@atlaskit/editor-plugin-highlight 26.0.4 → 26.0.7

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-highlight
 
+## 26.0.7
+
+### Patch Changes
+
+- Updated dependencies
+
+## 26.0.6
+
+### Patch Changes
+
+- Updated dependencies
+
+## 26.0.5
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 26.0.4
 
 ### Patch Changes

package/dist/cjs/editor-commands/change-color.js

@@ -6,10 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.changeColor = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _mark = require("@atlaskit/editor-common/mark");
+var _commands = require("@atlaskit/editor-common/mark/commands");
 var _selection = require("@atlaskit/editor-common/selection");
 var _uiColor = require("@atlaskit/editor-common/ui-color");
+var _highlightColorPalette = require("@atlaskit/editor-common/ui-color/ColorPalette/highlightColorPalette");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
@@ -35,7 +37,7 @@ var changeColor = exports.changeColor = function changeColor(editorAnalyticsAPI)
       }
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(createAnalyticsEvent(color, inputMethod, tr))(tr);
       tr.scrollIntoView();
-      if (color === _uiColor.REMOVE_HIGHLIGHT_COLOR) {
+      if (color === _highlightColorPalette.REMOVE_HIGHLIGHT_COLOR) {
         (0, _mark.removeMark)(backgroundColor)({
           tr: tr
         });
@@ -54,7 +56,7 @@ var changeColor = exports.changeColor = function changeColor(editorAnalyticsAPI)
           type: _main.HighlightPluginAction.CHANGE_COLOR,
           color: color
         });
