@plone/volto 18.1.2 → 18.2.1

package/src/components/manage/Blocks/Image/Edit.jsx

@@ -5,13 +5,11 @@
 
 import React from 'react';
 import cx from 'classnames';
-import { ImageSidebar, SidebarPortal } from '@plone/volto/components';
+import ImageSidebar from '@plone/volto/components/manage/Blocks/Image/ImageSidebar';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 
-import {
-  flattenToAppURL,
-  isInternalURL,
-  withBlockExtensions,
-} from '@plone/volto/helpers';
+import { flattenToAppURL, isInternalURL } from '@plone/volto/helpers/Url/Url';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions';
 import config from '@plone/volto/registry';
 
 import { ImageInput } from '@plone/volto/components/manage/Widgets/ImageWidget';

package/src/components/manage/Blocks/Image/ImageSidebar.jsx

@@ -2,8 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Segment, Button } from 'semantic-ui-react';
 import { useIntl, FormattedMessage, defineMessages } from 'react-intl';
-import { flattenToAppURL, isInternalURL } from '@plone/volto/helpers';
-import { Icon, Image } from '@plone/volto/components';
+import { flattenToAppURL, isInternalURL } from '@plone/volto/helpers/Url/Url';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Image from '@plone/volto/components/theme/Image/Image';
 import { BlockDataForm } from '@plone/volto/components/manage/Form';
 import { ImageSchema } from './schema';
 import imageSVG from '@plone/volto/icons/image.svg';

package/src/components/manage/Blocks/Image/View.jsx

