Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Image from @plone/volto/components/theme/Image/Image instead of semantic-ui-react #6754

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/volto/news/6754.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use `Image` from `@plone/volto/components/theme/Image/Image` instead of `semantic-ui-react`. @wesleybl
6 changes: 3 additions & 3 deletions packages/volto/src/components/manage/Widgets/FileWidget.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React from 'react';
import PropTypes from 'prop-types';
import { Button, Image, Dimmer } from 'semantic-ui-react';
import { Button, Dimmer } from 'semantic-ui-react';
import { readAsDataURL } from 'promise-file-reader';
import { injectIntl } from 'react-intl';
import deleteSVG from '@plone/volto/icons/delete.svg';
Expand All @@ -16,6 +16,7 @@ import loadable from '@loadable/component';
import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
import { validateFileUploadSize } from '@plone/volto/helpers/FormValidation/FormValidation';
import { defineMessages, useIntl } from 'react-intl';
import Image from '@plone/volto/components/theme/Image/Image';

const imageMimetypes = [
'image/png',
Expand Down Expand Up @@ -131,9 +132,8 @@ const FileWidget = (props) => {
{isDragActive && <Dimmer active></Dimmer>}
{fileType ? (
<Image
className="image-preview"
className="image-preview small ui image"
id={`field-${id}-image`}
size="small"
src={imgsrc}
/>
) : (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import isArray from 'lodash/isArray';
import isEmpty from 'lodash/isEmpty';
import remove from 'lodash/remove';
import { connect } from 'react-redux';
import { Image, Label, Popup, Button } from 'semantic-ui-react';
import { Label, Popup, Button } from 'semantic-ui-react';
import {
flattenToAppURL,
isInternalURL,
Expand All @@ -33,6 +33,7 @@ import homeSVG from '@plone/volto/icons/home.svg';
import aheadSVG from '@plone/volto/icons/ahead.svg';
import blankSVG from '@plone/volto/icons/blank.svg';
import { withRouter } from 'react-router';
import Image from '@plone/volto/components/theme/Image/Image';

const messages = defineMessages({
placeholder: {
Expand Down Expand Up @@ -131,7 +132,7 @@ export class ObjectBrowserWidgetComponent extends Component {
<div className="item-title">
{includes(config.settings.imageObjects, item['@type']) ? (
<Image
size="small"
className="small ui image"
src={`${item['@id']}/@@images/image/thumb`}
/>
) : (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React, { useState } from 'react';
import PropTypes from 'prop-types';
import { Button, Image, Dimmer } from 'semantic-ui-react';
import { Button, Dimmer } from 'semantic-ui-react';
import { readAsDataURL } from 'promise-file-reader';
import { injectIntl } from 'react-intl';
import deleteSVG from '@plone/volto/icons/delete.svg';
Expand All @@ -15,6 +15,7 @@ import loadable from '@loadable/component';
import { defineMessages, useIntl } from 'react-intl';
import { toPublicURL } from '@plone/volto/helpers/Url/Url';
import { validateFileUploadSize } from '@plone/volto/helpers/FormValidation/FormValidation';
import Image from '@plone/volto/components/theme/Image/Image';

const imageMimetypes = [
'image/png',
Expand Down Expand Up @@ -119,9 +120,8 @@ const RegistryImageWidget = (props) => {
{isDragActive && <Dimmer active></Dimmer>}
{previewSrc ? (
<Image
className="image-preview"
className="image-preview small ui image"
id={`field-${id}-image`}
size="small"
src={previewSrc}
/>
) : (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ exports[`FileWidget renders a file widget component with value 1`] = `
tabindex="0"
>
<img
class="ui small image image-preview"
alt=""
class="image-preview small ui image"
fetchpriority="high"
id="field-my-field-image"
src="http://myfile?id=0"
/>
Expand Down Expand Up @@ -116,7 +118,9 @@ exports[`FileWidget renders a file widget component with value in raw data 1`] =
tabindex="0"
>
<img
class="ui small image image-preview"
alt=""
class="image-preview small ui image"
fetchpriority="high"
id="field-my-field-image"
src="data:image/png;base64,oiweurtksdgfjaslfqw9523563456"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ exports[`RegistryImageWidget renders a file widget component with value 1`] = `
tabindex="0"
>
<img
class="ui small image image-preview"
alt=""
class="image-preview small ui image"
fetchpriority="high"
id="field-my-field-image"
src="http://localhost:3000/@@site-logo/logo.cab945d8.svg"
/>
Expand Down
3 changes: 2 additions & 1 deletion packages/volto/src/components/theme/Logo/Logo.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
*/
import { defineMessages, useIntl } from 'react-intl';
import { useEffect } from 'react';
import { Image } from 'semantic-ui-react';
import LogoImage from '@plone/volto/components/theme/Logo/Logo.svg';
import { useSelector, useDispatch } from 'react-redux';
import { Link, useLocation } from 'react-router-dom';
import { getNavroot } from '@plone/volto/actions/navroot/navroot';
import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers/Url/Url';
import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
import Image from '@plone/volto/components/theme/Image/Image';

/**
* Logo component class.
Expand Down Expand Up @@ -47,6 +47,7 @@ const Logo = () => {
return (
<Link to={navRootPath} aria-label={intl.formatMessage(messages.home)}>
<Image
className="ui image"
src={
site['plone.site_logo']
? flattenToAppURL(site['plone.site_logo'])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ exports[`Multilingual Logo renders a logo component in a multilingual site langu
<img
alt="Logo of Plone Site"
className="ui image"
fetchpriority="high"
src="Logo.svg"
/>
</a>
Expand All @@ -23,6 +24,7 @@ exports[`Multilingual Logo renders a logo component in a multilingual site root
<img
alt="Logo of Plone Site"
className="ui image"
fetchpriority="high"
src="Logo.svg"
/>
</a>
Expand All @@ -37,6 +39,7 @@ exports[`Multilingual Logo renders a logo component with a custom logo in a non-
<img
alt="Logo of Plone Site"
className="ui image"
fetchpriority="high"
src="/@@site-logo/logo.cab945d8.svg"
/>
</a>
Expand All @@ -51,6 +54,7 @@ exports[`Multilingual Logo renders a logo component with a custom logo in a non-
<img
alt="Logo of Plone Site"
className="ui image"
fetchpriority="high"
src="/@@site-logo/logo.cab945d8.svg"
/>
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ exports[`Logo renders a logo component with a custom logo 1`] = `
<img
alt="Logo of Plone Site"
className="ui image"
fetchpriority="high"
src="/@@site-logo/logo.cab945d8.svg"
/>
</a>
Expand All @@ -23,6 +24,7 @@ exports[`Logo renders a logo component with a custom logo in a non-root url 1`]
<img
alt="Logo of Plone Site"
className="ui image"
fetchpriority="high"
src="/@@site-logo/logo.cab945d8.svg"
/>
</a>
Expand All @@ -37,6 +39,7 @@ exports[`Logo renders a logo component with default config 1`] = `
<img
alt="Logo of Plone Site"
className="ui image"
fetchpriority="high"
src="Logo.svg"
/>
</a>
Expand All @@ -51,6 +54,7 @@ exports[`Logo renders a logo component with default config in a non-root url 1`]
<img
alt="Logo of Plone Site"
className="ui image"
fetchpriority="high"
src="/@@site-logo/logo.cab945d8.svg"
/>
</a>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import PropTypes from 'prop-types';
import React from 'react';
import { List, Image } from 'semantic-ui-react';
import { List } from 'semantic-ui-react';
import { Link as RouterLink } from 'react-router-dom';
import cx from 'classnames';
import { compose } from 'redux';
Expand All @@ -13,6 +13,7 @@ import UniversalLink from '@plone/volto/components/manage/UniversalLink/Universa
import { withContentNavigation } from './withContentNavigation';

import leftIcon from '@plone/volto/icons/left-key.svg';
import Image from '@plone/volto/components/theme/Image/Image';

const messages = defineMessages({
navigation: {
Expand All @@ -38,7 +39,11 @@ function renderNode(node, parentLevel) {
in_path: node.is_in_path,
})}
>
{node.thumb ? <Image src={flattenToAppURL(node.thumb)} /> : ''}
{node.thumb ? (
<Image src={flattenToAppURL(node.thumb)} className="ui image" />
) : (
''
)}
{node.title}
{node.is_current ? (
<List.Content className="active-indicator">
Expand Down
Loading