@atlaskit/editor-plugin-toolbar-lists-indentation 27.0.3 → 27.0.5

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

@@ -7,11 +7,15 @@ Object.defineProperty(exports, "__esModule", {
 exports.ListsIndentationHeroButtonNew = exports.ListsIndentationHeroButtonCollapsed = exports.ListsIndentationHeroButton = 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 _messages = require("@atlaskit/editor-common/messages");
+var _list = require("@atlaskit/editor-common/messages/list");
+var _tasksAndDecisions = require("@atlaskit/editor-common/messages/tasks-and-decisions");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _listBulletedIcon = require("@atlaskit/editor-toolbar/list-bulleted-icon");
+var _listNumberedIcon = require("@atlaskit/editor-toolbar/list-numbered-icon");
+var _toolbarButton = require("@atlaskit/editor-toolbar/toolbar-button");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
 var _task = _interopRequireDefault(require("@atlaskit/icon/core/task"));
 function useListsIndentationHeroButtonInfo(_ref) {
   var api = _ref.api,
@@ -19,7 +23,7 @@ function useListsIndentationHeroButtonInfo(_ref) {
     defaultListType = _ref.defaultListType;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['list', 'taskDecision'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['list', 'taskDecision'], function (states) {
       var _states$listState, _states$listState2, _states$listState3, _states$taskDecisionS;
       return {
         bulletListActive: (_states$listState = states.listState) === null || _states$listState === void 0 ? void 0 : _states$listState.bulletListActive,
@@ -37,7 +41,7 @@ function useListsIndentationHeroButtonInfo(_ref) {
   var getKeymap = getListType === 'taskList' ? taskListKeymap : getListType === 'orderedList' ? _keymaps.toggleOrderedList : _keymaps.toggleBulletList;
   var shortcut = (0, _keymaps.formatShortcut)(getKeymap);
   var keymap = getKeymap;
-  var message = getListType === 'taskList' ? formatMessage(_messages.tasksAndDecisionsMessages.taskList) : getListType === 'orderedList' ? formatMessage(_messages.listMessages.orderedList) : formatMessage(_messages.listMessages.bulletedList);
+  var message = getListType === 'taskList' ? formatMessage(_tasksAndDecisions.tasksAndDecisionsMessages.taskList) : getListType === 'orderedList' ? formatMessage(_list.messages.orderedList) : formatMessage(_list.messages.bulletedList);
   var onClick = function onClick() {
     var inputMethod = (0, _toolbar.getInputMethodFromParentKeys)(parents);
     if (getListType === 'taskList') {
@@ -50,13 +54,13 @@ function useListsIndentationHeroButtonInfo(_ref) {
     }
   };
   var iconBefore = getListType === 'taskList' ? /*#__PURE__*/_react.default.createElement(_task.default, {
-    label: formatMessage(_messages.tasksAndDecisionsMessages.taskList),
+    label: formatMessage(_tasksAndDecisions.tasksAndDecisionsMessages.taskList),
     size: "small"
-  }) : getListType === 'orderedList' ? /*#__PURE__*/_react.default.createElement(_editorToolbar.ListNumberedIcon, {
-    label: formatMessage(_messages.listMessages.orderedList),
+  }) : getListType === 'orderedList' ? /*#__PURE__*/_react.default.createElement(_listNumberedIcon.ListNumberedIcon, {
+    label: formatMessage(_list.messages.orderedList),
     size: "small"
-  }) : /*#__PURE__*/_react.default.createElement(_editorToolbar.ListBulletedIcon, {
-    label: formatMessage(_messages.listMessages.bulletedList),
+  }) : /*#__PURE__*/_react.default.createElement(_listBulletedIcon.ListBulletedIcon, {
+    label: formatMessage(_list.messages.bulletedList),
     size: "small"
   });
   var isSelected = getListType === 'bulletList' ? bulletListActive : getListType === 'orderedList' ? orderedListActive : taskListActive;
@@ -86,12 +90,12 @@ var ListsIndentationHeroButtonCollapsed = exports.ListsIndentationHeroButtonColl
     iconBefore = _useListsIndentationH.iconBefore,
     isSelected = _useListsIndentationH.isSelected,
     isDisabled = _useListsIndentationH.isDisabled;
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
     content: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
       description: message,
       keymap: keymap
     })
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
     iconBefore: iconBefore,
     isSelected: isSelected,
     isDisabled: isDisabled,
@@ -114,12 +118,12 @@ var ListsIndentationHeroButtonNew = exports.ListsIndentationHeroButtonNew = func
     iconBefore = _useListsIndentationH2.iconBefore,
     isSelected = _useListsIndentationH2.isSelected,
     isDisabled = _useListsIndentationH2.isDisabled;
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
     content: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
       description: message,
       keymap: keymap
     })
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
     iconBefore: iconBefore,
     isSelected: isSelected,
     isDisabled: isDisabled,
@@ -141,9 +145,9 @@ var ListsIndentationHeroButton = exports.ListsIndentationHeroButton = function L
     iconBefore = _useListsIndentationH3.iconBefore,
     isSelected = _useListsIndentationH3.isSelected,
     isDisabled = _useListsIndentationH3.isDisabled;
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
     content: message
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
     iconBefore: iconBefore,
     isSelected: isSelected,
     isDisabled: isDisabled,

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

@@ -6,16 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getListsIndentationHeroButton = void 0;
 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 _ListsIndentationHeroButton = require("./ListsIndentationHeroButton");
 var getListsIndentationHeroButton = exports.getListsIndentationHeroButton = function getListsIndentationHeroButton(api) {
   return [{
-    type: _toolbar.LISTS_INDENTATION_HERO_BUTTON.type,
-    key: _toolbar.LISTS_INDENTATION_HERO_BUTTON.key,
+    type: _keys.LISTS_INDENTATION_HERO_BUTTON.type,
+    key: _keys.LISTS_INDENTATION_HERO_BUTTON.key,
     parents: [{
-      type: _toolbar.LISTS_INDENTATION_GROUP.type,
-      key: _toolbar.LISTS_INDENTATION_GROUP.key,
-      rank: _toolbar.LISTS_INDENTATION_GROUP_RANK[_toolbar.LISTS_INDENTATION_HERO_BUTTON.key]
+      type: _keys.LISTS_INDENTATION_GROUP.type,
+      key: _keys.LISTS_INDENTATION_GROUP.key,
+      rank: _rank.LISTS_INDENTATION_GROUP_RANK[_keys.LISTS_INDENTATION_HERO_BUTTON.key]
     }],
     component: function component(_ref) {
       var parents = _ref.parents;
@@ -25,16 +26,16 @@ var getListsIndentationHeroButton = exports.getListsIndentationHeroButton = func
       });
     }
   }, {
-    type: _toolbar.LISTS_INDENTATION_HERO_BUTTON_COLLAPSED.type,
-    key: _toolbar.LISTS_INDENTATION_HERO_BUTTON_COLLAPSED.key,
+    type: _keys.LISTS_INDENTATION_HERO_BUTTON_COLLAPSED.type,
+    key: _keys.LISTS_INDENTATION_HERO_BUTTON_COLLAPSED.key,
     parents: [{
-      type: _toolbar.LISTS_INDENTATION_GROUP_COLLAPSED.type,
-      key: _toolbar.LISTS_INDENTATION_GROUP_COLLAPSED.key,
-      rank: _toolbar.LISTS_INDENTATION_GROUP_COLLAPSED_RANK[_toolbar.LISTS_INDENTATION_HERO_BUTTON_COLLAPSED.key]
+      type: _keys.LISTS_INDENTATION_GROUP_COLLAPSED.type,
+      key: _keys.LISTS_INDENTATION_GROUP_COLLAPSED.key,
+      rank: _rank.LISTS_INDENTATION_GROUP_COLLAPSED_RANK[_keys.LISTS_INDENTATION_HERO_BUTTON_COLLAPSED.key]
     }, {
-      type: _toolbar.LISTS_INDENTATION_GROUP_INLINE.type,
-      key: _toolbar.LISTS_INDENTATION_GROUP_INLINE.key,
-      rank: _toolbar.LISTS_INDENTATION_GROUP_COLLAPSED_RANK[_toolbar.LISTS_INDENTATION_HERO_BUTTON_COLLAPSED.key]
+      type: _keys.LISTS_INDENTATION_GROUP_INLINE.type,
+      key: _keys.LISTS_INDENTATION_GROUP_INLINE.key,
+      rank: _rank.LISTS_INDENTATION_GROUP_COLLAPSED_RANK[_keys.LISTS_INDENTATION_HERO_BUTTON_COLLAPSED.key]
     }],
     component: function component(_ref2) {
       var parents = _ref2.parents;

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

@@ -7,25 +7,27 @@ Object.defineProperty(exports, "__esModule", {
 exports.ListsIndentationMenu = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _hooks = require("@atlaskit/editor-common/hooks");
-var _lists = require("@atlaskit/editor-common/lists");
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
-var _hooks2 = require("../utils/hooks");
+var _messages = require("@atlaskit/editor-common/lists/messages");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _moreItemsIcon = require("@atlaskit/editor-toolbar/more-items-icon");
+var _toolbarDropdownMenu = require("@atlaskit/editor-toolbar/toolbar-dropdown-menu");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
+var _hooks = require("../utils/hooks");
 var ListsIndentationMenu = exports.ListsIndentationMenu = function ListsIndentationMenu(_ref) {
   var children = _ref.children,
     api = _ref.api,
     allowHeadingAndParagraphIndentation = _ref.allowHeadingAndParagraphIndentation;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorView = _useEditorToolbar.editorView;
-  var indentationState = (0, _hooks2.useIndentationState)({
+  var indentationState = (0, _hooks.useIndentationState)({
     api: api,
     allowHeadingAndParagraphIndentation: allowHeadingAndParagraphIndentation,
     state: editorView === null || editorView === void 0 ? void 0 : editorView.state
   });
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['list', 'taskDecision'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['list', 'taskDecision'], function (states) {
       var _states$listState, _states$listState2, _states$taskDecisionS;
       return {
         bulletListDisabled: (_states$listState = states.listState) === null || _states$listState === void 0 ? void 0 : _states$listState.bulletListDisabled,
@@ -37,15 +39,15 @@ var ListsIndentationMenu = exports.ListsIndentationMenu = function ListsIndentat
     orderedListDisabled = _useSharedPluginState.orderedListDisabled,
     taskListActive = _useSharedPluginState.taskListActive;
   var allItemsDisabled = bulletListDisabled && orderedListDisabled && (indentationState === null || indentationState === void 0 ? void 0 : indentationState.indentDisabled) && (indentationState === null || indentationState === void 0 ? void 0 : indentationState.outdentDisabled) && !taskListActive;
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownMenu, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.MoreItemsIcon, {
-      label: formatMessage(_lists.messages.lists)
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownMenu.ToolbarDropdownMenu, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_moreItemsIcon.MoreItemsIcon, {
+      label: formatMessage(_messages.messages.lists)
     }),
     isDisabled: allItemsDisabled,
     testId: "editor-toolbar__lists-and-indentation-menu",
-    label: formatMessage(_lists.messages.lists),
-    tooltipComponent: /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
-      content: formatMessage(_lists.messages.lists)
+    label: formatMessage(_messages.messages.lists),
+    tooltipComponent: /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
+      content: formatMessage(_messages.messages.lists)
     })
   }, children);
 };

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

@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getListsIndentationMenu = void 0;
 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 _BulletedListMenuItem = require("./BulletedListMenuItem");
 var _IndentMenuItem = require("./IndentMenuItem");
 var _ListsIndentationMenu = require("./ListsIndentationMenu");
@@ -15,20 +16,20 @@ var _NumberedListMenuItem = require("./NumberedListMenuItem");
 var _OutdentMenuItem = require("./OutdentMenuItem");
 var getListsIndentationMenu = exports.getListsIndentationMenu = function getListsIndentationMenu(allowHeadingAndParagraphIndentation, showIndentationButtons, api) {
   return [{
-    type: _toolbar.LISTS_INDENTATION_MENU.type,
-    key: _toolbar.LISTS_INDENTATION_MENU.key,
+    type: _keys.LISTS_INDENTATION_MENU.type,
+    key: _keys.LISTS_INDENTATION_MENU.key,
     parents: [{
-      type: _toolbar.LISTS_INDENTATION_GROUP.type,
-      key: _toolbar.LISTS_INDENTATION_GROUP.key,
-      rank: _toolbar.LISTS_INDENTATION_GROUP_RANK[_toolbar.LISTS_INDENTATION_MENU.key]
+      type: _keys.LISTS_INDENTATION_GROUP.type,
+      key: _keys.LISTS_INDENTATION_GROUP.key,
+      rank: _rank.LISTS_INDENTATION_GROUP_RANK[_keys.LISTS_INDENTATION_MENU.key]
     }, {
-      type: _toolbar.LISTS_INDENTATION_GROUP_COLLAPSED.type,
-      key: _toolbar.LISTS_INDENTATION_GROUP_COLLAPSED.key,
-      rank: _toolbar.LISTS_INDENTATION_GROUP_COLLAPSED_RANK[_toolbar.LISTS_INDENTATION_MENU.key]
+      type: _keys.LISTS_INDENTATION_GROUP_COLLAPSED.type,
+      key: _keys.LISTS_INDENTATION_GROUP_COLLAPSED.key,
+      rank: _rank.LISTS_INDENTATION_GROUP_COLLAPSED_RANK[_keys.LISTS_INDENTATION_MENU.key]
     }, {
-      type: _toolbar.LISTS_INDENTATION_GROUP_INLINE.type,
-      key: _toolbar.LISTS_INDENTATION_GROUP_INLINE.key,
-      rank: _toolbar.LISTS_INDENTATION_GROUP_COLLAPSED_RANK[_toolbar.LISTS_INDENTATION_MENU.key]
+      type: _keys.LISTS_INDENTATION_GROUP_INLINE.type,
+      key: _keys.LISTS_INDENTATION_GROUP_INLINE.key,
+      rank: _rank.LISTS_INDENTATION_GROUP_COLLAPSED_RANK[_keys.LISTS_INDENTATION_MENU.key]
     }],
     component: function component(_ref) {
       var children = _ref.children;
@@ -38,25 +39,25 @@ var getListsIndentationMenu = exports.getListsIndentationMenu = function getList
       }, children);
     }
   }, {
-    type: _toolbar.LISTS_INDENTATION_MENU_SECTION.type,
-    key: _toolbar.LISTS_INDENTATION_MENU_SECTION.key,
+    type: _keys.LISTS_INDENTATION_MENU_SECTION.type,
+    key: _keys.LISTS_INDENTATION_MENU_SECTION.key,
     parents: [{
-      type: _toolbar.LISTS_INDENTATION_MENU.type,
-      key: _toolbar.LISTS_INDENTATION_MENU.key,
-      rank: _toolbar.LISTS_INDENTATION_MENU_RANK[_toolbar.LISTS_INDENTATION_MENU_SECTION.key]
+      type: _keys.LISTS_INDENTATION_MENU.type,
+      key: _keys.LISTS_INDENTATION_MENU.key,
+      rank: _rank.LISTS_INDENTATION_MENU_RANK[_keys.LISTS_INDENTATION_MENU_SECTION.key]
     }, {
-      type: _toolbar.TEXT_COLLAPSED_MENU.type,
-      key: _toolbar.TEXT_COLLAPSED_MENU.key,
-      rank: _toolbar.TEXT_COLLAPSED_MENU_RANK[_toolbar.LISTS_INDENTATION_MENU_SECTION.key]
+      type: _keys.TEXT_COLLAPSED_MENU.type,
+      key: _keys.TEXT_COLLAPSED_MENU.key,
+      rank: _rank.TEXT_COLLAPSED_MENU_RANK[_keys.LISTS_INDENTATION_MENU_SECTION.key]
     }],
     component: _MenuSection.MenuSection
   }, {
-    type: _toolbar.BULLETED_LIST_MENU_ITEM.type,
-    key: _toolbar.BULLETED_LIST_MENU_ITEM.key,
+    type: _keys.BULLETED_LIST_MENU_ITEM.type,
+    key: _keys.BULLETED_LIST_MENU_ITEM.key,
     parents: [{
-      type: _toolbar.LISTS_INDENTATION_MENU_SECTION.type,
-      key: _toolbar.LISTS_INDENTATION_MENU_SECTION.key,
-      rank: _toolbar.LISTS_INDENTATION_MENU_SECTION_RANK[_toolbar.BULLETED_LIST_MENU_ITEM.key]
+      type: _keys.LISTS_INDENTATION_MENU_SECTION.type,
+      key: _keys.LISTS_INDENTATION_MENU_SECTION.key,
+      rank: _rank.LISTS_INDENTATION_MENU_SECTION_RANK[_keys.BULLETED_LIST_MENU_ITEM.key]
     }],
     component: function component(_ref2) {
       var parents = _ref2.parents;
@@ -66,12 +67,12 @@ var getListsIndentationMenu = exports.getListsIndentationMenu = function getList
       });
     }
   }, {
-    type: _toolbar.NUMBERED_LIST_MENU_ITEM.type,
-    key: _toolbar.NUMBERED_LIST_MENU_ITEM.key,
+    type: _keys.NUMBERED_LIST_MENU_ITEM.type,
+    key: _keys.NUMBERED_LIST_MENU_ITEM.key,
     parents: [{
-      type: _toolbar.LISTS_INDENTATION_MENU_SECTION.type,
-      key: _toolbar.LISTS_INDENTATION_MENU_SECTION.key,
-      rank: _toolbar.LISTS_INDENTATION_MENU_SECTION_RANK[_toolbar.NUMBERED_LIST_MENU_ITEM.key]
+      type: _keys.LISTS_INDENTATION_MENU_SECTION.type,
+      key: _keys.LISTS_INDENTATION_MENU_SECTION.key,
+      rank: _rank.LISTS_INDENTATION_MENU_SECTION_RANK[_keys.NUMBERED_LIST_MENU_ITEM.key]
     }],
     component: function component(_ref3) {
       var parents = _ref3.parents;
@@ -81,12 +82,12 @@ var getListsIndentationMenu = exports.getListsIndentationMenu = function getList
       });
     }
   }, {
-    type: _toolbar.OUTDENT_MENU_ITEM.type,
-    key: _toolbar.OUTDENT_MENU_ITEM.key,
+    type: _keys.OUTDENT_MENU_ITEM.type,
+    key: _keys.OUTDENT_MENU_ITEM.key,
     parents: [{
-      type: _toolbar.LISTS_INDENTATION_MENU_SECTION.type,
-      key: _toolbar.LISTS_INDENTATION_MENU_SECTION.key,
-      rank: _toolbar.LISTS_INDENTATION_MENU_SECTION_RANK[_toolbar.OUTDENT_MENU_ITEM.key]
+      type: _keys.LISTS_INDENTATION_MENU_SECTION.type,
+      key: _keys.LISTS_INDENTATION_MENU_SECTION.key,
+      rank: _rank.LISTS_INDENTATION_MENU_SECTION_RANK[_keys.OUTDENT_MENU_ITEM.key]
     }],
     component: function component(_ref4) {
       var parents = _ref4.parents;
@@ -98,12 +99,12 @@ var getListsIndentationMenu = exports.getListsIndentationMenu = function getList
       });
     }
   }, {
-    type: _toolbar.INDENT_MENU_ITEM.type,
-    key: _toolbar.INDENT_MENU_ITEM.key,
+    type: _keys.INDENT_MENU_ITEM.type,
+    key: _keys.INDENT_MENU_ITEM.key,
     parents: [{
-      type: _toolbar.LISTS_INDENTATION_MENU_SECTION.type,
-      key: _toolbar.LISTS_INDENTATION_MENU_SECTION.key,
-      rank: _toolbar.LISTS_INDENTATION_MENU_SECTION_RANK[_toolbar.INDENT_MENU_ITEM.key]
+      type: _keys.LISTS_INDENTATION_MENU_SECTION.type,
+      key: _keys.LISTS_INDENTATION_MENU_SECTION.key,
+      rank: _rank.LISTS_INDENTATION_MENU_SECTION_RANK[_keys.INDENT_MENU_ITEM.key]
     }],
     component: function component(_ref5) {
       var parents = _ref5.parents;

package/dist/cjs/ui/toolbar-components/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-components/NumberedListMenuItem.js

@@ -7,17 +7,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.NumberedListMenuItem = 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 _messages = require("@atlaskit/editor-common/messages");
+var _list = require("@atlaskit/editor-common/messages/list");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _listNumberedIcon = require("@atlaskit/editor-toolbar/list-numbered-icon");
+var _toolbarDropdownItem = require("@atlaskit/editor-toolbar/toolbar-dropdown-item");
+var _toolbarKeyboardShortcutHint = require("@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint");
 var NumberedListMenuItem = exports.NumberedListMenuItem = function NumberedListMenuItem(_ref) {
   var api = _ref.api,
     parents = _ref.parents;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['list', 'taskDecision'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['list', 'taskDecision'], function (states) {
       var _states$listState, _states$listState2, _states$taskDecisionS;
       return {
         orderedListActive: (_states$listState = states.listState) === null || _states$listState === void 0 ? void 0 : _states$listState.orderedListActive,
@@ -33,17 +35,17 @@ var NumberedListMenuItem = exports.NumberedListMenuItem = function NumberedListM
     api === null || api === void 0 || api.core.actions.execute(taskListActive ? api === null || api === void 0 || (_api$taskDecision = api.taskDecision) === null || _api$taskDecision === void 0 ? void 0 : _api$taskDecision.commands.toggleTaskList('orderedList') : api === null || api === void 0 ? void 0 : api.list.commands.toggleOrderedList((0, _toolbar.getInputMethodFromParentKeys)(parents)));
   };
   var shortcut = (0, _keymaps.formatShortcut)(_keymaps.toggleOrderedList);
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
-    elemBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.ListNumberedIcon, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
+    elemBefore: /*#__PURE__*/_react.default.createElement(_listNumberedIcon.ListNumberedIcon, {
       size: "small",
       label: ""
     }),
-    elemAfter: shortcut ? /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
+    elemAfter: shortcut ? /*#__PURE__*/_react.default.createElement(_toolbarKeyboardShortcutHint.ToolbarKeyboardShortcutHint, {
       shortcut: shortcut
     }) : undefined,
     isSelected: orderedListActive,
     isDisabled: orderedListDisabled && !taskListActive,
     onClick: onClick,
     ariaKeyshortcuts: shortcut
-  }, formatMessage(_messages.listMessages.orderedList));
+  }, formatMessage(_list.messages.orderedList));
 };

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

@@ -8,9 +8,12 @@ exports.OutdentMenuItem = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
+var _indentation = require("@atlaskit/editor-common/messages/indentation");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _outdentIcon = require("@atlaskit/editor-toolbar/outdent-icon");
+var _toolbarDropdownItem = require("@atlaskit/editor-toolbar/toolbar-dropdown-item");
+var _toolbarKeyboardShortcutHint = require("@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint");
 var _hooks = require("../utils/hooks");
 var OutdentMenuItem = exports.OutdentMenuItem = function OutdentMenuItem(_ref) {
   var api = _ref.api,
@@ -19,7 +22,7 @@ var OutdentMenuItem = exports.OutdentMenuItem = function OutdentMenuItem(_ref) {
     parents = _ref.parents;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorView = _useEditorToolbar.editorView;
   var indentationState = (0, _hooks.useIndentationState)({
     api: api,
@@ -49,16 +52,16 @@ var OutdentMenuItem = exports.OutdentMenuItem = function OutdentMenuItem(_ref) {
     }
   };
   var shortcut = (0, _keymaps.formatShortcut)(_keymaps.outdent);
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
-    elemBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.OutdentIcon, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
+    elemBefore: /*#__PURE__*/_react.default.createElement(_outdentIcon.OutdentIcon, {
       size: "small",
       label: ""
     }),
-    elemAfter: shortcut ? /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
+    elemAfter: shortcut ? /*#__PURE__*/_react.default.createElement(_toolbarKeyboardShortcutHint.ToolbarKeyboardShortcutHint, {
       shortcut: shortcut
     }) : undefined,
     isDisabled: indentationState === null || indentationState === void 0 ? void 0 : indentationState.outdentDisabled,
     ariaKeyshortcuts: shortcut,
     onClick: onClick
-  }, formatMessage(_messages.indentationMessages.outdent));
+  }, formatMessage(_indentation.messages.outdent));
 };

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

@@ -7,18 +7,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.TaskListMenuItem = 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 _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _tasksAndDecisions = require("@atlaskit/editor-common/messages/tasks-and-decisions");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+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 _task = _interopRequireDefault(require("@atlaskit/icon/core/task"));
 var TaskListMenuItem = exports.TaskListMenuItem = function TaskListMenuItem(_ref) {
   var api = _ref.api;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorView = _useEditorToolbar.editorView;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['taskDecision'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['taskDecision'], function (states) {
       var _states$taskDecisionS;
       return {
         taskListActive: (_states$taskDecisionS = states.taskDecisionState) === null || _states$taskDecisionS === void 0 ? void 0 : _states$taskDecisionS.isInsideTask
@@ -32,16 +33,16 @@ var TaskListMenuItem = exports.TaskListMenuItem = function TaskListMenuItem(_ref
     var _api$taskDecision;
     api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$taskDecision = api.taskDecision) === null || _api$taskDecision === void 0 ? void 0 : _api$taskDecision.commands.toggleTaskList());
   };
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/_react.default.createElement(_task.default, {
       size: "small",
       label: ""
     }),
-    elemAfter: /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
+    elemAfter: /*#__PURE__*/_react.default.createElement(_toolbarKeyboardShortcutHint.ToolbarKeyboardShortcutHint, {
       shortcut: "[]"
     }),
     isSelected: taskListActive,
     isDisabled: false,
     onClick: handleClick
-  }, formatMessage(_messages.tasksAndDecisionsMessages.taskList));
+  }, formatMessage(_tasksAndDecisions.tasksAndDecisionsMessages.taskList));
 };

