@atlaskit/editor-plugin-block-type 30.0.4 → 30.0.5

package/dist/cjs/ui/quick-insert/getBlockTypeQuickInsertComponents.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getBlockTypeQuickInsertComponents = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
-var _messages = require("@atlaskit/editor-common/messages");
+var _blockType = require("@atlaskit/editor-common/messages/block-type");
 var _createQuickInsertMatcher = require("@atlaskit/editor-common/quick-insert/create-quick-insert-matcher");
 var _keys = require("@atlaskit/editor-common/quick-insert/keys");
 var _rank = require("@atlaskit/editor-common/quick-insert/rank");
@@ -74,9 +74,9 @@ var getBlockTypeQuickInsertComponents = exports.getBlockTypeQuickInsertComponent
     match: (0, _createQuickInsertMatcher.createQuickInsertMatcher)(function (_ref4) {
       var formatMessage = _ref4.formatMessage;
       return {
-        description: formatMessage(_messages.blockTypeMessages.blockquoteDescription),
+        description: formatMessage(_blockType.messages.blockquoteDescription),
         shortcut: '>',
-        title: formatMessage(_messages.blockTypeMessages.blockquote)
+        title: formatMessage(_blockType.messages.blockquote)
       };
     }),
     component: function component() {

package/dist/es2019/blockTypePlugin.js

@@ -3,10 +3,11 @@ import { extendedBlockquote, extendedBlockquoteWithLocalId } from '@atlaskit/adf
 import { fontSize } from '@atlaskit/adf-schema/font-size';
 import { hardBreak } from '@atlaskit/adf-schema/hard-break';
 import { heading } from '@atlaskit/adf-schema/heading';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { IconHeading, IconQuote } from '@atlaskit/editor-common/assets';
-import { keymap, tooltip } from '@atlaskit/editor-common/keymaps';
-import { blockTypeMessages as messages } from '@atlaskit/editor-common/messages';
+import { keymap } from '@atlaskit/editor-common/keymap';
+import { tooltip } from '@atlaskit/editor-common/keymaps';
+import { messages } from '@atlaskit/editor-common/messages/block-type';
 import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';

package/dist/es2019/pm-plugins/block-types.js

@@ -1,7 +1,16 @@
 import React from 'react';
-import { blockTypeMessages as messages } from '@atlaskit/editor-common/messages';
-import { BLOCK_QUOTE_MENU_ITEM, HEADING_1_MENU_ITEM, HEADING_2_MENU_ITEM, HEADING_3_MENU_ITEM, HEADING_4_MENU_ITEM, HEADING_5_MENU_ITEM, HEADING_6_MENU_ITEM, NORMAL_TEXT_MENU_ITEM, SMALL_TEXT_MENU_ITEM, TEXT_STYLES_MENU_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
-import { TextNormalIcon, QuoteIcon, HeadingOneIcon, HeadingTwoIcon, HeadingThreeIcon, HeadingFourIcon, HeadingFiveIcon, HeadingSixIcon, TextSmallIcon } from '@atlaskit/editor-toolbar';
+import { messages } from '@atlaskit/editor-common/messages/block-type';
+import { BLOCK_QUOTE_MENU_ITEM, HEADING_1_MENU_ITEM, HEADING_2_MENU_ITEM, HEADING_3_MENU_ITEM, HEADING_4_MENU_ITEM, HEADING_5_MENU_ITEM, HEADING_6_MENU_ITEM, NORMAL_TEXT_MENU_ITEM, SMALL_TEXT_MENU_ITEM } from '@atlaskit/editor-common/toolbar/keys';
+import { TEXT_STYLES_MENU_SECTION_RANK } from '@atlaskit/editor-common/toolbar/rank';
+import { HeadingFiveIcon } from '@atlaskit/editor-toolbar/heading-five-icon';
+import { HeadingFourIcon } from '@atlaskit/editor-toolbar/heading-four-icon';
+import { HeadingOneIcon } from '@atlaskit/editor-toolbar/heading-one-icon';
+import { HeadingSixIcon } from '@atlaskit/editor-toolbar/heading-six-icon';
+import { HeadingThreeIcon } from '@atlaskit/editor-toolbar/heading-three-icon';
+import { HeadingTwoIcon } from '@atlaskit/editor-toolbar/heading-two-icon';
+import { QuoteIcon } from '@atlaskit/editor-toolbar/quote-icon';
+import { TextNormalIcon } from '@atlaskit/editor-toolbar/text-normal-icon';
+import { TextSmallIcon } from '@atlaskit/editor-toolbar/text-small-icon';
 import TextHeadingFiveIcon from '@atlaskit/icon-lab/core/text-heading-five';
 import TextHeadingFourIcon from '@atlaskit/icon-lab/core/text-heading-four';
 import TextHeadingOneIcon from '@atlaskit/icon-lab/core/text-heading-one';

package/dist/es2019/pm-plugins/commands/block-type.js

@@ -1,9 +1,10 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 import { createToggleBlockMarkOnRangeNext } from '@atlaskit/editor-common/commands';
-import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
-import { filterChildrenBetween, wrapSelectionIn } from '@atlaskit/editor-common/utils';
+import { filterChildrenBetween } from '@atlaskit/editor-common/utils';
+import { wrapSelectionIn } from '@atlaskit/editor-common/utils/wrap-selection-in';
+import { withAnalytics } from '@atlaskit/editor-common/withAnalytics';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
-import { CellSelection } from '@atlaskit/editor-tables';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { HEADINGS_BY_NAME, NORMAL_TEXT } from '../block-types';
 import { convertTaskItemsToBlockTaskItems, getSelectionRangeExpandedToLists } from '../utils';
 import { FORMATTING_NODE_TYPES, FORMATTING_MARK_TYPES, cellSelectionNodesBetween, formatTypes, clearNodeFormattingOnSelection } from './clear-formatting';

package/dist/es2019/pm-plugins/commands/clear-formatting.js

@@ -1,4 +1,4 @@
-import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
+import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics/types/enums';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 // Functions duplicated from platform/packages/editor/editor-plugin-text-formatting/src/editor-commands/clear-formatting.ts
 // TODO: ED-26959 - Refactor to avoid duplication.

package/dist/es2019/pm-plugins/input-rule.js

@@ -1,8 +1,10 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { insertBlock } from '@atlaskit/editor-common/commands';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { insertBlock } from '@atlaskit/editor-common/commands/insert-block';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
-import { createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
+import { createRule } from '@atlaskit/editor-common/utils';
+import { inputRuleWithAnalytics } from '@atlaskit/editor-common/utils/input-rules';
+import { leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules/constants';
+import { createPlugin } from '@atlaskit/prosemirror-input-rules/utils';
 import { createJoinNodesRule, createWrappingTextBlockRule } from './utils';
 const MAX_HEADING_LEVEL = 6;
 

package/dist/es2019/pm-plugins/keymap.js

@@ -1,6 +1,7 @@
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { backspace, bindKeymapWithCommand, deleteKey, enter, findKeyMapForBrowser, findShortcutByKeymap, forwardDelete, insertNewLine, keymap, moveDown, moveUp, redo as redoKeymap, toggleBlockQuote, undo as undoKeymap } from '@atlaskit/editor-common/keymaps';
-import { createNewParagraphAbove, createNewParagraphBelow, deleteEmptyParagraphAndMoveBlockUp, insertNewLineWithAnalytics } from '@atlaskit/editor-common/utils';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { keymap } from '@atlaskit/editor-common/keymap';
+import { backspace, bindKeymapWithCommand, deleteKey, enter, findKeyMapForBrowser, findShortcutByKeymap, forwardDelete, insertNewLine, moveDown, moveUp, redo as redoKeymap, toggleBlockQuote, undo as undoKeymap } from '@atlaskit/editor-common/keymaps';
+import { createNewParagraphAbove, createNewParagraphBelow, deleteEmptyParagraphAndMoveBlockUp, insertNewLineWithAnalytics } from '@atlaskit/editor-common/utils/commands';
 import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { redo } from '@atlaskit/prosemirror-history/redo';
 import { undo } from '@atlaskit/prosemirror-history/undo';

package/dist/es2019/pm-plugins/main.js

@@ -1,4 +1,4 @@
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { INSERTED_TRAILING_PARAGRAPH_TO_LAST_NODE_META } from '@atlaskit/editor-common/block-type';
 import { getBrowserInfo } from '@atlaskit/editor-common/browser';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';

package/dist/es2019/pm-plugins/ui/FloatingToolbarComponent.js

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import ToolbarBlockType from './ToolbarBlockType';
 const FloatingToolbarSettings = {

package/dist/es2019/pm-plugins/ui/PrimaryToolbarComponent.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import ToolbarBlockType from './ToolbarBlockType';
 export function PrimaryToolbarComponent({
   api,

package/dist/es2019/pm-plugins/ui/ToolbarBlockType/HeadingButton.js

@@ -6,12 +6,13 @@ import { ax, ix } from "@compiled/react/runtime";
 
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import editorUGCToken from '@atlaskit/editor-common/get-editor-ugc-token';
 import { formatShortcut, setNormalText, toggleHeading1, toggleHeading2, toggleHeading3, toggleHeading4, toggleHeading5, toggleHeading6, toggleSmallText } from '@atlaskit/editor-common/keymaps';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { editorUGCToken } from '@atlaskit/editor-common/ugc-tokens';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/useSharedPluginStateSelector';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
+import { ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint';
 import { isSelectionInsideListNode } from '../../utils';
 const headingTextProps = {
   normal: {

package/dist/es2019/pm-plugins/ui/ToolbarBlockType/QuoteButton.js

@@ -1,10 +1,11 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { formatShortcut, toggleBlockQuote } from '@atlaskit/editor-common/keymaps';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/useSharedPluginStateSelector';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
+import { ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint';
 import { isSelectionInsideListNode } from '../../utils';
 const shouldDisableQuoteButton = state => {
   if (!state) {

package/dist/es2019/pm-plugins/ui/ToolbarBlockType/TextStylesMenuButton.js

@@ -1,9 +1,11 @@
 import React, { useMemo } from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { ToolbarDropdownMenu, ToolbarTooltip, TextIcon } from '@atlaskit/editor-toolbar';
+import { toolbarMessages } from '@atlaskit/editor-common/messages/toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { TextIcon } from '@atlaskit/editor-toolbar/text-icon';
+import { ToolbarDropdownMenu } from '@atlaskit/editor-toolbar/toolbar-dropdown-menu';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 import { toolbarBlockTypesWithRank } from '../../block-types';
 const selectPluginState = state => {
   var _state$blockTypeState, _state$blockTypeState2;

package/dist/es2019/pm-plugins/ui/ToolbarBlockType/blocktype-button.js

@@ -6,9 +6,10 @@ import React from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-import { expandIconContainerStyle, wrapperStyle } from '@atlaskit/editor-common/styles';
-import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import { toolbarMessages } from '@atlaskit/editor-common/messages/toolbar';
+import { expandIconContainerStyle } from '@atlaskit/editor-common/styles/expand';
+import { wrapperStyle } from '@atlaskit/editor-common/styles/plugins';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import TextIcon from '@atlaskit/icon/core/text';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss

package/dist/es2019/pm-plugins/ui/ToolbarBlockType/index.js

@@ -9,10 +9,10 @@ import React from 'react';
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl';
 import { clearFormatting, findKeymapByDescription, tooltip } from '@atlaskit/editor-common/keymaps';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-import { separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
-import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu';
-import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
+import { toolbarMessages } from '@atlaskit/editor-common/messages/toolbar';
+import { separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles/plugins';
+import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu/DropdownMenu';
+import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles/constants';
 import TextIcon from '@atlaskit/icon/core/text';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 import { Box, xcss } from '@atlaskit/primitives';

package/dist/es2019/pm-plugins/ui/ToolbarBlockType/styled.js

@@ -4,8 +4,9 @@
  */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
-import { headingsSharedStyles, blockquoteSharedStyles } from '@atlaskit/editor-common/styles';
-import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
+import { blockquoteSharedStyles } from '@atlaskit/editor-common/styles/blockquote';
+import { headingsSharedStyles } from '@atlaskit/editor-common/styles/headings';
+import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut/main';
 export const blockTypeMenuItemStyle = (tagName, selected, typographyTheme) => {
   // TEMP FIX: See https://product-fabric.atlassian.net/browse/ED-13878
   const selectedStyle = selected ? `${tagName} { color: ${"var(--ds-text, #292A2E)"} !important; }` : '';

package/dist/es2019/pm-plugins/ui/toolbar-components.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import { TEXT_STYLES_GROUP, TEXT_SECTION_RANK, TEXT_SECTION, TEXT_STYLES_MENU, TEXT_STYLES_GROUP_RANK, TEXT_STYLES_MENU_SECTION, TEXT_STYLES_MENU_RANK, TEXT_COLLAPSED_MENU_RANK, TEXT_COLLAPSED_MENU, TEXT_SECTION_PRIMARY_TOOLBAR_RANK, TEXT_SECTION_PRIMARY_TOOLBAR } from '@atlaskit/editor-common/toolbar';
+import { TEXT_STYLES_GROUP, TEXT_SECTION, TEXT_STYLES_MENU, TEXT_STYLES_MENU_SECTION, TEXT_COLLAPSED_MENU, TEXT_SECTION_PRIMARY_TOOLBAR } from '@atlaskit/editor-common/toolbar/keys';
+import { TEXT_SECTION_RANK, TEXT_STYLES_GROUP_RANK, TEXT_STYLES_MENU_RANK, TEXT_COLLAPSED_MENU_RANK, TEXT_SECTION_PRIMARY_TOOLBAR_RANK } from '@atlaskit/editor-common/toolbar/rank';
 import { toolbarBlockTypesWithRank } from '../block-types';
 import { HeadingButton } from './ToolbarBlockType/HeadingButton';
 import { QuoteButton } from './ToolbarBlockType/QuoteButton';

package/dist/es2019/pm-plugins/utils.js

@@ -1,6 +1,7 @@
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
 import { createBlockTaskItem } from '@atlaskit/editor-common/transforms';
-import { createRule, createWrappingJoinRule } from '@atlaskit/editor-common/utils';
+import { createRule } from '@atlaskit/editor-common/utils';
+import { createWrappingJoinRule } from '@atlaskit/editor-common/utils/input-rules';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { WRAPPER_BLOCK_TYPES, FORMATTING_NODE_TYPES, FORMATTING_MARK_TYPES } from './block-types';
 export const isNodeAWrappingBlockNode = node => {

package/dist/es2019/ui/HeadingBlockMenuItem.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { blockTypeMessages } from '@atlaskit/editor-common/messages';
-import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { messages as blockTypeMessages } from '@atlaskit/editor-common/messages/block-type';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
 import TextHeadingFiveIcon from '@atlaskit/icon-lab/core/text-heading-five';
 import TextHeadingFourIcon from '@atlaskit/icon-lab/core/text-heading-four';
 import TextHeadingOneIcon from '@atlaskit/icon-lab/core/text-heading-one';

package/dist/es2019/ui/ParagraphBlockMenuItem.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { blockMenuMessages } from '@atlaskit/editor-common/messages';
-import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { messages as blockMenuMessages } from '@atlaskit/editor-common/messages/block-menu';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
 import TextNormalIcon from '@atlaskit/icon-lab/core/text-normal';
 import TextParagraphIcon from '@atlaskit/icon-lab/core/text-paragraph';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';

package/dist/es2019/ui/QuoteBlockMenuItem.js

@@ -3,9 +3,9 @@ import "./QuoteBlockMenuItem.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { blockTypeMessages } from '@atlaskit/editor-common/messages';
-import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { messages as blockTypeMessages } from '@atlaskit/editor-common/messages/block-type';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
 import QuotationMarkIcon from '@atlaskit/icon/core/quotation-mark';
 const styles = {
   svgOverflow: "_1wrmewfl _172sewfl"

package/dist/es2019/ui/SmallTextBlockMenuItem.js

@@ -1,8 +1,9 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { blockTypeMessages } from '@atlaskit/editor-common/messages';
-import { TextSmallIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { messages as blockTypeMessages } from '@atlaskit/editor-common/messages/block-type';
+import { TextSmallIcon } from '@atlaskit/editor-toolbar/text-small-icon';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
 const NODE_NAME = 'smallText';
 const SmallTextBlockMenuItem = ({
   api,

package/dist/es2019/ui/index.js

@@ -1,6 +1,5 @@
-import { TRANSFORM_HEADINGS_MENU_SECTION_RANK, TRANSFORM_HEADINGS_H1_MENU_ITEM, TRANSFORM_HEADINGS_H2_MENU_ITEM, TRANSFORM_HEADINGS_H3_MENU_ITEM, TRANSFORM_HEADINGS_H4_MENU_ITEM, TRANSFORM_HEADINGS_H5_MENU_ITEM, TRANSFORM_HEADINGS_H6_MENU_ITEM, TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM, TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM, TRANSFORM_STRUCTURE_MENU_SECTION, TRANSFORM_STRUCTURE_MENU_SECTION_RANK } from '@atlaskit/editor-common/block-menu';
-import { TRANSFORM_TEXTFORMATTING_MENU_SECTION, TRANSFORM_TEXT_FORMATTING_SMALL_TEXT_MENU_ITEM } from '@atlaskit/editor-common/block-menu/key';
-import { TRANSFORM_TEXT_FORMATTING_MENU_SECTION_RANK } from '@atlaskit/editor-common/block-menu/rank';
+import { TRANSFORM_TEXTFORMATTING_MENU_SECTION, TRANSFORM_TEXT_FORMATTING_SMALL_TEXT_MENU_ITEM, TRANSFORM_HEADINGS_H1_MENU_ITEM, TRANSFORM_HEADINGS_H2_MENU_ITEM, TRANSFORM_HEADINGS_H3_MENU_ITEM, TRANSFORM_HEADINGS_H4_MENU_ITEM, TRANSFORM_HEADINGS_H5_MENU_ITEM, TRANSFORM_HEADINGS_H6_MENU_ITEM, TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM, TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM, TRANSFORM_STRUCTURE_MENU_SECTION } from '@atlaskit/editor-common/block-menu/key';
+import { TRANSFORM_TEXT_FORMATTING_MENU_SECTION_RANK, TRANSFORM_HEADINGS_MENU_SECTION_RANK, TRANSFORM_STRUCTURE_MENU_SECTION_RANK } from '@atlaskit/editor-common/block-menu/rank';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { createHeadingBlockMenuItem } from './HeadingBlockMenuItem';
 import { createParagraphBlockMenuItem } from './ParagraphBlockMenuItem';

package/dist/es2019/ui/quick-insert/BlockTypeQuickInsertMenuItem.js

@@ -1,9 +1,9 @@
 var _tooltip, _tooltip2, _tooltip3, _tooltip4, _tooltip5, _tooltip6;
 import React, { useCallback, useMemo } from 'react';
 import { useIntl } from 'react-intl';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { toggleHeading1, toggleHeading2, toggleHeading3, toggleHeading4, toggleHeading5, toggleHeading6, tooltip } from '@atlaskit/editor-common/keymaps';
-import { blockTypeMessages as messages } from '@atlaskit/editor-common/messages';
+import { messages } from '@atlaskit/editor-common/messages/block-type';
 import { QuickInsertMenuItem } from '@atlaskit/editor-common/quick-insert/menu-item';
 import { messages as quickInsertMessages } from '@atlaskit/editor-common/quick-insert/messages';
 import TextHeadingFiveIcon from '@atlaskit/icon-lab/core/text-heading-five';

package/dist/es2019/ui/quick-insert/getBlockTypeQuickInsertComponents.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { blockTypeMessages as messages } from '@atlaskit/editor-common/messages';
+import { messages } from '@atlaskit/editor-common/messages/block-type';
 import { createQuickInsertMatcher } from '@atlaskit/editor-common/quick-insert/create-quick-insert-matcher';
 import { BLOCKQUOTE_MENU_ITEM, HEADING_1_MENU_ITEM, HEADING_2_MENU_ITEM, HEADING_3_MENU_ITEM, HEADING_4_MENU_ITEM, HEADING_5_MENU_ITEM, HEADING_6_MENU_ITEM, TEXT_FORMATTING_SECTION } from '@atlaskit/editor-common/quick-insert/keys';
 import { TEXT_FORMATTING_SECTION_RANK } from '@atlaskit/editor-common/quick-insert/rank';

package/dist/esm/blockTypePlugin.js

@@ -7,10 +7,11 @@ import { extendedBlockquote, extendedBlockquoteWithLocalId } from '@atlaskit/adf
 import { fontSize } from '@atlaskit/adf-schema/font-size';
 import { hardBreak } from '@atlaskit/adf-schema/hard-break';
 import { heading } from '@atlaskit/adf-schema/heading';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { IconHeading, IconQuote } from '@atlaskit/editor-common/assets';
-import { keymap, tooltip } from '@atlaskit/editor-common/keymaps';
-import { blockTypeMessages as messages } from '@atlaskit/editor-common/messages';
+import { keymap } from '@atlaskit/editor-common/keymap';
+import { tooltip } from '@atlaskit/editor-common/keymaps';
+import { messages } from '@atlaskit/editor-common/messages/block-type';
 import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';

package/dist/esm/pm-plugins/block-types.js

@@ -2,9 +2,18 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React from 'react';
-import { blockTypeMessages as messages } from '@atlaskit/editor-common/messages';
-import { BLOCK_QUOTE_MENU_ITEM, HEADING_1_MENU_ITEM, HEADING_2_MENU_ITEM, HEADING_3_MENU_ITEM, HEADING_4_MENU_ITEM, HEADING_5_MENU_ITEM, HEADING_6_MENU_ITEM, NORMAL_TEXT_MENU_ITEM, SMALL_TEXT_MENU_ITEM, TEXT_STYLES_MENU_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
-import { TextNormalIcon, QuoteIcon, HeadingOneIcon, HeadingTwoIcon, HeadingThreeIcon, HeadingFourIcon, HeadingFiveIcon, HeadingSixIcon, TextSmallIcon } from '@atlaskit/editor-toolbar';
+import { messages } from '@atlaskit/editor-common/messages/block-type';
+import { BLOCK_QUOTE_MENU_ITEM, HEADING_1_MENU_ITEM, HEADING_2_MENU_ITEM, HEADING_3_MENU_ITEM, HEADING_4_MENU_ITEM, HEADING_5_MENU_ITEM, HEADING_6_MENU_ITEM, NORMAL_TEXT_MENU_ITEM, SMALL_TEXT_MENU_ITEM } from '@atlaskit/editor-common/toolbar/keys';
+import { TEXT_STYLES_MENU_SECTION_RANK } from '@atlaskit/editor-common/toolbar/rank';
+import { HeadingFiveIcon } from '@atlaskit/editor-toolbar/heading-five-icon';
+import { HeadingFourIcon } from '@atlaskit/editor-toolbar/heading-four-icon';
+import { HeadingOneIcon } from '@atlaskit/editor-toolbar/heading-one-icon';
+import { HeadingSixIcon } from '@atlaskit/editor-toolbar/heading-six-icon';
+import { HeadingThreeIcon } from '@atlaskit/editor-toolbar/heading-three-icon';
+import { HeadingTwoIcon } from '@atlaskit/editor-toolbar/heading-two-icon';
+import { QuoteIcon } from '@atlaskit/editor-toolbar/quote-icon';
+import { TextNormalIcon } from '@atlaskit/editor-toolbar/text-normal-icon';
+import { TextSmallIcon } from '@atlaskit/editor-toolbar/text-small-icon';
 import TextHeadingFiveIcon from '@atlaskit/icon-lab/core/text-heading-five';
 import TextHeadingFourIcon from '@atlaskit/icon-lab/core/text-heading-four';
 import TextHeadingOneIcon from '@atlaskit/icon-lab/core/text-heading-one';

package/dist/esm/pm-plugins/commands/block-type.js

@@ -1,12 +1,13 @@
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 import { createToggleBlockMarkOnRangeNext } from '@atlaskit/editor-common/commands';
-import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
-import { filterChildrenBetween, wrapSelectionIn } from '@atlaskit/editor-common/utils';
+import { filterChildrenBetween } from '@atlaskit/editor-common/utils';
+import { wrapSelectionIn } from '@atlaskit/editor-common/utils/wrap-selection-in';
+import { withAnalytics } from '@atlaskit/editor-common/withAnalytics';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
-import { CellSelection } from '@atlaskit/editor-tables';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { HEADINGS_BY_NAME, NORMAL_TEXT } from '../block-types';
 import { convertTaskItemsToBlockTaskItems, getSelectionRangeExpandedToLists } from '../utils';
 import { FORMATTING_NODE_TYPES, FORMATTING_MARK_TYPES, cellSelectionNodesBetween, formatTypes, clearNodeFormattingOnSelection } from './clear-formatting';

package/dist/esm/pm-plugins/commands/clear-formatting.js

@@ -1,4 +1,4 @@
-import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
+import { ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics/types/enums';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 // Functions duplicated from platform/packages/editor/editor-plugin-text-formatting/src/editor-commands/clear-formatting.ts
 // TODO: ED-26959 - Refactor to avoid duplication.

package/dist/esm/pm-plugins/input-rule.js

@@ -1,9 +1,11 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { insertBlock } from '@atlaskit/editor-common/commands';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { insertBlock } from '@atlaskit/editor-common/commands/insert-block';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
-import { createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
+import { createRule } from '@atlaskit/editor-common/utils';
+import { inputRuleWithAnalytics } from '@atlaskit/editor-common/utils/input-rules';
+import { leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules/constants';
+import { createPlugin } from '@atlaskit/prosemirror-input-rules/utils';
 import { createJoinNodesRule, createWrappingTextBlockRule } from './utils';
 var MAX_HEADING_LEVEL = 6;
 

package/dist/esm/pm-plugins/keymap.js

@@ -1,6 +1,7 @@
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { backspace, bindKeymapWithCommand, deleteKey, enter, findKeyMapForBrowser, findShortcutByKeymap, forwardDelete, insertNewLine, keymap, moveDown, moveUp, redo as redoKeymap, toggleBlockQuote, undo as undoKeymap } from '@atlaskit/editor-common/keymaps';
-import { createNewParagraphAbove, createNewParagraphBelow, deleteEmptyParagraphAndMoveBlockUp, insertNewLineWithAnalytics } from '@atlaskit/editor-common/utils';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { keymap } from '@atlaskit/editor-common/keymap';
+import { backspace, bindKeymapWithCommand, deleteKey, enter, findKeyMapForBrowser, findShortcutByKeymap, forwardDelete, insertNewLine, moveDown, moveUp, redo as redoKeymap, toggleBlockQuote, undo as undoKeymap } from '@atlaskit/editor-common/keymaps';
+import { createNewParagraphAbove, createNewParagraphBelow, deleteEmptyParagraphAndMoveBlockUp, insertNewLineWithAnalytics } from '@atlaskit/editor-common/utils/commands';
 import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { redo } from '@atlaskit/prosemirror-history/redo';
 import { undo } from '@atlaskit/prosemirror-history/undo';

package/dist/esm/pm-plugins/main.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { INSERTED_TRAILING_PARAGRAPH_TO_LAST_NODE_META } from '@atlaskit/editor-common/block-type';
 import { getBrowserInfo } from '@atlaskit/editor-common/browser';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';

package/dist/esm/pm-plugins/ui/FloatingToolbarComponent.js

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import ToolbarBlockType from './ToolbarBlockType';
 var FloatingToolbarSettings = {

package/dist/esm/pm-plugins/ui/PrimaryToolbarComponent.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import ToolbarBlockType from './ToolbarBlockType';
 export function PrimaryToolbarComponent(_ref) {
   var api = _ref.api,

package/dist/esm/pm-plugins/ui/ToolbarBlockType/HeadingButton.js

@@ -6,12 +6,13 @@ import { ax, ix } from "@compiled/react/runtime";
 
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import editorUGCToken from '@atlaskit/editor-common/get-editor-ugc-token';
 import { formatShortcut, setNormalText, toggleHeading1, toggleHeading2, toggleHeading3, toggleHeading4, toggleHeading5, toggleHeading6, toggleSmallText } from '@atlaskit/editor-common/keymaps';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { editorUGCToken } from '@atlaskit/editor-common/ugc-tokens';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/useSharedPluginStateSelector';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
+import { ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint';
 import { isSelectionInsideListNode } from '../../utils';
 var headingTextProps = {
   normal: {

package/dist/esm/pm-plugins/ui/ToolbarBlockType/QuoteButton.js

@@ -1,10 +1,11 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { formatShortcut, toggleBlockQuote } from '@atlaskit/editor-common/keymaps';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/useSharedPluginStateSelector';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
+import { ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint';
 import { isSelectionInsideListNode } from '../../utils';
 var shouldDisableQuoteButton = function shouldDisableQuoteButton(state) {
   if (!state) {

package/dist/esm/pm-plugins/ui/ToolbarBlockType/TextStylesMenuButton.js

@@ -1,9 +1,11 @@
 import React, { useMemo } from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { ToolbarDropdownMenu, ToolbarTooltip, TextIcon } from '@atlaskit/editor-toolbar';
+import { toolbarMessages } from '@atlaskit/editor-common/messages/toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { TextIcon } from '@atlaskit/editor-toolbar/text-icon';
+import { ToolbarDropdownMenu } from '@atlaskit/editor-toolbar/toolbar-dropdown-menu';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 import { toolbarBlockTypesWithRank } from '../../block-types';
 var selectPluginState = function selectPluginState(state) {
   var _state$blockTypeState, _state$blockTypeState2;

package/dist/esm/pm-plugins/ui/ToolbarBlockType/blocktype-button.js

@@ -6,9 +6,10 @@ import React from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-import { expandIconContainerStyle, wrapperStyle } from '@atlaskit/editor-common/styles';
-import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import { toolbarMessages } from '@atlaskit/editor-common/messages/toolbar';
+import { expandIconContainerStyle } from '@atlaskit/editor-common/styles/expand';
+import { wrapperStyle } from '@atlaskit/editor-common/styles/plugins';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import TextIcon from '@atlaskit/icon/core/text';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss

package/dist/esm/pm-plugins/ui/ToolbarBlockType/index.js

@@ -18,10 +18,10 @@ import React from 'react';
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl';
 import { clearFormatting, findKeymapByDescription, tooltip } from '@atlaskit/editor-common/keymaps';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-import { separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
-import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu';
-import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
+import { toolbarMessages } from '@atlaskit/editor-common/messages/toolbar';
+import { separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles/plugins';
+import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu/DropdownMenu';
+import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles/constants';
 import TextIcon from '@atlaskit/icon/core/text';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 import { Box, xcss } from '@atlaskit/primitives';