@plone/volto 18.1.1 → 18.2.0

package/src/components/manage/Rules/Rules.jsx

@@ -4,7 +4,7 @@
  */
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Helmet } from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { Link } from 'react-router-dom';
@@ -19,7 +19,7 @@ import {
 } from 'semantic-ui-react';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
 
-import { getBaseUrl } from '@plone/volto/helpers';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
 import {
   addRule,
   getRules,
@@ -28,15 +28,16 @@ import {
   applyRulesToSubfolders,
   unapplyRulesToSubfolders,
   removeRules,
-} from '@plone/volto/actions';
+} from '@plone/volto/actions/rules/rules';
 
-import { Icon, Toolbar } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
 
 import backSVG from '@plone/volto/icons/back.svg';
 import checkSVG from '@plone/volto/icons/check.svg';
 
 import { toast } from 'react-toastify';
-import { Toast } from '@plone/volto/components';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 
 const messages = defineMessages({
   back: {

package/src/components/manage/Sharing/Sharing.jsx

@@ -5,11 +5,13 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Plug, Pluggable } from '@plone/volto/components/manage/Pluggable';
-import { Helmet } from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { Link, withRouter } from 'react-router-dom';
-import { find, isEqual, map } from 'lodash';
+import find from 'lodash/find';
+import isEqual from 'lodash/isEqual';
+import map from 'lodash/map';
 import { createPortal } from 'react-dom';
 import {
   Button,
@@ -24,9 +26,14 @@ import {
 import jwtDecode from 'jwt-decode';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
 
-import { updateSharing, getSharing } from '@plone/volto/actions';
-import { getBaseUrl } from '@plone/volto/helpers';
-import { Icon, Toolbar, Toast } from '@plone/volto/components';
+import {
+  updateSharing,
+  getSharing,
+} from '@plone/volto/actions/sharing/sharing';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 import { toast } from 'react-toastify';
 import config from '@plone/volto/registry';
 

package/src/components/manage/Sidebar/AlignBlock.jsx

@@ -1,5 +1,5 @@
 import { defineMessages, useIntl } from 'react-intl';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { Button } from 'semantic-ui-react';
 import imageLeftSVG from '@plone/volto/icons/image-left.svg';
 import imageRightSVG from '@plone/volto/icons/image-right.svg';

package/src/components/manage/Sidebar/ObjectBrowser.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import ObjectBrowserBody from '@plone/volto/components/manage/Sidebar/ObjectBrowserBody';
 import SidebarPopup from '@plone/volto/components/manage/Sidebar/SidebarPopup';
-import { getBaseUrl } from '@plone/volto/helpers';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
 
 const withObjectBrowser = (WrappedComponent) =>
   class extends React.Component {

package/src/components/manage/Sidebar/ObjectBrowserBody.jsx

@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
 import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
 import { Input, Segment, Breadcrumb } from 'semantic-ui-react';
 
-import { join } from 'lodash';
+import join from 'lodash/join';
 
 // These absolute imports (without using the corresponding centralized index.js) are required
 // to cut circular import problems, this file should never use them. This is because of

package/src/components/manage/Sidebar/ObjectBrowserNav.jsx

@@ -3,7 +3,8 @@ import { Button, Segment, Popup } from 'semantic-ui-react';
 import { useIntl, defineMessages } from 'react-intl';
 import cx from 'classnames';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
-import { flattenToAppURL, getContentIcon } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import { getContentIcon } from '@plone/volto/helpers/Content/Content';
 import config from '@plone/volto/registry';
 
 import rightArrowSVG from '@plone/volto/icons/right-key.svg';

package/src/components/manage/Sidebar/Sidebar.jsx

@@ -6,10 +6,11 @@ import { compose } from 'redux';
 import { withCookies } from 'react-cookie';
 import { defineMessages, useIntl } from 'react-intl';
 import cx from 'classnames';
-import { BodyClass, getCookieOptions } from '@plone/volto/helpers';
-import { Icon } from '@plone/volto/components';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
+import { getCookieOptions } from '@plone/volto/helpers/Cookies/cookies';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import forbiddenSVG from '@plone/volto/icons/forbidden.svg';
-import { setSidebarTab } from '@plone/volto/actions';
+import { setSidebarTab } from '@plone/volto/actions/sidebar/sidebar';
 import expandSVG from '@plone/volto/icons/left-key.svg';
 import collapseSVG from '@plone/volto/icons/right-key.svg';
 

package/src/components/manage/Sidebar/SidebarPopup.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { createPortal } from 'react-dom';
 import { CSSTransition } from 'react-transition-group';
 import PropTypes from 'prop-types';
-import { doesNodeContainClick } from 'semantic-ui-react/dist/commonjs/lib';
+import doesNodeContainClick from 'semantic-ui-react/dist/commonjs/lib/doesNodeContainClick';
 
 const DEFAULT_TIMEOUT = 500;
 

package/src/components/manage/TextLineEdit/TextLineEdit.jsx

@@ -3,7 +3,7 @@ import { Editor, Node, Transforms, Range, createEditor } from 'slate';
 import { ReactEditor, Editable, Slate, withReact } from 'slate-react';
 import PropTypes from 'prop-types';
 import { defineMessages, useIntl } from 'react-intl';
-import { usePrevious } from '@plone/volto/helpers';
+import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
 import config from '@plone/volto/registry';
 import { P } from '@plone/volto-slate/constants';
 import cx from 'classnames';

package/src/components/manage/Toolbar/More.jsx

@@ -3,23 +3,22 @@ import { defineMessages, useIntl } from 'react-intl';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 import { Link, useHistory } from 'react-router-dom';
-import { find } from 'lodash';
+import find from 'lodash/find';
 import { toast } from 'react-toastify';
 
-import { Toast } from '@plone/volto/components';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 import { Pluggable, Plug } from '@plone/volto/components/manage/Pluggable';
-import {
-  FormattedDate,
-  Icon,
-  Display,
-  Workflow,
-} from '@plone/volto/components';
+import FormattedDate from '@plone/volto/components/theme/FormattedDate/FormattedDate';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Display from '@plone/volto/components/manage/Display/Display';
+import Workflow from '@plone/volto/components/manage/Workflow/Workflow';
 import {
   applyWorkingCopy,
   createWorkingCopy,
   removeWorkingCopy,
-} from '@plone/volto/actions';
-import { flattenToAppURL, getBaseUrl, usePrevious } from '@plone/volto/helpers';
+} from '@plone/volto/actions/workingcopy/workingcopy';
+import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
 import config from '@plone/volto/registry';
 import rightArrowSVG from '@plone/volto/icons/right-key.svg';
 import userSVG from '@plone/volto/icons/user.svg';

package/src/components/manage/Toolbar/PersonalTools.jsx

@@ -6,10 +6,10 @@ import jwtDecode from 'jwt-decode';
 import cx from 'classnames';
 import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
 
-import { Icon } from '@plone/volto/components';
-import { getUser } from '@plone/volto/actions';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import { getUser } from '@plone/volto/actions/users/users';
 import { Pluggable } from '@plone/volto/components/manage/Pluggable';
-import { expandToBackendURL, getBaseUrl } from '@plone/volto/helpers';
+import { expandToBackendURL, getBaseUrl } from '@plone/volto/helpers/Url/Url';
 import logoutSVG from '@plone/volto/icons/log-out.svg';
 import rightArrowSVG from '@plone/volto/icons/right-key.svg';
 import backSVG from '@plone/volto/icons/back.svg';

package/src/components/manage/Toolbar/StandardWrapper.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import backSVG from '@plone/volto/icons/back.svg';
 
 const StandardWrapper = (props) => {

package/src/components/manage/Toolbar/Toolbar.jsx

@@ -10,9 +10,10 @@ import { Link } from 'react-router-dom';
 import jwtDecode from 'jwt-decode';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
-import { doesNodeContainClick } from 'semantic-ui-react/dist/commonjs/lib';
+import doesNodeContainClick from 'semantic-ui-react/dist/commonjs/lib/doesNodeContainClick';
 import { withCookies } from 'react-cookie';
-import { filter, find } from 'lodash';
+import filter from 'lodash/filter';
+import find from 'lodash/find';
 import cx from 'classnames';
 import config from '@plone/volto/registry';
 
@@ -22,19 +23,15 @@ import Types from '@plone/volto/components/manage/Toolbar/Types';
 import PersonalInformation from '@plone/volto/components/manage/Preferences/PersonalInformation';
 import PersonalPreferences from '@plone/volto/components/manage/Preferences/PersonalPreferences';
 import StandardWrapper from '@plone/volto/components/manage/Toolbar/StandardWrapper';
-import {
-  getTypes,
-  listActions,
-  setExpandedToolbar,
-  unlockContent,
-} from '@plone/volto/actions';
-import { Icon } from '@plone/volto/components';
-import {
-  BodyClass,
-  getBaseUrl,
-  getCookieOptions,
-  hasApiExpander,
-} from '@plone/volto/helpers';
+import { getTypes } from '@plone/volto/actions/types/types';
+import { listActions } from '@plone/volto/actions/actions/actions';
+import { setExpandedToolbar } from '@plone/volto/actions/toolbar/toolbar';
+import { unlockContent } from '@plone/volto/actions/content/content';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { getCookieOptions } from '@plone/volto/helpers/Cookies/cookies';
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
 import { Pluggable } from '@plone/volto/components/manage/Pluggable';
 
 import penSVG from '@plone/volto/icons/pen.svg';

package/src/components/manage/Toolbar/Types.jsx

@@ -2,9 +2,14 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { Link } from 'react-router-dom';
-import { filter, find, isEmpty, map } from 'lodash';
+import filter from 'lodash/filter';
+import find from 'lodash/find';
+import isEmpty from 'lodash/isEmpty';
+import map from 'lodash/map';
 import { FormattedMessage } from 'react-intl';
-import { flattenToAppURL, langmap, toBackendLang } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import langmap from '@plone/volto/helpers/LanguageMap/LanguageMap';
+import { toBackendLang } from '@plone/volto/helpers/Utils/Utils';
 import config from '@plone/volto/registry';
 
 const Types = ({ types, pathname, content, currentLanguage }) => {

package/src/components/manage/Widgets/ArrayWidget.jsx

@@ -9,14 +9,15 @@ import PropTypes from 'prop-types';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
-import { find, isObject } from 'lodash';
+import find from 'lodash/find';
+import isObject from 'lodash/isObject';
 
 import {
   getVocabFromHint,
   getVocabFromField,
   getVocabFromItems,
-} from '@plone/volto/helpers';
-import { getVocabulary } from '@plone/volto/actions';
+} from '@plone/volto/helpers/Vocabularies/Vocabularies';
+import { getVocabulary } from '@plone/volto/actions/vocabularies/vocabularies';
 
 import {
   Option,

package/src/components/manage/Widgets/ButtonsWidget.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { Button } from 'semantic-ui-react';
 
 // The ButtonsWidget

package/src/components/manage/Widgets/ColorPickerWidget.tsx

@@ -1,7 +1,8 @@
 import React from 'react';
 import { Form } from 'semantic-ui-react';
 import { Grid, Button } from 'semantic-ui-react';
-import { isEmpty, isEqual } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
+import isEqual from 'lodash/isEqual';
 import { defineMessages, useIntl } from 'react-intl';
 
 const messages = defineMessages({

package/src/components/manage/Widgets/DatetimeWidget.jsx

@@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
 import { defineMessages, useIntl } from 'react-intl';
 import loadable from '@loadable/component';
 import cx from 'classnames';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
-import { parseDateTime, toBackendLang } from '@plone/volto/helpers';
+import { parseDateTime, toBackendLang } from '@plone/volto/helpers/Utils/Utils';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 
 import leftKey from '@plone/volto/icons/left-key.svg';

package/src/components/manage/Widgets/FileWidget.jsx

@@ -9,10 +9,12 @@ import { Button, Image, Dimmer } from 'semantic-ui-react';
 import { readAsDataURL } from 'promise-file-reader';
 import { injectIntl } from 'react-intl';
 import deleteSVG from '@plone/volto/icons/delete.svg';
-import { Icon, UniversalLink } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
 import loadable from '@loadable/component';
-import { flattenToAppURL, validateFileUploadSize } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import { validateFileUploadSize } from '@plone/volto/helpers/FormValidation/FormValidation';
 import { defineMessages, useIntl } from 'react-intl';
 
 const imageMimetypes = [

package/src/components/manage/Widgets/FormFieldWrapper.jsx

@@ -5,11 +5,11 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Form, Grid, Icon as IconOld, Label } from 'semantic-ui-react';
-import { map } from 'lodash';
+import map from 'lodash/map';
 import cx from 'classnames';
 import { defineMessages, injectIntl } from 'react-intl';
 import LanguageSVG from '@plone/volto/icons/language.svg';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 
 const messages = defineMessages({
   edit: {

package/src/components/manage/Widgets/IdWidget.jsx

@@ -7,13 +7,17 @@ import { useState, useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
 import { useSelector, useDispatch } from 'react-redux';
 import { Input } from 'semantic-ui-react';
-import { compact, concat, map, union, uniq } from 'lodash';
+import compact from 'lodash/compact';
+import concat from 'lodash/concat';
+import map from 'lodash/map';
+import union from 'lodash/union';
+import uniq from 'lodash/uniq';
 
 import { defineMessages, useIntl } from 'react-intl';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
 import config from '@plone/volto/registry';
-import { getQuerystring } from '@plone/volto/actions';
+import { getQuerystring } from '@plone/volto/actions/querystring/querystring';
 
 const messages = defineMessages({
   reservedId: {

package/src/components/manage/Widgets/ImageWidget.jsx

@@ -13,12 +13,13 @@ import {
   flattenToAppURL,
   getBaseUrl,
   isInternalURL,
-  validateFileUploadSize,
-  usePrevious,
-} from '@plone/volto/helpers';
-import { createContent } from '@plone/volto/actions';
+} from '@plone/volto/helpers/Url/Url';
+import { validateFileUploadSize } from '@plone/volto/helpers/FormValidation/FormValidation';
+import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
+import { createContent } from '@plone/volto/actions/content/content';
 import { readAsDataURL } from 'promise-file-reader';
-import { FormFieldWrapper, Icon } from '@plone/volto/components';
+import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 
 import imageBlockSVG from '@plone/volto/components/manage/Blocks/Image/block-image.svg';
 import clearSVG from '@plone/volto/icons/clear.svg';

package/src/components/manage/Widgets/InternalUrlWidget.jsx

@@ -6,9 +6,13 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { Input, Button } from 'semantic-ui-react';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
-import { isInternalURL, flattenToAppURL, URLUtils } from '@plone/volto/helpers';
+import {
+  isInternalURL,
+  flattenToAppURL,
+  URLUtils,
+} from '@plone/volto/helpers/Url/Url';
 import withObjectBrowser from '@plone/volto/components/manage/Sidebar/ObjectBrowser';
 import clearSVG from '@plone/volto/icons/clear.svg';
 import navTreeSVG from '@plone/volto/icons/nav.svg';

package/src/components/manage/Widgets/ObjectBrowserWidget.jsx

@@ -6,7 +6,11 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { compose } from 'redux';
-import { compact, includes, isArray, isEmpty, remove } from 'lodash';
+import compact from 'lodash/compact';
+import includes from 'lodash/includes';
+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 {

package/src/components/manage/Widgets/ObjectListWidget.jsx

@@ -1,9 +1,11 @@
 import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { Accordion, Button, Segment } from 'semantic-ui-react';
-import { DragDropList, Icon } from '@plone/volto/components';
+import DragDropList from '@plone/volto/components/manage/DragDropList/DragDropList';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
-import { applySchemaDefaults, reorderArray } from '@plone/volto/helpers';
+import { applySchemaDefaults } from '@plone/volto/helpers/Blocks/Blocks';
+import { reorderArray } from '@plone/volto/helpers/Utils/Utils';
 import ObjectWidget from '@plone/volto/components/manage/Widgets/ObjectWidget';
 
 import upSVG from '@plone/volto/icons/up-key.svg';

package/src/components/manage/Widgets/ObjectListWidget.stories.js

@@ -3,7 +3,7 @@ import { RealStoreWrapper, FormUndoWrapper } from '@plone/volto/storybook';
 import React from 'react';
 import { searchResults } from './ObjectBrowserWidget.stories';
 
-import { cloneDeep } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 
 const defaultSchema = {
   title: 'Item',

package/src/components/manage/Widgets/ObjectWidget.stories.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { searchResults } from './ObjectBrowserWidget.stories';
-import { cloneDeep } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 import ObjectWidget from './ObjectWidget';
 import WidgetStory from './story';
 

package/src/components/manage/Widgets/QuerySortOnWidget.jsx

@@ -1,6 +1,8 @@
 import React from 'react';
 import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
-import { toPairs, groupBy, map } from 'lodash';
+import toPairs from 'lodash/toPairs';
+import groupBy from 'lodash/groupBy';
+import map from 'lodash/map';
 import { defineMessages, useIntl } from 'react-intl';
 import { useSelector } from 'react-redux';
 

package/src/components/manage/Widgets/QueryWidget.jsx

@@ -8,10 +8,15 @@ import PropTypes from 'prop-types';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { Button, Form, Grid, Input, Label } from 'semantic-ui-react';
-import { filter, remove, toPairs, groupBy, isEmpty, map } from 'lodash';
+import filter from 'lodash/filter';
+import remove from 'lodash/remove';
+import toPairs from 'lodash/toPairs';
+import groupBy from 'lodash/groupBy';
+import isEmpty from 'lodash/isEmpty';
+import map from 'lodash/map';
 import { defineMessages, injectIntl } from 'react-intl';
-import { getQuerystring } from '@plone/volto/actions';
-import { Icon } from '@plone/volto/components';
+import { getQuerystring } from '@plone/volto/actions/querystring/querystring';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import cx from 'classnames';
 import config from '@plone/volto/registry';

package/src/components/manage/Widgets/RecurrenceWidget/ByDayField.jsx

@@ -7,7 +7,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Form, Grid, Button } from 'semantic-ui-react';
 import { Days } from './Utils';
-import { toBackendLang } from '@plone/volto/helpers';
+import { toBackendLang } from '@plone/volto/helpers/Utils/Utils';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import { useSelector } from 'react-redux';
 

package/src/components/manage/Widgets/RecurrenceWidget/MonthOfTheYearField.jsx

@@ -5,10 +5,10 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { map } from 'lodash';
+import map from 'lodash/map';
 import { Form } from 'semantic-ui-react';
 import SelectInput from './SelectInput';
-import { toBackendLang } from '@plone/volto/helpers';
+import { toBackendLang } from '@plone/volto/helpers/Utils/Utils';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import { useSelector } from 'react-redux';
 

package/src/components/manage/Widgets/RecurrenceWidget/Occurences.jsx

@@ -8,10 +8,10 @@ import PropTypes from 'prop-types';
 import { defineMessages, injectIntl } from 'react-intl';
 import cx from 'classnames';
 import { List, Button, Header, Label } from 'semantic-ui-react';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import addSVG from '@plone/volto/icons/circle-plus.svg';
 import trashSVG from '@plone/volto/icons/delete.svg';
-import { toBackendLang } from '@plone/volto/helpers';
+import { toBackendLang } from '@plone/volto/helpers/Utils/Utils';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 
 import { useSelector } from 'react-redux';

package/src/components/manage/Widgets/RecurrenceWidget/RecurrenceWidget.jsx

@@ -9,7 +9,11 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 
 import cx from 'classnames';
-import { isEqual, map, find, concat, remove } from 'lodash';
+import isEqual from 'lodash/isEqual';
+import map from 'lodash/map';
+import find from 'lodash/find';
+import concat from 'lodash/concat';
+import remove from 'lodash/remove';
 import { defineMessages, injectIntl } from 'react-intl';
 import {
   Form,
@@ -21,10 +25,10 @@ import {
   Header,
 } from 'semantic-ui-react';
 
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import DatetimeWidget from '@plone/volto/components/manage/Widgets/DatetimeWidget';
 import SelectWidget from '@plone/volto/components/manage/Widgets/SelectWidget';
-import { toBackendLang } from '@plone/volto/helpers';
+import { toBackendLang } from '@plone/volto/helpers/Utils/Utils';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 
 import saveSVG from '@plone/volto/icons/save.svg';

package/src/components/manage/Widgets/RecurrenceWidget/SelectInput.jsx

@@ -5,7 +5,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { find } from 'lodash';
+import find from 'lodash/find';
 import {
   Option,
   DropdownIndicator,

package/src/components/manage/Widgets/RecurrenceWidget/WeekdayOfTheMonthField.jsx

@@ -4,11 +4,11 @@
  */
 
 import React from 'react';
-import { map } from 'lodash';
+import map from 'lodash/map';
 import { Days } from './Utils';
 import SelectInput from './SelectInput';
 import { Form } from 'semantic-ui-react';
-import { toBackendLang } from '@plone/volto/helpers';
+import { toBackendLang } from '@plone/volto/helpers/Utils/Utils';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import { useSelector } from 'react-redux';
 

package/src/components/manage/Widgets/RecurrenceWidget/WeekdayOfTheMonthIndexField.jsx

@@ -6,7 +6,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { defineMessages, injectIntl } from 'react-intl';
-import { map } from 'lodash';
+import map from 'lodash/map';
 import { Form } from 'semantic-ui-react';
 import SelectInput from './SelectInput';
 

package/src/components/manage/Widgets/ReferenceWidget.jsx

@@ -2,12 +2,20 @@ import { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
 import { Label, Dropdown, Popup, Icon } from 'semantic-ui-react';
-import { compact, concat, fromPairs, map, values, uniqBy } from 'lodash';
+import compact from 'lodash/compact';
+import concat from 'lodash/concat';
+import fromPairs from 'lodash/fromPairs';
+import map from 'lodash/map';
+import values from 'lodash/values';
+import uniqBy from 'lodash/uniqBy';
 import { defineMessages, useIntl } from 'react-intl';
 
 import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
-import { resetSearchContent, searchContent } from '@plone/volto/actions';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import {
+  resetSearchContent,
+  searchContent,
+} from '@plone/volto/actions/search/search';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 const messages = defineMessages({
   no_results_found: {