@atlaskit/editor-plugin-text-formatting 26.0.4 → 26.0.5

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

@@ -2,7 +2,8 @@
 // import { toggleMark } from '@atlaskit/editor-common/mark';
 
 import { moveLeft as keymapMoveLeft, moveRight as keymapMoveRight } from '@atlaskit/editor-common/keymaps';
-import { anyMarkActive, wholeSelectionHasMarks } from '@atlaskit/editor-common/mark';
+import { anyMarkActive } from '@atlaskit/editor-common/mark';
+import { wholeSelectionHasMarks } from '@atlaskit/editor-common/mark/text-formatting';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { shallowEqual } from '@atlaskit/editor-common/utils';
 import { toggleMark } from '@atlaskit/editor-prosemirror/commands';

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

@@ -1,8 +1,10 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, PUNC, SYMBOL } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
+import { PUNC, SYMBOL } from '@atlaskit/editor-common/analytics/types/substitute-events';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
+import { createRule } from '@atlaskit/editor-common/utils';
+import { inputRuleWithAnalytics } from '@atlaskit/editor-common/utils/input-rules';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import { createPlugin } from '@atlaskit/prosemirror-input-rules';
+import { createPlugin } from '@atlaskit/prosemirror-input-rules/utils';
 
 // We don't agressively upgrade single quotes to smart quotes because
 // they may clash with an emoji. Only do that when we have a matching

package/dist/es2019/ui/FloatingToolbarComponent.js

@@ -7,8 +7,8 @@ import React, { useMemo } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { ToolbarSize } from '@atlaskit/editor-common/types';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { ToolbarButtonsStrong } from './Toolbar/constants';
 import { FormattingTextDropdownMenu } from './Toolbar/dropdown-menu';

