@plone/volto-slate 18.0.1 → 18.0.3

package/.eslintrc.js

@@ -3,4 +3,11 @@ module.exports = {
   rules: {
     'import/no-unresolved': 0,
   },
+  settings: {
+    'import/resolver': {
+      alias: {
+        map: [['@plone/volto-slate', './src']],
+      },
+    },
+  },
 };

package/CHANGELOG.md

@@ -8,6 +8,18 @@
 
 <!-- towncrier release notes start -->
 
+## 18.0.3 (2024-12-09)
+
+### Internal
+
+- Fix extension in files containing JSX. @sneridagh [#6520](https://github.com/plone/volto/issues/6520)
+
+## 18.0.2 (2024-12-08)
+
+### Internal
+
+- Removed all imports from barrel files for components, actions, helpers, hooks and lodash. @pnicolli [#6509](https://github.com/plone/volto/issues/6509)
+
 ## 18.0.1 (2024-11-11)
 
 ### Feature

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plone/volto-slate",
-  "version": "18.0.1",
+  "version": "18.0.3",
   "description": "Slate.js integration with Volto",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/actions/content.js

@@ -1,4 +1,4 @@
-import { nestContent } from '@plone/volto/helpers';
+import { nestContent } from '@plone/volto/helpers/Content/Content';
 import { UPLOAD_CONTENT } from '@plone/volto-slate/constants';
 
 // TODO: the PR has been merged into Volto, so this should be cleaned up

package/src/blocks/Table/TableBlockEdit.jsx

@@ -5,13 +5,16 @@
 
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { isEmpty, map, remove } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
+import map from 'lodash/map';
+import remove from 'lodash/remove';
 import { Button, Table } from 'semantic-ui-react';
 import cx from 'classnames';
 import { defineMessages, injectIntl } from 'react-intl';
 
 import Cell from './Cell';
-import { Icon, SidebarPortal } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import { BlockDataForm } from '@plone/volto/components/manage/Form';
 import TableSchema from './schema';
 

package/src/blocks/Table/TableBlockView.jsx

@@ -6,7 +6,7 @@
 import React, { useState, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { Table } from 'semantic-ui-react';
-import { map } from 'lodash';
+import map from 'lodash/map';
 import {
   serializeNodes,
   serializeNodesToText,

package/src/blocks/Text/DefaultTextBlockEditor.jsx

@@ -6,22 +6,20 @@ import { defineMessages, useIntl } from 'react-intl';
 import { useInView } from 'react-intersection-observer';
 import { Dimmer, Loader, Message, Segment } from 'semantic-ui-react';
 
-import {
-  flattenToAppURL,
-  getBaseUrl,
-  validateFileUploadSize,
-} from '@plone/volto/helpers';
+import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { validateFileUploadSize } from '@plone/volto/helpers/FormValidation/FormValidation';
 import config from '@plone/volto/registry';
-import { SidebarPortal, BlockChooserButton } from '@plone/volto/components';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
+import BlockChooserButton from '@plone/volto/components/manage/BlockChooser/BlockChooserButton';
 import { BlockDataForm } from '@plone/volto/components/manage/Form';
 
 import { SlateEditor } from '@plone/volto-slate/editor';
 import { serializeNodesToText } from '@plone/volto-slate/editor/render';
 import {
   createImageBlock,
-  parseDefaultSelection,
   deconstructToVoltoBlocks,
-} from '@plone/volto-slate/utils';
+} from '@plone/volto-slate/utils/volto-blocks';
+import { parseDefaultSelection } from '@plone/volto-slate/utils/selection';
 import { Transforms } from 'slate';
 
 import PersistentSlashMenu from './SlashMenu';

package/src/blocks/Text/SlashMenu.jsx

@@ -1,10 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { filter, isEmpty } from 'lodash';
+import filter from 'lodash/filter';
+import isEmpty from 'lodash/isEmpty';
 import { Menu } from 'semantic-ui-react';
 import { useIntl, FormattedMessage } from 'react-intl';
-import { Icon } from '@plone/volto/components';
-import { useUser } from '@plone/volto/hooks';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import useUser from '@plone/volto/hooks/user/useUser';
 
 const emptySlateBlock = () => ({
   value: [

package/src/blocks/Text/TextBlockEdit.jsx

@@ -2,10 +2,8 @@ import React from 'react';
 
 import { connect } from 'react-redux';
 
-import {
-  uploadContent,
-  saveSlateBlockSelection,
-} from '@plone/volto-slate/actions';
+import { uploadContent } from '@plone/volto-slate/actions/content';
+import saveSlateBlockSelection from '@plone/volto-slate/actions/selection';
 
 import DefaultTextBlockEditor from './DefaultTextBlockEditor';
 import DetachedTextBlockEditor from './DetachedTextBlockEditor';

package/src/blocks/Text/TextBlockView.jsx

@@ -3,9 +3,9 @@ import {
   serializeNodesToText,
 } from '@plone/volto-slate/editor/render';
 import config from '@plone/volto/registry';
-import { isEqual } from 'lodash';
+import isEqual from 'lodash/isEqual';
 import Slugger from 'github-slugger';
-import { normalizeString } from '@plone/volto/helpers';
+import { normalizeString } from '@plone/volto/helpers/Utils/Utils';
 
 const TextBlockView = (props) => {
   const { id, data, styling = {} } = props;

package/src/blocks/Text/extensions/breakList.js

@@ -1,13 +1,11 @@
 import { Editor, Range, Transforms } from 'slate';
 import config from '@plone/volto/registry';
-import {
-  isCursorAtBlockEnd,
-  splitEditorInTwoFragments,
-  setEditorContent,
-  createAndSelectNewBlockAfter,
-  getCurrentListItem,
-  createEmptyParagraph,
-} from '@plone/volto-slate/utils';
+import { isCursorAtBlockEnd } from '@plone/volto-slate/utils/selection';
+import { splitEditorInTwoFragments } from '@plone/volto-slate/utils/ops';
+import { setEditorContent } from '@plone/volto-slate/utils/editor';
+import { createAndSelectNewBlockAfter } from '@plone/volto-slate/utils/volto-blocks';
+import { getCurrentListItem } from '@plone/volto-slate/utils/lists';
+import { createEmptyParagraph } from '@plone/volto-slate/utils/blocks';
 
 /**
  * Handles `Enter` key on empty and non-empty list items.

package/src/blocks/Text/extensions/insertBreak.js

@@ -1,13 +1,10 @@
 import ReactDOM from 'react-dom';
 import { Editor } from 'slate';
 // import { ReactEditor } from 'slate-react';
-import {
-  splitEditorInTwoFragments,
-  setEditorContent,
-  createAndSelectNewBlockAfter,
-  rangeIsInSplittableNode,
-  // deconstructToVoltoBlocks,
-} from '@plone/volto-slate/utils';
+import { splitEditorInTwoFragments } from '@plone/volto-slate/utils/ops';
+import { setEditorContent } from '@plone/volto-slate/utils/editor';
+import { createAndSelectNewBlockAfter } from '@plone/volto-slate/utils/volto-blocks';
+import { rangeIsInSplittableNode } from '@plone/volto-slate/utils/internals';
 
 /**
  * @param {Editor} editor The Slate editor object to extend.

package/src/blocks/Text/extensions/withDeserializers.js

@@ -1,7 +1,8 @@
 import isUrl from 'is-url';
 import imageExtensions from 'image-extensions';
 import { blockTagDeserializer } from '@plone/volto-slate/editor/deserialize';
-import { getBaseUrl, validateFileUploadSize } from '@plone/volto/helpers';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { validateFileUploadSize } from '@plone/volto/helpers/FormValidation/FormValidation';
 import { v4 as uuid } from 'uuid';
 import { Transforms } from 'slate';
 

package/src/blocks/Text/index.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import TextBlockView from './TextBlockView';
 import TextBlockEdit from './TextBlockEdit';
 import TextBlockSchema from './TextBlockSchema';
-import { cloneDeep } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 
 import {
   goDown,

package/src/blocks/Text/keyboard/backspaceInList.js

@@ -3,8 +3,8 @@ import config from '@plone/volto/registry';
 import {
   isCursorInList,
   isCursorAtListBlockStart,
-  deconstructToVoltoBlocks,
-} from '@plone/volto-slate/utils';
+} from '@plone/volto-slate/utils/lists';
+import { deconstructToVoltoBlocks } from '@plone/volto-slate/utils/volto-blocks';
 
 /**
  * Handle the new Volto blocks created by `deconstructToVoltoBlocks`.

package/src/blocks/Text/keyboard/indentListItems.js

@@ -1,11 +1,11 @@
 import { Editor, Path, Transforms } from 'slate';
 import {
   isCursorInList,
-  deconstructToVoltoBlocks,
   getCurrentListItem,
   mergeWithNextList,
   mergeWithPreviousList,
-} from '@plone/volto-slate/utils';
+} from '@plone/volto-slate/utils/lists';
+import { deconstructToVoltoBlocks } from '@plone/volto-slate/utils/volto-blocks';
 import config from '@plone/volto/registry';
 
 /**

package/src/blocks/Text/keyboard/joinBlocks.js

@@ -1,22 +1,24 @@
 import ReactDOM from 'react-dom';
-import { cloneDeep } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 import { serializeNodesToText } from '@plone/volto-slate/editor/render';
 import { Editor } from 'slate';
 import {
   getPreviousVoltoBlock,
   getNextVoltoBlock,
-  isCursorAtBlockStart,
-  isCursorAtBlockEnd,
   mergeSlateWithBlockBackward,
   mergeSlateWithBlockForward,
-  makeEditor,
-} from '@plone/volto-slate/utils';
+} from '@plone/volto-slate/utils/volto-blocks';
+import {
+  isCursorAtBlockStart,
+  isCursorAtBlockEnd,
+} from '@plone/volto-slate/utils/selection';
+import { makeEditor } from '@plone/volto-slate/utils/editor';
 import {
   changeBlock,
   deleteBlock,
   getBlocksFieldname,
   getBlocksLayoutFieldname,
-} from '@plone/volto/helpers';
+} from '@plone/volto/helpers/Blocks/Blocks';
 /**
  * Joins the current block (which has an active Slate Editor)
  * with the previous block, to make a single block.

package/src/blocks/Text/keyboard/moveListItems.js

@@ -1,5 +1,8 @@
 import { Editor, Path, Transforms, Node } from 'slate';
-import { isCursorInList, getCurrentListItem } from '@plone/volto-slate/utils';
+import {
+  isCursorInList,
+  getCurrentListItem,
+} from '@plone/volto-slate/utils/lists';
 import config from '@plone/volto/registry';
 
 /**

package/src/blocks/Text/keyboard/traverseBlocks.js

@@ -2,10 +2,12 @@ import { Node } from 'slate';
 import {
   isCursorAtBlockStart,
   isCursorAtBlockEnd,
+} from '@plone/volto-slate/utils/selection';
+import {
   getNextVoltoBlock,
   getPreviousVoltoBlock,
-  createDefaultBlock,
-} from '@plone/volto-slate/utils';
+} from '@plone/volto-slate/utils/volto-blocks';
+import { createDefaultBlock } from '@plone/volto-slate/utils/blocks';
 
 /**
  * goUp.

package/src/editor/SlateEditor.jsx

@@ -1,6 +1,6 @@
 import ReactDOM from 'react-dom';
 import cx from 'classnames';
-import { isEqual } from 'lodash';
+import isEqual from 'lodash/isEqual';
 import { Transforms, Editor } from 'slate'; // , Transforms
 import { Slate, Editable, ReactEditor } from 'slate-react';
 import React, { Component } from 'react'; // , useState
@@ -11,12 +11,10 @@ import config from '@plone/volto/registry';
 import { Element, Leaf } from './render';
 
 import withTestingFeatures from './extensions/withTestingFeatures';
-import {
-  makeEditor,
-  toggleInlineFormat,
-  toggleMark,
-  parseDefaultSelection,
-} from '@plone/volto-slate/utils';
+import { makeEditor } from '@plone/volto-slate/utils/editor';
+import { toggleInlineFormat } from '@plone/volto-slate/utils/blocks';
+import { toggleMark } from '@plone/volto-slate/utils/marks';
+import { parseDefaultSelection } from '@plone/volto-slate/utils/selection';
 import { InlineToolbar } from './ui';
 import EditorContext from './EditorContext';
 

package/src/editor/config.jsx

@@ -15,7 +15,7 @@ import strikethroughIcon from '@plone/volto/icons/strikethrough.svg';
 import subindexIcon from '@plone/volto/icons/subindex.svg';
 import superindexIcon from '@plone/volto/icons/superindex.svg';
 
-import { createEmptyParagraph } from '@plone/volto-slate/utils';
+import { createEmptyParagraph } from '@plone/volto-slate/utils/blocks';
 
 import {
   MarkElementButton,

package/src/editor/extensions/insertData.js

@@ -3,9 +3,9 @@ import { deserialize } from '@plone/volto-slate/editor/deserialize';
 import {
   createBlock,
   createDefaultBlock,
-  MIMETypeName,
   normalizeExternalData,
-} from '@plone/volto-slate/utils';
+} from '@plone/volto-slate/utils/blocks';
+import { MIMETypeName } from '@plone/volto-slate/utils/mime-types';
 import { isBlockActive } from '../../utils/blocks';
 
 export const insertData = (editor) => {

package/src/editor/extensions/normalizeExternalData.js

@@ -1,4 +1,4 @@
-import { normalizeExternalData as normalize } from '@plone/volto-slate/utils';
+import { normalizeExternalData as normalize } from '@plone/volto-slate/utils/blocks';
 
 export function normalizeExternalData(editor) {
   editor.normalizeExternalData = (fragment) => {

package/src/editor/extensions/withTestingFeatures.jsx

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 import { ReactEditor } from 'slate-react';
-import { omit } from 'lodash';
+import omit from 'lodash/omit';
 
 const withTestingFeatures = (WrappedComponent) => {
   return (props) => {

package/src/editor/plugins/AdvancedLink/deserialize.js

@@ -1,7 +1,7 @@
 import { jsx } from 'slate-hyperscript';
 import { LINK } from '@plone/volto-slate/constants';
 import { deserialize } from '@plone/volto-slate/editor/deserialize';
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
 // import { Editor } from 'slate';
 
 /**

package/src/editor/plugins/AdvancedLink/render.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 './styles.less';
 
 export const LinkElement = ({ attributes, children, element, mode }) => {

package/src/editor/plugins/Blockquote/index.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { BlockButton } from '@plone/volto-slate/editor/ui';
+import BlockButton from '@plone/volto-slate/editor/ui/BlockButton';
 import quoteIcon from '@plone/volto/icons/quote.svg';
 
 // TODO: this needs to use constants for el type

package/src/editor/plugins/Callout/index.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { BlockButton } from '@plone/volto-slate/editor/ui';
+import BlockButton from '@plone/volto-slate/editor/ui/BlockButton';
 import calloutSVG from '@plone/volto/icons/megaphone.svg';
 
 // TODO: this needs to use constants for el type

package/src/editor/plugins/Link/index.jsx

@@ -12,12 +12,10 @@ import {
 import { SIMPLELINK, LINK } from '@plone/volto-slate/constants';
 import { LinkElement } from './render';
 import { simpleLinkDeserializer, withSimpleLink } from './extensions';
-import { setPluginOptions } from '@plone/volto-slate/actions';
-import {
-  ToolbarButton as UIToolbarButton,
-  PositionedToolbar,
-} from '@plone/volto-slate/editor/ui';
-import { useSelectionPosition } from '@plone/volto-slate/hooks';
+import { setPluginOptions } from '@plone/volto-slate/actions/plugins';
+import UIToolbarButton from '@plone/volto-slate/editor/ui/ToolbarButton';
+import PositionedToolbar from '@plone/volto-slate/editor/ui/PositionedToolbar';
+import { useSelectionPosition } from '@plone/volto-slate/hooks/useSelectionPosition';
 
 import linkSVG from '@plone/volto/icons/link.svg';
 import unlinkSVG from '@plone/volto/icons/unlink.svg';

package/src/editor/plugins/Link/render.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import cx from 'classnames';
-import { UniversalLink } from '@plone/volto/components';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import config from '@plone/volto/registry';
-import { isInternalURL, flattenToAppURL } from '@plone/volto/helpers';
+import { isInternalURL, flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 const ViewLink = ({ url, target, download, children }) => {
   const { openExternalLinkInNewTab } = config.settings;

package/src/editor/plugins/Markdown/constants.js

@@ -1,5 +1,5 @@
 import { toggleList } from './utils';
-import { isBlockActive } from '@plone/volto-slate/utils';
+import { isBlockActive } from '@plone/volto-slate/utils/blocks';
 import { UL, OL, LI, H2, H3, BLOCKQUOTE } from '@plone/volto-slate/constants';
 
 /**

package/src/editor/plugins/Markdown/extensions.js

@@ -1,4 +1,5 @@
-import { castArray, map } from 'lodash';
+import castArray from 'lodash/castArray';
+import map from 'lodash/map';
 import { Editor, Path, Point, Range, Transforms } from 'slate';
 
 /**

package/src/editor/plugins/Markdown/utils.js

@@ -3,7 +3,7 @@ import {
   getMaxRange,
   selectAll,
   getSelectionNodesArrayByType,
-} from '@plone/volto-slate/utils';
+} from '@plone/volto-slate/utils/selection';
 import { P, LI, UL, OL } from '@plone/volto-slate/constants';
 
 export function unwrapNodesByType(editor, types, options = {}) {

package/src/editor/plugins/StyleMenu/StyleMenu.jsx

@@ -3,10 +3,10 @@ import { useSlate } from 'slate-react';
 import { Dropdown } from 'semantic-ui-react';
 import { useIntl, defineMessages } from 'react-intl';
 import cx from 'classnames';
-import { omit } from 'lodash';
+import omit from 'lodash/omit';
 import { isBlockStyleActive, isInlineStyleActive, toggleStyle } from './utils';
 import config from '@plone/volto/registry';
-import { ToolbarButton } from '@plone/volto-slate/editor/ui';
+import ToolbarButton from '@plone/volto-slate/editor/ui/ToolbarButton';
 import paintSVG from '@plone/volto/icons/paint.svg';
 
 const messages = defineMessages({

package/src/editor/plugins/StyleMenu/utils.js

@@ -1,6 +1,6 @@
 /* eslint no-console: ["error", { allow: ["warn", "error"] }] */
 import { Editor, Transforms } from 'slate';
-import { isBlockActive } from '@plone/volto-slate/utils';
+import { isBlockActive } from '@plone/volto-slate/utils/blocks';
 import config from '@plone/volto/registry';
 
 /**

package/src/editor/plugins/Table/TableButton.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useSlate } from 'slate-react';
 import { Dropdown } from 'semantic-ui-react';
-import { ToolbarButton } from '@plone/volto-slate/editor/ui';
+import ToolbarButton from '@plone/volto-slate/editor/ui/ToolbarButton';
 
 import tableSVG from '@plone/volto/icons/table.svg';
 import TableContainer from './TableContainer';

package/src/editor/plugins/Table/index.jsx

@@ -12,7 +12,7 @@ import colAfterSVG from '@plone/volto/icons/column-after.svg';
 import rowDeleteSVG from '@plone/volto/icons/row-delete.svg';
 import colDeleteSVG from '@plone/volto/icons/column-delete.svg';
 
-import { ToolbarButton } from '@plone/volto-slate/editor/ui';
+import ToolbarButton from '@plone/volto-slate/editor/ui/ToolbarButton';
 import { Range, Transforms, Editor, Path } from 'slate';
 import { defineMessages, useIntl } from 'react-intl';
 import { TABLE, TR, P, TD, TH } from '@plone/volto-slate/constants';

package/src/editor/render.jsx

@@ -6,9 +6,12 @@ import { useIntl } from 'react-intl';
 import { useSelector } from 'react-redux';
 import { Node, Text } from 'slate';
 import cx from 'classnames';
-import { isEmpty, omit } from 'lodash';
-import { UniversalLink, Toast } from '@plone/volto/components';
-import { messages, addAppURL } from '@plone/volto/helpers';
+import isEmpty from 'lodash/isEmpty';
+import omit from 'lodash/omit';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
+import { messages } from '@plone/volto/helpers/MessageLabels/MessageLabels';
+import { addAppURL } from '@plone/volto/helpers/Url/Url';
 import useClipboard from '@plone/volto/hooks/clipboard/useClipboard';
 import config from '@plone/volto/registry';
 import linkSVG from '@plone/volto/icons/link.svg';

package/src/editor/ui/BlockButton.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useSlate } from 'slate-react';
-import { isBlockActive, toggleBlock } from '@plone/volto-slate/utils';
+import { isBlockActive, toggleBlock } from '@plone/volto-slate/utils/blocks';
 
 import ToolbarButton from './ToolbarButton';
 

package/src/editor/ui/ClearFormattingButton.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useSlate } from 'slate-react';
-import { clearFormatting } from '@plone/volto-slate/utils';
+import { clearFormatting } from '@plone/volto-slate/utils/blocks';
 
 import ToolbarButton from './ToolbarButton';
 

package/src/editor/ui/InlineToolbar.jsx

@@ -2,7 +2,7 @@ import React from 'react'; // , useState
 import SlateToolbar from './SlateToolbar';
 import SlateContextToolbar from './SlateContextToolbar';
 import config from '@plone/volto/registry';
-import { hasRangeSelection } from '@plone/volto-slate/utils';
+import { hasRangeSelection } from '@plone/volto-slate/utils/selection';
 import { ReactEditor } from 'slate-react';
 import cx from 'classnames';
 

package/src/editor/ui/MarkButton.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useSlate } from 'slate-react';
 
-import { isMarkActive, toggleMark } from '@plone/volto-slate/utils';
+import { isMarkActive, toggleMark } from '@plone/volto-slate/utils/marks';
 import ToolbarButton from './ToolbarButton';
 
 const MarkButton = ({ format, icon, ...props }) => {

package/src/editor/ui/MarkElementButton.jsx

@@ -1,6 +1,9 @@
 import React from 'react';
 import { useSlate } from 'slate-react';
-import { isBlockActive, toggleInlineFormat } from '@plone/volto-slate/utils';
+import {
+  isBlockActive,
+  toggleInlineFormat,
+} from '@plone/volto-slate/utils/blocks';
 
 import ToolbarButton from './ToolbarButton';
 

package/src/editor/ui/ToolbarButton.jsx

@@ -1,6 +1,6 @@
 import cx from 'classnames';
 import React from 'react';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { Button } from 'semantic-ui-react';
 import { useIntl } from 'react-intl';
 

package/src/elementEditor/ContextButtons.jsx

@@ -4,8 +4,8 @@ import { useIntl } from 'react-intl'; // , defineMessages
 
 import clearSVG from '@plone/volto/icons/delete.svg';
 
-import { ToolbarButton } from '@plone/volto-slate/editor/ui';
-import { setPluginOptions } from '@plone/volto-slate/actions';
+import ToolbarButton from '@plone/volto-slate/editor/ui/ToolbarButton';
+import { setPluginOptions } from '@plone/volto-slate/actions/plugins';
 
 /*
  * Note: this is a weirder component, it should be called as a native function

package/src/elementEditor/PluginEditor.jsx

@@ -1,11 +1,11 @@
 /* eslint no-console: ["error", { allow: ["error"] }] */
-import { isEqual } from 'lodash';
+import isEqual from 'lodash/isEqual';
 import React from 'react';
 import { useDispatch } from 'react-redux';
 import { ReactEditor } from 'slate-react';
-import { Icon as VoltoIcon } from '@plone/volto/components';
+import VoltoIcon from '@plone/volto/components/theme/Icon/Icon';
 import { BlockDataForm } from '@plone/volto/components/manage/Form';
-import { setPluginOptions } from '@plone/volto-slate/actions';
+import { setPluginOptions } from '@plone/volto-slate/actions/plugins';
 import BaseSchemaProvider from './SchemaProvider';
 
 import briefcaseSVG from '@plone/volto/icons/briefcase.svg';

package/src/elementEditor/SidebarEditor.jsx

@@ -5,8 +5,8 @@
  */
 import React from 'react';
 import { useSelector, useDispatch } from 'react-redux';
-import { SidebarPopup } from '@plone/volto/components';
-import { setPluginOptions } from '@plone/volto-slate/actions';
+import SidebarPopup from '@plone/volto/components/manage/Sidebar/SidebarPopup';
+import { setPluginOptions } from '@plone/volto-slate/actions/plugins';
 
 const SidebarEditor = (props) => {
   const { editor, pluginId, getActiveElement, pluginEditor } = props;

package/src/elementEditor/ToolbarButton.jsx

@@ -4,11 +4,11 @@
 import React from 'react';
 import { useSlate } from 'slate-react';
 import { useDispatch } from 'react-redux';
-import { omit } from 'lodash';
+import omit from 'lodash/omit';
 
-import { ToolbarButton } from '@plone/volto-slate/editor/ui';
-import { hasRangeSelection } from '@plone/volto-slate/utils';
-import { setPluginOptions } from '@plone/volto-slate/actions';
+import ToolbarButton from '@plone/volto-slate/editor/ui/ToolbarButton';
+import { hasRangeSelection } from '@plone/volto-slate/utils/selection';
+import { setPluginOptions } from '@plone/volto-slate/actions/plugins';
 
 const ElementToolbarButton = (props) => {
   const { isActiveElement, insertElement, pluginId, toolbarButtonIcon } = props;

package/src/elementEditor/{makeInlineElementPlugin.js → makeInlineElementPlugin.jsx}

@@ -11,7 +11,7 @@ import {
 import messages from './messages';
 import ToolbarButton from './ToolbarButton';
 import SchemaProvider from './SchemaProvider';
-import { omit } from 'lodash';
+import omit from 'lodash/omit';
 
 import tagSVG from '@plone/volto/icons/tag.svg';
 

package/src/utils/blocks.js

@@ -4,8 +4,11 @@ import config from '@plone/volto/registry';
 import {
   getBlocksFieldname,
   getBlocksLayoutFieldname,
-} from '@plone/volto/helpers';
-import _ from 'lodash';
+} from '@plone/volto/helpers/Blocks/Blocks';
+import find from 'lodash/find';
+import includes from 'lodash/includes';
+import some from 'lodash/some';
+import first from 'lodash/first';
 import { makeEditor } from './editor';
 
 // case sensitive; first in an inner array is the default and preffered format
@@ -145,10 +148,10 @@ export const isSingleBlockTypeActive = (editor, format) => {
 };
 
 export const isBlockActive = (editor, format) => {
-  const aliasList = _.find(formatAliases, (x) => _.includes(x, format));
+  const aliasList = find(formatAliases, (x) => includes(x, format));
 
   if (aliasList) {
-    const aliasFound = _.some(aliasList, (y) => {
+    const aliasFound = some(aliasList, (y) => {
       return isSingleBlockTypeActive(editor, y);
     });
 
@@ -163,17 +166,17 @@ export const isBlockActive = (editor, format) => {
 export const getBlockTypeContextData = (editor, format) => {
   let isActive, defaultFormat, matcher;
 
-  const aliasList = _.find(formatAliases, (x) => _.includes(x, format));
+  const aliasList = find(formatAliases, (x) => includes(x, format));
 
   if (aliasList) {
-    const aliasFound = _.some(aliasList, (y) => {
+    const aliasFound = some(aliasList, (y) => {
       return isSingleBlockTypeActive(editor, y);
     });
 
     if (aliasFound) {
       isActive = true;
-      defaultFormat = _.first(aliasList);
-      matcher = (n) => _.includes(aliasList, n.type);
+      defaultFormat = first(aliasList);
+      matcher = (n) => includes(aliasList, n.type);
 
       return { isActive, defaultFormat, matcher };
     }

package/src/utils/selection.js

@@ -1,7 +1,9 @@
-import { castArray, cloneDeep } from 'lodash';
+import castArray from 'lodash/castArray';
+import cloneDeep from 'lodash/cloneDeep';
 import { Editor, Transforms, Range, Node } from 'slate';
 import { ReactEditor } from 'slate-react';
-import { isCursorInList, makeEditor } from '@plone/volto-slate/utils';
+import { isCursorInList } from '@plone/volto-slate/utils/lists';
+import { makeEditor } from '@plone/volto-slate/utils/editor';
 import { LI } from '@plone/volto-slate/constants';
 import config from '@plone/volto/registry';
 

package/src/utils/volto-blocks.js

@@ -7,10 +7,10 @@ import {
   blockHasValue,
   getBlocksFieldname,
   getBlocksLayoutFieldname,
-} from '@plone/volto/helpers';
+} from '@plone/volto/helpers/Blocks/Blocks';
 import { Transforms, Editor, Node, Text, Path } from 'slate';
 import { serializeNodesToText } from '@plone/volto-slate/editor/render';
-import { omit } from 'lodash';
+import omit from 'lodash/omit';
 import config from '@plone/volto/registry';
 
 function fromEntries(pairs) {

package/src/widgets/HtmlSlateWidget.jsx

@@ -12,7 +12,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 import { FormFieldWrapper } from '@plone/volto/components/manage/Widgets';
 import SlateEditor from '@plone/volto-slate/editor/SlateEditor';
 import { serializeNodes } from '@plone/volto-slate/editor/render';
-import { makeEditor } from '@plone/volto-slate/utils';
+import { makeEditor } from '@plone/volto-slate/utils/editor';
 import deserialize from '@plone/volto-slate/editor/deserialize';
 
 import {

package/src/widgets/ObjectByTypeWidget.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Menu, Tab } from 'semantic-ui-react';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { ObjectWidget } from '@plone/volto/components/manage/Widgets';
 
 export const ObjectByTypeWidget = (props) => {