@@ -1,12 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { UniversalLink } from '@plone/volto/components';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import cx from 'classnames';
-import {
-  flattenToAppURL,
-  isInternalURL,
-  withBlockExtensions,
-} from '@plone/volto/helpers';
+import { flattenToAppURL, isInternalURL } from '@plone/volto/helpers/Url/Url';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions';
 import config from '@plone/volto/registry';
 
 export const View = ({ className, data, detached, properties, style }) => {

package/src/components/manage/Blocks/LeadImage/Edit.jsx

@@ -4,7 +4,8 @@ import { defineMessages, useIntl } from 'react-intl';
 import cx from 'classnames';
 import { Message } from 'semantic-ui-react';
 
-import { LeadImageSidebar, SidebarPortal } from '@plone/volto/components';
+import LeadImageSidebar from '@plone/volto/components/manage/Blocks/LeadImage/LeadImageSidebar';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import config from '@plone/volto/registry';
 
 import imageBlockSVG from '@plone/volto/components/manage/Blocks/Image/block-image.svg';

package/src/components/manage/Blocks/LeadImage/LeadImageSidebar.jsx

@@ -3,12 +3,13 @@ import PropTypes from 'prop-types';
 import { Form } from 'semantic-ui-react';
 import { Accordion, Grid, Segment } from 'semantic-ui-react';
 import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
-import { Icon, Image } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Image from '@plone/volto/components/theme/Image/Image';
 import {
   CheckboxWidget,
   TextWidget,
 } from '@plone/volto/components/manage/Widgets';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 import AlignBlock from '@plone/volto/components/manage/Sidebar/AlignBlock';
 
 import imageSVG from '@plone/volto/icons/image.svg';

package/src/components/manage/Blocks/LeadImage/View.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { UniversalLink } from '@plone/volto/components';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import cx from 'classnames';
 import config from '@plone/volto/registry';
 

package/src/components/manage/Blocks/Listing/DefaultTemplate.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { ConditionalLink, UniversalLink } from '@plone/volto/components';
-import { flattenToAppURL } from '@plone/volto/helpers';
-import { isInternalURL } from '@plone/volto/helpers/Url/Url';
+import ConditionalLink from '@plone/volto/components/manage/ConditionalLink/ConditionalLink';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
+import { flattenToAppURL, isInternalURL } from '@plone/volto/helpers/Url/Url';
 
 const DefaultTemplate = ({
   headlineTag,

package/src/components/manage/Blocks/Listing/Edit.jsx

@@ -1,16 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { defineMessages, useIntl } from 'react-intl';
-import { isEqual } from 'lodash';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import isEqual from 'lodash/isEqual';
 
-import {
-  SidebarPortal,
-  ListingBlockBody as ListingBody,
-} from '@plone/volto/components';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
+import { default as ListingBody } from '@plone/volto/components/manage/Blocks/Listing/ListingBody';
 import ListingData from './ListingData';
 
-import { getBaseUrl } from '@plone/volto/helpers';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
 
 const messages = defineMessages({
   results: {

package/src/components/manage/Blocks/Listing/ImageGallery.jsx

@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import loadable from '@loadable/component';
 import 'react-image-gallery/styles/css/image-gallery.css';
 import { Button } from 'semantic-ui-react';
-import { Icon } from '@plone/volto/components';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 import config from '@plone/volto/registry';
 
 import galleryLeftSVG from '@plone/volto/icons/left-key.svg';

package/src/components/manage/Blocks/Listing/ListingBody.jsx

@@ -3,11 +3,11 @@ import { FormattedMessage, injectIntl } from 'react-intl';
 import cx from 'classnames';
 import { Pagination, Dimmer, Loader } from 'semantic-ui-react';
 import Slugger from 'github-slugger';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { renderLinkElement } from '@plone/volto-slate/editor/render';
 import config from '@plone/volto/registry';
 import withQuerystringResults from './withQuerystringResults';
-import { normalizeString } from '@plone/volto/helpers';
+import { normalizeString } from '@plone/volto/helpers/Utils/Utils';
 
 import paginationLeftSVG from '@plone/volto/icons/left-key.svg';
 import paginationRightSVG from '@plone/volto/icons/right-key.svg';

package/src/components/manage/Blocks/Listing/SummaryTemplate.jsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { ConditionalLink, Component } from '@plone/volto/components';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import ConditionalLink from '@plone/volto/components/manage/ConditionalLink/ConditionalLink';
+import Component from '@plone/volto/components/theme/Component/Component';
 
-import { isInternalURL } from '@plone/volto/helpers/Url/Url';
+import { flattenToAppURL, isInternalURL } from '@plone/volto/helpers/Url/Url';
 
 const SummaryTemplate = ({ items, linkTitle, linkHref, isEditMode }) => {
   let link = null;

package/src/components/manage/Blocks/Listing/View.jsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions';
 
-import { ListingBlockBody as ListingBody } from '@plone/volto/components';
+import { default as ListingBody } from '@plone/volto/components/manage/Blocks/Listing/ListingBody';
 
 const View = (props) => {
   const { data, path, pathname, className, style } = props;

package/src/components/manage/Blocks/Listing/getAsyncData.js

@@ -1,5 +1,5 @@
-import { getQueryStringResults } from '@plone/volto/actions';
-import { resolveBlockExtensions } from '@plone/volto/helpers';
+import { getQueryStringResults } from '@plone/volto/actions/querystringsearch/querystringsearch';
+import { resolveBlockExtensions } from '@plone/volto/helpers/Extensions';
 import qs from 'query-string';
 import { slugify } from '@plone/volto/helpers/Utils/Utils';
 

package/src/components/manage/Blocks/Listing/withQuerystringResults.jsx

@@ -3,8 +3,10 @@ import { useDispatch, useSelector } from 'react-redux';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import useDeepCompareEffect from 'use-deep-compare-effect';
 
-import { getContent, getQueryStringResults } from '@plone/volto/actions';
-import { usePagination, getBaseUrl } from '@plone/volto/helpers';
+import { getContent } from '@plone/volto/actions/content/content';
+import { getQueryStringResults } from '@plone/volto/actions/querystringsearch/querystringsearch';
+import { usePagination } from '@plone/volto/helpers/Utils/usePagination';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
 
 import config from '@plone/volto/registry';
 

package/src/components/manage/Blocks/Maps/Edit.jsx

@@ -3,9 +3,11 @@ import PropTypes from 'prop-types';
 import { Button, Input, Message } from 'semantic-ui-react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 import cx from 'classnames';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions';
 import { compose } from 'redux';
-import { Icon, SidebarPortal, MapsSidebar } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
+import MapsSidebar from '@plone/volto/components/manage/Blocks/Maps/MapsSidebar';
 import clearSVG from '@plone/volto/icons/clear.svg';
 import aheadSVG from '@plone/volto/icons/ahead.svg';
 import mapsBlockSVG from '@plone/volto/components/manage/Blocks/Maps/block-maps.svg';

package/src/components/manage/Blocks/Maps/MapsSidebar.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { MapsSchema } from './schema';
 import { useIntl, defineMessages } from 'react-intl';
 import globeSVG from '@plone/volto/icons/globe.svg';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { BlockDataForm } from '@plone/volto/components/manage/Form';
 import { Segment } from 'semantic-ui-react';
 

package/src/components/manage/Blocks/Maps/View.jsx

@@ -8,7 +8,7 @@ import { injectIntl } from 'react-intl';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { compose } from 'redux';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions';
 
 /**
  * View image block class.

package/src/components/manage/Blocks/Search/SearchBlockEdit.jsx

@@ -2,16 +2,16 @@ import React, { useEffect } from 'react';
 import { defineMessages } from 'react-intl';
 import { compose } from 'redux';
 
-import { SidebarPortal } from '@plone/volto/components';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import { BlockDataForm } from '@plone/volto/components/manage/Form';
 import { addExtensionFieldToSchema } from '@plone/volto/helpers/Extensions/withBlockSchemaEnhancer';
-import { getBaseUrl } from '@plone/volto/helpers';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
 import config from '@plone/volto/registry';
 
 import { SearchBlockViewComponent } from './SearchBlockView';
 import Schema from './schema';
 import { withSearch, withQueryString } from './hocs';
-import { cloneDeep } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 
 const messages = defineMessages({
   template: {

package/src/components/manage/Blocks/Search/SearchBlockView.jsx

@@ -1,14 +1,15 @@
 import React from 'react';
 
 import ListingBody from '@plone/volto/components/manage/Blocks/Listing/ListingBody';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions';
 
 import config from '@plone/volto/registry';
 
 import { withSearch, withQueryString } from './hocs';
 import { compose } from 'redux';
 import { useSelector } from 'react-redux';
-import { isEqual, isFunction } from 'lodash';
+import isEqual from 'lodash/isEqual';
+import isFunction from 'lodash/isFunction';
 import cx from 'classnames';
 
 const getListingBodyVariation = (data) => {

package/src/components/manage/Blocks/Search/components/DateRangeFacet.jsx

@@ -3,7 +3,7 @@ import { Header } from 'semantic-ui-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import { compose } from 'redux';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { toBackendLang } from '@plone/volto/helpers/Utils/Utils';
 import { connect } from 'react-redux';
 

package/src/components/manage/Blocks/Search/components/FilterList.jsx

@@ -1,10 +1,10 @@
 import React from 'react';
 import { Accordion, Button, Icon } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
 
-import { Icon as VoltoIcon } from '@plone/volto/components';
-import { resolveExtension } from '@plone/volto/helpers';
+import { default as VoltoIcon } from '@plone/volto/components/theme/Icon/Icon';
+import { resolveExtension } from '@plone/volto/helpers/Extensions';
 import config from '@plone/volto/registry';
 
 import downSVG from '@plone/volto/icons/down-key.svg';

package/src/components/manage/Blocks/Search/components/SearchInput.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Button, Input } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import loupeSVG from '@plone/volto/icons/zoom.svg';
 import clearSVG from '@plone/volto/icons/clear.svg';
 

package/src/components/manage/Blocks/Search/components/SortOn.jsx

@@ -2,7 +2,7 @@ import { Button } from 'semantic-ui-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import cx from 'classnames';
 import { compose } from 'redux';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import {
   Option,
   DropdownIndicator,

package/src/components/manage/Blocks/Search/components/base.js

@@ -1,4 +1,4 @@
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
 
 /**
  * Converts the state (extracted from URL) to options for the facet control

package/src/components/manage/Blocks/Search/hocs/withQueryString.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { getQuerystring } from '@plone/volto/actions';
+import { getQuerystring } from '@plone/volto/actions/querystring/querystring';
 
 function getDisplayName(WrappedComponent) {
   return WrappedComponent.displayName || WrappedComponent.name || 'Component';

package/src/components/manage/Blocks/Search/hocs/withSearch.jsx

@@ -5,8 +5,8 @@ import { useLocation, useHistory } from 'react-router-dom';
 
 import { resolveExtension } from '@plone/volto/helpers/Extensions/withBlockExtensions';
 import config from '@plone/volto/registry';
-import { usePrevious } from '@plone/volto/helpers';
-import { isEqual } from 'lodash';
+import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
+import isEqual from 'lodash/isEqual';
 
 function getDisplayName(WrappedComponent) {
   return WrappedComponent.displayName || WrappedComponent.name || 'Component';

package/src/components/manage/Blocks/Search/schema.js

@@ -1,6 +1,6 @@
 import config from '@plone/volto/registry';
 import { defineMessages } from 'react-intl';
-import { cloneDeep } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 import { hasNonValueOperation, hasDateOperation } from './utils';
 
 const messages = defineMessages({

package/src/components/manage/Blocks/Search/widgets/SelectMetadataField.jsx

@@ -3,7 +3,10 @@
  * @module components/manage/Widgets/SelectWidget
  */
 
-import { map, filter, toPairs, groupBy } from 'lodash';
+import map from 'lodash/map';
+import filter from 'lodash/filter';
+import toPairs from 'lodash/toPairs';
+import groupBy from 'lodash/groupBy';
 import { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';

package/src/components/manage/Blocks/Teaser/Data.jsx

@@ -3,14 +3,13 @@ import { useDispatch } from 'react-redux';
 import { defineMessages, useIntl } from 'react-intl';
 import { Button } from 'semantic-ui-react';
 import { toast } from 'react-toastify';
-import { Icon, Toast } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 import { BlockDataForm } from '@plone/volto/components/manage/Form';
-import {
-  flattenToAppURL,
-  messages as defaultMessages,
-} from '@plone/volto/helpers';
-import { getContent } from '@plone/volto/actions';
-import { isEmpty } from 'lodash';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import { messages as defaultMessages } from '@plone/volto/helpers/MessageLabels/MessageLabels';
+import { getContent } from '@plone/volto/actions/content/content';
+import isEmpty from 'lodash/isEmpty';
 
 import reloadSVG from '@plone/volto/icons/reload.svg';
 import trashSVG from '@plone/volto/icons/delete.svg';

package/src/components/manage/Blocks/Teaser/DefaultBody.jsx

@@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
 import { Message } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
 import imageBlockSVG from '@plone/volto/components/manage/Blocks/Image/block-image.svg';
-import { isInternalURL } from '@plone/volto/helpers';
-import { MaybeWrap } from '@plone/volto/components';
-import { UniversalLink } from '@plone/volto/components';
+import { isInternalURL } from '@plone/volto/helpers/Url/Url';
+import MaybeWrap from '@plone/volto/components/manage/MaybeWrap/MaybeWrap';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import cx from 'classnames';
 import config from '@plone/volto/registry';
 

package/src/components/manage/Blocks/Teaser/Edit.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import TeaserBody from './Body';
-import { SidebarPortal } from '@plone/volto/components';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import TeaserData from './Data';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions';
 
 const TeaserEdit = (props) => {
   const { data, onChangeBlock, block, selected } = props;

package/src/components/manage/Blocks/Teaser/View.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import TeaserBody from './Body';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions';
 
 const TeaserView = (props) => {
   return <TeaserBody {...props} />;

package/src/components/manage/Blocks/Teaser/adapter.js

@@ -1,4 +1,4 @@
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
 
 export const TeaserBlockDataAdapter = ({
   block,

package/src/components/manage/Blocks/ToC/Edit.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { SidebarPortal } from '@plone/volto/components';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import { BlockDataForm } from '@plone/volto/components/manage/Form';
 
 import TableOfContentsSchema from './Schema';

package/src/components/manage/Blocks/ToC/View.jsx

@@ -8,12 +8,12 @@ import { FormattedMessage } from 'react-intl';
 import cx from 'classnames';
 import { Message } from 'semantic-ui-react';
 import config from '@plone/volto/registry';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions';
 
 import {
   getBlocksFieldname,
   getBlocksLayoutFieldname,
-} from '@plone/volto/helpers';
+} from '@plone/volto/helpers/Blocks/Blocks';
 
 export const getBlocksTocEntries = (properties, tocData) => {
   const blocksFieldName = getBlocksFieldname(properties);

package/src/components/manage/Blocks/ToC/variations/DefaultTocRenderer.jsx

@@ -4,11 +4,11 @@
  */
 
 import PropTypes from 'prop-types';
-import { map } from 'lodash';
+import map from 'lodash/map';
 import { List } from 'semantic-ui-react';
 import Slugger from 'github-slugger';
-import { UniversalLink } from '@plone/volto/components';
-import { normalizeString } from '@plone/volto/helpers';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
+import { normalizeString } from '@plone/volto/helpers/Utils/Utils';
 
 const RenderListItems = ({ items, data }) => {
   return map(items, (item) => {

package/src/components/manage/Blocks/ToC/variations/HorizontalMenu.jsx

@@ -1,10 +1,10 @@
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
-import { map } from 'lodash';
+import map from 'lodash/map';
 import { Menu, Dropdown } from 'semantic-ui-react';
 import AnchorLink from 'react-anchor-link-smooth-scroll';
 import Slugger from 'github-slugger';
-import { normalizeString } from '@plone/volto/helpers';
+import { normalizeString } from '@plone/volto/helpers/Utils/Utils';
 
 const RenderMenuItems = ({ items }) => {
   return map(items, (item) => {

package/src/components/manage/Blocks/Video/Body.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import { Embed, Message } from 'semantic-ui-react';
 import cx from 'classnames';
-import { isInternalURL, flattenToAppURL } from '@plone/volto/helpers';
+import { isInternalURL, flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 //Extracting videoID, listID and thumbnailURL from the video URL
 const getVideoIDAndPlaceholder = (url) => {

package/src/components/manage/Blocks/Video/Edit.jsx

@@ -4,12 +4,14 @@ import { defineMessages, useIntl } from 'react-intl';
 import { Button, Input, Message } from 'semantic-ui-react';
 import cx from 'classnames';
 
-import { Icon, SidebarPortal, VideoSidebar } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
+import VideoSidebar from '@plone/volto/components/manage/Blocks/Video/VideoSidebar';
 import clearSVG from '@plone/volto/icons/clear.svg';
 import aheadSVG from '@plone/volto/icons/ahead.svg';
 import videoBlockSVG from '@plone/volto/components/manage/Blocks/Video/block-video.svg';
 import Body from '@plone/volto/components/manage/Blocks/Video/Body';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions';
 
 const messages = defineMessages({
   VideoFormDescription: {

package/src/components/manage/Blocks/Video/VideoSidebar.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { VideoBlockSchema } from './schema';
 import { Segment } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { BlockDataForm } from '@plone/volto/components/manage/Form';
 import videoSVG from '@plone/volto/icons/videocamera.svg';
 

package/src/components/manage/Blocks/Video/View.jsx

@@ -6,7 +6,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Body from '@plone/volto/components/manage/Blocks/Video/Body';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions';
 import cx from 'classnames';
 
 /**

package/src/components/manage/ConditionalLink/ConditionalLink.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { UniversalLink } from '@plone/volto/components';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import PropTypes from 'prop-types';
 
 const ConditionalLink = ({ condition, to, item, ...props }) => {