@atlaskit/editor-plugin-text-color 26.0.4 → 26.0.7

package/dist/cjs/ui/ToolbarTextColor/index.js

@@ -15,21 +15,27 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _icons = require("@atlaskit/editor-common/icons");
-var _messages = require("@atlaskit/editor-common/messages");
-var _styles = require("@atlaskit/editor-common/styles");
-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 _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 _textColor = require("@atlaskit/editor-common/messages/text-color");
+var _expand = require("@atlaskit/editor-common/styles/expand");
+var _plugins = require("@atlaskit/editor-common/styles/plugins");
+var _ColorPalette = _interopRequireDefault(require("@atlaskit/editor-common/ui-color/ColorPalette"));
+var _paletteMessagesTokenModeNames = require("@atlaskit/editor-common/ui-color/ColorPalette/paletteMessagesTokenModeNames");
+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 _ToolbarButton = _interopRequireDefault(require("@atlaskit/editor-common/ui-menu/ToolbarButton"));
+var _text = require("@atlaskit/editor-palette/text");
+var _constants = require("@atlaskit/editor-shared-styles/constants");
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/core/chevron-down"));
 var _textStyle = _interopRequireDefault(require("@atlaskit/icon/core/text-style"));
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _changeColor = require("../../pm-plugins/commands/change-color");
 var _inputType = require("../../pm-plugins/utils/inputType");
-var _types = require("../../types");
+var _types2 = require("../../types");
 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; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