package/dist/es2019/ui/PrimaryToolbarComponent.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import Toolbar from './Toolbar';
 import { ToolbarType } from './Toolbar/types';
 const selector = states => {

package/dist/es2019/ui/Toolbar/components/BoldButtonGroup.js

@@ -1,6 +1,9 @@
 import React from 'react';
-import { BOLD_BUTTON_GROUP, BOLD_BUTTON, TEXT_SECTION_PRIMARY_TOOLBAR, TEXT_SECTION_PRIMARY_TOOLBAR_RANK, useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { Show, ToolbarButtonGroup } from '@atlaskit/editor-toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { BOLD_BUTTON_GROUP, BOLD_BUTTON, TEXT_SECTION_PRIMARY_TOOLBAR } from '@atlaskit/editor-common/toolbar/keys';
+import { TEXT_SECTION_PRIMARY_TOOLBAR_RANK } from '@atlaskit/editor-common/toolbar/rank';
+import { Show } from '@atlaskit/editor-toolbar/show';
+import { ToolbarButtonGroup } from '@atlaskit/editor-toolbar/toolbar-button-group';
 import { FormatOptions } from '../types';
 import { FormatButton } from './Component';
 import { formatOptions } from './utils';

package/dist/es2019/ui/Toolbar/components/Component.js

@@ -1,10 +1,18 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { ToolTipContent, clearFormatting, getAriaKeyshortcuts, tooltip } from '@atlaskit/editor-common/keymaps';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-import { getInputMethodFromParentKeys, TEXT_COLLAPSED_MENU } from '@atlaskit/editor-common/toolbar';
-import { ToolbarButton, ToolbarDropdownItem, ClearFormattingIcon, ToolbarKeyboardShortcutHint, ToolbarDropdownMenu, MoreItemsIcon, ToolbarTooltip, ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
+import { toolbarMessages } from '@atlaskit/editor-common/messages/toolbar';
+import { getInputMethodFromParentKeys } from '@atlaskit/editor-common/toolbar';
+import { TEXT_COLLAPSED_MENU } from '@atlaskit/editor-common/toolbar/keys';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { ClearFormattingIcon } from '@atlaskit/editor-toolbar/clear-formatting-icon';
+import { MoreItemsIcon } from '@atlaskit/editor-toolbar/more-items-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
+import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar/toolbar-dropdown-item-section';
+import { ToolbarDropdownMenu } from '@atlaskit/editor-toolbar/toolbar-dropdown-menu';
+import { ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 import { clearFormattingWithAnalyticsNext } from '../../../editor-commands/clear-formatting';
 import { useComponentInfo } from './utils';
 export const FormatMenuItem = ({

package/dist/es2019/ui/Toolbar/components/TextFormattingGroupForInlineToolbar.js

@@ -1,6 +1,7 @@
 import React from 'react';
-import { TEXT_FORMATTING_GROUP_INLINE, TEXT_FORMATTING_HERO_BUTTON, TEXT_SECTION, TEXT_SECTION_RANK, TEXT_FORMATTING_GROUP, TEXT_FORMAT_GROUP_RANK } from '@atlaskit/editor-common/toolbar';
-import { ToolbarButtonGroup } from '@atlaskit/editor-toolbar';
+import { TEXT_FORMATTING_GROUP_INLINE, TEXT_FORMATTING_HERO_BUTTON, TEXT_SECTION, TEXT_FORMATTING_GROUP } from '@atlaskit/editor-common/toolbar/keys';
+import { TEXT_SECTION_RANK, TEXT_FORMAT_GROUP_RANK } from '@atlaskit/editor-common/toolbar/rank';
+import { ToolbarButtonGroup } from '@atlaskit/editor-toolbar/toolbar-button-group';
 import { FormatOptions } from '../types';
 import { FormatButton } from './Component';
 import { formatOptions } from './utils';

package/dist/es2019/ui/Toolbar/components/TextFormattingGroups.js

@@ -1,6 +1,9 @@
 import React from 'react';
-import { TEXT_FORMATTING_GROUP, TEXT_FORMATTING_HERO_BUTTON, TEXT_FORMATTING_GROUP_COLLAPSED, TEXT_FORMATTING_HERO_BUTTON_COLLAPSED, TEXT_SECTION_PRIMARY_TOOLBAR, TEXT_FORMAT_GROUP_RANK, TEXT_FORMAT_GROUP_COLLAPSED_RANK, TEXT_SECTION_PRIMARY_TOOLBAR_RANK, useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { Show, ToolbarButtonGroup } from '@atlaskit/editor-toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { TEXT_FORMATTING_GROUP, TEXT_FORMATTING_HERO_BUTTON, TEXT_FORMATTING_GROUP_COLLAPSED, TEXT_FORMATTING_HERO_BUTTON_COLLAPSED, TEXT_SECTION_PRIMARY_TOOLBAR } from '@atlaskit/editor-common/toolbar/keys';
+import { TEXT_FORMAT_GROUP_RANK, TEXT_FORMAT_GROUP_COLLAPSED_RANK, TEXT_SECTION_PRIMARY_TOOLBAR_RANK } from '@atlaskit/editor-common/toolbar/rank';
+import { Show } from '@atlaskit/editor-toolbar/show';
+import { ToolbarButtonGroup } from '@atlaskit/editor-toolbar/toolbar-button-group';
 import { FormatOptions } from '../types';
 import { FormatButton } from './Component';
 import { formatOptions } from './utils';

package/dist/es2019/ui/Toolbar/components/TextFormattingMenuGroup.js

@@ -1,6 +1,7 @@
 import React from 'react';
-import { CLEAR_FORMARTTING_MENU_SECTION, CLEAR_FORMATTING_MENU_ITEM, TEXT_FORMATTING_MENU, TEXT_FORMATTING_MENU_SECTION, TEXT_FORMATTING_GROUP, TEXT_FORMATTING_GROUP_COLLAPSED, TEXT_FORMATTING_GROUP_INLINE, TEXT_FORMATTING_HERO_BUTTON, TEXT_FORMAT_GROUP_RANK, TEXT_FORMAT_MENU_RANK, CLEAR_FORMARTTING_MENU_SECTION_RANK, TEXT_COLLAPSED_MENU_RANK, TEXT_COLLAPSED_MENU } from '@atlaskit/editor-common/toolbar';
-import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
+import { CLEAR_FORMARTTING_MENU_SECTION, CLEAR_FORMATTING_MENU_ITEM, TEXT_FORMATTING_MENU, TEXT_FORMATTING_MENU_SECTION, TEXT_FORMATTING_GROUP, TEXT_FORMATTING_GROUP_COLLAPSED, TEXT_FORMATTING_GROUP_INLINE, TEXT_FORMATTING_HERO_BUTTON, TEXT_COLLAPSED_MENU } from '@atlaskit/editor-common/toolbar/keys';
+import { TEXT_FORMAT_GROUP_RANK, TEXT_FORMAT_MENU_RANK, CLEAR_FORMARTTING_MENU_SECTION_RANK, TEXT_COLLAPSED_MENU_RANK } from '@atlaskit/editor-common/toolbar/rank';
+import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar/toolbar-dropdown-item-section';
 import { ClearFormatMenuItem, MoreFormattingMenu, MenuSection, FormatMenuItem } from './Component';
 import { formatOptions } from './utils';
 export const getFormatMenuItems = api => {

package/dist/es2019/ui/Toolbar/components/UnderlineButtonGroup.js

@@ -1,6 +1,9 @@
 import React from 'react';
-import { UNDERLINE_BUTTON_GROUP, UNDERLINE_BUTTON, TEXT_SECTION_PRIMARY_TOOLBAR, TEXT_SECTION_PRIMARY_TOOLBAR_RANK, useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { Show, ToolbarButtonGroup } from '@atlaskit/editor-toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { UNDERLINE_BUTTON_GROUP, UNDERLINE_BUTTON, TEXT_SECTION_PRIMARY_TOOLBAR } from '@atlaskit/editor-common/toolbar/keys';
+import { TEXT_SECTION_PRIMARY_TOOLBAR_RANK } from '@atlaskit/editor-common/toolbar/rank';
+import { Show } from '@atlaskit/editor-toolbar/show';
+import { ToolbarButtonGroup } from '@atlaskit/editor-toolbar/toolbar-button-group';
 import { FormatOptions } from '../types';
 import { FormatButton } from './Component';
 import { formatOptions } from './utils';

package/dist/es2019/ui/Toolbar/components/utils.js

@@ -1,11 +1,20 @@
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { toggleBold, toggleCode, toggleItalic, toggleStrikethrough, toggleSubscript, toggleSuperscript, toggleUnderline, tooltip } from '@atlaskit/editor-common/keymaps';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-import { BOLD_MENU_ITEM, CODE_MENU_ITEM, ITALIC_MENU_ITEM, STRIKE_MENU_ITEM, SUBSCRIPT_MENU_ITEM, SUPERSCRIPT_MENU_ITEM, TEXT_FORMATTING_MENU_SECTION_RANK, UNDERLINE_MENU_ITEM, getInputMethodFromParentKeys } from '@atlaskit/editor-common/toolbar';
+import { toolbarMessages } from '@atlaskit/editor-common/messages/toolbar';
+import { getInputMethodFromParentKeys } from '@atlaskit/editor-common/toolbar';
+import { BOLD_MENU_ITEM, CODE_MENU_ITEM, ITALIC_MENU_ITEM, STRIKE_MENU_ITEM, SUBSCRIPT_MENU_ITEM, SUPERSCRIPT_MENU_ITEM, UNDERLINE_MENU_ITEM } from '@atlaskit/editor-common/toolbar/keys';
+import { TEXT_FORMATTING_MENU_SECTION_RANK } from '@atlaskit/editor-common/toolbar/rank';
+
 // oxlint-disable-next-line import/no-duplicates
 
-import { BoldIcon, ItalicIcon, UnderlineIcon, CodeIcon, StrikeThroughIcon, SubscriptIcon, SuperscriptIcon } from '@atlaskit/editor-toolbar';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { BoldIcon } from '@atlaskit/editor-toolbar/bold-icon';
+import { CodeIcon } from '@atlaskit/editor-toolbar/code-icon';
+import { ItalicIcon } from '@atlaskit/editor-toolbar/italic-icon';
+import { StrikeThroughIcon } from '@atlaskit/editor-toolbar/strike-through-icon';
+import { SubscriptIcon } from '@atlaskit/editor-toolbar/subscript-icon';
+import { SuperscriptIcon } from '@atlaskit/editor-toolbar/superscript-icon';
+import { UnderlineIcon } from '@atlaskit/editor-toolbar/underline-icon';
 import { toggleStrongWithAnalytics, toggleEmWithAnalytics, toggleUnderlineWithAnalytics, toggleCodeWithAnalytics, toggleStrikeWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics } from '../../../editor-commands/toggle-mark';
 const FormatMarkSchema = {
   strong: 'strong',

package/dist/es2019/ui/Toolbar/dropdown-menu.js

@@ -1,7 +1,7 @@
 import React, { useCallback, useState } from 'react';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-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 { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu/DropdownMenu';
+import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles/constants';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { DropdownToolbarButton } from './dropdown-toolbar-button';
 import { useMenuState } from './hooks/menu-state';

package/dist/es2019/ui/Toolbar/dropdown-toolbar-button.js

@@ -6,8 +6,9 @@ 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 { expandIconContainerStyle, triggerWrapperStylesWithPadding, disableBlueBorderStyles } from '@atlaskit/editor-common/styles';
-import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import { expandIconContainerStyle } from '@atlaskit/editor-common/styles/expand';
+import { triggerWrapperStylesWithPadding, disableBlueBorderStyles } from '@atlaskit/editor-common/styles/plugins';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import ItalicIcon from '@atlaskit/icon/core/text-italic';
 import { ToolbarType } from './types';

package/dist/es2019/ui/Toolbar/hooks/clear-formatting-icon.js

@@ -7,8 +7,8 @@ import { useCallback, useMemo } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { clearFormatting as clearFormattingKeymap, tooltip } from '@atlaskit/editor-common/keymaps';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
+import { toolbarMessages } from '@atlaskit/editor-common/messages/toolbar';
+import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut/main';
 import TableCellClearIcon from '@atlaskit/icon/core/table-cell-clear';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { clearFormattingWithAnalytics } from '../../../editor-commands/clear-formatting';

package/dist/es2019/ui/Toolbar/hooks/formatting-icons.js

@@ -6,11 +6,11 @@ import { useMemo } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
-import { TOOLBAR_ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
+import { TOOLBAR_ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics/types/toolbar-button';
 import { getAriaKeyshortcuts, toggleBold, toggleCode, toggleItalic, toggleStrikethrough, toggleSubscript, toggleSuperscript, toggleUnderline, tooltip, ToolTipContent } from '@atlaskit/editor-common/keymaps';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
-import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
+import { toolbarMessages } from '@atlaskit/editor-common/messages/toolbar';
+import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset/editor-commands';
+import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut/main';
 import AngleBracketsIcon from '@atlaskit/icon/core/angle-brackets';
 import BoldIcon from '@atlaskit/icon/core/text-bold';
 import ItalicIcon from '@atlaskit/icon/core/text-italic';

package/dist/es2019/ui/Toolbar/index.js

@@ -6,10 +6,10 @@ import { useEffect, useMemo, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl';
-import { usePreviousState } from '@atlaskit/editor-common/hooks';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-import { buttonGroupStyle, separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
-import { Announcer } from '@atlaskit/editor-common/ui';
+import Announcer from '@atlaskit/editor-common/announcer';
+import { toolbarMessages } from '@atlaskit/editor-common/messages/toolbar';
+import { buttonGroupStyle, separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles/plugins';
+import usePreviousState from '@atlaskit/editor-common/usePreviousState';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { compareItemsArrays, isArrayContainsContent } from '../../editor-commands/utils';
 import { FormattingTextDropdownMenu } from './dropdown-menu';

package/dist/es2019/ui/Toolbar/input-method-utils.js

@@ -1,4 +1,4 @@
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { ToolbarType } from './types';
 export const toolbarTypeToInputMethod = {
   [ToolbarType.PRIMARY]: INPUT_METHOD.TOOLBAR,

package/dist/es2019/ui/Toolbar/more-button.js

@@ -6,7 +6,7 @@ import React from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { css, jsx } from '@emotion/react';
-import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
 import ShowMoreHorizontalIcon from '@atlaskit/icon/core/show-more-horizontal';
 const MoreIconStyle = css({
   display: 'flex',

package/dist/es2019/ui/Toolbar/single-toolbar-buttons.js

@@ -6,8 +6,8 @@ import React, { useCallback } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { jsx } from '@emotion/react';
-import { buttonGroupStyle } from '@atlaskit/editor-common/styles';
-import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import { buttonGroupStyle } from '@atlaskit/editor-common/styles/plugins';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
 export const SingleToolbarButtons = /*#__PURE__*/React.memo(({
   items,
   isReducedSpacing,

package/dist/esm/editor-commands/clear-formatting.js

@@ -1,4 +1,4 @@
-import { INPUT_METHOD, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { cellSelectionNodesBetween } from './utils/cell-selection';

package/dist/esm/editor-commands/text-formatting.js

@@ -1,6 +1,6 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
-import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { applyMarkOnRange } from '@atlaskit/editor-common/mark/commands';
+import { withAnalytics } from '@atlaskit/editor-common/withAnalytics';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { hasCode, markActive } from './utils';
 export var moveRight = function moveRight() {

package/dist/esm/editor-commands/toggle-mark.js

@@ -1,5 +1,5 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { toggleMark } from '@atlaskit/editor-common/mark';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
+import { toggleMark } from '@atlaskit/editor-common/mark/commands';
 import { nextToggleMark } from './utils/marks';
 export var toggleEm = function toggleEm(_ref) {
   var tr = _ref.tr;

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

@@ -1,4 +1,4 @@
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { bindKeymapWithEditorCommand, clearFormatting, findShortcutByKeymap } from '@atlaskit/editor-common/keymaps';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { clearFormattingWithAnalyticsNext } from '../editor-commands/clear-formatting';

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

@@ -10,10 +10,12 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _superPropGet(t, o, e, r) { var p = _get(_getPrototypeOf(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
-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 { 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 { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var ValidAutoformatChars = /*#__PURE__*/function (ValidAutoformatChars) {
   ValidAutoformatChars["STRONG"] = "__";

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

@@ -1,4 +1,4 @@
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { bindKeymapWithEditorCommand, findShortcutByKeymap, isCapsLockOnAndModifyKeyboardEvent, toggleBold, toggleCode, toggleItalic, toggleStrikethrough, toggleSubscript, toggleSuperscript, toggleUnderline } from '@atlaskit/editor-common/keymaps';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { keydownHandler } from '@atlaskit/editor-prosemirror/keymap';

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

@@ -6,7 +6,8 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 // import { toggleMark } from '@atlaskit/editor-common/mark';
 
 import { moveLeft as keymapMoveLeft, moveRight as keymapMoveRight } from '@atlaskit/editor-common/keymaps';
-import { anyMarkActive, wholeSelectionHasMarks } from '@atlaskit/editor-common/mark';
+import { anyMarkActive } from '@atlaskit/editor-common/mark';
+import { wholeSelectionHasMarks } from '@atlaskit/editor-common/mark/text-formatting';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { shallowEqual } from '@atlaskit/editor-common/utils';
 import { toggleMark } from '@atlaskit/editor-prosemirror/commands';

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

@@ -1,11 +1,13 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, PUNC, SYMBOL } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
+import { PUNC, SYMBOL } from '@atlaskit/editor-common/analytics/types/substitute-events';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
+import { createRule } from '@atlaskit/editor-common/utils';
+import { inputRuleWithAnalytics } from '@atlaskit/editor-common/utils/input-rules';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import { createPlugin } from '@atlaskit/prosemirror-input-rules';
+import { createPlugin } from '@atlaskit/prosemirror-input-rules/utils';
 
 // We don't agressively upgrade single quotes to smart quotes because
 // they may clash with an emoji. Only do that when we have a matching

package/dist/esm/ui/FloatingToolbarComponent.js

@@ -9,8 +9,8 @@ import React, { useMemo } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { ToolbarSize } from '@atlaskit/editor-common/types';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { ToolbarButtonsStrong } from './Toolbar/constants';
 import { FormattingTextDropdownMenu } from './Toolbar/dropdown-menu';

package/dist/esm/ui/PrimaryToolbarComponent.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import Toolbar from './Toolbar';
 import { ToolbarType } from './Toolbar/types';
 var selector = function selector(states) {

package/dist/esm/ui/Toolbar/components/BoldButtonGroup.js

@@ -1,6 +1,9 @@
 import React from 'react';
-import { BOLD_BUTTON_GROUP, BOLD_BUTTON, TEXT_SECTION_PRIMARY_TOOLBAR, TEXT_SECTION_PRIMARY_TOOLBAR_RANK, useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { Show, ToolbarButtonGroup } from '@atlaskit/editor-toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { BOLD_BUTTON_GROUP, BOLD_BUTTON, TEXT_SECTION_PRIMARY_TOOLBAR } from '@atlaskit/editor-common/toolbar/keys';
+import { TEXT_SECTION_PRIMARY_TOOLBAR_RANK } from '@atlaskit/editor-common/toolbar/rank';
+import { Show } from '@atlaskit/editor-toolbar/show';
+import { ToolbarButtonGroup } from '@atlaskit/editor-toolbar/toolbar-button-group';
 import { FormatOptions } from '../types';
 import { FormatButton } from './Component';
 import { formatOptions } from './utils';

package/dist/esm/ui/Toolbar/components/Component.js

@@ -1,10 +1,18 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { ToolTipContent, clearFormatting, getAriaKeyshortcuts, tooltip } from '@atlaskit/editor-common/keymaps';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-import { getInputMethodFromParentKeys, TEXT_COLLAPSED_MENU } from '@atlaskit/editor-common/toolbar';
-import { ToolbarButton, ToolbarDropdownItem, ClearFormattingIcon, ToolbarKeyboardShortcutHint, ToolbarDropdownMenu, MoreItemsIcon, ToolbarTooltip, ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
+import { toolbarMessages } from '@atlaskit/editor-common/messages/toolbar';
+import { getInputMethodFromParentKeys } from '@atlaskit/editor-common/toolbar';
+import { TEXT_COLLAPSED_MENU } from '@atlaskit/editor-common/toolbar/keys';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { ClearFormattingIcon } from '@atlaskit/editor-toolbar/clear-formatting-icon';
+import { MoreItemsIcon } from '@atlaskit/editor-toolbar/more-items-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
+import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar/toolbar-dropdown-item-section';
+import { ToolbarDropdownMenu } from '@atlaskit/editor-toolbar/toolbar-dropdown-menu';
+import { ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 import { clearFormattingWithAnalyticsNext } from '../../../editor-commands/clear-formatting';
 import { useComponentInfo } from './utils';
 export var FormatMenuItem = function FormatMenuItem(_ref) {

package/dist/esm/ui/Toolbar/components/TextFormattingGroupForInlineToolbar.js

@@ -1,6 +1,7 @@
 import React from 'react';
-import { TEXT_FORMATTING_GROUP_INLINE, TEXT_FORMATTING_HERO_BUTTON, TEXT_SECTION, TEXT_SECTION_RANK, TEXT_FORMATTING_GROUP, TEXT_FORMAT_GROUP_RANK } from '@atlaskit/editor-common/toolbar';
-import { ToolbarButtonGroup } from '@atlaskit/editor-toolbar';
+import { TEXT_FORMATTING_GROUP_INLINE, TEXT_FORMATTING_HERO_BUTTON, TEXT_SECTION, TEXT_FORMATTING_GROUP } from '@atlaskit/editor-common/toolbar/keys';
+import { TEXT_SECTION_RANK, TEXT_FORMAT_GROUP_RANK } from '@atlaskit/editor-common/toolbar/rank';
+import { ToolbarButtonGroup } from '@atlaskit/editor-toolbar/toolbar-button-group';
 import { FormatOptions } from '../types';
 import { FormatButton } from './Component';
 import { formatOptions } from './utils';

package/dist/esm/ui/Toolbar/components/TextFormattingGroups.js

@@ -1,6 +1,9 @@
 import React from 'react';
-import { TEXT_FORMATTING_GROUP, TEXT_FORMATTING_HERO_BUTTON, TEXT_FORMATTING_GROUP_COLLAPSED, TEXT_FORMATTING_HERO_BUTTON_COLLAPSED, TEXT_SECTION_PRIMARY_TOOLBAR, TEXT_FORMAT_GROUP_RANK, TEXT_FORMAT_GROUP_COLLAPSED_RANK, TEXT_SECTION_PRIMARY_TOOLBAR_RANK, useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { Show, ToolbarButtonGroup } from '@atlaskit/editor-toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { TEXT_FORMATTING_GROUP, TEXT_FORMATTING_HERO_BUTTON, TEXT_FORMATTING_GROUP_COLLAPSED, TEXT_FORMATTING_HERO_BUTTON_COLLAPSED, TEXT_SECTION_PRIMARY_TOOLBAR } from '@atlaskit/editor-common/toolbar/keys';
+import { TEXT_FORMAT_GROUP_RANK, TEXT_FORMAT_GROUP_COLLAPSED_RANK, TEXT_SECTION_PRIMARY_TOOLBAR_RANK } from '@atlaskit/editor-common/toolbar/rank';
+import { Show } from '@atlaskit/editor-toolbar/show';
+import { ToolbarButtonGroup } from '@atlaskit/editor-toolbar/toolbar-button-group';
 import { FormatOptions } from '../types';
 import { FormatButton } from './Component';
 import { formatOptions } from './utils';

package/dist/esm/ui/Toolbar/components/TextFormattingMenuGroup.js

@@ -1,8 +1,9 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React from 'react';
-import { CLEAR_FORMARTTING_MENU_SECTION, CLEAR_FORMATTING_MENU_ITEM, TEXT_FORMATTING_MENU, TEXT_FORMATTING_MENU_SECTION, TEXT_FORMATTING_GROUP, TEXT_FORMATTING_GROUP_COLLAPSED, TEXT_FORMATTING_GROUP_INLINE, TEXT_FORMATTING_HERO_BUTTON, TEXT_FORMAT_GROUP_RANK, TEXT_FORMAT_MENU_RANK, CLEAR_FORMARTTING_MENU_SECTION_RANK, TEXT_COLLAPSED_MENU_RANK, TEXT_COLLAPSED_MENU } from '@atlaskit/editor-common/toolbar';
-import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
+import { CLEAR_FORMARTTING_MENU_SECTION, CLEAR_FORMATTING_MENU_ITEM, TEXT_FORMATTING_MENU, TEXT_FORMATTING_MENU_SECTION, TEXT_FORMATTING_GROUP, TEXT_FORMATTING_GROUP_COLLAPSED, TEXT_FORMATTING_GROUP_INLINE, TEXT_FORMATTING_HERO_BUTTON, TEXT_COLLAPSED_MENU } from '@atlaskit/editor-common/toolbar/keys';
+import { TEXT_FORMAT_GROUP_RANK, TEXT_FORMAT_MENU_RANK, CLEAR_FORMARTTING_MENU_SECTION_RANK, TEXT_COLLAPSED_MENU_RANK } from '@atlaskit/editor-common/toolbar/rank';
+import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar/toolbar-dropdown-item-section';
 import { ClearFormatMenuItem, MoreFormattingMenu, MenuSection, FormatMenuItem } from './Component';
 import { formatOptions } from './utils';
 export var getFormatMenuItems = function getFormatMenuItems(api) {

package/dist/esm/ui/Toolbar/components/UnderlineButtonGroup.js

@@ -1,6 +1,9 @@
 import React from 'react';
-import { UNDERLINE_BUTTON_GROUP, UNDERLINE_BUTTON, TEXT_SECTION_PRIMARY_TOOLBAR, TEXT_SECTION_PRIMARY_TOOLBAR_RANK, useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { Show, ToolbarButtonGroup } from '@atlaskit/editor-toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { UNDERLINE_BUTTON_GROUP, UNDERLINE_BUTTON, TEXT_SECTION_PRIMARY_TOOLBAR } from '@atlaskit/editor-common/toolbar/keys';
+import { TEXT_SECTION_PRIMARY_TOOLBAR_RANK } from '@atlaskit/editor-common/toolbar/rank';
+import { Show } from '@atlaskit/editor-toolbar/show';
+import { ToolbarButtonGroup } from '@atlaskit/editor-toolbar/toolbar-button-group';
 import { FormatOptions } from '../types';
 import { FormatButton } from './Component';
 import { formatOptions } from './utils';

package/dist/esm/ui/Toolbar/components/utils.js

@@ -2,13 +2,22 @@ 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 { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { toggleBold, toggleCode, toggleItalic, toggleStrikethrough, toggleSubscript, toggleSuperscript, toggleUnderline, tooltip } from '@atlaskit/editor-common/keymaps';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-import { BOLD_MENU_ITEM, CODE_MENU_ITEM, ITALIC_MENU_ITEM, STRIKE_MENU_ITEM, SUBSCRIPT_MENU_ITEM, SUPERSCRIPT_MENU_ITEM, TEXT_FORMATTING_MENU_SECTION_RANK, UNDERLINE_MENU_ITEM, getInputMethodFromParentKeys } from '@atlaskit/editor-common/toolbar';
+import { toolbarMessages } from '@atlaskit/editor-common/messages/toolbar';
+import { getInputMethodFromParentKeys } from '@atlaskit/editor-common/toolbar';
+import { BOLD_MENU_ITEM, CODE_MENU_ITEM, ITALIC_MENU_ITEM, STRIKE_MENU_ITEM, SUBSCRIPT_MENU_ITEM, SUPERSCRIPT_MENU_ITEM, UNDERLINE_MENU_ITEM } from '@atlaskit/editor-common/toolbar/keys';
+import { TEXT_FORMATTING_MENU_SECTION_RANK } from '@atlaskit/editor-common/toolbar/rank';
+
 // oxlint-disable-next-line import/no-duplicates
 
-import { BoldIcon, ItalicIcon, UnderlineIcon, CodeIcon, StrikeThroughIcon, SubscriptIcon, SuperscriptIcon } from '@atlaskit/editor-toolbar';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { BoldIcon } from '@atlaskit/editor-toolbar/bold-icon';
+import { CodeIcon } from '@atlaskit/editor-toolbar/code-icon';
+import { ItalicIcon } from '@atlaskit/editor-toolbar/italic-icon';
+import { StrikeThroughIcon } from '@atlaskit/editor-toolbar/strike-through-icon';
+import { SubscriptIcon } from '@atlaskit/editor-toolbar/subscript-icon';
+import { SuperscriptIcon } from '@atlaskit/editor-toolbar/superscript-icon';
+import { UnderlineIcon } from '@atlaskit/editor-toolbar/underline-icon';
 import { toggleStrongWithAnalytics, toggleEmWithAnalytics, toggleUnderlineWithAnalytics, toggleCodeWithAnalytics, toggleStrikeWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics } from '../../../editor-commands/toggle-mark';
 var FormatMarkSchema = {
   strong: 'strong',

package/dist/esm/ui/Toolbar/dropdown-menu.js

@@ -1,8 +1,8 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useCallback, useState } from 'react';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-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 { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu/DropdownMenu';
+import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles/constants';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { DropdownToolbarButton } from './dropdown-toolbar-button';
 import { useMenuState } from './hooks/menu-state';

package/dist/esm/ui/Toolbar/dropdown-toolbar-button.js

@@ -6,8 +6,9 @@ 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 { expandIconContainerStyle, triggerWrapperStylesWithPadding, disableBlueBorderStyles } from '@atlaskit/editor-common/styles';
-import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import { expandIconContainerStyle } from '@atlaskit/editor-common/styles/expand';
+import { triggerWrapperStylesWithPadding, disableBlueBorderStyles } from '@atlaskit/editor-common/styles/plugins';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import ItalicIcon from '@atlaskit/icon/core/text-italic';
 import { ToolbarType } from './types';

package/dist/esm/ui/Toolbar/hooks/clear-formatting-icon.js

@@ -7,8 +7,8 @@ import { useCallback, useMemo } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { clearFormatting as clearFormattingKeymap, tooltip } from '@atlaskit/editor-common/keymaps';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
+import { toolbarMessages } from '@atlaskit/editor-common/messages/toolbar';
+import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut/main';
 import TableCellClearIcon from '@atlaskit/icon/core/table-cell-clear';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { clearFormattingWithAnalytics } from '../../../editor-commands/clear-formatting';

package/dist/esm/ui/Toolbar/hooks/formatting-icons.js

@@ -7,11 +7,11 @@ import { useMemo } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
-import { TOOLBAR_ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
+import { TOOLBAR_ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics/types/toolbar-button';
 import { getAriaKeyshortcuts, toggleBold, toggleCode, toggleItalic, toggleStrikethrough, toggleSubscript, toggleSuperscript, toggleUnderline, tooltip, ToolTipContent } from '@atlaskit/editor-common/keymaps';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
-import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
+import { toolbarMessages } from '@atlaskit/editor-common/messages/toolbar';
+import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset/editor-commands';
+import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut/main';
 import AngleBracketsIcon from '@atlaskit/icon/core/angle-brackets';
 import BoldIcon from '@atlaskit/icon/core/text-bold';
 import ItalicIcon from '@atlaskit/icon/core/text-italic';

package/dist/esm/ui/Toolbar/index.js

@@ -10,10 +10,10 @@ import { useEffect, useMemo, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl';
-import { usePreviousState } from '@atlaskit/editor-common/hooks';
-import { toolbarMessages } from '@atlaskit/editor-common/messages';
-import { buttonGroupStyle, separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
-import { Announcer } from '@atlaskit/editor-common/ui';
+import Announcer from '@atlaskit/editor-common/announcer';
+import { toolbarMessages } from '@atlaskit/editor-common/messages/toolbar';
+import { buttonGroupStyle, separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles/plugins';
+import usePreviousState from '@atlaskit/editor-common/usePreviousState';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { compareItemsArrays, isArrayContainsContent } from '../../editor-commands/utils';
 import { FormattingTextDropdownMenu } from './dropdown-menu';

package/dist/esm/ui/Toolbar/input-method-utils.js

@@ -1,5 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { ToolbarType } from './types';
 export var toolbarTypeToInputMethod = _defineProperty(_defineProperty({}, ToolbarType.PRIMARY, INPUT_METHOD.TOOLBAR), ToolbarType.FLOATING, INPUT_METHOD.FLOATING_TB);
 export var getInputMethod = function getInputMethod(toolbarType) {