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

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

@@ -6,40 +6,43 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.underlineButtonGroup = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _rank = require("@atlaskit/editor-common/toolbar/rank");
+var _show = require("@atlaskit/editor-toolbar/show");
+var _toolbarButtonGroup = require("@atlaskit/editor-toolbar/toolbar-button-group");
 var _types = require("../types");
 var _Component = require("./Component");
 var _utils = require("./utils");
 var UnderlineButtonGroup = function UnderlineButtonGroup(_ref) {
   var children = _ref.children;
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorAppearance = _useEditorToolbar.editorAppearance;
   if (editorAppearance === 'full-page') {
-    return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
+    return /*#__PURE__*/_react.default.createElement(_show.Show, {
       above: "xl"
-    }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
+    }, /*#__PURE__*/_react.default.createElement(_toolbarButtonGroup.ToolbarButtonGroup, null, children));
   }
 };
 var underlineButtonGroup = exports.underlineButtonGroup = function underlineButtonGroup(api) {
   return [{
-    type: _toolbar.UNDERLINE_BUTTON_GROUP.type,
-    key: _toolbar.UNDERLINE_BUTTON_GROUP.key,
+    type: _keys.UNDERLINE_BUTTON_GROUP.type,
+    key: _keys.UNDERLINE_BUTTON_GROUP.key,
     parents: [{
-      type: _toolbar.TEXT_SECTION_PRIMARY_TOOLBAR.type,
-      key: _toolbar.TEXT_SECTION_PRIMARY_TOOLBAR.key,
-      rank: _toolbar.TEXT_SECTION_PRIMARY_TOOLBAR_RANK[_toolbar.UNDERLINE_BUTTON_GROUP.key]
+      type: _keys.TEXT_SECTION_PRIMARY_TOOLBAR.type,
+      key: _keys.TEXT_SECTION_PRIMARY_TOOLBAR.key,
+      rank: _rank.TEXT_SECTION_PRIMARY_TOOLBAR_RANK[_keys.UNDERLINE_BUTTON_GROUP.key]
     }],
     component: function component(_ref2) {
       var children = _ref2.children;
       return /*#__PURE__*/_react.default.createElement(UnderlineButtonGroup, null, children);
     }
   }, {
-    type: _toolbar.UNDERLINE_BUTTON.type,
-    key: _toolbar.UNDERLINE_BUTTON.key,
+    type: _keys.UNDERLINE_BUTTON.type,
+    key: _keys.UNDERLINE_BUTTON.key,
     parents: [{
-      type: _toolbar.UNDERLINE_BUTTON_GROUP.type,
-      key: _toolbar.UNDERLINE_BUTTON_GROUP.key,
+      type: _keys.UNDERLINE_BUTTON_GROUP.type,
+      key: _keys.UNDERLINE_BUTTON_GROUP.key,
       rank: 100
     }],
     component: function component(_ref3) {

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

@@ -7,11 +7,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.useComponentInfo = exports.formatOptions = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _reactIntl = require("react-intl");
-var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _toolbar = require("@atlaskit/editor-common/messages/toolbar");
+var _toolbar2 = require("@atlaskit/editor-common/toolbar");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _rank = require("@atlaskit/editor-common/toolbar/rank");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _boldIcon = require("@atlaskit/editor-toolbar/bold-icon");
+var _codeIcon = require("@atlaskit/editor-toolbar/code-icon");
+var _italicIcon = require("@atlaskit/editor-toolbar/italic-icon");
+var _strikeThroughIcon = require("@atlaskit/editor-toolbar/strike-through-icon");
+var _subscriptIcon = require("@atlaskit/editor-toolbar/subscript-icon");
+var _superscriptIcon = require("@atlaskit/editor-toolbar/superscript-icon");
+var _underlineIcon = require("@atlaskit/editor-toolbar/underline-icon");
 var _toggleMark = require("../../../editor-commands/toggle-mark");
 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; } // oxlint-disable-next-line import/no-duplicates
@@ -32,7 +40,7 @@ var useComponentInfo = exports.useComponentInfo = function useComponentInfo(_ref
     shortcut = _ref.shortcut,
     toggleMarkWithAnalyticsCallback = _ref.toggleMarkWithAnalyticsCallback,
     parents = _ref.parents;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['textFormatting'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['textFormatting'], function (states) {
       var _states$textFormattin, _states$textFormattin2, _states$textFormattin3, _states$textFormattin4;
       return {
         isActive: (_states$textFormattin = states.textFormattingState) === null || _states$textFormattin === void 0 ? void 0 : _states$textFormattin["".concat(optionType, "Active")],
@@ -67,7 +75,7 @@ var useComponentInfo = exports.useComponentInfo = function useComponentInfo(_ref
   var ariaLabel = (0, _keymaps.tooltip)(shortcut, formatTitle);
   var onClick = function onClick() {
     var _api$analytics;
-    api === null || api === void 0 || api.core.actions.execute(toggleMarkWithAnalyticsCallback(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)((0, _toolbar.getInputMethodFromParentKeys)(parents)));
+    api === null || api === void 0 || api.core.actions.execute(toggleMarkWithAnalyticsCallback(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)((0, _toolbar2.getInputMethodFromParentKeys)(parents)));
   };
   return _objectSpread(_objectSpread({}, formatOptionState), {}, {
     formatTitle: formatTitle,
@@ -79,58 +87,58 @@ var useComponentInfo = exports.useComponentInfo = function useComponentInfo(_ref
 var formatOptions = exports.formatOptions = function formatOptions() {
   return {
     strong: {
-      rank: _toolbar.TEXT_FORMATTING_MENU_SECTION_RANK[_toolbar.BOLD_MENU_ITEM.key],
-      key: _toolbar.BOLD_MENU_ITEM.key,
-      icon: _editorToolbar.BoldIcon,
-      title: _messages.toolbarMessages.bold,
+      rank: _rank.TEXT_FORMATTING_MENU_SECTION_RANK[_keys.BOLD_MENU_ITEM.key],
+      key: _keys.BOLD_MENU_ITEM.key,
+      icon: _boldIcon.BoldIcon,
+      title: _toolbar.toolbarMessages.bold,
       command: _toggleMark.toggleStrongWithAnalytics,
       shortcut: _keymaps.toggleBold
     },
     em: {
-      rank: _toolbar.TEXT_FORMATTING_MENU_SECTION_RANK[_toolbar.ITALIC_MENU_ITEM.key],
-      key: _toolbar.ITALIC_MENU_ITEM.key,
-      icon: _editorToolbar.ItalicIcon,
-      title: _messages.toolbarMessages.italic,
+      rank: _rank.TEXT_FORMATTING_MENU_SECTION_RANK[_keys.ITALIC_MENU_ITEM.key],
+      key: _keys.ITALIC_MENU_ITEM.key,
+      icon: _italicIcon.ItalicIcon,
+      title: _toolbar.toolbarMessages.italic,
       command: _toggleMark.toggleEmWithAnalytics,
       shortcut: _keymaps.toggleItalic
     },
     underline: {
-      rank: _toolbar.TEXT_FORMATTING_MENU_SECTION_RANK[_toolbar.UNDERLINE_MENU_ITEM.key],
-      key: _toolbar.UNDERLINE_MENU_ITEM.key,
-      icon: _editorToolbar.UnderlineIcon,
-      title: _messages.toolbarMessages.underline,
+      rank: _rank.TEXT_FORMATTING_MENU_SECTION_RANK[_keys.UNDERLINE_MENU_ITEM.key],
+      key: _keys.UNDERLINE_MENU_ITEM.key,
+      icon: _underlineIcon.UnderlineIcon,
+      title: _toolbar.toolbarMessages.underline,
       command: _toggleMark.toggleUnderlineWithAnalytics,
       shortcut: _keymaps.toggleUnderline
     },
     strike: {
-      rank: _toolbar.TEXT_FORMATTING_MENU_SECTION_RANK[_toolbar.STRIKE_MENU_ITEM.key],
-      key: _toolbar.STRIKE_MENU_ITEM.key,
-      icon: _editorToolbar.StrikeThroughIcon,
-      title: _messages.toolbarMessages.strike,
+      rank: _rank.TEXT_FORMATTING_MENU_SECTION_RANK[_keys.STRIKE_MENU_ITEM.key],
+      key: _keys.STRIKE_MENU_ITEM.key,
+      icon: _strikeThroughIcon.StrikeThroughIcon,
+      title: _toolbar.toolbarMessages.strike,
       command: _toggleMark.toggleStrikeWithAnalytics,
       shortcut: _keymaps.toggleStrikethrough
     },
     code: {
-      rank: _toolbar.TEXT_FORMATTING_MENU_SECTION_RANK[_toolbar.CODE_MENU_ITEM.key],
-      key: _toolbar.CODE_MENU_ITEM.key,
-      icon: _editorToolbar.CodeIcon,
-      title: _messages.toolbarMessages.code,
+      rank: _rank.TEXT_FORMATTING_MENU_SECTION_RANK[_keys.CODE_MENU_ITEM.key],
+      key: _keys.CODE_MENU_ITEM.key,
+      icon: _codeIcon.CodeIcon,
+      title: _toolbar.toolbarMessages.code,
       command: _toggleMark.toggleCodeWithAnalytics,
       shortcut: _keymaps.toggleCode
     },
     subscript: {
-      rank: _toolbar.TEXT_FORMATTING_MENU_SECTION_RANK[_toolbar.SUBSCRIPT_MENU_ITEM.key],
-      key: _toolbar.SUBSCRIPT_MENU_ITEM.key,
-      icon: _editorToolbar.SubscriptIcon,
-      title: _messages.toolbarMessages.subscript,
+      rank: _rank.TEXT_FORMATTING_MENU_SECTION_RANK[_keys.SUBSCRIPT_MENU_ITEM.key],
+      key: _keys.SUBSCRIPT_MENU_ITEM.key,
+      icon: _subscriptIcon.SubscriptIcon,
+      title: _toolbar.toolbarMessages.subscript,
       command: _toggleMark.toggleSubscriptWithAnalytics,
       shortcut: _keymaps.toggleSubscript
     },
     superscript: {
-      rank: _toolbar.TEXT_FORMATTING_MENU_SECTION_RANK[_toolbar.SUPERSCRIPT_MENU_ITEM.key],
-      key: _toolbar.SUPERSCRIPT_MENU_ITEM.key,
-      icon: _editorToolbar.SuperscriptIcon,
-      title: _messages.toolbarMessages.superscript,
+      rank: _rank.TEXT_FORMATTING_MENU_SECTION_RANK[_keys.SUPERSCRIPT_MENU_ITEM.key],
+      key: _keys.SUPERSCRIPT_MENU_ITEM.key,
+      icon: _superscriptIcon.SuperscriptIcon,
+      title: _toolbar.toolbarMessages.superscript,
       command: _toggleMark.toggleSuperscriptWithAnalytics,
       shortcut: _keymaps.toggleSuperscript
     }

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

@@ -8,9 +8,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.FormattingTextDropdownMenu = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
-var _messages = require("@atlaskit/editor-common/messages");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
-var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _toolbar = require("@atlaskit/editor-common/messages/toolbar");
+var _DropdownMenu = require("@atlaskit/editor-common/ui-menu/DropdownMenu");
+var _constants = require("@atlaskit/editor-shared-styles/constants");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _dropdownToolbarButton = require("./dropdown-toolbar-button");
 var _menuState = require("./hooks/menu-state");
@@ -57,7 +57,7 @@ var FormattingTextDropdownMenu = exports.FormattingTextDropdownMenu = /*#__PURE_
   var defaultIconName = (_items$0$items$2 = items[0].items[0]) === null || _items$0$items$2 === void 0 ? void 0 : _items$0$items$2.value.name;
   var iconBefore = activeItem ? activeItem === null || activeItem === void 0 ? void 0 : activeItem.elemBefore : defaultIcon;
   var activeIconName = (activeItem === null || activeItem === void 0 ? void 0 : activeItem.value.name) || defaultIconName;
-  return /*#__PURE__*/_react.default.createElement(_uiMenu.DropdownMenuWithKeyboardNavigation, {
+  return /*#__PURE__*/_react.default.createElement(_DropdownMenu.DropdownMenuWithKeyboardNavigation, {
     mountTo: popupsMountPoint,
     onOpenChange: closeMenu,
     boundariesElement: popupsBoundariesElement,
@@ -65,7 +65,7 @@ var FormattingTextDropdownMenu = exports.FormattingTextDropdownMenu = /*#__PURE_
     onItemActivated: onItemActivated,
     isOpen: isMenuOpen,
     items: items,
-    zIndex: _editorSharedStyles.akEditorMenuZIndex,
+    zIndex: _constants.akEditorMenuZIndex,
     fitHeight: 188,
     fitWidth: (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'control') ? 136 : 230,
     shouldUseDefaultRole: true
@@ -107,7 +107,7 @@ var FormattingTextDropdownMenu = exports.FormattingTextDropdownMenu = /*#__PURE_
     isReducedSpacing: isReducedSpacing,
     isDisabled: Boolean(isDisabled),
     isSelected: isMenuOpen,
-    label: intl.formatMessage(_messages.toolbarMessages.textFormat),
+    label: intl.formatMessage(_toolbar.toolbarMessages.textFormat),
     "aria-expanded": isMenuOpen,
     "aria-haspopup": true
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)

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

@@ -7,8 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.DropdownToolbarButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
-var _styles = require("@atlaskit/editor-common/styles");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+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 _chevronDown = _interopRequireDefault(require("@atlaskit/icon/core/chevron-down"));
 var _textItalic = _interopRequireDefault(require("@atlaskit/icon/core/text-italic"));
 var _types = require("./types");
@@ -31,10 +32,10 @@ var DropdownToolbarButton = exports.DropdownToolbarButton = function DropdownToo
     iconBefore = _ref.iconBefore,
     activeIconName = _ref.activeIconName;
   var reducedSpacing = toolbarType === _types.ToolbarType.FLOATING ? 'compact' : 'none';
-  return (0, _react2.jsx)(_uiMenu.ToolbarButton
+  return (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,
+    css: _plugins.disableBlueBorderStyles,
     testId: 'ak-editor-selection-toolbar-format-text-button',
     spacing: isReducedSpacing ? reducedSpacing : 'default',
     disabled: isDisabled,
@@ -48,14 +49,14 @@ var DropdownToolbarButton = exports.DropdownToolbarButton = function DropdownToo
     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,
+      _plugins.triggerWrapperStylesWithPadding,
       "data-testid": activeIconName ? "editor-toolbar__".concat(activeIconName) : undefined
     }, iconBefore ? iconBefore : (0, _react2.jsx)(_textItalic.default, {
       color: "currentColor",
       spacing: "spacious",
       label: ""
     }), (0, _react2.jsx)("span", {
-      css: _styles.expandIconContainerStyle
+      css: _expand.expandIconContainerStyle
     }, (0, _react2.jsx)(_chevronDown.default, {
       label: "",
       color: "currentColor",

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

@@ -8,8 +8,8 @@ exports.useClearIcon = void 0;
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
-var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
+var _toolbar = require("@atlaskit/editor-common/messages/toolbar");
+var _main = require("@atlaskit/editor-shared-styles/shortcut/main");
 var _tableCellClear = _interopRequireDefault(require("@atlaskit/icon/core/table-cell-clear"));
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _clearFormatting = require("../../../editor-commands/clear-formatting");
@@ -29,7 +29,7 @@ var useClearIcon = exports.useClearIcon = function useClearIcon(_ref) {
     toolbarType = _ref.toolbarType;
   var isPluginAvailable = Boolean(formattingPluginInitialised);
   var formattingIsPresent = Boolean(formattingPresent);
-  var clearFormattingLabel = intl.formatMessage(_messages.toolbarMessages.clearFormatting);
+  var clearFormattingLabel = intl.formatMessage(_toolbar.toolbarMessages.clearFormatting);
   var clearFormattingToolbar = (0, _react.useCallback)(function (state, dispatch) {
     return (0, _clearFormatting.clearFormattingWithAnalytics)((0, _inputMethodUtils.getInputMethod)(toolbarType), editorAnalyticsAPI)(state, dispatch);
   }, [editorAnalyticsAPI, toolbarType]);
@@ -47,7 +47,7 @@ var useClearIcon = exports.useClearIcon = function useClearIcon(_ref) {
       elemAfter:
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       (0, _react2.jsx)("div", {
-        css: _shortcut.shortcutStyle
+        css: _main.shortcutStyle
       }, (0, _keymaps.tooltip)(_keymaps.clearFormatting)),
       value: {
         name: 'clearFormatting'

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

@@ -8,11 +8,11 @@ exports.useHasFormattingActived = exports.useFormattingIcons = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _toolbarButton = require("@atlaskit/editor-common/analytics/types/toolbar-button");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
-var _preset = require("@atlaskit/editor-common/preset");
-var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
+var _toolbar = require("@atlaskit/editor-common/messages/toolbar");
+var _editorCommands = require("@atlaskit/editor-common/preset/editor-commands");
+var _main = require("@atlaskit/editor-shared-styles/shortcut/main");
 var _angleBrackets = _interopRequireDefault(require("@atlaskit/icon/core/angle-brackets"));
 var _textBold = _interopRequireDefault(require("@atlaskit/icon/core/text-bold"));
 var _textItalic = _interopRequireDefault(require("@atlaskit/icon/core/text-italic"));
@@ -31,14 +31,14 @@ var _types = require("../types");
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
 var withInputMethod = function withInputMethod(toolbarType, func) {
-  return (0, _preset.editorCommandToPMCommand)(func((0, _inputMethodUtils.getInputMethod)(toolbarType)));
+  return (0, _editorCommands.editorCommandToPMCommand)(func((0, _inputMethodUtils.getInputMethod)(toolbarType)));
 };
 var IconButtons = function IconButtons(editorAnalyticsAPI, toolbarType) {
   return {
     strong: {
-      buttonId: _analytics.TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_STRONG,
+      buttonId: _toolbarButton.TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_STRONG,
       command: withInputMethod(toolbarType, (0, _toggleMark.toggleStrongWithAnalytics)(editorAnalyticsAPI)),
-      message: _messages.toolbarMessages.bold,
+      message: _toolbar.toolbarMessages.bold,
       tooltipKeymap: _keymaps.toggleBold,
       component: function component() {
         return (0, _react2.jsx)(_textBold.default, {
@@ -49,9 +49,9 @@ var IconButtons = function IconButtons(editorAnalyticsAPI, toolbarType) {
       }
     },
     em: {
-      buttonId: _analytics.TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_ITALIC,
+      buttonId: _toolbarButton.TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_ITALIC,
       command: withInputMethod(toolbarType, (0, _toggleMark.toggleEmWithAnalytics)(editorAnalyticsAPI)),
-      message: _messages.toolbarMessages.italic,
+      message: _toolbar.toolbarMessages.italic,
       tooltipKeymap: _keymaps.toggleItalic,
       component: function component() {
         return (0, _react2.jsx)(_textItalic.default, {
@@ -62,9 +62,9 @@ var IconButtons = function IconButtons(editorAnalyticsAPI, toolbarType) {
       }
     },
     underline: {
-      buttonId: _analytics.TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_UNDERLINE,
+      buttonId: _toolbarButton.TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_UNDERLINE,
       command: withInputMethod(toolbarType, (0, _toggleMark.toggleUnderlineWithAnalytics)(editorAnalyticsAPI)),
-      message: _messages.toolbarMessages.underline,
+      message: _toolbar.toolbarMessages.underline,
       tooltipKeymap: _keymaps.toggleUnderline,
       component: function component() {
         return (0, _react2.jsx)(_textUnderline.default, {
@@ -76,22 +76,22 @@ var IconButtons = function IconButtons(editorAnalyticsAPI, toolbarType) {
     },
     strike: {
       command: withInputMethod(toolbarType, (0, _toggleMark.toggleStrikeWithAnalytics)(editorAnalyticsAPI)),
-      message: _messages.toolbarMessages.strike,
+      message: _toolbar.toolbarMessages.strike,
       tooltipKeymap: _keymaps.toggleStrikethrough
     },
     code: {
       command: withInputMethod(toolbarType, (0, _toggleMark.toggleCodeWithAnalytics)(editorAnalyticsAPI)),
-      message: _messages.toolbarMessages.code,
+      message: _toolbar.toolbarMessages.code,
       tooltipKeymap: _keymaps.toggleCode
     },
     subscript: {
       command: withInputMethod(toolbarType, (0, _toggleMark.toggleSubscriptWithAnalytics)(editorAnalyticsAPI)),
-      message: _messages.toolbarMessages.subscript,
+      message: _toolbar.toolbarMessages.subscript,
       tooltipKeymap: _keymaps.toggleSubscript
     },
     superscript: {
       command: withInputMethod(toolbarType, (0, _toggleMark.toggleSuperscriptWithAnalytics)(editorAnalyticsAPI)),
-      message: _messages.toolbarMessages.superscript,
+      message: _toolbar.toolbarMessages.superscript,
       tooltipKeymap: _keymaps.toggleSuperscript
     }
   };
@@ -166,7 +166,7 @@ var getIcon = function getIcon(_ref) {
     elemAfter: tooltipKeymap ?
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
     (0, _react2.jsx)("div", {
-      css: _shortcut.shortcutStyle
+      css: _main.shortcutStyle
     }, (0, _keymaps.tooltip)(tooltipKeymap)) : undefined,
     value: {
       name: iconType

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

@@ -11,10 +11,10 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntl = require("react-intl");
-var _hooks = require("@atlaskit/editor-common/hooks");
-var _messages = require("@atlaskit/editor-common/messages");
-var _styles = require("@atlaskit/editor-common/styles");
-var _ui = require("@atlaskit/editor-common/ui");
+var _announcer = _interopRequireDefault(require("@atlaskit/editor-common/announcer"));
+var _toolbar = require("@atlaskit/editor-common/messages/toolbar");
+var _plugins = require("@atlaskit/editor-common/styles/plugins");
+var _usePreviousState2 = _interopRequireDefault(require("@atlaskit/editor-common/usePreviousState"));
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _utils = require("../../editor-commands/utils");
 var _dropdownMenu = require("./dropdown-menu");
@@ -80,33 +80,33 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
     }),
     dropdownItems = _useResponsiveToolbar.dropdownItems,
     singleItems = _useResponsiveToolbar.singleItems;
-  var clearFormattingStatus = intl.formatMessage(_messages.toolbarMessages.textFormattingOff);
-  var superscriptOffSubscriptOnStatus = intl.formatMessage(_messages.toolbarMessages.superscriptOffSubscriptOn);
-  var subscriptOffSuperscriptOnStatus = intl.formatMessage(_messages.toolbarMessages.subscriptOffSuperscriptOn);
+  var clearFormattingStatus = intl.formatMessage(_toolbar.toolbarMessages.textFormattingOff);
+  var superscriptOffSubscriptOnStatus = intl.formatMessage(_toolbar.toolbarMessages.superscriptOffSubscriptOn);
+  var subscriptOffSuperscriptOnStatus = intl.formatMessage(_toolbar.toolbarMessages.subscriptOffSuperscriptOn);
 
   // eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- Ignored via go/ees017 (to be fixed)
   var activeItems = [].concat((0, _toConsumableArray2.default)(dropdownItems), (0, _toConsumableArray2.default)(singleItems)).filter(function (item) {
     return item.isActive;
   });
-  var prevActiveItems = (_usePreviousState = (0, _hooks.usePreviousState)(activeItems)) !== null && _usePreviousState !== void 0 ? _usePreviousState : [];
+  var prevActiveItems = (_usePreviousState = (0, _usePreviousState2.default)(activeItems)) !== null && _usePreviousState !== void 0 ? _usePreviousState : [];
   var fromSuperscriptToSubscript = (0, _utils.isArrayContainsContent)(activeItems, 'Subscript') && (0, _utils.isArrayContainsContent)(prevActiveItems, 'Superscript');
   var fromSubscriptToSuperscript = (0, _utils.isArrayContainsContent)(activeItems, 'Superscript') && (0, _utils.isArrayContainsContent)(prevActiveItems, 'Subscript');
   var comparedItems;
   var screenReaderMessage = '';
   if (prevActiveItems && activeItems.length > prevActiveItems.length) {
     comparedItems = (0, _utils.compareItemsArrays)(activeItems, prevActiveItems);
-    screenReaderMessage = intl.formatMessage(_messages.toolbarMessages.on, {
+    screenReaderMessage = intl.formatMessage(_toolbar.toolbarMessages.on, {
       formattingType: comparedItems[0].content
     });
   } else {
     comparedItems = (0, _utils.compareItemsArrays)(prevActiveItems, activeItems);
     if (comparedItems && comparedItems.length) {
       var _activeItems$;
-      screenReaderMessage = intl.formatMessage(_messages.toolbarMessages.off, {
+      screenReaderMessage = intl.formatMessage(_toolbar.toolbarMessages.off, {
         formattingType: comparedItems[0].content
       });
       if (((_activeItems$ = activeItems[0]) === null || _activeItems$ === void 0 ? void 0 : _activeItems$.content) === 'Code') {
-        screenReaderMessage = intl.formatMessage(_messages.toolbarMessages.codeOn, {
+        screenReaderMessage = intl.formatMessage(_toolbar.toolbarMessages.codeOn, {
           textFormattingOff: (prevActiveItems === null || prevActiveItems === void 0 ? void 0 : prevActiveItems.length) > 1 ? clearFormattingStatus : screenReaderMessage
         });
       }
@@ -135,8 +135,8 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
       items: [clearIcon]
     }];
   }, [clearIcon, dropdownItems]);
-  var moreFormattingButtonLabel = intl.formatMessage(_messages.toolbarMessages.moreFormatting);
-  var labelTextFormat = intl.formatMessage(_messages.toolbarMessages.textFormatting);
+  var moreFormattingButtonLabel = intl.formatMessage(_toolbar.toolbarMessages.moreFormatting);
+  var labelTextFormat = intl.formatMessage(_toolbar.toolbarMessages.textFormatting);
   (0, _react.useEffect)(function () {
     if (screenReaderMessage) {
       setMessage(screenReaderMessage);
@@ -147,14 +147,14 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
     (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.buttonGroupStyle
+      _plugins.buttonGroupStyle
     }, (0, _react2.jsx)("div", {
       role: "group"
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       ,
       className: 'js-text-format-wrap',
       "aria-label": labelTextFormat
-    }, message && (0, _react2.jsx)(_ui.Announcer, {
+    }, message && (0, _react2.jsx)(_announcer.default, {
       ariaLive: "assertive",
       text: message,
       ariaRelevant: "additions",
@@ -165,7 +165,7 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
       isReducedSpacing: isReducedSpacing
     }), (0, _react2.jsx)("span", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage
-      css: _styles.wrapperStyle
+      css: _plugins.wrapperStyle
     }, isToolbarDisabled && !(0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1') ? (0, _react2.jsx)("div", null, (0, _react2.jsx)(_moreButton.MoreButton, {
       label: moreFormattingButtonLabel,
       isReducedSpacing: isReducedSpacing,
@@ -189,7 +189,7 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
     }))), !(api !== null && api !== void 0 && api.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
     }))
   );
 };

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

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.toolbarTypeToInputMethod = exports.getInputMethod = 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 _types = require("./types");
-var toolbarTypeToInputMethod = exports.toolbarTypeToInputMethod = (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.ToolbarType.PRIMARY, _analytics.INPUT_METHOD.TOOLBAR), _types.ToolbarType.FLOATING, _analytics.INPUT_METHOD.FLOATING_TB);
+var toolbarTypeToInputMethod = exports.toolbarTypeToInputMethod = (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.ToolbarType.PRIMARY, _enums.INPUT_METHOD.TOOLBAR), _types.ToolbarType.FLOATING, _enums.INPUT_METHOD.FLOATING_TB);
 var getInputMethod = exports.getInputMethod = function getInputMethod(toolbarType) {
   return toolbarTypeToInputMethod[toolbarType];
 };

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

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.MoreButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _ToolbarButton = _interopRequireDefault(require("@atlaskit/editor-common/ui-menu/ToolbarButton"));
 var _showMoreHorizontal = _interopRequireDefault(require("@atlaskit/icon/core/show-more-horizontal"));
 /**
  * @jsxRuntime classic
@@ -29,7 +29,7 @@ var MoreButton = exports.MoreButton = /*#__PURE__*/_react.default.memo(function
     isDisabled = _ref.isDisabled,
     onClick = _ref.onClick,
     onKeyDown = _ref.onKeyDown;
-  return (0, _react2.jsx)(_uiMenu.ToolbarButton, {
+  return (0, _react2.jsx)(_ToolbarButton.default, {
     disabled: isDisabled,
     selected: isSelected,
     onClick: onClick,

package/dist/cjs/ui/Toolbar/single-toolbar-buttons.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,8 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.SingleToolbarButtons = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
-var _styles = require("@atlaskit/editor-common/styles");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _plugins = require("@atlaskit/editor-common/styles/plugins");
+var _ToolbarButton = _interopRequireDefault(require("@atlaskit/editor-common/ui-menu/ToolbarButton"));
 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); }
 /**
  * @jsxRuntime classic
@@ -32,10 +33,10 @@ var SingleToolbarButtons = exports.SingleToolbarButtons = /*#__PURE__*/_react.de
     (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.buttonGroupStyle
+      _plugins.buttonGroupStyle
     }, items.map(function (item) {
       var _item$ariaLabel;
-      return (0, _react2.jsx)(_uiMenu.ToolbarButton, {
+      return (0, _react2.jsx)(_ToolbarButton.default, {
         key: item.key,
         testId: "editor-toolbar__".concat(String(item.content)),
         buttonId: item.buttonId,

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,9 @@
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
-import { createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
+import { createRule } from '@atlaskit/editor-common/utils';
+import { inputRuleWithAnalytics } from '@atlaskit/editor-common/utils/input-rules';
+import { leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules/constants';
+import { createPlugin } from '@atlaskit/prosemirror-input-rules/utils';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var ValidAutoformatChars = /*#__PURE__*/function (ValidAutoformatChars) {
   ValidAutoformatChars["STRONG"] = "__";

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

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