-        (0, _mark.toggleMark)(backgroundColor, {
+        (0, _commands.toggleMark)(backgroundColor, {
           color: color
         })({
           tr: tr
@@ -67,8 +69,8 @@ var changeColor = exports.changeColor = function changeColor(editorAnalyticsAPI)
 };
 var createAnalyticsEvent = function createAnalyticsEvent(color, inputMethod, tr) {
   var _getActiveColor;
-  var previousColor = (_getActiveColor = (0, _color.getActiveColor)(tr)) !== null && _getActiveColor !== void 0 ? _getActiveColor : _uiColor.REMOVE_HIGHLIGHT_COLOR;
-  var highlightPalette = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_lovability_text_bg_color', 'isEnabled', true) ? _uiColor.highlightColorPaletteNew : _uiColor.highlightColorPalette;
+  var previousColor = (_getActiveColor = (0, _color.getActiveColor)(tr)) !== null && _getActiveColor !== void 0 ? _getActiveColor : _highlightColorPalette.REMOVE_HIGHLIGHT_COLOR;
+  var highlightPalette = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_lovability_text_bg_color', 'isEnabled', true) ? _uiColor.highlightColorPaletteNew : _highlightColorPalette.highlightColorPalette;
 
   // get color names from palette
   var newColorFromPalette = highlightPalette.find(function (_ref3) {
@@ -85,14 +87,14 @@ var createAnalyticsEvent = function createAnalyticsEvent(color, inputMethod, tr)
     textColor = _tr$doc$type$schema$m.textColor,
     link = _tr$doc$type$schema$m.link;
   return {
-    action: _analytics.ACTION.FORMATTED,
-    actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_BACKGROUND_COLOR,
-    eventType: _analytics.EVENT_TYPE.TRACK,
+    action: _enums.ACTION.FORMATTED,
+    actionSubject: _enums.ACTION_SUBJECT.TEXT,
+    actionSubjectId: _enums.ACTION_SUBJECT_ID.FORMAT_BACKGROUND_COLOR,
+    eventType: _enums.EVENT_TYPE.TRACK,
     attributes: _objectSpread({
       newColor: newColorLabel.toLowerCase(),
       previousColor: previousColorLabel ? previousColorLabel.toLowerCase() : '',
       inputMethod: inputMethod
-    }, color === _uiColor.REMOVE_HIGHLIGHT_COLOR ? {} : (0, _mark.getHadMarkAttributes)(tr, [textColor, link]))
+    }, color === _highlightColorPalette.REMOVE_HIGHLIGHT_COLOR ? {} : (0, _mark.getHadMarkAttributes)(tr, [textColor, link]))
   };
 };

package/dist/cjs/editor-commands/disabled.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getDisabledState = void 0;
 var _mark = require("@atlaskit/editor-common/mark");
-var _selection = require("@atlaskit/editor-common/selection");
+var _selection = require("@atlaskit/editor-common/selection/gap-cursor/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var getDisabledState = exports.getDisabledState = function getDisabledState(state) {
   var backgroundColor = state.schema.marks.backgroundColor;

package/dist/cjs/editor-commands/palette.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.togglePalette = exports.setPalette = void 0;
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _main = require("../pm-plugins/main");
 // oxlint-disable-next-line import/no-duplicates
 
@@ -48,10 +48,10 @@ var setPalette = exports.setPalette = function setPalette(api) {
 };
 var createAnalyticsEvent = function createAnalyticsEvent(isPaletteOpen, inputMethod) {
   return {
-    action: isPaletteOpen ? _analytics.ACTION.OPENED : _analytics.ACTION.CLOSED,
-    actionSubject: _analytics.ACTION_SUBJECT.TOOLBAR,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_BACKGROUND_COLOR,
-    eventType: _analytics.EVENT_TYPE.TRACK,
+    action: isPaletteOpen ? _enums.ACTION.OPENED : _enums.ACTION.CLOSED,
+    actionSubject: _enums.ACTION_SUBJECT.TOOLBAR,
+    actionSubjectId: _enums.ACTION_SUBJECT_ID.FORMAT_BACKGROUND_COLOR,
+    eventType: _enums.EVENT_TYPE.TRACK,
     attributes: {
       inputMethod: inputMethod
     }

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

@@ -4,10 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.keymapPlugin = keymapPlugin;
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _keymap = require("@atlaskit/editor-common/keymap");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _preset = require("@atlaskit/editor-common/preset");
+var _editorCommands = require("@atlaskit/editor-common/preset/editor-commands");
 var _uiColor = require("@atlaskit/editor-common/ui-color");
+var _highlightColorPalette = require("@atlaskit/editor-common/ui-color/ColorPalette/highlightColorPalette");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _changeColor = require("../editor-commands/change-color");
 var _palette = require("../editor-commands/palette");
@@ -24,11 +26,11 @@ function keymapPlugin(_ref) {
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     (0, _palette.togglePalette)(api)({
-      inputMethod: _analytics.INPUT_METHOD.SHORTCUT
+      inputMethod: _enums.INPUT_METHOD.SHORTCUT
     }), list);
   }
   var analyticsApi = api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions;
-  var highlightPalette = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_lovability_text_bg_color', 'isEnabled', true) ? _uiColor.highlightColorPaletteNew : _uiColor.highlightColorPalette;
+  var highlightPalette = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_lovability_text_bg_color', 'isEnabled', true) ? _uiColor.highlightColorPaletteNew : _highlightColorPalette.highlightColorPalette;
   var color = highlightPalette.find(function (_ref2) {
     var label = _ref2.label;
     return label === 'Yellow';
@@ -37,10 +39,10 @@ function keymapPlugin(_ref) {
     (0, _keymaps.bindKeymapWithCommand)(
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    _keymaps.applyYellowHighlight.common, (0, _preset.editorCommandToPMCommand)((0, _changeColor.changeColor)(analyticsApi)({
+    _keymaps.applyYellowHighlight.common, (0, _editorCommands.editorCommandToPMCommand)((0, _changeColor.changeColor)(analyticsApi)({
       color: color.value,
-      inputMethod: _analytics.INPUT_METHOD.SHORTCUT
+      inputMethod: _enums.INPUT_METHOD.SHORTCUT
     })), list);
   }
-  return (0, _keymaps.keymap)(list);
+  return (0, _keymap.keymap)(list);
 }

package/dist/cjs/ui/FloatingToolbarHighlightColor.js

@@ -8,16 +8,18 @@ exports.FloatingToolbarHighlightColorWithIntl = void 0;
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _hooks = require("@atlaskit/editor-common/hooks");
-var _icons = require("@atlaskit/editor-common/icons");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _toolbarButton = require("@atlaskit/editor-common/analytics/types/toolbar-button");
+var _DynamicStrokeIconDecoration = require("@atlaskit/editor-common/icons/DynamicStrokeIconDecoration");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
-var _styles = require("@atlaskit/editor-common/styles");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
-var _editorPalette = require("@atlaskit/editor-palette");
+var _highlight = require("@atlaskit/editor-common/messages/highlight");
+var _expand = require("@atlaskit/editor-common/styles/expand");
+var _plugins = require("@atlaskit/editor-common/styles/plugins");
+var _ToolbarButton = _interopRequireDefault(require("@atlaskit/editor-common/ui-menu/ToolbarButton"));
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _textBackgroundColor = require("@atlaskit/editor-palette/text-background-color");
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/core/chevron-down"));
-var _highlight = _interopRequireDefault(require("@atlaskit/icon/core/highlight"));
+var _highlight2 = _interopRequireDefault(require("@atlaskit/icon/core/highlight"));
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _palette = require("../editor-commands/palette");
 var _PaletteDropdown = require("./shared/PaletteDropdown");
@@ -42,7 +44,7 @@ var FloatingToolbarHighlightColor = function FloatingToolbarHighlightColor(_ref)
     formatMessage = _ref.intl.formatMessage,
     editorView = _ref.editorView;
   var toolbarItemRef = (0, _react.useRef)(null);
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['highlight'], selector),
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(pluginInjectionApi, ['highlight'], selector),
     activeColor = _useSharedPluginState.activeColor,
     disabled = _useSharedPluginState.disabled,
     isPaletteOpen = _useSharedPluginState.isPaletteOpen;
@@ -53,16 +55,16 @@ var FloatingToolbarHighlightColor = function FloatingToolbarHighlightColor(_ref)
         dispatch = editorView.dispatch;
       (0, _palette.setPalette)(pluginInjectionApi)({
         isPaletteOpen: isOpen,
-        inputMethod: _analytics.INPUT_METHOD.FLOATING_TB
+        inputMethod: _enums.INPUT_METHOD.FLOATING_TB
       })(state, dispatch);
     }
     pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a === void 0 || _pluginInjectionApi$a.actions.fireAnalyticsEvent({
-      action: isOpen ? _analytics.ACTION.OPENED : _analytics.ACTION.CLOSED,
-      actionSubject: _analytics.ACTION_SUBJECT.TOOLBAR,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_BACKGROUND_COLOR,
-      eventType: _analytics.EVENT_TYPE.TRACK,
+      action: isOpen ? _enums.ACTION.OPENED : _enums.ACTION.CLOSED,
+      actionSubject: _enums.ACTION_SUBJECT.TOOLBAR,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.FORMAT_BACKGROUND_COLOR,
+      eventType: _enums.EVENT_TYPE.TRACK,
       attributes: {
-        inputMethod: _analytics.INPUT_METHOD.FLOATING_TB
+        inputMethod: _enums.INPUT_METHOD.FLOATING_TB
       }
     });
   };
@@ -84,20 +86,20 @@ var FloatingToolbarHighlightColor = function FloatingToolbarHighlightColor(_ref)
   if (activeColor === undefined || disabled === undefined) {
     return null;
   }
-  var toolbarButtonLabel = formatMessage(_messages.highlightMessages.highlight);
+  var toolbarButtonLabel = formatMessage(_highlight.highlightMessages.highlight);
 
   // Get the design token for the  active color (if it exists) to modify the toolbar
   // icon, but show the nice rainbow if none is selected
-  var activeColorToken = activeColor === null ? null : (0, _editorPalette.hexToEditorTextBackgroundPaletteColor)(activeColor);
+  var activeColorToken = activeColor === null ? null : (0, _textBackgroundColor.hexToEditorTextBackgroundPaletteColor)(activeColor);
   var title = (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1') ? (0, _keymaps.tooltip)(_keymaps.toggleHighlightPalette, toolbarButtonLabel) : toolbarButtonLabel;
   return (0, _react2.jsx)(_PaletteDropdown.PaletteDropdown, {
     isOpen: isDropdownOpen && !disabled,
     activeColor: activeColor,
-    trigger: (0, _react2.jsx)(_uiMenu.ToolbarButton
+    trigger: (0, _react2.jsx)(_ToolbarButton.default
     // eslint-disable-next-line @atlaskit/design-system/no-unsafe-style-overrides, @atlaskit/ui-styling-standard/no-imported-style-values
     , {
-      css: _styles.disableBlueBorderStyles,
-      buttonId: _uiMenu.TOOLBAR_BUTTON.BACKGROUND_COLOR,
+      css: _plugins.disableBlueBorderStyles,
+      buttonId: _toolbarButton.TOOLBAR_ACTION_SUBJECT_ID.BACKGROUND_COLOR,
       spacing: (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1') ? 'default' : 'compact',
       disabled: disabled,
       selected: isDropdownOpen,
@@ -112,11 +114,11 @@ var FloatingToolbarHighlightColor = function FloatingToolbarHighlightColor(_ref)
       iconBefore:
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
       (0, _react2.jsx)("div", {
-        css: _styles.triggerWrapperStylesWithPadding
-      }, (0, _react2.jsx)(_icons.DynamicStrokeIconDecoration, {
+        css: _plugins.triggerWrapperStylesWithPadding
+      }, (0, _react2.jsx)(_DynamicStrokeIconDecoration.DynamicStrokeIconDecoration, {
         selectedColor: activeColorToken,
         disabled: disabled,
-        icon: (0, _react2.jsx)(_highlight.default, {
+        icon: (0, _react2.jsx)(_highlight2.default, {
           label: "",
           color: "currentColor",
           spacing: "spacious"
@@ -124,19 +126,19 @@ var FloatingToolbarHighlightColor = function FloatingToolbarHighlightColor(_ref)
       }),
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
       (0, _react2.jsx)("span", {
-        css: _styles.expandIconContainerStyle
+        css: _expand.expandIconContainerStyle
       }, (0, _react2.jsx)(_chevronDown.default, {
         label: "",
         color: "currentColor",
         size: "small"
       })))
-    }, (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'control') && formatMessage(_messages.highlightMessages.highlightFloatingToolbar))
+    }, (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'control') && formatMessage(_highlight.highlightMessages.highlightFloatingToolbar))
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     ,
     onColorChange: function onColorChange(color) {
       return handleColorChange({
         color: color,
-        inputMethod: _analytics.INPUT_METHOD.FLOATING_TB
+        inputMethod: _enums.INPUT_METHOD.FLOATING_TB
       });
     },
     isOpenedByKeyboard: isOpenedByKeyboard,

package/dist/cjs/ui/HighlightColorMenuItem.js

@@ -14,12 +14,15 @@ var _runtime = require("@compiled/react/runtime");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _reactIntl = require("react-intl");
 var _css = require("@atlaskit/css");
-var _messages = require("@atlaskit/editor-common/messages");
+var _highlight = require("@atlaskit/editor-common/messages/highlight");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _uiColor = require("@atlaskit/editor-common/ui-color");
-var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
-var _editorPalette = require("@atlaskit/editor-palette");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _highlightColorPalette = require("@atlaskit/editor-common/ui-color/ColorPalette/highlightColorPalette");
+var _useSharedPluginStateSelector = require("@atlaskit/editor-common/useSharedPluginStateSelector");
+var _text = require("@atlaskit/editor-palette/text");
+var _textBackgroundColor = require("@atlaskit/editor-palette/text-background-color");
+var _colorPalette = require("@atlaskit/editor-toolbar/color-palette");
+var _toolbarDropdownMenuContext = require("@atlaskit/editor-toolbar/toolbar-dropdown-menu-context");
 var _heading = _interopRequireDefault(require("@atlaskit/heading/heading"));
 var _checkMark = _interopRequireDefault(require("@atlaskit/icon/core/check-mark"));
 var _textStyle = _interopRequireDefault(require("@atlaskit/icon/core/text-style"));
@@ -42,7 +45,7 @@ var getTextColorIconColor = function getTextColorIconColor(defaultColor, textCol
   if (!textColor || defaultColor && textColor === defaultColor) {
     return "var(--ds-icon, #292A2E)";
   }
-  return (0, _editorPalette.hexToEditorTextPaletteColor)(textColor) || "var(--ds-icon, #292A2E)";
+  return (0, _text.hexToEditorTextPaletteColor)(textColor) || "var(--ds-icon, #292A2E)";
 };
 var TextColorIconDecorator = function TextColorIconDecorator(_ref) {
   var label = _ref.label,
@@ -97,13 +100,13 @@ function HighlightColorMenuItem(_ref3) {
     formatMessage = _useIntl.formatMessage;
   var labelId = (0, _react.useId)();
   var activeColor = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'highlight.activeColor');
-  var context = (0, _editorToolbar.useToolbarDropdownMenu)();
+  var context = (0, _toolbarDropdownMenuContext.useToolbarDropdownMenu)();
   var _useSelectedTextColor = (0, _uiColor.useSelectedTextColor)(),
     textColor = _useSelectedTextColor.textColor,
     defaultColor = _useSelectedTextColor.defaultColor;
   var closeMenu = context === null || context === void 0 ? void 0 : context.closeMenu;
   var isNewColorPaletteEnabled = (0, _expValEquals.expValEquals)('platform_editor_lovability_text_bg_color', 'isEnabled', true);
-  var selectedColor = activeColor || (isNewColorPaletteEnabled ? _uiColor.REMOVE_HIGHLIGHT_COLOR : null);
+  var selectedColor = activeColor || (isNewColorPaletteEnabled ? _highlightColorPalette.REMOVE_HIGHLIGHT_COLOR : null);
   var handleHighlightColorChange = (0, _react.useCallback)(function (color, event) {
     var _api$highlight;
     if (api !== null && api !== void 0 && (_api$highlight = api.highlight) !== null && _api$highlight !== void 0 && (_api$highlight = _api$highlight.commands) !== null && _api$highlight !== void 0 && _api$highlight.changeColor) {
@@ -121,12 +124,12 @@ function HighlightColorMenuItem(_ref3) {
       return color.value === selectedColor;
     };
     var iconColor = getTextColorIconColor(defaultColor, textColor, isNewColorPaletteEnabled);
-    var highlightPalette = isNewColorPaletteEnabled ? _uiColor.highlightColorPaletteNew : _uiColor.highlightColorPalette;
+    var highlightPalette = isNewColorPaletteEnabled ? _uiColor.highlightColorPaletteNew : _highlightColorPalette.highlightColorPalette;
     return highlightPalette.filter(function (color) {
-      return color.value !== _uiColor.REMOVE_HIGHLIGHT_COLOR;
+      return color.value !== _highlightColorPalette.REMOVE_HIGHLIGHT_COLOR;
     }).map(function (color) {
       return _objectSpread(_objectSpread({}, color), {}, {
-        decorator: isNewColorPaletteEnabled && color.value === _uiColor.REMOVE_HIGHLIGHT_COLOR ? /*#__PURE__*/React.createElement(NoColorIconDecorator, {
+        decorator: isNewColorPaletteEnabled && color.value === _highlightColorPalette.REMOVE_HIGHLIGHT_COLOR ? /*#__PURE__*/React.createElement(NoColorIconDecorator, {
           isSelected: isSelected(color),
           iconColor: iconColor
         }) : /*#__PURE__*/React.createElement(TextColorIconDecorator, {
@@ -137,7 +140,7 @@ function HighlightColorMenuItem(_ref3) {
       });
     });
   }, [defaultColor, textColor, isNewColorPaletteEnabled, selectedColor]);
-  var colorPaletteElement = /*#__PURE__*/React.createElement(_editorToolbar.ColorPalette, {
+  var colorPaletteElement = /*#__PURE__*/React.createElement(_colorPalette.ColorPalette, {
     ariaLabelledBy: labelId,
     cols: isNewColorPaletteEnabled ? HIGHLIGHT_COLOR_PICKER_COLUMNS : undefined,
     gap: isNewColorPaletteEnabled ? 'space.0' : undefined
@@ -151,7 +154,7 @@ function HighlightColorMenuItem(_ref3) {
     ,
     paletteOptions: {
       palette: colorPalette || [],
-      hexToPaletteColor: _editorPalette.hexToEditorTextBackgroundPaletteColor
+      hexToPaletteColor: _textBackgroundColor.hexToEditorTextBackgroundPaletteColor
     }
   });
   return /*#__PURE__*/React.createElement(_compiled.Stack, {
@@ -163,7 +166,7 @@ function HighlightColorMenuItem(_ref3) {
     // The label names the palette's radio group; a heading inside a menu is skipped and has no stable level here
     ,
     as: (0, _fg.fg)('platform_editor_a11y_color_palette_radiogroup') ? 'div' : undefined
-  }, formatMessage(_messages.highlightMessages.highlight)), isNewColorPaletteEnabled ? /*#__PURE__*/React.createElement(_compiled.Bleed, {
+  }, formatMessage(_highlight.highlightMessages.highlight)), isNewColorPaletteEnabled ? /*#__PURE__*/React.createElement(_compiled.Bleed, {
     inline: "space.025"
   }, colorPaletteElement) : colorPaletteElement);
 }

package/dist/cjs/ui/PrimaryToolbarHighlightColor.js

@@ -8,16 +8,18 @@ exports.PrimaryToolbarHighlightColorWithIntl = void 0;
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _hooks = require("@atlaskit/editor-common/hooks");
-var _icons = require("@atlaskit/editor-common/icons");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _toolbarButton = require("@atlaskit/editor-common/analytics/types/toolbar-button");
+var _DynamicStrokeIconDecoration = require("@atlaskit/editor-common/icons/DynamicStrokeIconDecoration");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
-var _styles = require("@atlaskit/editor-common/styles");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
-var _editorPalette = require("@atlaskit/editor-palette");
+var _highlight = require("@atlaskit/editor-common/messages/highlight");
+var _expand = require("@atlaskit/editor-common/styles/expand");
+var _plugins = require("@atlaskit/editor-common/styles/plugins");
+var _ToolbarButton = _interopRequireDefault(require("@atlaskit/editor-common/ui-menu/ToolbarButton"));
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _textBackgroundColor = require("@atlaskit/editor-palette/text-background-color");
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/core/chevron-down"));
-var _highlight = _interopRequireDefault(require("@atlaskit/icon/core/highlight"));
+var _highlight2 = _interopRequireDefault(require("@atlaskit/icon/core/highlight"));
 var _compiled = require("@atlaskit/primitives/compiled");
 var _palette = require("../editor-commands/palette");
 var _PaletteDropdown = require("./shared/PaletteDropdown");
@@ -47,7 +49,7 @@ var PrimaryToolbarHighlightColor = function PrimaryToolbarHighlightColor(_ref) {
     formatMessage = _ref.intl.formatMessage,
     editorView = _ref.editorView;
   var toolbarItemRef = (0, _react.useRef)(null);
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['highlight'], selector),
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(pluginInjectionApi, ['highlight'], selector),
     isPaletteOpen = _useSharedPluginState.isPaletteOpen,
     highlightDisabled = _useSharedPluginState.highlightDisabled,
     activeColor = _useSharedPluginState.activeColor;
@@ -59,7 +61,7 @@ var PrimaryToolbarHighlightColor = function PrimaryToolbarHighlightColor(_ref) {
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       (0, _palette.setPalette)(pluginInjectionApi)({
         isPaletteOpen: isOpen,
-        inputMethod: _analytics.INPUT_METHOD.TOOLBAR
+        inputMethod: _enums.INPUT_METHOD.TOOLBAR
       })(state, dispatch);
     }
   };
@@ -81,11 +83,11 @@ var PrimaryToolbarHighlightColor = function PrimaryToolbarHighlightColor(_ref) {
   if (activeColor === undefined || highlightDisabled === undefined) {
     return null;
   }
-  var toolbarButtonLabel = formatMessage(_messages.highlightMessages.highlight);
+  var toolbarButtonLabel = formatMessage(_highlight.highlightMessages.highlight);
 
   // Get the design token for the  active color (if it exists) to modify the toolbar
   // icon, but show the nice rainbow if none is selected
-  var activeColorToken = activeColor === null ? null : (0, _editorPalette.hexToEditorTextBackgroundPaletteColor)(activeColor);
+  var activeColorToken = activeColor === null ? null : (0, _textBackgroundColor.hexToEditorTextBackgroundPaletteColor)(activeColor);
   return (0, _react2.jsx)(_compiled.Flex, {
     alignItems: "center"
   }, (0, _react2.jsx)(_PaletteDropdown.PaletteDropdown, {
@@ -94,11 +96,11 @@ var PrimaryToolbarHighlightColor = function PrimaryToolbarHighlightColor(_ref) {
     popupsScrollableElement: popupsScrollableElement,
     isOpen: isDropdownOpen && !highlightDisabled,
     activeColor: activeColor,
-    trigger: (0, _react2.jsx)(_uiMenu.ToolbarButton
+    trigger: (0, _react2.jsx)(_ToolbarButton.default
     // eslint-disable-next-line @atlaskit/design-system/no-unsafe-style-overrides, @atlaskit/ui-styling-standard/no-imported-style-values
     , {
-      css: _styles.disableBlueBorderStyles,
-      buttonId: _uiMenu.TOOLBAR_BUTTON.BACKGROUND_COLOR,
+      css: _plugins.disableBlueBorderStyles,
+      buttonId: _toolbarButton.TOOLBAR_ACTION_SUBJECT_ID.BACKGROUND_COLOR,
       spacing: isToolbarReducedSpacing ? 'none' : 'default',
       disabled: disabled || highlightDisabled,
       selected: isDropdownOpen,
@@ -113,11 +115,11 @@ var PrimaryToolbarHighlightColor = function PrimaryToolbarHighlightColor(_ref) {
       iconBefore:
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
       (0, _react2.jsx)("div", {
-        css: _styles.triggerWrapperStylesWithPadding
-      }, (0, _react2.jsx)(_icons.DynamicStrokeIconDecoration, {
+        css: _plugins.triggerWrapperStylesWithPadding
+      }, (0, _react2.jsx)(_DynamicStrokeIconDecoration.DynamicStrokeIconDecoration, {
         selectedColor: activeColorToken,
         disabled: highlightDisabled,
-        icon: (0, _react2.jsx)(_highlight.default, {
+        icon: (0, _react2.jsx)(_highlight2.default, {
           label: "",
           color: "currentColor",
           spacing: "spacious"
@@ -125,7 +127,7 @@ var PrimaryToolbarHighlightColor = function PrimaryToolbarHighlightColor(_ref) {
       }),
       //eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
       (0, _react2.jsx)("span", {
-        css: _styles.expandIconContainerStyle
+        css: _expand.expandIconContainerStyle
       }, (0, _react2.jsx)(_chevronDown.default, {
         label: "",
         color: "currentColor",
@@ -137,7 +139,7 @@ var PrimaryToolbarHighlightColor = function PrimaryToolbarHighlightColor(_ref) {
     onColorChange: function onColorChange(color) {
       return handleColorChange({
         color: color,
-        inputMethod: _analytics.INPUT_METHOD.TOOLBAR
+        inputMethod: _enums.INPUT_METHOD.TOOLBAR
       });
     },
     isOpenedByKeyboard: isOpenedByKeyboard,

package/dist/cjs/ui/shared/EditorHighlightIcon.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.EditorHighlightIcon = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _icons = require("@atlaskit/editor-common/icons");
+var _SteppedRainbowIconDecoration = require("@atlaskit/editor-common/icons/SteppedRainbowIconDecoration");
 var _edit = _interopRequireDefault(require("@atlaskit/icon/core/edit"));
 var _compiled = require("@atlaskit/primitives/compiled");
 var EditorHighlightIcon = exports.EditorHighlightIcon = function EditorHighlightIcon(_ref) {
@@ -14,7 +14,7 @@ var EditorHighlightIcon = exports.EditorHighlightIcon = function EditorHighlight
     selectedColor = _ref.selectedColor;
   return /*#__PURE__*/_react.default.createElement(_compiled.Box, {
     paddingInline: "space.050"
-  }, /*#__PURE__*/_react.default.createElement(_icons.SteppedRainbowIconDecoration, {
+  }, /*#__PURE__*/_react.default.createElement(_SteppedRainbowIconDecoration.SteppedRainbowIconDecoration, {
     selectedColor: selectedColor,
     disabled: disabled,
     icon: /*#__PURE__*/_react.default.createElement(_edit.default, {

package/dist/cjs/ui/shared/PaletteDropdown.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -7,9 +8,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.PaletteDropdown = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _uiColor = require("@atlaskit/editor-common/ui-color");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
-var _editorPalette = require("@atlaskit/editor-palette");
-var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _ColorPalette = _interopRequireDefault(require("@atlaskit/editor-common/ui-color/ColorPalette"));
+var _highlightColorPalette = require("@atlaskit/editor-common/ui-color/ColorPalette/highlightColorPalette");
+var _utils = require("@atlaskit/editor-common/ui-color/ColorPalette/utils");
+var _types = require("@atlaskit/editor-common/ui-menu/ArrowKeyNavigationProvider/types");
+var _DropdownContainer = require("@atlaskit/editor-common/ui-menu/DropdownContainer");
+var _textBackgroundColor = require("@atlaskit/editor-palette/text-background-color");
+var _constants = require("@atlaskit/editor-shared-styles/constants");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var HIGHLIGHT_COLOR_PICKER_COLUMNS = 8;
@@ -29,10 +34,10 @@ var PaletteDropdown = exports.PaletteDropdown = function PaletteDropdown(props)
   var highlightPalette = (0, _react.useMemo)(function () {
     if (isNewColorPaletteEnabled) {
       return _uiColor.highlightColorPaletteNew.filter(function (color) {
-        return color.value !== _uiColor.REMOVE_HIGHLIGHT_COLOR;
+        return color.value !== _highlightColorPalette.REMOVE_HIGHLIGHT_COLOR;
       });
     }
-    return _uiColor.highlightColorPalette;
+    return _highlightColorPalette.highlightColorPalette;
   }, [isNewColorPaletteEnabled]);
   var colorPickerColumns = isNewColorPaletteEnabled ? HIGHLIGHT_COLOR_PICKER_COLUMNS_NEW : HIGHLIGHT_COLOR_PICKER_COLUMNS;
 
@@ -43,24 +48,24 @@ var PaletteDropdown = exports.PaletteDropdown = function PaletteDropdown(props)
   // 10 cols: 336 = (32 * 10) + (8 + 8)
   // Not sure where the extra 2px comes from
 
-  var selectedColor = activeColor || (isNewColorPaletteEnabled ? _uiColor.REMOVE_HIGHLIGHT_COLOR : null);
-  var _getSelectedRowAndCol = (0, _uiColor.getSelectedRowAndColumnFromPalette)(highlightPalette, selectedColor, colorPickerColumns),
+  var selectedColor = activeColor || (isNewColorPaletteEnabled ? _highlightColorPalette.REMOVE_HIGHLIGHT_COLOR : null);
+  var _getSelectedRowAndCol = (0, _utils.getSelectedRowAndColumnFromPalette)(highlightPalette, selectedColor, colorPickerColumns),
     selectedRowIndex = _getSelectedRowAndCol.selectedRowIndex,
     selectedColumnIndex = _getSelectedRowAndCol.selectedColumnIndex;
-  return /*#__PURE__*/_react.default.createElement(_uiMenu.DropdownContainer, {
+  return /*#__PURE__*/_react.default.createElement(_DropdownContainer.DropdownContainer, {
     mountTo: popupsMountPoint,
     boundariesElement: popupsBoundariesElement,
     scrollableElement: popupsScrollableElement,
     isOpen: isOpen,
     handleClickOutside: handleClickOutside,
     handleEscapeKeydown: handleEscapeKeydown,
-    zIndex: _editorSharedStyles.akEditorMenuZIndex,
+    zIndex: _constants.akEditorMenuZIndex,
     fitWidth: fitWidth,
     closeOnTab: true
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     ,
     arrowKeyNavigationProviderOptions: {
-      type: _uiMenu.ArrowKeyNavigationType.COLOR,
+      type: _types.ArrowKeyNavigationType.COLOR,
       selectedRowIndex: selectedRowIndex,
       selectedColumnIndex: selectedColumnIndex,
       isOpenedByKeyboard: isOpenedByKeyboard,
@@ -69,7 +74,7 @@ var PaletteDropdown = exports.PaletteDropdown = function PaletteDropdown(props)
     trigger: trigger
   }, /*#__PURE__*/_react.default.createElement("div", {
     "data-testid": "highlight-color-palette"
-  }, /*#__PURE__*/_react.default.createElement(_uiColor.ColorPalette, {
+  }, /*#__PURE__*/_react.default.createElement(_ColorPalette.default, {
     cols: colorPickerColumns,
     onClick: onColorChange,
     selectedColor: selectedColor
@@ -77,7 +82,7 @@ var PaletteDropdown = exports.PaletteDropdown = function PaletteDropdown(props)
     ,
     paletteOptions: {
       palette: highlightPalette,
-      hexToPaletteColor: _editorPalette.hexToEditorTextBackgroundPaletteColor
+      hexToPaletteColor: _textBackgroundColor.hexToEditorTextBackgroundPaletteColor
     }
   })));
 };

package/dist/cjs/ui/toolbar-component.js

@@ -7,14 +7,15 @@ Object.defineProperty(exports, "__esModule", {
 exports.getToolbarComponent = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
-var _toolbar = require("@atlaskit/editor-common/toolbar");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _rank = require("@atlaskit/editor-common/toolbar/rank");
 var _HighlightColorMenuItem = require("./HighlightColorMenuItem");
 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) { (0, _defineProperty2.default)(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; }
 var getToolbarComponent = exports.getToolbarComponent = function getToolbarComponent(api) {
-  return [_objectSpread(_objectSpread({}, _toolbar.HIGHLIGHT_MENU_ITEM), {}, {
-    parents: [_objectSpread(_objectSpread({}, _toolbar.TEXT_COLOR_HIGHLIGHT_MENU_SECTION), {}, {
-      rank: _toolbar.TEXT_COLOR_HIGHLIGHT_MENU_SECTION_RANK[_toolbar.HIGHLIGHT_MENU_ITEM.key]
+  return [_objectSpread(_objectSpread({}, _keys.HIGHLIGHT_MENU_ITEM), {}, {
+    parents: [_objectSpread(_objectSpread({}, _keys.TEXT_COLOR_HIGHLIGHT_MENU_SECTION), {}, {
+      rank: _rank.TEXT_COLOR_HIGHLIGHT_MENU_SECTION_RANK[_keys.HIGHLIGHT_MENU_ITEM.key]
     })],
     component: function component(_ref) {
       var parents = _ref.parents;

package/dist/es2019/editor-commands/change-color.js

@@ -1,7 +1,9 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { getHadMarkAttributes, removeMark, toggleMark } from '@atlaskit/editor-common/mark';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
+import { getHadMarkAttributes, removeMark } from '@atlaskit/editor-common/mark';
+import { toggleMark } from '@atlaskit/editor-common/mark/commands';
 import { FORMAT_SELECTION_SYNC_META } from '@atlaskit/editor-common/selection';
-import { REMOVE_HIGHLIGHT_COLOR, highlightColorPalette, highlightColorPaletteNew } from '@atlaskit/editor-common/ui-color';
+import { highlightColorPaletteNew } from '@atlaskit/editor-common/ui-color';
+import { REMOVE_HIGHLIGHT_COLOR, highlightColorPalette } from '@atlaskit/editor-common/ui-color/ColorPalette/highlightColorPalette';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';

package/dist/es2019/editor-commands/disabled.js

@@ -1,5 +1,5 @@
 import { isMarkAllowedInRange, isMarkExcluded } from '@atlaskit/editor-common/mark';
-import { GapCursorSelection } from '@atlaskit/editor-common/selection';
+import { GapCursorSelection } from '@atlaskit/editor-common/selection/gap-cursor/selection';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 export const getDisabledState = state => {
   const {

package/dist/es2019/editor-commands/palette.js

@@ -1,4 +1,4 @@
-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';
 // oxlint-disable-next-line import/no-duplicates
 
 import { HighlightPluginAction, highlightPluginKey } from '../pm-plugins/main';

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

@@ -1,7 +1,9 @@
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { applyYellowHighlight, bindKeymapWithCommand, keymap, toggleHighlightPalette } from '@atlaskit/editor-common/keymaps';
-import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
-import { highlightColorPalette, highlightColorPaletteNew } from '@atlaskit/editor-common/ui-color';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { keymap } from '@atlaskit/editor-common/keymap';
+import { applyYellowHighlight, bindKeymapWithCommand, toggleHighlightPalette } from '@atlaskit/editor-common/keymaps';
+import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset/editor-commands';
+import { highlightColorPaletteNew } from '@atlaskit/editor-common/ui-color';
+import { highlightColorPalette } from '@atlaskit/editor-common/ui-color/ColorPalette/highlightColorPalette';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { changeColor } from '../editor-commands/change-color';
 import { togglePalette } from '../editor-commands/palette';

package/dist/es2019/ui/FloatingToolbarHighlightColor.js

@@ -6,14 +6,16 @@ import { useRef } 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 { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { DynamicStrokeIconDecoration } from '@atlaskit/editor-common/icons';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { TOOLBAR_ACTION_SUBJECT_ID as TOOLBAR_BUTTON } from '@atlaskit/editor-common/analytics/types/toolbar-button';
+import { DynamicStrokeIconDecoration } from '@atlaskit/editor-common/icons/DynamicStrokeIconDecoration';
 import { toggleHighlightPalette, tooltip, getAriaKeyshortcuts } from '@atlaskit/editor-common/keymaps';
-import { highlightMessages as messages } from '@atlaskit/editor-common/messages';
-import { disableBlueBorderStyles, expandIconContainerStyle, triggerWrapperStylesWithPadding } from '@atlaskit/editor-common/styles';
-import { TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
-import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
+import { highlightMessages as messages } from '@atlaskit/editor-common/messages/highlight';
+import { expandIconContainerStyle } from '@atlaskit/editor-common/styles/expand';
+import { disableBlueBorderStyles, triggerWrapperStylesWithPadding } from '@atlaskit/editor-common/styles/plugins';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette/text-background-color';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import HighlightIcon from '@atlaskit/icon/core/highlight';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';

package/dist/es2019/ui/HighlightColorMenuItem.js

@@ -5,12 +5,15 @@ import { ax, ix } from "@compiled/react/runtime";
 import { useCallback, useId, useMemo } from 'react';
 import { useIntl } from 'react-intl';
 import { cx } from '@atlaskit/css';
-import { highlightMessages as messages } from '@atlaskit/editor-common/messages';
+import { highlightMessages as messages } from '@atlaskit/editor-common/messages/highlight';
 import { getInputMethodFromParentKeys } from '@atlaskit/editor-common/toolbar';
-import { REMOVE_HIGHLIGHT_COLOR, highlightColorPalette, highlightColorPaletteNew, useSelectedTextColor } from '@atlaskit/editor-common/ui-color';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { hexToEditorTextBackgroundPaletteColor, hexToEditorTextPaletteColor } from '@atlaskit/editor-palette';
-import { ColorPalette, useToolbarDropdownMenu } from '@atlaskit/editor-toolbar';
+import { highlightColorPaletteNew, useSelectedTextColor } from '@atlaskit/editor-common/ui-color';
+import { REMOVE_HIGHLIGHT_COLOR, highlightColorPalette } from '@atlaskit/editor-common/ui-color/ColorPalette/highlightColorPalette';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/useSharedPluginStateSelector';
+import { hexToEditorTextPaletteColor } from '@atlaskit/editor-palette/text';
+import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette/text-background-color';
+import { ColorPalette } from '@atlaskit/editor-toolbar/color-palette';
+import { useToolbarDropdownMenu } from '@atlaskit/editor-toolbar/toolbar-dropdown-menu-context';
 import Heading from '@atlaskit/heading/heading';
 import EditorDoneIcon from '@atlaskit/icon/core/check-mark';
 import Icon from '@atlaskit/icon/core/text-style';

package/dist/es2019/ui/PrimaryToolbarHighlightColor.js

@@ -6,14 +6,16 @@ import { useRef } 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 { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { DynamicStrokeIconDecoration } from '@atlaskit/editor-common/icons';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { TOOLBAR_ACTION_SUBJECT_ID as TOOLBAR_BUTTON } from '@atlaskit/editor-common/analytics/types/toolbar-button';
+import { DynamicStrokeIconDecoration } from '@atlaskit/editor-common/icons/DynamicStrokeIconDecoration';
 import { getAriaKeyshortcuts, toggleHighlightPalette, tooltip } from '@atlaskit/editor-common/keymaps';
-import { highlightMessages as messages } from '@atlaskit/editor-common/messages';
-import { disableBlueBorderStyles, expandIconContainerStyle, triggerWrapperStylesWithPadding } from '@atlaskit/editor-common/styles';
-import { TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
-import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
+import { highlightMessages as messages } from '@atlaskit/editor-common/messages/highlight';
+import { expandIconContainerStyle } from '@atlaskit/editor-common/styles/expand';
+import { disableBlueBorderStyles, triggerWrapperStylesWithPadding } from '@atlaskit/editor-common/styles/plugins';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette/text-background-color';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import HighlightIcon from '@atlaskit/icon/core/highlight';
 import { Flex } from '@atlaskit/primitives/compiled';

package/dist/es2019/ui/shared/EditorHighlightIcon.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { SteppedRainbowIconDecoration } from '@atlaskit/editor-common/icons';
+import { SteppedRainbowIconDecoration } from '@atlaskit/editor-common/icons/SteppedRainbowIconDecoration';
 import EditFilledIcon from '@atlaskit/icon/core/edit';
 import { Box } from '@atlaskit/primitives/compiled';
 export const EditorHighlightIcon = ({

package/dist/es2019/ui/shared/PaletteDropdown.js

@@ -1,8 +1,12 @@
 import React, { useMemo } from 'react';
-import { ColorPalette, REMOVE_HIGHLIGHT_COLOR, getSelectedRowAndColumnFromPalette, highlightColorPalette, highlightColorPaletteNew } from '@atlaskit/editor-common/ui-color';
-import { ArrowKeyNavigationType, DropdownContainer as Dropdown } from '@atlaskit/editor-common/ui-menu';
-import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
-import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
+import { highlightColorPaletteNew } from '@atlaskit/editor-common/ui-color';
+import ColorPalette from '@atlaskit/editor-common/ui-color/ColorPalette';
+import { REMOVE_HIGHLIGHT_COLOR, highlightColorPalette } from '@atlaskit/editor-common/ui-color/ColorPalette/highlightColorPalette';
+import { getSelectedRowAndColumnFromPalette } from '@atlaskit/editor-common/ui-color/ColorPalette/utils';
+import { ArrowKeyNavigationType } from '@atlaskit/editor-common/ui-menu/ArrowKeyNavigationProvider/types';
+import { DropdownContainer as Dropdown } from '@atlaskit/editor-common/ui-menu/DropdownContainer';
+import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette/text-background-color';
+import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles/constants';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 const HIGHLIGHT_COLOR_PICKER_COLUMNS = 8;
 const HIGHLIGHT_COLOR_PICKER_COLUMNS_NEW = 10;

package/dist/es2019/ui/toolbar-component.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import { HIGHLIGHT_MENU_ITEM, TEXT_COLOR_HIGHLIGHT_MENU_SECTION, TEXT_COLOR_HIGHLIGHT_MENU_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
+import { HIGHLIGHT_MENU_ITEM, TEXT_COLOR_HIGHLIGHT_MENU_SECTION } from '@atlaskit/editor-common/toolbar/keys';
+import { TEXT_COLOR_HIGHLIGHT_MENU_SECTION_RANK } from '@atlaskit/editor-common/toolbar/rank';
 import { HighlightColorMenuItem } from './HighlightColorMenuItem';
 export const getToolbarComponent = api => {
   return [{

package/dist/esm/editor-commands/change-color.js

@@ -1,10 +1,12 @@
 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 { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { getHadMarkAttributes, removeMark, toggleMark } from '@atlaskit/editor-common/mark';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
+import { getHadMarkAttributes, removeMark } from '@atlaskit/editor-common/mark';
+import { toggleMark } from '@atlaskit/editor-common/mark/commands';
 import { FORMAT_SELECTION_SYNC_META } from '@atlaskit/editor-common/selection';
-import { REMOVE_HIGHLIGHT_COLOR, highlightColorPalette, highlightColorPaletteNew } from '@atlaskit/editor-common/ui-color';
+import { highlightColorPaletteNew } from '@atlaskit/editor-common/ui-color';
+import { REMOVE_HIGHLIGHT_COLOR, highlightColorPalette } from '@atlaskit/editor-common/ui-color/ColorPalette/highlightColorPalette';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';

package/dist/esm/editor-commands/disabled.js

@@ -1,5 +1,5 @@
 import { isMarkAllowedInRange, isMarkExcluded } from '@atlaskit/editor-common/mark';
-import { GapCursorSelection } from '@atlaskit/editor-common/selection';
+import { GapCursorSelection } from '@atlaskit/editor-common/selection/gap-cursor/selection';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 export var getDisabledState = function getDisabledState(state) {
   var backgroundColor = state.schema.marks.backgroundColor;

package/dist/esm/editor-commands/palette.js

@@ -1,4 +1,4 @@
-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';
 // oxlint-disable-next-line import/no-duplicates
 
 import { HighlightPluginAction, highlightPluginKey } from '../pm-plugins/main';

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

@@ -1,7 +1,9 @@
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { applyYellowHighlight, bindKeymapWithCommand, keymap, toggleHighlightPalette } from '@atlaskit/editor-common/keymaps';
-import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
-import { highlightColorPalette, highlightColorPaletteNew } from '@atlaskit/editor-common/ui-color';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { keymap } from '@atlaskit/editor-common/keymap';
+import { applyYellowHighlight, bindKeymapWithCommand, toggleHighlightPalette } from '@atlaskit/editor-common/keymaps';
+import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset/editor-commands';
+import { highlightColorPaletteNew } from '@atlaskit/editor-common/ui-color';
+import { highlightColorPalette } from '@atlaskit/editor-common/ui-color/ColorPalette/highlightColorPalette';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { changeColor } from '../editor-commands/change-color';
 import { togglePalette } from '../editor-commands/palette';

package/dist/esm/ui/FloatingToolbarHighlightColor.js

@@ -6,14 +6,16 @@ import { useRef } 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 { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { DynamicStrokeIconDecoration } from '@atlaskit/editor-common/icons';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { TOOLBAR_ACTION_SUBJECT_ID as TOOLBAR_BUTTON } from '@atlaskit/editor-common/analytics/types/toolbar-button';
+import { DynamicStrokeIconDecoration } from '@atlaskit/editor-common/icons/DynamicStrokeIconDecoration';
 import { toggleHighlightPalette, tooltip, getAriaKeyshortcuts } from '@atlaskit/editor-common/keymaps';
-import { highlightMessages as messages } from '@atlaskit/editor-common/messages';
-import { disableBlueBorderStyles, expandIconContainerStyle, triggerWrapperStylesWithPadding } from '@atlaskit/editor-common/styles';
-import { TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
-import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
+import { highlightMessages as messages } from '@atlaskit/editor-common/messages/highlight';
+import { expandIconContainerStyle } from '@atlaskit/editor-common/styles/expand';
+import { disableBlueBorderStyles, triggerWrapperStylesWithPadding } from '@atlaskit/editor-common/styles/plugins';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette/text-background-color';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import HighlightIcon from '@atlaskit/icon/core/highlight';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';

package/dist/esm/ui/HighlightColorMenuItem.js

@@ -8,12 +8,15 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { useCallback, useId, useMemo } from 'react';
 import { useIntl } from 'react-intl';
 import { cx } from '@atlaskit/css';
-import { highlightMessages as messages } from '@atlaskit/editor-common/messages';
+import { highlightMessages as messages } from '@atlaskit/editor-common/messages/highlight';
 import { getInputMethodFromParentKeys } from '@atlaskit/editor-common/toolbar';
-import { REMOVE_HIGHLIGHT_COLOR, highlightColorPalette, highlightColorPaletteNew, useSelectedTextColor } from '@atlaskit/editor-common/ui-color';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { hexToEditorTextBackgroundPaletteColor, hexToEditorTextPaletteColor } from '@atlaskit/editor-palette';
-import { ColorPalette, useToolbarDropdownMenu } from '@atlaskit/editor-toolbar';
+import { highlightColorPaletteNew, useSelectedTextColor } from '@atlaskit/editor-common/ui-color';
+import { REMOVE_HIGHLIGHT_COLOR, highlightColorPalette } from '@atlaskit/editor-common/ui-color/ColorPalette/highlightColorPalette';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/useSharedPluginStateSelector';
+import { hexToEditorTextPaletteColor } from '@atlaskit/editor-palette/text';
+import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette/text-background-color';
+import { ColorPalette } from '@atlaskit/editor-toolbar/color-palette';
+import { useToolbarDropdownMenu } from '@atlaskit/editor-toolbar/toolbar-dropdown-menu-context';
 import Heading from '@atlaskit/heading/heading';
 import EditorDoneIcon from '@atlaskit/icon/core/check-mark';
 import Icon from '@atlaskit/icon/core/text-style';

package/dist/esm/ui/PrimaryToolbarHighlightColor.js

@@ -6,14 +6,16 @@ import { useRef } 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 { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { DynamicStrokeIconDecoration } from '@atlaskit/editor-common/icons';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { TOOLBAR_ACTION_SUBJECT_ID as TOOLBAR_BUTTON } from '@atlaskit/editor-common/analytics/types/toolbar-button';
+import { DynamicStrokeIconDecoration } from '@atlaskit/editor-common/icons/DynamicStrokeIconDecoration';
 import { getAriaKeyshortcuts, toggleHighlightPalette, tooltip } from '@atlaskit/editor-common/keymaps';
-import { highlightMessages as messages } from '@atlaskit/editor-common/messages';
-import { disableBlueBorderStyles, expandIconContainerStyle, triggerWrapperStylesWithPadding } from '@atlaskit/editor-common/styles';
-import { TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
-import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
+import { highlightMessages as messages } from '@atlaskit/editor-common/messages/highlight';
+import { expandIconContainerStyle } from '@atlaskit/editor-common/styles/expand';
+import { disableBlueBorderStyles, triggerWrapperStylesWithPadding } from '@atlaskit/editor-common/styles/plugins';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette/text-background-color';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import HighlightIcon from '@atlaskit/icon/core/highlight';
 import { Flex } from '@atlaskit/primitives/compiled';

package/dist/esm/ui/shared/EditorHighlightIcon.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { SteppedRainbowIconDecoration } from '@atlaskit/editor-common/icons';
+import { SteppedRainbowIconDecoration } from '@atlaskit/editor-common/icons/SteppedRainbowIconDecoration';
 import EditFilledIcon from '@atlaskit/icon/core/edit';
 import { Box } from '@atlaskit/primitives/compiled';
 export var EditorHighlightIcon = function EditorHighlightIcon(_ref) {

package/dist/esm/ui/shared/PaletteDropdown.js

@@ -1,8 +1,12 @@
 import React, { useMemo } from 'react';
-import { ColorPalette, REMOVE_HIGHLIGHT_COLOR, getSelectedRowAndColumnFromPalette, highlightColorPalette, highlightColorPaletteNew } from '@atlaskit/editor-common/ui-color';
-import { ArrowKeyNavigationType, DropdownContainer as Dropdown } from '@atlaskit/editor-common/ui-menu';
-import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
-import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
+import { highlightColorPaletteNew } from '@atlaskit/editor-common/ui-color';
+import ColorPalette from '@atlaskit/editor-common/ui-color/ColorPalette';
+import { REMOVE_HIGHLIGHT_COLOR, highlightColorPalette } from '@atlaskit/editor-common/ui-color/ColorPalette/highlightColorPalette';
+import { getSelectedRowAndColumnFromPalette } from '@atlaskit/editor-common/ui-color/ColorPalette/utils';
+import { ArrowKeyNavigationType } from '@atlaskit/editor-common/ui-menu/ArrowKeyNavigationProvider/types';
+import { DropdownContainer as Dropdown } from '@atlaskit/editor-common/ui-menu/DropdownContainer';
+import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette/text-background-color';
+import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles/constants';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var HIGHLIGHT_COLOR_PICKER_COLUMNS = 8;
 var HIGHLIGHT_COLOR_PICKER_COLUMNS_NEW = 10;

package/dist/esm/ui/toolbar-component.js

@@ -2,7 +2,8 @@ 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 { HIGHLIGHT_MENU_ITEM, TEXT_COLOR_HIGHLIGHT_MENU_SECTION, TEXT_COLOR_HIGHLIGHT_MENU_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
+import { HIGHLIGHT_MENU_ITEM, TEXT_COLOR_HIGHLIGHT_MENU_SECTION } from '@atlaskit/editor-common/toolbar/keys';
+import { TEXT_COLOR_HIGHLIGHT_MENU_SECTION_RANK } from '@atlaskit/editor-common/toolbar/rank';
 import { HighlightColorMenuItem } from './HighlightColorMenuItem';
 export var getToolbarComponent = function getToolbarComponent(api) {
   return [_objectSpread(_objectSpread({}, HIGHLIGHT_MENU_ITEM), {}, {

package/dist/types/editor-commands/change-color.d.ts

@@ -1,5 +1,6 @@
-import type { EditorAnalyticsAPI, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import type { EditorCommand } from '@atlaskit/editor-common/types';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics/api';
+import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import type { EditorCommand } from '@atlaskit/editor-common/types/editor-command';
 export declare const changeColor: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => ({ color, inputMethod }: {
     color: string;
     inputMethod: INPUT_METHOD;

package/dist/types/editor-commands/palette.d.ts

@@ -1,5 +1,6 @@
-import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import type { Command, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import type { Command } from '@atlaskit/editor-common/types/command';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { HighlightPlugin } from '../highlightPluginType';
 export declare const togglePalette: (api: ExtractInjectionAPI<HighlightPlugin>) => ({ inputMethod }: {
     inputMethod: INPUT_METHOD;

package/dist/types/highlightPluginType.d.ts

@@ -1,11 +1,12 @@
-import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
-import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
-import type { SelectionToolbarPlugin } from '@atlaskit/editor-plugin-selection-toolbar';
-import type { TextFormattingPlugin } from '@atlaskit/editor-plugin-text-formatting';
-import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
-import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-preferences';
+import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import type { EditorCommand } from '@atlaskit/editor-common/types/editor-command';
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types/next-editor-plugin';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics/analyticsPluginType';
+import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar/primary-toolbar-plugin-type';
+import type { SelectionToolbarPlugin } from '@atlaskit/editor-plugin-selection-toolbar/selection-toolbar-plugin-type';
+import type { TextFormattingPlugin } from '@atlaskit/editor-plugin-text-formatting/text-formatting-plugin-type';
+import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar/toolbar-plugin-type';
+import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-preferences/user-preferences-plugin-type';
 import type { HighlightPluginState } from './pm-plugins/main';
 export type HighlightPlugin = NextEditorPlugin<'highlight', {
     commands: {

package/dist/types/pm-plugins/keymap.d.ts

@@ -1,5 +1,5 @@
 import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { HighlightPlugin } from '../highlightPluginType';
 export declare function keymapPlugin({ api }: {
     api: ExtractInjectionAPI<HighlightPlugin> | undefined;

package/dist/types/ui/FloatingToolbarHighlightColor.d.ts

@@ -1,7 +1,7 @@
 import type { ComponentType, FC } from 'react';
 import type { WithIntlProps, WrappedComponentProps } from 'react-intl';
-import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics/types/dispatch-analytics-event';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { HighlightPlugin } from '../highlightPluginType';
 type FloatingToolbarHighlightColorProps = {

package/dist/types/ui/HighlightColorMenuItem.d.ts

@@ -2,8 +2,8 @@
  * @jsxRuntime classic
  * @jsx jsx
  */
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { ToolbarComponentTypes } from '@atlaskit/editor-toolbar-model';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
+import type { ToolbarComponentTypes } from '@atlaskit/editor-toolbar-model/types';
 import type { HighlightPlugin } from '../highlightPluginType';
 interface HighlightMenuItemProps {
     api: ExtractInjectionAPI<HighlightPlugin> | undefined;

package/dist/types/ui/PrimaryToolbarHighlightColor.d.ts

@@ -1,6 +1,6 @@
 import type { ComponentType, FC } from 'react';
 import type { WithIntlProps, WrappedComponentProps } from 'react-intl';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { HighlightPlugin } from '../highlightPluginType';
 type PrimaryToolbarHighlightColorProps = {

package/dist/types/ui/shared/PaletteDropdown.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { WithOutsideClickProps } from '@atlaskit/editor-common/ui';
+import type { WithOutsideClickProps } from '@atlaskit/editor-common/with-outer-listeners';
 type PaletteDropdownProps = {
     activeColor: string | null;
     isOpen: boolean;

package/dist/types/ui/shared/useDropdownEvents.d.ts

@@ -1,6 +1,6 @@
-import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { ToolbarButtonRef } from '@atlaskit/editor-common/ui-menu';
+import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
+import type { ToolbarButtonRef } from '@atlaskit/editor-common/ui-menu/ToolbarButton';
 import type { HighlightPlugin } from '../../highlightPluginType';
 type UseDropdownEventArgs = {
     isDropdownOpen: boolean;

package/dist/types/ui/toolbar-component.d.ts

@@ -1,4 +1,4 @@
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { RegisterComponent } from '@atlaskit/editor-toolbar-model';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
+import type { RegisterComponent } from '@atlaskit/editor-toolbar-model/types';
 import type { HighlightPlugin } from '../highlightPluginType';
 export declare const getToolbarComponent: (api: ExtractInjectionAPI<HighlightPlugin> | undefined) => RegisterComponent[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-highlight",
-	"version": "26.0.4",
+	"version": "26.0.7",
 	"description": "Highlight plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -45,13 +45,13 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/primitives": "^22.5.0",
-		"@atlaskit/tmp-editor-statsig": "^231.0.0",
+		"@atlaskit/tmp-editor-statsig": "^234.0.0",
 		"@atlaskit/tokens": "^20.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^130.3.0",
+		"@atlaskit/editor-common": "^130.5.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},