@@ -98,7 +104,7 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
         });
       }
       if (logCloseEvent) {
-        _this.dispatchAnalyticsEvent(_this.buildAnalyticsPalette(isOpen ? _analytics.ACTION.OPENED : _analytics.ACTION.CLOSED, {
+        _this.dispatchAnalyticsEvent(_this.buildAnalyticsPalette(isOpen ? _enums.ACTION.OPENED : _enums.ACTION.CLOSED, {
           noSelect: isOpen === false
         }));
       }
@@ -106,7 +112,7 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
     (0, _defineProperty2.default)(_this, "hide", function (e) {
       var isOpen = _this.state.isOpen;
       if (isOpen === true) {
-        _this.dispatchAnalyticsEvent(_this.buildAnalyticsPalette(_analytics.ACTION.CLOSED, {
+        _this.dispatchAnalyticsEvent(_this.buildAnalyticsPalette(_enums.ACTION.CLOSED, {
           noSelect: true
         }));
         _this.setState({
@@ -161,39 +167,39 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
         return paletteItem.value === pluginState.color;
       })) === null || _palette$find === void 0 ? void 0 : _palette$find.label;
       var selectedColorPaletteItemLabelText = selectedColorPaletteItemLabel || '';
-      var labelTextColor = formatMessage(_messages.textColorMessages.textColor, {
+      var labelTextColor = formatMessage(_textColor.textColorMessages.textColor, {
         selectedColorName: selectedColorPaletteItemLabelText
       });
-      var tooltipTextColor = formatMessage(_messages.textColorMessages.textColorTooltip);
-      var _getSelectedRowAndCol = (0, _uiColor.getSelectedRowAndColumnFromPalette)(palette, pluginState.color, colorPickerColumns),
+      var tooltipTextColor = formatMessage(_textColor.textColorMessages.textColorTooltip);
+      var _getSelectedRowAndCol = (0, _utils.getSelectedRowAndColumnFromPalette)(palette, pluginState.color, colorPickerColumns),
         selectedRowIndex = _getSelectedRowAndCol.selectedRowIndex,
         selectedColumnIndex = _getSelectedRowAndCol.selectedColumnIndex;
-      var reducedSpacing = this.props.toolbarType === _types.ToolbarType.FLOATING ? 'compact' : 'none';
+      var reducedSpacing = this.props.toolbarType === _types2.ToolbarType.FLOATING ? 'compact' : 'none';
       return (0, _react2.jsx)("span", {
         css:
         // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
-        [_styles.wrapperStyle, addMarginToWrapper]
-      }, (0, _react2.jsx)(_uiMenu.DropdownContainer, {
+        [_plugins.wrapperStyle, addMarginToWrapper]
+      }, (0, _react2.jsx)(_DropdownContainer.DropdownContainer, {
         mountTo: popupsMountPoint,
         boundariesElement: popupsBoundariesElement,
         scrollableElement: popupsScrollableElement,
         isOpen: isOpen && !pluginState.disabled,
         handleClickOutside: this.hide,
         handleEscapeKeydown: this.hideonEsc,
-        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,
           isPopupPositioned: true
         },
-        trigger: (0, _react2.jsx)(_uiMenu.ToolbarButton, {
-          buttonId: _uiMenu.TOOLBAR_BUTTON.TEXT_COLOR,
+        trigger: (0, _react2.jsx)(_ToolbarButton.default, {
+          buttonId: _toolbarButton.TOOLBAR_ACTION_SUBJECT_ID.TEXT_COLOR,
           spacing: !isReducedSpacing || (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1') ? 'default' : reducedSpacing,
           disabled: disabled || pluginState.disabled,
           selected: isOpen,
@@ -207,8 +213,8 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
           iconBefore: (0, _react2.jsx)("div", {
             css:
             // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
-            _styles.triggerWrapperStylesWithPadding
-          }, (0, _react2.jsx)(_icons.DynamicStrokeIconDecoration, {
+            _plugins.triggerWrapperStylesWithPadding
+          }, (0, _react2.jsx)(_DynamicStrokeIconDecoration.DynamicStrokeIconDecoration, {
             selectedColor: selectedColor,
             disabled: pluginState.disabled,
             icon: (0, _react2.jsx)(_textStyle.default, {
@@ -219,7 +225,7 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
           }),
           //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",
@@ -228,7 +234,7 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
         })
       }, (0, _react2.jsx)("div", {
         "data-testid": "text-color-palette"
-      }, (0, _react2.jsx)(_uiColor.ColorPalette, {
+      }, (0, _react2.jsx)(_ColorPalette.default, {
         cols: colorPickerColumns
         // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
         ,
@@ -241,13 +247,13 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
         ,
         paletteOptions: {
           palette: palette,
-          hexToPaletteColor: _editorPalette.hexToEditorTextPaletteColor,
-          paletteColorTooltipMessages: _uiColor.textPaletteTooltipMessages
+          hexToPaletteColor: _text.hexToEditorTextPaletteColor,
+          paletteColorTooltipMessages: _paletteMessagesTokenModeNames.textPaletteTooltipMessages
         }
       }))), !(pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.primaryToolbar) && /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage */
       // 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.separatorStyles
+        css: _plugins.separatorStyles
       }));
     }
   }, {
@@ -256,7 +262,7 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
       var selectedColor = pluginState.color !== pluginState.defaultColor ? pluginState.color ?
       // Ignored via go/ees005
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      (0, _editorPalette.hexToEditorTextPaletteColor)(pluginState.color) : pluginState.color : null;
+      (0, _text.hexToEditorTextPaletteColor)(pluginState.color) : pluginState.color : null;
       return selectedColor;
     }
   }, {
@@ -264,9 +270,9 @@ var ToolbarTextColor = exports.ToolbarTextColor = /*#__PURE__*/function (_React$
     value: function buildAnalyticsPalette(action, data) {
       return {
         action: action,
-        actionSubject: _analytics.ACTION_SUBJECT.TOOLBAR,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_COLOR,
-        eventType: _analytics.EVENT_TYPE.TRACK,
+        actionSubject: _enums.ACTION_SUBJECT.TOOLBAR,
+        actionSubjectId: _enums.ACTION_SUBJECT_ID.FORMAT_COLOR,
+        eventType: _enums.EVENT_TYPE.TRACK,
         attributes: _objectSpread({}, data)
       };
     }

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

@@ -8,7 +8,8 @@ exports.getToolbarComponents = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 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 _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _ColorAccessibilityMenuItem = require("./ColorAccessibilityMenuItem");
 var _RemoveColorMenuItem = require("./RemoveColorMenuItem");
@@ -18,17 +19,17 @@ var _TextMenuSection = require("./TextMenuSection");
 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 getToolbarComponents = exports.getToolbarComponents = function getToolbarComponents(api) {
-  return [_objectSpread(_objectSpread({}, _toolbar.TEXT_COLOR_HIGHLIGHT_GROUP), {}, {
-    parents: [_objectSpread(_objectSpread({}, _toolbar.TEXT_SECTION), {}, {
-      rank: _toolbar.TEXT_SECTION_RANK[_toolbar.TEXT_COLOR_HIGHLIGHT_GROUP.key]
+  return [_objectSpread(_objectSpread({}, _keys.TEXT_COLOR_HIGHLIGHT_GROUP), {}, {
+    parents: [_objectSpread(_objectSpread({}, _keys.TEXT_SECTION), {}, {
+      rank: _rank.TEXT_SECTION_RANK[_keys.TEXT_COLOR_HIGHLIGHT_GROUP.key]
     }), {
-      type: _toolbar.TEXT_SECTION_PRIMARY_TOOLBAR.type,
-      key: _toolbar.TEXT_SECTION_PRIMARY_TOOLBAR.key,
-      rank: _toolbar.TEXT_SECTION_PRIMARY_TOOLBAR_RANK[_toolbar.TEXT_COLOR_HIGHLIGHT_GROUP.key]
+      type: _keys.TEXT_SECTION_PRIMARY_TOOLBAR.type,
+      key: _keys.TEXT_SECTION_PRIMARY_TOOLBAR.key,
+      rank: _rank.TEXT_SECTION_PRIMARY_TOOLBAR_RANK[_keys.TEXT_COLOR_HIGHLIGHT_GROUP.key]
     }]
-  }), _objectSpread(_objectSpread({}, _toolbar.TEXT_COLOR_HIGHLIGHT_MENU), {}, {
-    parents: [_objectSpread(_objectSpread({}, _toolbar.TEXT_COLOR_HIGHLIGHT_GROUP), {}, {
-      rank: _toolbar.TEXT_COLOR_HIGHLIGHT_GROUP_RANK[_toolbar.TEXT_COLOR_HIGHLIGHT_MENU.key]
+  }), _objectSpread(_objectSpread({}, _keys.TEXT_COLOR_HIGHLIGHT_MENU), {}, {
+    parents: [_objectSpread(_objectSpread({}, _keys.TEXT_COLOR_HIGHLIGHT_GROUP), {}, {
+      rank: _rank.TEXT_COLOR_HIGHLIGHT_GROUP_RANK[_keys.TEXT_COLOR_HIGHLIGHT_MENU.key]
     })],
     component: function component(_ref) {
       var children = _ref.children;
@@ -36,18 +37,18 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
         api: api
       }, children);
     }
-  }), _objectSpread(_objectSpread({}, _toolbar.TEXT_COLOR_HIGHLIGHT_MENU_SECTION), {}, {
-    parents: [_objectSpread(_objectSpread({}, _toolbar.TEXT_COLOR_HIGHLIGHT_MENU), {}, {
-      rank: _toolbar.TEXT_COLOR_HIGHLIGHT_MENU_RANK[_toolbar.TEXT_COLOR_HIGHLIGHT_MENU_SECTION.key]
+  }), _objectSpread(_objectSpread({}, _keys.TEXT_COLOR_HIGHLIGHT_MENU_SECTION), {}, {
+    parents: [_objectSpread(_objectSpread({}, _keys.TEXT_COLOR_HIGHLIGHT_MENU), {}, {
+      rank: _rank.TEXT_COLOR_HIGHLIGHT_MENU_RANK[_keys.TEXT_COLOR_HIGHLIGHT_MENU_SECTION.key]
     }), {
-      type: _toolbar.TEXT_COLLAPSED_MENU.type,
-      key: _toolbar.TEXT_COLLAPSED_MENU.key,
-      rank: _toolbar.TEXT_COLLAPSED_MENU_RANK[_toolbar.TEXT_COLOR_HIGHLIGHT_MENU_SECTION.key]
+      type: _keys.TEXT_COLLAPSED_MENU.type,
+      key: _keys.TEXT_COLLAPSED_MENU.key,
+      rank: _rank.TEXT_COLLAPSED_MENU_RANK[_keys.TEXT_COLOR_HIGHLIGHT_MENU_SECTION.key]
     }],
     component: _TextMenuSection.TextMenuSection
-  }), _objectSpread(_objectSpread({}, _toolbar.TEXT_COLOR_MENU_ITEM), {}, {
-    parents: [_objectSpread(_objectSpread({}, _toolbar.TEXT_COLOR_HIGHLIGHT_MENU_SECTION), {}, {
-      rank: _toolbar.TEXT_COLOR_HIGHLIGHT_MENU_SECTION_RANK[_toolbar.TEXT_COLOR_MENU_ITEM.key]
+  }), _objectSpread(_objectSpread({}, _keys.TEXT_COLOR_MENU_ITEM), {}, {
+    parents: [_objectSpread(_objectSpread({}, _keys.TEXT_COLOR_HIGHLIGHT_MENU_SECTION), {}, {
+      rank: _rank.TEXT_COLOR_HIGHLIGHT_MENU_SECTION_RANK[_keys.TEXT_COLOR_MENU_ITEM.key]
     })],
     component: function component(_ref2) {
       var parents = _ref2.parents;
@@ -56,9 +57,9 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
         parents: parents
       });
     }
-  }), _objectSpread(_objectSpread({}, _toolbar.CLEAR_COLOR_MENU_ITEM), {}, {
-    parents: [_objectSpread(_objectSpread({}, _toolbar.TEXT_COLOR_HIGHLIGHT_MENU_SECTION), {}, {
-      rank: _toolbar.TEXT_COLOR_HIGHLIGHT_MENU_SECTION_RANK[_toolbar.CLEAR_COLOR_MENU_ITEM.key]
+  }), _objectSpread(_objectSpread({}, _keys.CLEAR_COLOR_MENU_ITEM), {}, {
+    parents: [_objectSpread(_objectSpread({}, _keys.TEXT_COLOR_HIGHLIGHT_MENU_SECTION), {}, {
+      rank: _rank.TEXT_COLOR_HIGHLIGHT_MENU_SECTION_RANK[_keys.CLEAR_COLOR_MENU_ITEM.key]
     })],
     component: function component(_ref3) {
       var parents = _ref3.parents;
@@ -67,9 +68,9 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
         parents: parents
       });
     }
-  })].concat((0, _toConsumableArray2.default)((0, _expValEquals.expValEquals)('platform_editor_lovability_text_bg_color', 'isEnabled', true) ? [_objectSpread(_objectSpread({}, _toolbar.COLOR_ACCESSIBILITY_MENU_ITEM), {}, {
-    parents: [_objectSpread(_objectSpread({}, _toolbar.TEXT_COLOR_HIGHLIGHT_MENU_SECTION), {}, {
-      rank: _toolbar.TEXT_COLOR_HIGHLIGHT_MENU_SECTION_RANK[_toolbar.COLOR_ACCESSIBILITY_MENU_ITEM.key]
+  })].concat((0, _toConsumableArray2.default)((0, _expValEquals.expValEquals)('platform_editor_lovability_text_bg_color', 'isEnabled', true) ? [_objectSpread(_objectSpread({}, _keys.COLOR_ACCESSIBILITY_MENU_ITEM), {}, {
+    parents: [_objectSpread(_objectSpread({}, _keys.TEXT_COLOR_HIGHLIGHT_MENU_SECTION), {}, {
+      rank: _rank.TEXT_COLOR_HIGHLIGHT_MENU_SECTION_RANK[_keys.COLOR_ACCESSIBILITY_MENU_ITEM.key]
     })],
     component: function component() {
       return /*#__PURE__*/_react.default.createElement(_ColorAccessibilityMenuItem.ColorAccessibilityMenuItem, {

package/dist/es2019/editor-commands/change-color.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';
 import { getHadMarkAttributes } from '@atlaskit/editor-common/mark';
 import { FORMAT_SELECTION_SYNC_META } from '@atlaskit/editor-common/selection';
 import { getActiveColorNew } from '../pm-plugins/utils/color';

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

@@ -1,4 +1,5 @@
-import { removeMark, toggleMark } from '@atlaskit/editor-common/mark';
+import { removeMark } from '@atlaskit/editor-common/mark';
+import { toggleMark } from '@atlaskit/editor-common/mark/commands';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ACTIONS, pluginKey } from '../pm-plugins/main';
 import { overrideMarks } from '../pm-plugins/utils/constants';

package/dist/es2019/pm-plugins/commands/change-color.js

@@ -1,6 +1,6 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 import { getHadMarkAttributes } from '@atlaskit/editor-common/mark';
+import { withAnalytics } from '@atlaskit/editor-common/withAnalytics';
 import { pluginKey } from '../main';
 import { getActiveColor } from '../utils/color';
 import { removeColor } from './remove-color';

package/dist/es2019/pm-plugins/commands/toggle-color.js

@@ -1,4 +1,5 @@
-import { removeMark, toggleMark } from '@atlaskit/editor-common/mark';
+import { 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 { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ACTIONS, pluginKey } from '../main';

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

@@ -1,4 +1,5 @@
-import { bindKeymapWithEditorCommand, keymap, toggleHighlightPalette } from '@atlaskit/editor-common/keymaps';
+import { keymap } from '@atlaskit/editor-common/keymap';
+import { bindKeymapWithEditorCommand, toggleHighlightPalette } from '@atlaskit/editor-common/keymaps';
 import { togglePalette } from '../editor-commands/palette';
 export function keymapPlugin({
   api

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

@@ -1,5 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { textColorPalette, textColorPaletteNew } from '@atlaskit/editor-common/ui-color';
+import { textColorPaletteNew } from '@atlaskit/editor-common/ui-color';
+import { textColorPalette } from '@atlaskit/editor-common/ui-color/ColorPalette/textColorPalette';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { getActiveColor } from './utils/color';

package/dist/es2019/pm-plugins/utils/inputType.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';
 const toolbarTypeToInputMethod = {
   [ToolbarType.PRIMARY]: INPUT_METHOD.TOOLBAR,

package/dist/es2019/ui/ColorAccessibilityMenuItem.js

@@ -6,12 +6,15 @@ import { useIntl } from 'react-intl';
 import { PanelType } from '@atlaskit/adf-schema/panel';
 import IconButton from '@atlaskit/button/icon/button';
 import { cx } from '@atlaskit/css';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { colorAccessibilityMessages as messages } from '@atlaskit/editor-common/messages';
-import { getPanelTypeBackgroundNoTokens } from '@atlaskit/editor-common/panel';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { getTextColorInNonActiveTheme, getTokenCSSVariableValue, getTokenCSSVariableValueForNonActiveTheme } from '@atlaskit/editor-common/ui-color';
-import { hexToEditorBackgroundPaletteColor, hexToEditorTextBackgroundPaletteColor, hexToEditorTextPaletteColor } from '@atlaskit/editor-palette';
+import { colorAccessibilityMessages as messages } from '@atlaskit/editor-common/messages/color-accessibility';
+import { getPanelTypeBackgroundNoTokens } from '@atlaskit/editor-common/styles/panel';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { getTextColorInNonActiveTheme } from '@atlaskit/editor-common/ui-color';
+import { getTokenCSSVariableValue, getTokenCSSVariableValueForNonActiveTheme } from '@atlaskit/editor-common/ui-color/ColorPalette/utils';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette/background';
+import { hexToEditorTextPaletteColor } from '@atlaskit/editor-palette/text';
+import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette/text-background-color';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import AccessibilityIcon from '@atlaskit/icon/core/accessibility';
 import QuestionCircleIcon from '@atlaskit/icon/core/question-circle';

package/dist/es2019/ui/FloatingToolbarComponent.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { ToolbarType } from '../types';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default

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 { ToolbarType } from '../types';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default

package/dist/es2019/ui/RemoveColorMenuItem.js

@@ -4,10 +4,10 @@ import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useIntl } from 'react-intl';
 import Button from '@atlaskit/button/default/button';
-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 } from '@atlaskit/editor-common/ui-color';
-import { useToolbarDropdownMenu } from '@atlaskit/editor-toolbar';
+import { REMOVE_HIGHLIGHT_COLOR } from '@atlaskit/editor-common/ui-color/ColorPalette/highlightColorPalette';
+import { useToolbarDropdownMenu } from '@atlaskit/editor-toolbar/toolbar-dropdown-menu-context';
 import ColourNoneIcon from '@atlaskit/icon-lab/core/colour-none';
 import { Text } from '@atlaskit/primitives/compiled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';

package/dist/es2019/ui/TextColorHighlightMenu.js

@@ -1,11 +1,17 @@
 import React, { useCallback, useEffect, useRef } from 'react';
 import { useIntl } from 'react-intl';
 import { toggleHighlightPalette, ToolTipContent } from '@atlaskit/editor-common/keymaps';
-import { textColorMessages as messages } from '@atlaskit/editor-common/messages';
+import { textColorMessages as messages } from '@atlaskit/editor-common/messages/text-color';
 import { SelectedTextColorProvider } from '@atlaskit/editor-common/ui-color';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { hexToEditorTextPaletteColor, hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette';
-import { TextColorIcon, ToolbarColorSwatch, ToolbarDropdownMenu, ToolbarDropdownMenuProvider, ToolbarTooltip, useToolbarUI } from '@atlaskit/editor-toolbar';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/useSharedPluginStateSelector';
+import { hexToEditorTextPaletteColor } from '@atlaskit/editor-palette/text';
+import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette/text-background-color';
+import { TextColorIcon } from '@atlaskit/editor-toolbar/text-color-icon';
+import { ToolbarColorSwatch } from '@atlaskit/editor-toolbar/toolbar-color-swatch';
+import { ToolbarDropdownMenu } from '@atlaskit/editor-toolbar/toolbar-dropdown-menu';
+import { ToolbarDropdownMenuProvider } from '@atlaskit/editor-toolbar/toolbar-dropdown-menu-context';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
+import { useToolbarUI } from '@atlaskit/editor-toolbar/ui-context';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 const getIconColor = (textColor, defaultColor, highlightColor) => {
   if (expValEquals('platform_editor_lovability_text_bg_color', 'isEnabled', true)) {

package/dist/es2019/ui/TextColorMenuItem.js

@@ -3,12 +3,14 @@ import "./TextColorMenuItem.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useCallback, useId } from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { textColorMessages as messages } from '@atlaskit/editor-common/messages';
-import { getInputMethodFromParentKeys, useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { textPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color';
-import { hexToEditorTextPaletteColor } from '@atlaskit/editor-palette';
-import { ColorPalette, useToolbarDropdownMenu } from '@atlaskit/editor-toolbar';
+import { textColorMessages as messages } from '@atlaskit/editor-common/messages/text-color';
+import { getInputMethodFromParentKeys } from '@atlaskit/editor-common/toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { textPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color/ColorPalette/paletteMessagesTokenModeNames';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { hexToEditorTextPaletteColor } from '@atlaskit/editor-palette/text';
+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 { fg } from '@atlaskit/platform-feature-flags/fg';
 import { Bleed, Stack } from '@atlaskit/primitives/compiled';

package/dist/es2019/ui/TextMenuSection.js

@@ -2,8 +2,8 @@
 import "./TextMenuSection.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
-import { TEXT_COLLAPSED_MENU } from '@atlaskit/editor-common/toolbar';
-import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
+import { TEXT_COLLAPSED_MENU } from '@atlaskit/editor-common/toolbar/keys';
+import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar/toolbar-dropdown-item-section';
 import { Box } from '@atlaskit/primitives/compiled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 const styles = {

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

@@ -8,14 +8,20 @@ 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 { injectIntl } from 'react-intl';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { DynamicStrokeIconDecoration } from '@atlaskit/editor-common/icons';
-import { textColorMessages as messages } from '@atlaskit/editor-common/messages';
-import { expandIconContainerStyle, separatorStyles, triggerWrapperStylesWithPadding, wrapperStyle } from '@atlaskit/editor-common/styles';
-import { ColorPalette, getSelectedRowAndColumnFromPalette, textPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color';
-import { ArrowKeyNavigationType, DropdownContainer as Dropdown, TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
-import { hexToEditorTextPaletteColor } from '@atlaskit/editor-palette';
-import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } 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 { textColorMessages as messages } from '@atlaskit/editor-common/messages/text-color';
+import { expandIconContainerStyle } from '@atlaskit/editor-common/styles/expand';
+import { separatorStyles, triggerWrapperStylesWithPadding, wrapperStyle } from '@atlaskit/editor-common/styles/plugins';
+import ColorPalette from '@atlaskit/editor-common/ui-color/ColorPalette';
+import { textPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color/ColorPalette/paletteMessagesTokenModeNames';
+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 ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
+import { hexToEditorTextPaletteColor } from '@atlaskit/editor-palette/text';
+import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles/constants';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import TextStyleIcon from '@atlaskit/icon/core/text-style';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';

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

@@ -1,5 +1,6 @@
 import React from 'react';
-import { TEXT_SECTION, TEXT_SECTION_RANK, TEXT_COLOR_HIGHLIGHT_GROUP, TEXT_COLOR_HIGHLIGHT_MENU, TEXT_COLOR_HIGHLIGHT_MENU_SECTION, TEXT_COLOR_MENU_ITEM, TEXT_COLOR_HIGHLIGHT_MENU_SECTION_RANK, TEXT_COLOR_HIGHLIGHT_GROUP_RANK, TEXT_COLOR_HIGHLIGHT_MENU_RANK, TEXT_COLLAPSED_MENU_RANK, TEXT_COLLAPSED_MENU, CLEAR_COLOR_MENU_ITEM, COLOR_ACCESSIBILITY_MENU_ITEM, TEXT_SECTION_PRIMARY_TOOLBAR_RANK, TEXT_SECTION_PRIMARY_TOOLBAR } from '@atlaskit/editor-common/toolbar';
+import { TEXT_SECTION, TEXT_COLOR_HIGHLIGHT_GROUP, TEXT_COLOR_HIGHLIGHT_MENU, TEXT_COLOR_HIGHLIGHT_MENU_SECTION, TEXT_COLOR_MENU_ITEM, TEXT_COLLAPSED_MENU, CLEAR_COLOR_MENU_ITEM, COLOR_ACCESSIBILITY_MENU_ITEM, TEXT_SECTION_PRIMARY_TOOLBAR } from '@atlaskit/editor-common/toolbar/keys';
+import { TEXT_SECTION_RANK, TEXT_COLOR_HIGHLIGHT_MENU_SECTION_RANK, TEXT_COLOR_HIGHLIGHT_GROUP_RANK, TEXT_COLOR_HIGHLIGHT_MENU_RANK, TEXT_COLLAPSED_MENU_RANK, TEXT_SECTION_PRIMARY_TOOLBAR_RANK } from '@atlaskit/editor-common/toolbar/rank';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ColorAccessibilityMenuItem } from './ColorAccessibilityMenuItem';
 import { RemoveColorMenuItem } from './RemoveColorMenuItem';

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

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 import { getHadMarkAttributes } from '@atlaskit/editor-common/mark';
 import { FORMAT_SELECTION_SYNC_META } from '@atlaskit/editor-common/selection';
 import { getActiveColorNew } from '../pm-plugins/utils/color';

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

@@ -1,4 +1,5 @@
-import { removeMark, toggleMark } from '@atlaskit/editor-common/mark';
+import { removeMark } from '@atlaskit/editor-common/mark';
+import { toggleMark } from '@atlaskit/editor-common/mark/commands';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ACTIONS, pluginKey } from '../pm-plugins/main';
 import { overrideMarks } from '../pm-plugins/utils/constants';

package/dist/esm/pm-plugins/commands/change-color.js

@@ -1,9 +1,9 @@
 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 { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 import { getHadMarkAttributes } from '@atlaskit/editor-common/mark';
+import { withAnalytics } from '@atlaskit/editor-common/withAnalytics';
 import { pluginKey } from '../main';
 import { getActiveColor } from '../utils/color';
 import { removeColor } from './remove-color';

package/dist/esm/pm-plugins/commands/toggle-color.js

@@ -1,4 +1,5 @@
-import { removeMark, toggleMark } from '@atlaskit/editor-common/mark';
+import { 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 { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ACTIONS, pluginKey } from '../main';

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

@@ -1,4 +1,5 @@
-import { bindKeymapWithEditorCommand, keymap, toggleHighlightPalette } from '@atlaskit/editor-common/keymaps';
+import { keymap } from '@atlaskit/editor-common/keymap';
+import { bindKeymapWithEditorCommand, toggleHighlightPalette } from '@atlaskit/editor-common/keymaps';
 import { togglePalette } from '../editor-commands/palette';
 export function keymapPlugin(_ref) {
   var api = _ref.api;

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

@@ -3,7 +3,8 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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 { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { textColorPalette, textColorPaletteNew } from '@atlaskit/editor-common/ui-color';
+import { textColorPaletteNew } from '@atlaskit/editor-common/ui-color';
+import { textColorPalette } from '@atlaskit/editor-common/ui-color/ColorPalette/textColorPalette';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { getActiveColor } from './utils/color';

package/dist/esm/pm-plugins/utils/inputType.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';
 var toolbarTypeToInputMethod = _defineProperty(_defineProperty({}, ToolbarType.PRIMARY, INPUT_METHOD.TOOLBAR), ToolbarType.FLOATING, INPUT_METHOD.FLOATING_TB);
 export var getInputMethod = function getInputMethod(toolbarType) {

package/dist/esm/ui/ColorAccessibilityMenuItem.js

@@ -9,12 +9,15 @@ import { useIntl } from 'react-intl';
 import { PanelType } from '@atlaskit/adf-schema/panel';
 import IconButton from '@atlaskit/button/icon/button';
 import { cx } from '@atlaskit/css';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { colorAccessibilityMessages as messages } from '@atlaskit/editor-common/messages';
-import { getPanelTypeBackgroundNoTokens } from '@atlaskit/editor-common/panel';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { getTextColorInNonActiveTheme, getTokenCSSVariableValue, getTokenCSSVariableValueForNonActiveTheme } from '@atlaskit/editor-common/ui-color';
-import { hexToEditorBackgroundPaletteColor, hexToEditorTextBackgroundPaletteColor, hexToEditorTextPaletteColor } from '@atlaskit/editor-palette';
+import { colorAccessibilityMessages as messages } from '@atlaskit/editor-common/messages/color-accessibility';
+import { getPanelTypeBackgroundNoTokens } from '@atlaskit/editor-common/styles/panel';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { getTextColorInNonActiveTheme } from '@atlaskit/editor-common/ui-color';
+import { getTokenCSSVariableValue, getTokenCSSVariableValueForNonActiveTheme } from '@atlaskit/editor-common/ui-color/ColorPalette/utils';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette/background';
+import { hexToEditorTextPaletteColor } from '@atlaskit/editor-palette/text';
+import { hexToEditorTextBackgroundPaletteColor } from '@atlaskit/editor-palette/text-background-color';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import AccessibilityIcon from '@atlaskit/icon/core/accessibility';
 import QuestionCircleIcon from '@atlaskit/icon/core/question-circle';

package/dist/esm/ui/FloatingToolbarComponent.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { ToolbarType } from '../types';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default

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 { ToolbarType } from '../types';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-named-as-default