package/dist/cjs/ui/utils/hooks.js

@@ -4,13 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useIndentationState = void 0;
-var _hooks = require("@atlaskit/editor-common/hooks");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
 var _indentationButtons = require("../../pm-plugins/indentation-buttons");
 var useIndentationState = exports.useIndentationState = function useIndentationState(_ref) {
   var api = _ref.api,
     allowHeadingAndParagraphIndentation = _ref.allowHeadingAndParagraphIndentation,
     state = _ref.state;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['indentation'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['indentation'], function (states) {
       var _states$indentationSt, _states$indentationSt2, _states$indentationSt3;
       return {
         isIndentationAllowed: (_states$indentationSt = states.indentationState) === null || _states$indentationSt === void 0 ? void 0 : _states$indentationSt.isIndentationAllowed,
@@ -21,7 +21,7 @@ var useIndentationState = exports.useIndentationState = function useIndentationS
     isIndentationAllowed = _useSharedPluginState.isIndentationAllowed,
     indentDisabled = _useSharedPluginState.indentDisabled,
     outdentDisabled = _useSharedPluginState.outdentDisabled;
-  var _useSharedPluginState2 = (0, _hooks.useSharedPluginStateWithSelector)(api, ['taskDecision'], function (states) {
+  var _useSharedPluginState2 = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['taskDecision'], function (states) {
       var _states$taskDecisionS, _states$taskDecisionS2, _states$taskDecisionS3;
       return {
         isInsideTask: (_states$taskDecisionS = states.taskDecisionState) === null || _states$taskDecisionS === void 0 ? void 0 : _states$taskDecisionS.isInsideTask,

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

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 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 = (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.ToolbarType.PRIMARY, _analytics.INPUT_METHOD.TOOLBAR), _types.ToolbarType.FLOATING, _analytics.INPUT_METHOD.FLOATING_TB);
+var 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/es2019/pm-plugins/indentation-buttons.js

@@ -1,5 +1,5 @@
 import { MAX_INDENTATION_LEVEL } from '@atlaskit/editor-common/indentation';
-import { getListItemAttributes } from '@atlaskit/editor-common/lists';
+import { getListItemAttributes } from '@atlaskit/editor-common/lists/selection';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 export function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndentation, taskDecisionState, indentationState, isInsideListItem) {
   var _indentationState$isI;

package/dist/es2019/toolbarListsIndentationPlugin.js

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { usePluginStateEffect } from '@atlaskit/editor-common/use-plugin-state-effect';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { getIndentationButtonsState } from './pm-plugins/indentation-buttons';
 import { ToolbarType } from './types';

package/dist/es2019/ui/FloatingToolbarComponent.js

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { usePluginStateEffect } from '@atlaskit/editor-common/use-plugin-state-effect';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { getIndentationButtonsState } from '../pm-plugins/indentation-buttons';
 import { ToolbarType } from '../types';

package/dist/es2019/ui/Toolbar.js

@@ -3,10 +3,13 @@ import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useEffect, useRef } from 'react';
 import { useIntl } from 'react-intl';
+import { TOOLBAR_ACTION_SUBJECT_ID as TOOLBAR_BUTTON } from '@atlaskit/editor-common/analytics/types/toolbar-button';
 import { getAriaKeyshortcuts, toggleBulletList as toggleBulletListKeymap, indent as toggleIndentKeymap, toggleOrderedList as toggleOrderedListKeymap, outdent as toggleOutdentKeymap, tooltip, ToolTipContent } from '@atlaskit/editor-common/keymaps';
-import { indentationMessages, listMessages as messages } from '@atlaskit/editor-common/messages';
-import { ToolbarButtonGroup, ToolbarSeparator } from '@atlaskit/editor-common/ui';
-import { TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import { messages as indentationMessages } from '@atlaskit/editor-common/messages/indentation';
+import { messages } from '@atlaskit/editor-common/messages/list';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
+import { ToolbarButtonGroup } from '@atlaskit/editor-common/ui-toolbar/ButtonGroup';
+import { ToolbarSeparator } from '@atlaskit/editor-common/ui-toolbar/Separator';
 import BulletedListIcon from '@atlaskit/icon/core/list-bulleted';
 import NumberListIcon from '@atlaskit/icon/core/list-numbered';
 import OutdentIcon from '@atlaskit/icon/core/text-indent-left';

package/dist/es2019/ui/ToolbarDropdown.js

@@ -3,9 +3,15 @@ import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { useIntl } from 'react-intl';
 import { toggleBulletList as toggleBulletListKeymap, indent as toggleIndentKeymap, toggleOrderedList as toggleOrderedListKeymap, outdent as toggleOutdentKeymap, tooltip } from '@atlaskit/editor-common/keymaps';
-import { indentationMessages, listMessages } from '@atlaskit/editor-common/messages';
-import { Shortcut, ToolbarDropdownTriggerWrapper, ToolbarDropdownWrapper, ToolbarExpandIcon, ToolbarSeparator } from '@atlaskit/editor-common/ui';
-import { DropdownMenuWithKeyboardNavigation as DropdownMenu, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import { messages as indentationMessages } from '@atlaskit/editor-common/messages/indentation';
+import { messages as listMessages } from '@atlaskit/editor-common/messages/list';
+import { Shortcut } from '@atlaskit/editor-common/Shortcut';
+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 ListBulletedIcon from '@atlaskit/icon/core/list-bulleted';
 import ListNumberedIcon from '@atlaskit/icon/core/list-numbered';
 import TextIndentLeftIcon from '@atlaskit/icon/core/text-indent-left';

package/dist/es2019/ui/index.js

@@ -1,7 +1,7 @@
 /* index.tsx generated by @compiled/babel-plugin v3.0.2 */
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { ToolbarType } from '../types';
 import { onItemActivated } from './onItemActivated';