@atlaskit/editor-plugin-alignment 27.0.3 → 27.0.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-alignment
 
+## 27.0.5
+
+### Patch Changes
+
+- Updated dependencies
+
+## 27.0.4
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 27.0.3
 
 ### Patch Changes

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

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isAlignable = exports.changeAlignmentTr = exports.changeAlignment = void 0;
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _commands = require("@atlaskit/editor-common/commands");
-var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
+var _withAnalytics = require("@atlaskit/editor-common/withAnalytics");
 var _state = require("@atlaskit/editor-prosemirror/state");
 /**
  * Iterates over the commands one after the other,
@@ -55,11 +55,11 @@ var changeBlockAlignmentWithAnalytics = function changeBlockAlignmentWithAnalyti
       paragraph = _state$schema2$nodes.paragraph,
       heading = _state$schema2$nodes.heading,
       alignment = _state$schema2.marks.alignment;
-    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, {
-      eventType: _analytics.EVENT_TYPE.TRACK,
-      actionSubject: _analytics.ACTION_SUBJECT.ALIGNMENT,
-      action: _analytics.ACTION.UPDATED,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.TEXT,
+    return (0, _withAnalytics.withAnalytics)(editorAnalyticsApi, {
+      eventType: _enums.EVENT_TYPE.TRACK,
+      actionSubject: _enums.ACTION_SUBJECT.ALIGNMENT,
+      action: _enums.ACTION.UPDATED,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.TEXT,
       attributes: {
         alignmentType: align,
         inputMethod: inputMethod
@@ -87,10 +87,10 @@ var changeBlockAlignmentWithAnalyticsTr = function changeBlockAlignmentWithAnaly
     if (alignmentApplied) {
       var _api$analytics;
       api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.attachAnalyticsEvent({
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        actionSubject: _analytics.ACTION_SUBJECT.ALIGNMENT,
-        action: _analytics.ACTION.UPDATED,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.TEXT,
+        eventType: _enums.EVENT_TYPE.TRACK,
+        actionSubject: _enums.ACTION_SUBJECT.ALIGNMENT,
+        action: _enums.ACTION.UPDATED,
+        actionSubjectId: _enums.ACTION_SUBJECT_ID.TEXT,
         attributes: {
           alignmentType: align,
           inputMethod: inputMethod
@@ -102,11 +102,11 @@ var changeBlockAlignmentWithAnalyticsTr = function changeBlockAlignmentWithAnaly
 };
 var changeImageAlignmentWithAnalytics = function changeImageAlignmentWithAnalytics(editorAnalyticsApi, align, inputMethod) {
   return function (state, dispatch) {
-    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, {
-      eventType: _analytics.EVENT_TYPE.TRACK,
-      actionSubject: _analytics.ACTION_SUBJECT.ALIGNMENT,
-      action: _analytics.ACTION.UPDATED,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.MEDIA_SINGLE,
+    return (0, _withAnalytics.withAnalytics)(editorAnalyticsApi, {
+      eventType: _enums.EVENT_TYPE.TRACK,
+      actionSubject: _enums.ACTION_SUBJECT.ALIGNMENT,
+      action: _enums.ACTION.UPDATED,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.MEDIA_SINGLE,
       attributes: {
         alignmentType: align,
         inputMethod: inputMethod
@@ -121,10 +121,10 @@ var changeImageAlignmentWithAnalyticsTr = function changeImageAlignmentWithAnaly
     if (alignmentApplied) {
       var _api$analytics2;
       api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        actionSubject: _analytics.ACTION_SUBJECT.ALIGNMENT,
-        action: _analytics.ACTION.UPDATED,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.MEDIA_SINGLE,
+        eventType: _enums.EVENT_TYPE.TRACK,
+        actionSubject: _enums.ACTION_SUBJECT.ALIGNMENT,
+        action: _enums.ACTION.UPDATED,
+        actionSubjectId: _enums.ACTION_SUBJECT_ID.MEDIA_SINGLE,
         attributes: {
           alignmentType: align,
           inputMethod: inputMethod

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

@@ -4,7 +4,8 @@ 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 _editorCommands = require("../editor-commands");
 function keymapPlugin(api) {
@@ -13,14 +14,14 @@ function keymapPlugin(api) {
   // Ignored via go/ees005
   (0, _keymaps.bindKeymapWithCommand)(
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  _keymaps.alignLeft.common, (0, _editorCommands.changeAlignment)('start', api, _analytics.INPUT_METHOD.SHORTCUT), list);
+  _keymaps.alignLeft.common, (0, _editorCommands.changeAlignment)('start', api, _enums.INPUT_METHOD.SHORTCUT), list);
   // Ignored via go/ees005
   (0, _keymaps.bindKeymapWithCommand)(
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  _keymaps.alignCenter.common, (0, _editorCommands.changeAlignment)('center', api, _analytics.INPUT_METHOD.SHORTCUT), list);
+  _keymaps.alignCenter.common, (0, _editorCommands.changeAlignment)('center', api, _enums.INPUT_METHOD.SHORTCUT), list);
   // Ignored via go/ees005
   (0, _keymaps.bindKeymapWithCommand)(
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  _keymaps.alignRight.common, (0, _editorCommands.changeAlignment)('end', api, _analytics.INPUT_METHOD.SHORTCUT), list);
-  return (0, _keymaps.keymap)(list);
+  _keymaps.alignRight.common, (0, _editorCommands.changeAlignment)('end', api, _enums.INPUT_METHOD.SHORTCUT), list);
+  return (0, _keymap.keymap)(list);
 }

package/dist/cjs/ui/Alignment/AlignmentButton/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _ToolbarButton = _interopRequireDefault(require("@atlaskit/editor-common/ui-menu/ToolbarButton"));
 function AlignmentButton(_ref) {
   var label = _ref.label,
     isSelected = _ref.isSelected,
@@ -21,7 +21,7 @@ function AlignmentButton(_ref) {
     e.preventDefault();
     onClick(value, isMouseEvent);
   };
-  return /*#__PURE__*/_react.default.createElement(_uiMenu.ToolbarButton, {
+  return /*#__PURE__*/_react.default.createElement(_ToolbarButton.default, {
     disabled: false,
     selected: isSelected,
     title: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {

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

@@ -11,8 +11,8 @@ require("./index.compiled.css");
 var React = _interopRequireWildcard(require("react"));
 var _runtime = require("@compiled/react/runtime");
 var _reactIntl = require("react-intl");
+var _alignment = require("@atlaskit/editor-common/alignment");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
 var _iconMap = require("../ToolbarAlignment/icon-map");
 var _AlignmentButton = _interopRequireDefault(require("./AlignmentButton"));
 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); }
@@ -23,15 +23,15 @@ var alignmentWrapperStylesUnbounded = null;
 var alignCenterKeyboardShortcut = _keymaps.alignCenter;
 var alignRightKeyboardShortcut = _keymaps.alignRight;
 var alignmentOptions = [{
-  title: _messages.alignmentMessages.alignLeft,
+  title: _alignment.alignmentMessages.alignLeft,
   shortcut: _keymaps.alignLeft,
   value: 'start'
 }, {
-  title: _messages.alignmentMessages.alignCenter,
+  title: _alignment.alignmentMessages.alignCenter,
   shortcut: alignCenterKeyboardShortcut,
   value: 'center'
 }, {
-  title: _messages.alignmentMessages.alignRight,
+  title: _alignment.alignmentMessages.alignRight,
   shortcut: alignRightKeyboardShortcut,
   value: 'end'
 }];

package/dist/cjs/ui/FloatingToolbarComponent.js

@@ -7,8 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FloatingToolbarComponent = FloatingToolbarComponent;
 var _react = _interopRequireWildcard(require("react"));
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _hooks = require("@atlaskit/editor-common/hooks");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _editorCommands = require("../editor-commands");
 var _types = require("../pm-plugins/types");
@@ -21,7 +21,7 @@ var FloatingToolbarSettings = {
 function FloatingToolbarComponent(_ref) {
   var api = _ref.api,
     editorView = _ref.editorView;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['alignment'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['alignment'], function (states) {
       var _states$alignmentStat, _states$alignmentStat2;
       return {
         align: (_states$alignmentStat = states.alignmentState) === null || _states$alignmentStat === void 0 ? void 0 : _states$alignmentStat.align,
@@ -31,7 +31,7 @@ function FloatingToolbarComponent(_ref) {
     align = _useSharedPluginState.align,
     isEnabled = _useSharedPluginState.isEnabled;
   var changeAlignmentCallback = (0, _react.useCallback)(function (align) {
-    return (0, _editorCommands.changeAlignment)(align, api, _analytics.INPUT_METHOD.FLOATING_TB)(editorView.state, editorView.dispatch);
+    return (0, _editorCommands.changeAlignment)(align, api, _enums.INPUT_METHOD.FLOATING_TB)(editorView.state, editorView.dispatch);
   }, [editorView, api]);
   return /*#__PURE__*/_react.default.createElement(_ToolbarAlignment.default, {
     align: align,

package/dist/cjs/ui/PrimaryToolbarComponent.js

@@ -7,8 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.PrimaryToolbarComponent = PrimaryToolbarComponent;
 var _react = _interopRequireWildcard(require("react"));
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _hooks = require("@atlaskit/editor-common/hooks");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
 var _editorCommands = require("../editor-commands");
 var _types = require("../pm-plugins/types");
 var _ToolbarAlignment = _interopRequireDefault(require("./ToolbarAlignment"));
@@ -21,7 +21,7 @@ function PrimaryToolbarComponent(_ref) {
     popupsBoundariesElement = _ref.popupsBoundariesElement,
     popupsScrollableElement = _ref.popupsScrollableElement,
     isToolbarReducedSpacing = _ref.isToolbarReducedSpacing;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['alignment'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['alignment'], function (states) {
       var _states$alignmentStat, _states$alignmentStat2;
       return {
         align: (_states$alignmentStat = states.alignmentState) === null || _states$alignmentStat === void 0 ? void 0 : _states$alignmentStat.align,
@@ -31,7 +31,7 @@ function PrimaryToolbarComponent(_ref) {
     align = _useSharedPluginState.align,
     isEnabled = _useSharedPluginState.isEnabled;
   var changeAlignmentCallback = (0, _react.useCallback)(function (align) {
-    return (0, _editorCommands.changeAlignment)(align, api, _analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+    return (0, _editorCommands.changeAlignment)(align, api, _enums.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
   }, [editorView, api]);
   return /*#__PURE__*/_react.default.createElement(_ToolbarAlignment.default, {
     align: align,

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

@@ -7,14 +7,15 @@ Object.defineProperty(exports, "__esModule", {
 exports.AlignmentMenu = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _hooks = require("@atlaskit/editor-common/hooks");
-var _messages = require("@atlaskit/editor-common/messages");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _alignment = require("@atlaskit/editor-common/alignment");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _toolbarDropdownMenu = require("@atlaskit/editor-toolbar/toolbar-dropdown-menu");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
 var _options = require("./options");
 var AlignmentMenu = exports.AlignmentMenu = function AlignmentMenu(_ref) {
   var children = _ref.children,
     api = _ref.api;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['alignment'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['alignment'], function (states) {
       var _states$alignmentStat, _states$alignmentStat2;
       return {
         align: (_states$alignmentStat = states.alignmentState) === null || _states$alignmentStat === void 0 ? void 0 : _states$alignmentStat.align,
@@ -27,8 +28,8 @@ var AlignmentMenu = exports.AlignmentMenu = function AlignmentMenu(_ref) {
   var Icon = (0, _options.alignmentOptions)()[align].icon;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var title = formatMessage(_messages.alignmentMessages.alignment);
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownMenu, {
+  var title = formatMessage(_alignment.alignmentMessages.alignment);
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownMenu.ToolbarDropdownMenu, {
     iconBefore: /*#__PURE__*/_react.default.createElement(Icon, {
       label: "",
       size: "small",
@@ -37,7 +38,7 @@ var AlignmentMenu = exports.AlignmentMenu = function AlignmentMenu(_ref) {
     isDisabled: !isEnabled,
     testId: "text-alignment-menu",
     label: title,
-    tooltipComponent: /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
+    tooltipComponent: /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
       content: title
     })
   }, children);

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

@@ -7,10 +7,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.AlignmentMenuItem = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _toolbarDropdownItem = require("@atlaskit/editor-toolbar/toolbar-dropdown-item");
+var _toolbarKeyboardShortcutHint = require("@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint");
 var _editorCommands = require("../../editor-commands");
 var AlignmentMenuItem = exports.AlignmentMenuItem = function AlignmentMenuItem(_ref) {
   var _ref$option = _ref.option,
@@ -20,7 +21,7 @@ var AlignmentMenuItem = exports.AlignmentMenuItem = function AlignmentMenuItem(_
     api = _ref.api,
     alignment = _ref.alignment,
     parents = _ref.parents;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['alignment'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['alignment'], function (states) {
       var _states$alignmentStat;
       return {
         align: (_states$alignmentStat = states.alignmentState) === null || _states$alignmentStat === void 0 ? void 0 : _states$alignmentStat.align
@@ -30,13 +31,13 @@ var AlignmentMenuItem = exports.AlignmentMenuItem = function AlignmentMenuItem(_
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var shortcut = (0, _keymaps.tooltip)(keymap);
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
     isSelected: align === alignment,
     elemBefore: /*#__PURE__*/_react.default.createElement(Icon, {
       size: "small",
       label: ""
     }),
-    elemAfter: shortcut && /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
+    elemAfter: shortcut && /*#__PURE__*/_react.default.createElement(_toolbarKeyboardShortcutHint.ToolbarKeyboardShortcutHint, {
       shortcut: shortcut
     }),
     ariaKeyshortcuts: (0, _keymaps.getAriaKeyshortcuts)(keymap)

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

@@ -6,16 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.MenuSection = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _toolbarDropdownItemSection = require("@atlaskit/editor-toolbar/toolbar-dropdown-item-section");
 var MenuSection = exports.MenuSection = function MenuSection(_ref) {
   var children = _ref.children,
     title = _ref.title,
     parents = _ref.parents;
   var hasSeparator = parents.some(function (parent) {
-    return parent.key === _toolbar.TEXT_COLLAPSED_MENU.key;
+    return parent.key === _keys.TEXT_COLLAPSED_MENU.key;
   });
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItemSection.ToolbarDropdownItemSection, {
     hasSeparator: hasSeparator,
     title: title
   }, children);

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

@@ -4,34 +4,37 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.alignmentOptions = void 0;
+var _alignment = require("@atlaskit/editor-common/alignment");
 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 _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _rank = require("@atlaskit/editor-common/toolbar/rank");
+var _alignTextCenterIcon = require("@atlaskit/editor-toolbar/align-text-center-icon");
+var _alignTextLeftIcon = require("@atlaskit/editor-toolbar/align-text-left-icon");
+var _alignTextRightIcon = require("@atlaskit/editor-toolbar/align-text-right-icon");
 var alignmentOptions = exports.alignmentOptions = function alignmentOptions() {
   return {
     start: {
-      key: _toolbar.ALIGN_LEFT_MENU_ITEM.key,
-      type: _toolbar.ALIGN_LEFT_MENU_ITEM.type,
-      rank: _toolbar.ALIGNMENT_MENU_SECTION_RANK[_toolbar.ALIGN_LEFT_MENU_ITEM.key],
-      label: _messages.alignmentMessages.alignLeft,
-      icon: _editorToolbar.AlignTextLeftIcon,
+      key: _keys.ALIGN_LEFT_MENU_ITEM.key,
+      type: _keys.ALIGN_LEFT_MENU_ITEM.type,
+      rank: _rank.ALIGNMENT_MENU_SECTION_RANK[_keys.ALIGN_LEFT_MENU_ITEM.key],
+      label: _alignment.alignmentMessages.alignLeft,
+      icon: _alignTextLeftIcon.AlignTextLeftIcon,
       keymap: _keymaps.alignLeft
     },
     center: {
-      key: _toolbar.ALIGN_CENTER_MENU_ITEM.key,
-      type: _toolbar.ALIGN_CENTER_MENU_ITEM.type,
-      rank: _toolbar.ALIGNMENT_MENU_SECTION_RANK[_toolbar.ALIGN_CENTER_MENU_ITEM.key],
-      label: _messages.alignmentMessages.alignCenter,
-      icon: _editorToolbar.AlignTextCenterIcon,
+      key: _keys.ALIGN_CENTER_MENU_ITEM.key,
+      type: _keys.ALIGN_CENTER_MENU_ITEM.type,
+      rank: _rank.ALIGNMENT_MENU_SECTION_RANK[_keys.ALIGN_CENTER_MENU_ITEM.key],
+      label: _alignment.alignmentMessages.alignCenter,
+      icon: _alignTextCenterIcon.AlignTextCenterIcon,
       keymap: _keymaps.alignCenter
     },
     end: {
-      key: _toolbar.ALIGN_RIGHT_MENU_ITEM.key,
-      type: _toolbar.ALIGN_RIGHT_MENU_ITEM.type,
-      rank: _toolbar.ALIGNMENT_MENU_SECTION_RANK[_toolbar.ALIGN_RIGHT_MENU_ITEM.key],
-      label: _messages.alignmentMessages.alignRight,
-      icon: _editorToolbar.AlignTextRightIcon,
+      key: _keys.ALIGN_RIGHT_MENU_ITEM.key,
+      type: _keys.ALIGN_RIGHT_MENU_ITEM.type,
+      rank: _rank.ALIGNMENT_MENU_SECTION_RANK[_keys.ALIGN_RIGHT_MENU_ITEM.key],
+      label: _alignment.alignmentMessages.alignRight,
+      icon: _alignTextRightIcon.AlignTextRightIcon,
       keymap: _keymaps.alignRight
     }
   };

package/dist/cjs/ui/ToolbarAlignment/icon-map.js

@@ -7,22 +7,22 @@ Object.defineProperty(exports, "__esModule", {
 exports.IconMap = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _messages = require("@atlaskit/editor-common/messages");
+var _alignment = require("@atlaskit/editor-common/alignment");
 var _alignTextCenter = _interopRequireDefault(require("@atlaskit/icon/core/align-text-center"));
 var _alignTextLeft = _interopRequireDefault(require("@atlaskit/icon/core/align-text-left"));
 var _alignTextRight = _interopRequireDefault(require("@atlaskit/icon/core/align-text-right"));
 var iconAndMessageMap = {
   start: {
     Component: _alignTextLeft.default,
-    label: _messages.alignmentMessages.alignLeft
+    label: _alignment.alignmentMessages.alignLeft
   },
   end: {
     Component: _alignTextRight.default,
-    label: _messages.alignmentMessages.alignRight
+    label: _alignment.alignmentMessages.alignRight
   },
   center: {
     Component: _alignTextCenter.default,
-    label: _messages.alignmentMessages.alignCenter
+    label: _alignment.alignmentMessages.alignCenter
   }
 };
 var IconMap = exports.IconMap = function IconMap(props) {

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

@@ -15,15 +15,22 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
+var _alignment = require("@atlaskit/editor-common/alignment");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
-var _ui = require("@atlaskit/editor-common/ui");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _Shortcut = require("@atlaskit/editor-common/Shortcut");
+var _types = require("@atlaskit/editor-common/ui-menu/ArrowKeyNavigationProvider/types");
+var _DropdownContainer = require("@atlaskit/editor-common/ui-menu/DropdownContainer");
+var _DropdownMenu = require("@atlaskit/editor-common/ui-menu/DropdownMenu");
+var _ToolbarButton = _interopRequireDefault(require("@atlaskit/editor-common/ui-menu/ToolbarButton"));
+var _DropdownTriggerWrapper = require("@atlaskit/editor-common/ui-toolbar/DropdownTriggerWrapper");
+var _DropdownWrapper = require("@atlaskit/editor-common/ui-toolbar/DropdownWrapper");
+var _ExpandIcon = require("@atlaskit/editor-common/ui-toolbar/ExpandIcon");
+var _Separator = require("@atlaskit/editor-common/ui-toolbar/Separator");
 var _alignTextCenter = _interopRequireDefault(require("@atlaskit/icon/core/align-text-center"));
 var _alignTextLeft = _interopRequireDefault(require("@atlaskit/icon/core/align-text-left"));
 var _alignTextRight = _interopRequireDefault(require("@atlaskit/icon/core/align-text-right"));
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
-var _types = require("../../pm-plugins/types");
+var _types2 = require("../../pm-plugins/types");
 var _Alignment = _interopRequireDefault(require("../Alignment"));
 var _iconMap = require("./icon-map");
 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)); }
@@ -101,11 +108,11 @@ var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
         intl = _this$props.intl,
         api = _this$props.api;
       var alignment = align !== null && align !== void 0 ? align : 'start';
-      var title = intl.formatMessage(_messages.alignmentMessages.alignment);
+      var title = intl.formatMessage(_alignment.alignmentMessages.alignment);
       var alignmentLabelMap = {
-        start: intl.formatMessage(_messages.alignmentMessages.alignLeft),
-        center: intl.formatMessage(_messages.alignmentMessages.alignCenter),
-        end: intl.formatMessage(_messages.alignmentMessages.alignRight)
+        start: intl.formatMessage(_alignment.alignmentMessages.alignLeft),
+        center: intl.formatMessage(_alignment.alignmentMessages.alignCenter),
+        end: intl.formatMessage(_alignment.alignmentMessages.alignRight)
       };
       var ariaLabel = "".concat(title, ", ").concat((_alignmentLabelMap$al = alignmentLabelMap[alignment]) !== null && _alignmentLabelMap$al !== void 0 ? _alignmentLabelMap$al : '');
       var reducedSpacing = (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1', {
@@ -113,43 +120,43 @@ var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
       }) ? 'compact' : 'none';
       var items = [{
         key: 'alignmentLeft',
-        content: intl.formatMessage(_messages.alignmentMessages.alignLeft),
+        content: intl.formatMessage(_alignment.alignmentMessages.alignLeft),
         value: {
           name: 'start'
         },
         isActive: align === 'start',
-        elemAfter: /*#__PURE__*/_react.default.createElement(_ui.Shortcut, null, (0, _keymaps.tooltip)(_keymaps.alignLeft)),
+        elemAfter: /*#__PURE__*/_react.default.createElement(_Shortcut.Shortcut, null, (0, _keymaps.tooltip)(_keymaps.alignLeft)),
         elemBefore: /*#__PURE__*/_react.default.createElement(_alignTextLeft.default, {
           label: ""
         })
       }, {
         key: 'alignmentCenter',
-        content: intl.formatMessage(_messages.alignmentMessages.alignCenter),
+        content: intl.formatMessage(_alignment.alignmentMessages.alignCenter),
         value: {
           name: 'center'
         },
         isActive: align === 'center',
-        elemAfter: /*#__PURE__*/_react.default.createElement(_ui.Shortcut, null, (0, _keymaps.tooltip)(_keymaps.alignCenter)),
+        elemAfter: /*#__PURE__*/_react.default.createElement(_Shortcut.Shortcut, null, (0, _keymaps.tooltip)(_keymaps.alignCenter)),
         elemBefore: /*#__PURE__*/_react.default.createElement(_alignTextCenter.default, {
           label: ""
         })
       }, {
         key: 'alignmentRight',
-        content: intl.formatMessage(_messages.alignmentMessages.alignRight),
+        content: intl.formatMessage(_alignment.alignmentMessages.alignRight),
         value: {
           name: 'end'
         },
         isActive: align === 'end',
-        elemAfter: /*#__PURE__*/_react.default.createElement(_ui.Shortcut, null, (0, _keymaps.tooltip)(_keymaps.alignRight)),
+        elemAfter: /*#__PURE__*/_react.default.createElement(_Shortcut.Shortcut, null, (0, _keymaps.tooltip)(_keymaps.alignRight)),
         elemBefore: /*#__PURE__*/_react.default.createElement(_alignTextRight.default, {
           label: ""
         })
       }];
-      return /*#__PURE__*/_react.default.createElement(_ui.ToolbarDropdownWrapper, null, (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1') ? /*#__PURE__*/_react.default.createElement(_uiMenu.DropdownMenuWithKeyboardNavigation
+      return /*#__PURE__*/_react.default.createElement(_DropdownWrapper.ToolbarDropdownWrapper, null, (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1') ? /*#__PURE__*/_react.default.createElement(_DropdownMenu.DropdownMenuWithKeyboardNavigation
       // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
       , {
         arrowKeyNavigationProviderOptions: {
-          type: _uiMenu.ArrowKeyNavigationType.MENU
+          type: _types.ArrowKeyNavigationType.MENU
         }
         // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
         ,
@@ -169,7 +176,7 @@ var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
         boundariesElement: popupsBoundariesElement,
         scrollableElement: popupsScrollableElement,
         fitWidth: 200
-      }, /*#__PURE__*/_react.default.createElement(_uiMenu.ToolbarButton, {
+      }, /*#__PURE__*/_react.default.createElement(_ToolbarButton.default, {
         spacing: isReducedSpacing ? reducedSpacing : 'default',
         disabled: disabled,
         selected: isOpen,
@@ -179,10 +186,10 @@ var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
         "aria-haspopup": true,
         onClick: this.toggleOpen,
         onKeyDown: this.toggleOpenByKeyboard,
-        iconBefore: /*#__PURE__*/_react.default.createElement(_ui.ToolbarDropdownTriggerWrapper, null, /*#__PURE__*/_react.default.createElement(_iconMap.IconMap, {
+        iconBefore: /*#__PURE__*/_react.default.createElement(_DropdownTriggerWrapper.ToolbarDropdownTriggerWrapper, null, /*#__PURE__*/_react.default.createElement(_iconMap.IconMap, {
           alignment: alignment
-        }), /*#__PURE__*/_react.default.createElement(_ui.ToolbarExpandIcon, null))
-      })) : /*#__PURE__*/_react.default.createElement(_uiMenu.DropdownContainer, {
+        }), /*#__PURE__*/_react.default.createElement(_ExpandIcon.ToolbarExpandIcon, null))
+      })) : /*#__PURE__*/_react.default.createElement(_DropdownContainer.DropdownContainer, {
         mountTo: popupsMountPoint,
         boundariesElement: popupsBoundariesElement,
         scrollableElement: popupsScrollableElement,
@@ -201,12 +208,12 @@ var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
         // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
         ,
         arrowKeyNavigationProviderOptions: {
-          type: _uiMenu.ArrowKeyNavigationType.MENU
+          type: _types.ArrowKeyNavigationType.MENU
         },
         fitWidth: 112,
         fitHeight: 80,
         closeOnTab: true,
-        trigger: /*#__PURE__*/_react.default.createElement(_uiMenu.ToolbarButton, {
+        trigger: /*#__PURE__*/_react.default.createElement(_ToolbarButton.default, {
           spacing: isReducedSpacing ? reducedSpacing : 'default',
           disabled: disabled,
           selected: isOpen,
@@ -219,9 +226,9 @@ var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
           "aria-haspopup": true,
           onClick: this.toggleOpen,
           onKeyDown: this.toggleOpenByKeyboard,
-          iconBefore: /*#__PURE__*/_react.default.createElement(_ui.ToolbarDropdownTriggerWrapper, null, /*#__PURE__*/_react.default.createElement(_iconMap.IconMap, {
+          iconBefore: /*#__PURE__*/_react.default.createElement(_DropdownTriggerWrapper.ToolbarDropdownTriggerWrapper, null, /*#__PURE__*/_react.default.createElement(_iconMap.IconMap, {
             alignment: alignment
-          }), /*#__PURE__*/_react.default.createElement(_ui.ToolbarExpandIcon, null)),
+          }), /*#__PURE__*/_react.default.createElement(_ExpandIcon.ToolbarExpandIcon, null)),
           ref: this.toolbarItemRef
         })
       }, /*#__PURE__*/_react.default.createElement(_Alignment.default
@@ -231,13 +238,13 @@ var AlignmentToolbar = /*#__PURE__*/function (_React$Component) {
           return _this2.changeAlignment(align, false);
         },
         selectedAlignment: alignment
-      })), !(api !== null && api !== void 0 && api.primaryToolbar) && /*#__PURE__*/_react.default.createElement(_ui.ToolbarSeparator, null));
+      })), !(api !== null && api !== void 0 && api.primaryToolbar) && /*#__PURE__*/_react.default.createElement(_Separator.ToolbarSeparator, null));
     }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(_prevProps) {
       var _this3 = this;
-      if (this.props.toolbarType !== _types.ToolbarType.FLOATING && this.state.isOpen) {
+      if (this.props.toolbarType !== _types2.ToolbarType.FLOATING && this.state.isOpen) {
         // by triggering the keyboard event with a setTimeout, we ensure that the tooltip
         // associated with the alignment button doesn't render until the next render cycle
         // where the popup will be correctly positioned and the relative position of the tooltip

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

@@ -8,7 +8,8 @@ exports.getToolbarComponents = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 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 _AlignmentMenu = require("./Toolbar/AlignmentMenu");
 var _AlignmentMenuItem = require("./Toolbar/AlignmentMenuItem");
 var _MenuSection = require("./Toolbar/MenuSection");
@@ -25,8 +26,8 @@ var getAlignmentMenuItems = function getAlignmentMenuItems(api) {
       type: type,
       key: key,
       parents: [{
-        type: _toolbar.ALIGNMENT_MENU_SECTION.type,
-        key: _toolbar.ALIGNMENT_MENU_SECTION.key,
+        type: _keys.ALIGNMENT_MENU_SECTION.type,
+        key: _keys.ALIGNMENT_MENU_SECTION.key,
         rank: rank
       }],
       component: function component(_ref3) {
@@ -43,24 +44,24 @@ var getAlignmentMenuItems = function getAlignmentMenuItems(api) {
 };
 var getToolbarComponents = exports.getToolbarComponents = function getToolbarComponents(api) {
   return [{
-    type: _toolbar.ALIGNMENT_GROUP.type,
-    key: _toolbar.ALIGNMENT_GROUP.key,
+    type: _keys.ALIGNMENT_GROUP.type,
+    key: _keys.ALIGNMENT_GROUP.key,
     parents: [{
-      type: _toolbar.TEXT_SECTION.type,
-      key: _toolbar.TEXT_SECTION.key,
-      rank: _toolbar.TEXT_SECTION_RANK[_toolbar.ALIGNMENT_GROUP.key]
+      type: _keys.TEXT_SECTION.type,
+      key: _keys.TEXT_SECTION.key,
+      rank: _rank.TEXT_SECTION_RANK[_keys.ALIGNMENT_GROUP.key]
     }, {
-      type: _toolbar.TEXT_SECTION_PRIMARY_TOOLBAR.type,
-      key: _toolbar.TEXT_SECTION_PRIMARY_TOOLBAR.key,
-      rank: _toolbar.TEXT_SECTION_PRIMARY_TOOLBAR_RANK[_toolbar.ALIGNMENT_GROUP.key]
+      type: _keys.TEXT_SECTION_PRIMARY_TOOLBAR.type,
+      key: _keys.TEXT_SECTION_PRIMARY_TOOLBAR.key,
+      rank: _rank.TEXT_SECTION_PRIMARY_TOOLBAR_RANK[_keys.ALIGNMENT_GROUP.key]
     }]
   }, {
-    type: _toolbar.ALIGNMENT_MENU.type,
-    key: _toolbar.ALIGNMENT_MENU.key,
+    type: _keys.ALIGNMENT_MENU.type,
+    key: _keys.ALIGNMENT_MENU.key,
     parents: [{
-      type: _toolbar.ALIGNMENT_GROUP.type,
-      key: _toolbar.ALIGNMENT_GROUP.key,
-      rank: _toolbar.ALIGNMENT_GROUP_RANK[_toolbar.ALIGNMENT_MENU.key]
+      type: _keys.ALIGNMENT_GROUP.type,
+      key: _keys.ALIGNMENT_GROUP.key,
+      rank: _rank.ALIGNMENT_GROUP_RANK[_keys.ALIGNMENT_MENU.key]
     }],
     component: function component(_ref4) {
       var children = _ref4.children;
@@ -69,16 +70,16 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
       }, children);
     }
   }, {
-    type: _toolbar.ALIGNMENT_MENU_SECTION.type,
-    key: _toolbar.ALIGNMENT_MENU_SECTION.key,
+    type: _keys.ALIGNMENT_MENU_SECTION.type,
+    key: _keys.ALIGNMENT_MENU_SECTION.key,
     parents: [{
-      type: _toolbar.ALIGNMENT_MENU.type,
-      key: _toolbar.ALIGNMENT_MENU.key,
-      rank: _toolbar.ALIGNMENT_MENU_RANK[_toolbar.ALIGNMENT_MENU_SECTION.key]
+      type: _keys.ALIGNMENT_MENU.type,
+      key: _keys.ALIGNMENT_MENU.key,
+      rank: _rank.ALIGNMENT_MENU_RANK[_keys.ALIGNMENT_MENU_SECTION.key]
     }, {
-      type: _toolbar.TEXT_COLLAPSED_MENU.type,
-      key: _toolbar.TEXT_COLLAPSED_MENU.key,
-      rank: _toolbar.TEXT_COLLAPSED_MENU_RANK[_toolbar.ALIGNMENT_MENU_SECTION.key]
+      type: _keys.TEXT_COLLAPSED_MENU.type,
+      key: _keys.TEXT_COLLAPSED_MENU.key,
+      rank: _rank.TEXT_COLLAPSED_MENU_RANK[_keys.ALIGNMENT_MENU_SECTION.key]
     }],
     component: _MenuSection.MenuSection
   }].concat((0, _toConsumableArray2.default)(getAlignmentMenuItems(api)));

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

@@ -1,6 +1,6 @@
-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 { changeImageAlignment, changeImageAlignmentNext, toggleBlockMark, toggleBlockMarkNext } from '@atlaskit/editor-common/commands';
-import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
+import { withAnalytics } from '@atlaskit/editor-common/withAnalytics';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 /**
  * Iterates over the commands one after the other,

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

@@ -1,5 +1,6 @@
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { alignCenter, alignLeft, alignRight, bindKeymapWithCommand, keymap } from '@atlaskit/editor-common/keymaps';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { keymap } from '@atlaskit/editor-common/keymap';
+import { alignCenter, alignLeft, alignRight, bindKeymapWithCommand } from '@atlaskit/editor-common/keymaps';
 import { changeAlignment } from '../editor-commands';
 export function keymapPlugin(api) {
   const list = {};

package/dist/es2019/ui/Alignment/AlignmentButton/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { getAriaKeyshortcuts, tooltip, ToolTipContent } from '@atlaskit/editor-common/keymaps';
-import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
 function AlignmentButton({
   label,
   isSelected,

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

@@ -3,8 +3,8 @@ import "./index.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { injectIntl } from 'react-intl';
+import { alignmentMessages } from '@atlaskit/editor-common/alignment';
 import { alignCenter, alignLeft, alignRight } from '@atlaskit/editor-common/keymaps';
-import { alignmentMessages } from '@atlaskit/editor-common/messages';
 import { IconMap } from '../ToolbarAlignment/icon-map';
 import AlignmentButton from './AlignmentButton';
 const alignmentWrapper = null;

package/dist/es2019/ui/FloatingToolbarComponent.js

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { changeAlignment } from '../editor-commands';
 import { ToolbarType } from '../pm-plugins/types';

package/dist/es2019/ui/PrimaryToolbarComponent.js

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { changeAlignment } from '../editor-commands';
 import { ToolbarType } from '../pm-plugins/types';
 import ToolbarAlignment from './ToolbarAlignment';

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

@@ -1,8 +1,9 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { alignmentMessages as messages } from '@atlaskit/editor-common/messages';
-import { ToolbarDropdownMenu, ToolbarTooltip } from '@atlaskit/editor-toolbar';
+import { alignmentMessages as messages } from '@atlaskit/editor-common/alignment';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { ToolbarDropdownMenu } from '@atlaskit/editor-toolbar/toolbar-dropdown-menu';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 import { alignmentOptions } from './options';
 export const AlignmentMenu = ({
   children,

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

@@ -1,9 +1,10 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { getAriaKeyshortcuts, tooltip } from '@atlaskit/editor-common/keymaps';
 import { getInputMethodFromParentKeys } from '@atlaskit/editor-common/toolbar';
-import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
+import { ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint';
 import { changeAlignmentTr } from '../../editor-commands';
 export const AlignmentMenuItem = ({
   option: {

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

@@ -1,6 +1,6 @@
 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';
 export const MenuSection = ({
   children,
   title,

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

@@ -1,7 +1,10 @@
+import { alignmentMessages as messages } from '@atlaskit/editor-common/alignment';
 import { alignCenter, alignLeft, alignRight } from '@atlaskit/editor-common/keymaps';
-import { alignmentMessages as messages } from '@atlaskit/editor-common/messages';
-import { ALIGN_LEFT_MENU_ITEM, ALIGN_CENTER_MENU_ITEM, ALIGN_RIGHT_MENU_ITEM, ALIGNMENT_MENU_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
-import { AlignTextLeftIcon, AlignTextCenterIcon, AlignTextRightIcon } from '@atlaskit/editor-toolbar';
+import { ALIGN_LEFT_MENU_ITEM, ALIGN_CENTER_MENU_ITEM, ALIGN_RIGHT_MENU_ITEM } from '@atlaskit/editor-common/toolbar/keys';
+import { ALIGNMENT_MENU_SECTION_RANK } from '@atlaskit/editor-common/toolbar/rank';
+import { AlignTextCenterIcon } from '@atlaskit/editor-toolbar/align-text-center-icon';
+import { AlignTextLeftIcon } from '@atlaskit/editor-toolbar/align-text-left-icon';
+import { AlignTextRightIcon } from '@atlaskit/editor-toolbar/align-text-right-icon';
 export const alignmentOptions = () => ({
   start: {
     key: ALIGN_LEFT_MENU_ITEM.key,

package/dist/es2019/ui/ToolbarAlignment/icon-map.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { alignmentMessages as messages } from '@atlaskit/editor-common/messages';
+import { alignmentMessages as messages } from '@atlaskit/editor-common/alignment';
 import AlignTextCenterIcon from '@atlaskit/icon/core/align-text-center';
 import AlignTextLeftIcon from '@atlaskit/icon/core/align-text-left';
 import AlignTextRightIcon from '@atlaskit/icon/core/align-text-right';

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

@@ -3,10 +3,17 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { injectIntl } from 'react-intl';
+import { alignmentMessages as messages } from '@atlaskit/editor-common/alignment';
 import { alignCenter, alignLeft, alignRight, tooltip } from '@atlaskit/editor-common/keymaps';
-import { alignmentMessages as messages } from '@atlaskit/editor-common/messages';
-import { Shortcut, ToolbarDropdownTriggerWrapper, ToolbarDropdownWrapper, ToolbarExpandIcon, ToolbarSeparator } from '@atlaskit/editor-common/ui';
-import { ArrowKeyNavigationType, DropdownContainer as Dropdown, DropdownMenuWithKeyboardNavigation as DropdownMenu, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import { Shortcut } from '@atlaskit/editor-common/Shortcut';
+import { ArrowKeyNavigationType } from '@atlaskit/editor-common/ui-menu/ArrowKeyNavigationProvider/types';
+import { DropdownContainer as Dropdown } from '@atlaskit/editor-common/ui-menu/DropdownContainer';
+import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu/DropdownMenu';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
+import { ToolbarDropdownTriggerWrapper } from '@atlaskit/editor-common/ui-toolbar/DropdownTriggerWrapper';
+import { ToolbarDropdownWrapper } from '@atlaskit/editor-common/ui-toolbar/DropdownWrapper';
+import { ToolbarExpandIcon } from '@atlaskit/editor-common/ui-toolbar/ExpandIcon';
+import { ToolbarSeparator } from '@atlaskit/editor-common/ui-toolbar/Separator';
 import AlignTextCenterIcon from '@atlaskit/icon/core/align-text-center';
 import AlignTextLeftIcon from '@atlaskit/icon/core/align-text-left';
 import AlignTextRightIcon from '@atlaskit/icon/core/align-text-right';

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

@@ -1,5 +1,6 @@
 import React from 'react';
-import { ALIGNMENT_GROUP, ALIGNMENT_GROUP_RANK, ALIGNMENT_MENU, ALIGNMENT_MENU_SECTION, TEXT_SECTION, TEXT_SECTION_RANK, ALIGNMENT_MENU_RANK, TEXT_COLLAPSED_MENU_RANK, TEXT_COLLAPSED_MENU, TEXT_SECTION_PRIMARY_TOOLBAR, TEXT_SECTION_PRIMARY_TOOLBAR_RANK } from '@atlaskit/editor-common/toolbar';
+import { ALIGNMENT_GROUP, ALIGNMENT_MENU, ALIGNMENT_MENU_SECTION, TEXT_SECTION, TEXT_COLLAPSED_MENU, TEXT_SECTION_PRIMARY_TOOLBAR } from '@atlaskit/editor-common/toolbar/keys';
+import { ALIGNMENT_GROUP_RANK, TEXT_SECTION_RANK, ALIGNMENT_MENU_RANK, TEXT_COLLAPSED_MENU_RANK, TEXT_SECTION_PRIMARY_TOOLBAR_RANK } from '@atlaskit/editor-common/toolbar/rank';
 import { AlignmentMenu } from './Toolbar/AlignmentMenu';
 import { AlignmentMenuItem } from './Toolbar/AlignmentMenuItem';
 import { MenuSection } from './Toolbar/MenuSection';

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

@@ -1,6 +1,6 @@
-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 { changeImageAlignment, changeImageAlignmentNext, toggleBlockMark, toggleBlockMarkNext } from '@atlaskit/editor-common/commands';
-import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
+import { withAnalytics } from '@atlaskit/editor-common/withAnalytics';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 /**
  * Iterates over the commands one after the other,

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

@@ -1,5 +1,6 @@
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { alignCenter, alignLeft, alignRight, bindKeymapWithCommand, keymap } from '@atlaskit/editor-common/keymaps';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { keymap } from '@atlaskit/editor-common/keymap';
+import { alignCenter, alignLeft, alignRight, bindKeymapWithCommand } from '@atlaskit/editor-common/keymaps';
 import { changeAlignment } from '../editor-commands';
 export function keymapPlugin(api) {
   var list = {};

package/dist/esm/ui/Alignment/AlignmentButton/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { getAriaKeyshortcuts, tooltip, ToolTipContent } from '@atlaskit/editor-common/keymaps';
-import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
 function AlignmentButton(_ref) {
   var label = _ref.label,
     isSelected = _ref.isSelected,

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

@@ -3,8 +3,8 @@ import "./index.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { injectIntl } from 'react-intl';
+import { alignmentMessages } from '@atlaskit/editor-common/alignment';
 import { alignCenter, alignLeft, alignRight } from '@atlaskit/editor-common/keymaps';
-import { alignmentMessages } from '@atlaskit/editor-common/messages';
 import { IconMap } from '../ToolbarAlignment/icon-map';
 import AlignmentButton from './AlignmentButton';
 var alignmentWrapper = null;

package/dist/esm/ui/FloatingToolbarComponent.js

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { changeAlignment } from '../editor-commands';
 import { ToolbarType } from '../pm-plugins/types';

package/dist/esm/ui/PrimaryToolbarComponent.js

@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { changeAlignment } from '../editor-commands';
 import { ToolbarType } from '../pm-plugins/types';
 import ToolbarAlignment from './ToolbarAlignment';

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

@@ -1,8 +1,9 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { alignmentMessages as messages } from '@atlaskit/editor-common/messages';
-import { ToolbarDropdownMenu, ToolbarTooltip } from '@atlaskit/editor-toolbar';
+import { alignmentMessages as messages } from '@atlaskit/editor-common/alignment';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { ToolbarDropdownMenu } from '@atlaskit/editor-toolbar/toolbar-dropdown-menu';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 import { alignmentOptions } from './options';
 export var AlignmentMenu = function AlignmentMenu(_ref) {
   var children = _ref.children,

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

@@ -1,9 +1,10 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { getAriaKeyshortcuts, tooltip } from '@atlaskit/editor-common/keymaps';
 import { getInputMethodFromParentKeys } from '@atlaskit/editor-common/toolbar';
-import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
+import { ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint';
 import { changeAlignmentTr } from '../../editor-commands';
 export var AlignmentMenuItem = function AlignmentMenuItem(_ref) {
   var _ref$option = _ref.option,

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

@@ -1,6 +1,6 @@
 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';
 export var MenuSection = function MenuSection(_ref) {
   var children = _ref.children,
     title = _ref.title,

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

@@ -1,7 +1,10 @@
+import { alignmentMessages as messages } from '@atlaskit/editor-common/alignment';
 import { alignCenter, alignLeft, alignRight } from '@atlaskit/editor-common/keymaps';
-import { alignmentMessages as messages } from '@atlaskit/editor-common/messages';
-import { ALIGN_LEFT_MENU_ITEM, ALIGN_CENTER_MENU_ITEM, ALIGN_RIGHT_MENU_ITEM, ALIGNMENT_MENU_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
-import { AlignTextLeftIcon, AlignTextCenterIcon, AlignTextRightIcon } from '@atlaskit/editor-toolbar';
+import { ALIGN_LEFT_MENU_ITEM, ALIGN_CENTER_MENU_ITEM, ALIGN_RIGHT_MENU_ITEM } from '@atlaskit/editor-common/toolbar/keys';
+import { ALIGNMENT_MENU_SECTION_RANK } from '@atlaskit/editor-common/toolbar/rank';
+import { AlignTextCenterIcon } from '@atlaskit/editor-toolbar/align-text-center-icon';
+import { AlignTextLeftIcon } from '@atlaskit/editor-toolbar/align-text-left-icon';
+import { AlignTextRightIcon } from '@atlaskit/editor-toolbar/align-text-right-icon';
 export var alignmentOptions = function alignmentOptions() {
   return {
     start: {

package/dist/esm/ui/ToolbarAlignment/icon-map.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { alignmentMessages as messages } from '@atlaskit/editor-common/messages';
+import { alignmentMessages as messages } from '@atlaskit/editor-common/alignment';
 import AlignTextCenterIcon from '@atlaskit/icon/core/align-text-center';
 import AlignTextLeftIcon from '@atlaskit/icon/core/align-text-left';
 import AlignTextRightIcon from '@atlaskit/icon/core/align-text-right';

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

@@ -10,10 +10,17 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
 import { injectIntl } from 'react-intl';
+import { alignmentMessages as messages } from '@atlaskit/editor-common/alignment';
 import { alignCenter, alignLeft, alignRight, tooltip } from '@atlaskit/editor-common/keymaps';
-import { alignmentMessages as messages } from '@atlaskit/editor-common/messages';
-import { Shortcut, ToolbarDropdownTriggerWrapper, ToolbarDropdownWrapper, ToolbarExpandIcon, ToolbarSeparator } from '@atlaskit/editor-common/ui';
-import { ArrowKeyNavigationType, DropdownContainer as Dropdown, DropdownMenuWithKeyboardNavigation as DropdownMenu, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import { Shortcut } from '@atlaskit/editor-common/Shortcut';
+import { ArrowKeyNavigationType } from '@atlaskit/editor-common/ui-menu/ArrowKeyNavigationProvider/types';
+import { DropdownContainer as Dropdown } from '@atlaskit/editor-common/ui-menu/DropdownContainer';
+import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu/DropdownMenu';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
+import { ToolbarDropdownTriggerWrapper } from '@atlaskit/editor-common/ui-toolbar/DropdownTriggerWrapper';
+import { ToolbarDropdownWrapper } from '@atlaskit/editor-common/ui-toolbar/DropdownWrapper';
+import { ToolbarExpandIcon } from '@atlaskit/editor-common/ui-toolbar/ExpandIcon';
+import { ToolbarSeparator } from '@atlaskit/editor-common/ui-toolbar/Separator';
 import AlignTextCenterIcon from '@atlaskit/icon/core/align-text-center';
 import AlignTextLeftIcon from '@atlaskit/icon/core/align-text-left';
 import AlignTextRightIcon from '@atlaskit/icon/core/align-text-right';

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

@@ -1,7 +1,8 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React from 'react';
-import { ALIGNMENT_GROUP, ALIGNMENT_GROUP_RANK, ALIGNMENT_MENU, ALIGNMENT_MENU_SECTION, TEXT_SECTION, TEXT_SECTION_RANK, ALIGNMENT_MENU_RANK, TEXT_COLLAPSED_MENU_RANK, TEXT_COLLAPSED_MENU, TEXT_SECTION_PRIMARY_TOOLBAR, TEXT_SECTION_PRIMARY_TOOLBAR_RANK } from '@atlaskit/editor-common/toolbar';
+import { ALIGNMENT_GROUP, ALIGNMENT_MENU, ALIGNMENT_MENU_SECTION, TEXT_SECTION, TEXT_COLLAPSED_MENU, TEXT_SECTION_PRIMARY_TOOLBAR } from '@atlaskit/editor-common/toolbar/keys';
+import { ALIGNMENT_GROUP_RANK, TEXT_SECTION_RANK, ALIGNMENT_MENU_RANK, TEXT_COLLAPSED_MENU_RANK, TEXT_SECTION_PRIMARY_TOOLBAR_RANK } from '@atlaskit/editor-common/toolbar/rank';
 import { AlignmentMenu } from './Toolbar/AlignmentMenu';
 import { AlignmentMenuItem } from './Toolbar/AlignmentMenuItem';
 import { MenuSection } from './Toolbar/MenuSection';

package/dist/types/alignmentPluginType.d.ts

@@ -1,11 +1,11 @@
-import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
-import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction';
-import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
-import type { SelectionToolbarPlugin } from '@atlaskit/editor-plugin-selection-toolbar';
-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 { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types/next-editor-plugin';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics/analyticsPluginType';
+import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction/interaction-plugin-type';
+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 { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar/toolbar-plugin-type';
+import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-preferences/user-preferences-plugin-type';
 import type { AlignmentPluginState } from './pm-plugins/types';
 export type AlignmentPluginDependencies = [
     OptionalPlugin<PrimaryToolbarPlugin>,

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

@@ -1,4 +1,6 @@
-import type { Command, EditorCommand, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { Command } from '@atlaskit/editor-common/types/command';
+import type { EditorCommand } from '@atlaskit/editor-common/types/editor-command';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { AlignmentPlugin, InputMethod } from '../alignmentPluginType';
 import type { AlignmentState } from '../pm-plugins/types';
 export declare const isAlignable: (align?: AlignmentState) => Command;

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

@@ -1,4 +1,4 @@
 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 { AlignmentPlugin } from '../alignmentPluginType';
 export declare function keymapPlugin(api?: ExtractInjectionAPI<AlignmentPlugin>): SafePlugin;

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

@@ -1,5 +1,5 @@
 import React from 'react';
-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 { AlignmentPlugin } from '../alignmentPluginType';
 interface FloatingToolbarComponentProps {

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

@@ -1,5 +1,5 @@
 import React from 'react';
-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 { AlignmentPlugin } from '../alignmentPluginType';
 interface PrimaryToolbarComponentProps {

package/dist/types/ui/Toolbar/AlignmentMenu.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { AlignmentPlugin } from '../../alignmentPluginType';
 export declare const AlignmentMenu: ({ children, api, }: {
     api: ExtractInjectionAPI<AlignmentPlugin> | undefined;

package/dist/types/ui/Toolbar/AlignmentMenuItem.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-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 { AlignmentPlugin } from '../../alignmentPluginType';
 import type { AlignmentState } from '../../pm-plugins/types';
 import type { OptionInfo } from './types';

package/dist/types/ui/Toolbar/MenuSection.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { ReactNode } from 'react';
-import type { CommonComponentProps } from '@atlaskit/editor-toolbar-model';
+import type { CommonComponentProps } from '@atlaskit/editor-toolbar-model/types';
 export declare const MenuSection: ({ children, title, parents, }: {
     children?: ReactNode;
     parents: CommonComponentProps['parents'];

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

@@ -1,6 +1,6 @@
 import type { MessageDescriptor } from 'react-intl';
 import type { Keymap } from '@atlaskit/editor-common/keymaps';
-import type { IconComponent } from '@atlaskit/editor-toolbar';
+import type { IconComponent } from '@atlaskit/editor-toolbar/types';
 export type OptionInfo = {
     icon: IconComponent;
     key: string;

package/dist/types/ui/ToolbarAlignment/index.d.ts

@@ -4,7 +4,7 @@
  */
 import React 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 { AlignmentPlugin } from '../../alignmentPluginType';
 import { ToolbarType } from '../../pm-plugins/types';
 import type { AlignmentState } from '../../pm-plugins/types';

package/dist/types/ui/toolbar-components.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 { AlignmentPlugin } from '../alignmentPluginType';
 export declare const getToolbarComponents: (api: ExtractInjectionAPI<AlignmentPlugin> | undefined) => RegisterComponent[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-alignment",
-	"version": "27.0.3",
+	"version": "27.0.5",
 	"description": "Alignment plugin for @atlaskit/editor-core",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -33,7 +33,7 @@
 		"@atlaskit/editor-toolbar": "^2.8.0",
 		"@atlaskit/icon": "^38.0.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
-		"@atlaskit/tmp-editor-statsig": "^230.0.0",
+		"@atlaskit/tmp-editor-statsig": "^232.0.0",
 		"@atlaskit/tokens": "^20.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2"