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

package/CHANGELOG.md

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

package/dist/cjs/pm-plugins/indentation-buttons.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getIndentationButtonsState = getIndentationButtonsState;
 var _indentation = require("@atlaskit/editor-common/indentation");
-var _lists = require("@atlaskit/editor-common/lists");
+var _selection = require("@atlaskit/editor-common/lists/selection");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndentation, taskDecisionState, indentationState, isInsideListItem) {
   var _indentationState$isI;
@@ -21,7 +21,7 @@ function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndenta
   // Check for lists before paragraphs and headings in case
   // the selection is in a list nested in a layout column.
   if (isInsideListItem !== null && isInsideListItem !== void 0 && isInsideListItem(editorState.tr)) {
-    var _getListItemAttribute = (0, _lists.getListItemAttributes)(selection.$head),
+    var _getListItemAttribute = (0, _selection.getListItemAttributes)(selection.$head),
       indentLevel = _getListItemAttribute.indentLevel;
     return {
       // List indent levels are zero indexed so we need to subtract 1

package/dist/cjs/toolbarListsIndentationPlugin.js

@@ -10,9 +10,9 @@ exports.toolbarListsIndentationPlugin = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
-var _hooks = require("@atlaskit/editor-common/hooks");
 var _types = require("@atlaskit/editor-common/types");
 var _usePluginStateEffect = require("@atlaskit/editor-common/use-plugin-state-effect");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _indentationButtons = require("./pm-plugins/indentation-buttons");
 var _types2 = require("./types");
@@ -124,7 +124,7 @@ function PrimaryToolbarComponent(_ref4) {
     showIndentationButtons = _ref4.showIndentationButtons,
     pluginInjectionApi = _ref4.pluginInjectionApi,
     allowHeadingAndParagraphIndentation = _ref4.allowHeadingAndParagraphIndentation;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['list', 'indentation'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(pluginInjectionApi, ['list', 'indentation'], function (states) {
       var _states$listState, _states$listState2, _states$listState3, _states$listState4, _states$indentationSt, _states$indentationSt2, _states$indentationSt3, _states$listState5;
       return {
         bulletListActive: (_states$listState = states.listState) === null || _states$listState === void 0 ? void 0 : _states$listState.bulletListActive,

package/dist/cjs/ui/FloatingToolbarComponent.js

@@ -8,8 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.FloatingToolbarComponent = FloatingToolbarComponent;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
-var _hooks = require("@atlaskit/editor-common/hooks");
 var _usePluginStateEffect = require("@atlaskit/editor-common/use-plugin-state-effect");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _indentationButtons = require("../pm-plugins/indentation-buttons");
 var _types = require("../types");
@@ -27,7 +27,7 @@ function FloatingToolbarComponent(_ref) {
     showIndentationButtons = _ref.showIndentationButtons,
     pluginInjectionApi = _ref.pluginInjectionApi,
     allowHeadingAndParagraphIndentation = _ref.allowHeadingAndParagraphIndentation;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['list', 'indentation'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(pluginInjectionApi, ['list', 'indentation'], function (states) {
       var _states$listState, _states$listState2, _states$listState3, _states$listState4, _states$indentationSt, _states$indentationSt2, _states$indentationSt3, _states$listState5;
       return {
         bulletListActive: (_states$listState = states.listState) === null || _states$listState === void 0 ? void 0 : _states$listState.bulletListActive,

package/dist/cjs/ui/Toolbar.js

@@ -11,10 +11,13 @@ var _react = _interopRequireWildcard(require("react"));
 var React = _react;
 var _runtime = require("@compiled/react/runtime");
 var _reactIntl = require("react-intl");
+var _toolbarButton = require("@atlaskit/editor-common/analytics/types/toolbar-button");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
-var _ui = require("@atlaskit/editor-common/ui");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _indentation = require("@atlaskit/editor-common/messages/indentation");
+var _list = require("@atlaskit/editor-common/messages/list");
+var _ToolbarButton = _interopRequireDefault(require("@atlaskit/editor-common/ui-menu/ToolbarButton"));
+var _ButtonGroup = require("@atlaskit/editor-common/ui-toolbar/ButtonGroup");
+var _Separator = require("@atlaskit/editor-common/ui-toolbar/Separator");
 var _listBulleted = _interopRequireDefault(require("@atlaskit/icon/core/list-bulleted"));
 var _listNumbered = _interopRequireDefault(require("@atlaskit/icon/core/list-numbered"));
 var _textIndentLeft = _interopRequireDefault(require("@atlaskit/icon/core/text-indent-left"));
@@ -36,11 +39,11 @@ function Toolbar(props) {
     outdentDisabled = props.outdentDisabled,
     onItemActivated = props.onItemActivated,
     pluginInjectionApi = props.pluginInjectionApi;
-  var labelUnorderedList = formatMessage(_messages.listMessages.unorderedList);
-  var labelOrderedList = formatMessage(_messages.listMessages.orderedList);
-  var labelListsFormat = formatMessage(_messages.listMessages.listsFormat);
-  var indentMessage = formatMessage(_messages.indentationMessages.indent);
-  var outdentMessage = formatMessage(_messages.indentationMessages.outdent);
+  var labelUnorderedList = formatMessage(_list.messages.unorderedList);
+  var labelOrderedList = formatMessage(_list.messages.orderedList);
+  var labelListsFormat = formatMessage(_list.messages.listsFormat);
+  var indentMessage = formatMessage(_indentation.messages.indent);
+  var outdentMessage = formatMessage(_indentation.messages.outdent);
   var isIndentButtonFocused = document.activeElement === indentButtonRef.current;
   var isOutdentButtonFocused = document.activeElement === outdentButtonRef.current;
   var handleOnItemActivated = function handleOnItemActivated(buttonName) {
@@ -61,11 +64,11 @@ function Toolbar(props) {
       indentButtonRef.current.focus();
     }
   }, [outdentButtonRef, outdentDisabled, isOutdentButtonFocused]);
-  return /*#__PURE__*/React.createElement(_ui.ToolbarButtonGroup, null, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(_ButtonGroup.ToolbarButtonGroup, null, /*#__PURE__*/React.createElement("div", {
     role: "group",
     "aria-label": labelListsFormat
-  }, /*#__PURE__*/React.createElement(_uiMenu.ToolbarButton, {
-    buttonId: _uiMenu.TOOLBAR_BUTTON.BULLET_LIST,
+  }, /*#__PURE__*/React.createElement(_ToolbarButton.default, {
+    buttonId: _toolbarButton.TOOLBAR_ACTION_SUBJECT_ID.BULLET_LIST,
     testId: labelUnorderedList,
     spacing: isReducedSpacing ? 'none' : 'default',
     onClick: handleOnItemActivated('bullet_list'),
@@ -83,8 +86,8 @@ function Toolbar(props) {
       color: "currentColor",
       spacing: "spacious"
     })
-  }), /*#__PURE__*/React.createElement(_uiMenu.ToolbarButton, {
-    buttonId: _uiMenu.TOOLBAR_BUTTON.ORDERED_LIST,
+  }), /*#__PURE__*/React.createElement(_ToolbarButton.default, {
+    buttonId: _toolbarButton.TOOLBAR_ACTION_SUBJECT_ID.ORDERED_LIST,
     testId: labelOrderedList,
     spacing: isReducedSpacing ? 'none' : 'default',
     onClick: handleOnItemActivated('ordered_list'),
@@ -102,9 +105,9 @@ function Toolbar(props) {
       spacing: "spacious",
       label: ""
     })
-  }), showIndentationButtons && /*#__PURE__*/React.createElement(_uiMenu.ToolbarButton, {
-    buttonId: _uiMenu.TOOLBAR_BUTTON.OUTDENT,
-    testId: _uiMenu.TOOLBAR_BUTTON.OUTDENT,
+  }), showIndentationButtons && /*#__PURE__*/React.createElement(_ToolbarButton.default, {
+    buttonId: _toolbarButton.TOOLBAR_ACTION_SUBJECT_ID.OUTDENT,
+    testId: _toolbarButton.TOOLBAR_ACTION_SUBJECT_ID.OUTDENT,
     ref: outdentButtonRef,
     spacing: isReducedSpacing ? 'none' : 'default',
     onClick: handleOnItemActivated('outdent'),
@@ -120,9 +123,9 @@ function Toolbar(props) {
       description: outdentMessage,
       keymap: _keymaps.outdent
     })
-  }), showIndentationButtons && /*#__PURE__*/React.createElement(_uiMenu.ToolbarButton, {
-    buttonId: _uiMenu.TOOLBAR_BUTTON.INDENT,
-    testId: _uiMenu.TOOLBAR_BUTTON.INDENT,
+  }), showIndentationButtons && /*#__PURE__*/React.createElement(_ToolbarButton.default, {
+    buttonId: _toolbarButton.TOOLBAR_ACTION_SUBJECT_ID.INDENT,
+    testId: _toolbarButton.TOOLBAR_ACTION_SUBJECT_ID.INDENT,
     ref: indentButtonRef,
     spacing: isReducedSpacing ? 'none' : 'default',
     onClick: handleOnItemActivated('indent'),
@@ -138,5 +141,5 @@ function Toolbar(props) {
       description: indentMessage,
       keymap: _keymaps.indent
     })
-  })), !(pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.primaryToolbar) && /*#__PURE__*/React.createElement(_ui.ToolbarSeparator, null));
+  })), !(pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.primaryToolbar) && /*#__PURE__*/React.createElement(_Separator.ToolbarSeparator, null));
 }

package/dist/cjs/ui/ToolbarDropdown.js

@@ -11,9 +11,15 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 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 _ui = require("@atlaskit/editor-common/ui");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _indentation = require("@atlaskit/editor-common/messages/indentation");
+var _list = require("@atlaskit/editor-common/messages/list");
+var _Shortcut = require("@atlaskit/editor-common/Shortcut");
+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 _listBulleted = _interopRequireDefault(require("@atlaskit/icon/core/list-bulleted"));
 var _listNumbered = _interopRequireDefault(require("@atlaskit/icon/core/list-numbered"));
 var _textIndentLeft = _interopRequireDefault(require("@atlaskit/icon/core/text-indent-left"));
@@ -40,7 +46,7 @@ function ToolbarDropdown(props) {
     _React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
     isOpenedByKeyboard = _React$useState4[0],
     setOpenedByKeyboard = _React$useState4[1];
-  var labelLists = formatMessage(_messages.listMessages.lists);
+  var labelLists = formatMessage(_list.messages.lists);
 
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -89,7 +95,7 @@ function ToolbarDropdown(props) {
     });
     isSelected = bulletListActive || orderedListActive || isDropdownOpen;
   }
-  return /*#__PURE__*/_react.default.createElement(_ui.ToolbarDropdownWrapper, null, /*#__PURE__*/_react.default.createElement(_uiMenu.DropdownMenuWithKeyboardNavigation, {
+  return /*#__PURE__*/_react.default.createElement(_DropdownWrapper.ToolbarDropdownWrapper, null, /*#__PURE__*/_react.default.createElement(_DropdownMenu.DropdownMenuWithKeyboardNavigation, {
     items: items,
     onItemActivated: handleOnItemActivated,
     mountTo: popupsMountPoint,
@@ -108,7 +114,7 @@ function ToolbarDropdown(props) {
       }
       return isOpenedByKeyboard;
     }
-  }, /*#__PURE__*/_react.default.createElement(_uiMenu.ToolbarButton, {
+  }, /*#__PURE__*/_react.default.createElement(_ToolbarButton.default, {
     spacing: isReducedSpacing ? reducedSpacing : 'default',
     selected: isSelected,
     "aria-expanded": isDropdownOpen,
@@ -118,14 +124,14 @@ function ToolbarDropdown(props) {
     onClick: handleTriggerClick,
     onKeyDown: handleOnKeyDown,
     title: labelLists,
-    iconBefore: /*#__PURE__*/_react.default.createElement(_ui.ToolbarDropdownTriggerWrapper, null, activeListIcon, /*#__PURE__*/_react.default.createElement(_ui.ToolbarExpandIcon, null))
-  })), !(pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.primaryToolbar) && /*#__PURE__*/_react.default.createElement(_ui.ToolbarSeparator, null));
+    iconBefore: /*#__PURE__*/_react.default.createElement(_DropdownTriggerWrapper.ToolbarDropdownTriggerWrapper, null, activeListIcon, /*#__PURE__*/_react.default.createElement(_ExpandIcon.ToolbarExpandIcon, null))
+  })), !(pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.primaryToolbar) && /*#__PURE__*/_react.default.createElement(_Separator.ToolbarSeparator, null));
 }
 function useItems(props) {
   var _useIntl2 = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl2.formatMessage;
-  var labelUnorderedList = formatMessage(_messages.listMessages.unorderedList);
-  var labelOrderedList = formatMessage(_messages.listMessages.orderedList);
+  var labelUnorderedList = formatMessage(_list.messages.unorderedList);
+  var labelOrderedList = formatMessage(_list.messages.orderedList);
   var items = [{
     key: 'unorderedList',
     content: labelUnorderedList,
@@ -134,7 +140,7 @@ function useItems(props) {
     },
     isDisabled: props.bulletListDisabled,
     isActive: Boolean(props.bulletListActive),
-    elemAfter: /*#__PURE__*/_react.default.createElement(_ui.Shortcut, null, (0, _keymaps.tooltip)(_keymaps.toggleBulletList)),
+    elemAfter: /*#__PURE__*/_react.default.createElement(_Shortcut.Shortcut, null, (0, _keymaps.tooltip)(_keymaps.toggleBulletList)),
     elemBefore: (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1') ? /*#__PURE__*/_react.default.createElement(_listBulleted.default, {
       label: ""
     }) : undefined
@@ -146,14 +152,14 @@ function useItems(props) {
     },
     isDisabled: props.orderedListDisabled,
     isActive: Boolean(props.orderedListActive),
-    elemAfter: /*#__PURE__*/_react.default.createElement(_ui.Shortcut, null, (0, _keymaps.tooltip)(_keymaps.toggleOrderedList)),
+    elemAfter: /*#__PURE__*/_react.default.createElement(_Shortcut.Shortcut, null, (0, _keymaps.tooltip)(_keymaps.toggleOrderedList)),
     elemBefore: (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1') ? /*#__PURE__*/_react.default.createElement(_listNumbered.default, {
       label: ""
     }) : undefined
   }];
   if (props.showIndentationButtons) {
-    var labelIndent = formatMessage(_messages.indentationMessages.indent);
-    var labelOutdent = formatMessage(_messages.indentationMessages.outdent);
+    var labelIndent = formatMessage(_indentation.messages.indent);
+    var labelOutdent = formatMessage(_indentation.messages.outdent);
     items.push({
       key: 'outdent',
       content: labelOutdent,
@@ -162,7 +168,7 @@ function useItems(props) {
       },
       isDisabled: props.outdentDisabled,
       isActive: false,
-      elemAfter: /*#__PURE__*/_react.default.createElement(_ui.Shortcut, null, (0, _keymaps.tooltip)(_keymaps.outdent)),
+      elemAfter: /*#__PURE__*/_react.default.createElement(_Shortcut.Shortcut, null, (0, _keymaps.tooltip)(_keymaps.outdent)),
       elemBefore: (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1') ? /*#__PURE__*/_react.default.createElement(_textIndentLeft.default, {
         label: ""
       }) : undefined
@@ -174,7 +180,7 @@ function useItems(props) {
       },
       isDisabled: props.indentDisabled,
       isActive: false,
-      elemAfter: /*#__PURE__*/_react.default.createElement(_ui.Shortcut, null, (0, _keymaps.tooltip)(_keymaps.indent)),
+      elemAfter: /*#__PURE__*/_react.default.createElement(_Shortcut.Shortcut, null, (0, _keymaps.tooltip)(_keymaps.indent)),
       elemBefore: (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1') ? /*#__PURE__*/_react.default.createElement(_textIndentRight.default, {
         label: ""
       }) : undefined

package/dist/cjs/ui/index.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = ToolbarListsIndentation;
 var React = _interopRequireWildcard(require("react"));
 var _runtime = require("@compiled/react/runtime");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _types = require("../types");
 var _onItemActivated = require("./onItemActivated");
@@ -34,7 +34,7 @@ function ToolbarListsIndentation(props) {
     featureFlags = props.featureFlags,
     pluginInjectionApi = props.pluginInjectionApi,
     toolbarType = props.toolbarType;
-  var inputMethod = toolbarType ? (0, _inputMethod.getInputMethod)(toolbarType) : _analytics.INPUT_METHOD.TOOLBAR;
+  var inputMethod = toolbarType ? (0, _inputMethod.getInputMethod)(toolbarType) : _enums.INPUT_METHOD.TOOLBAR;
   if (isSmall || toolbarType === _types.ToolbarType.FLOATING || (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1')) {
     var areAllOptionsDisabled = [bulletListDisabled, orderedListDisabled, indentDisabled, outdentDisabled].every(function (item) {
       return Boolean(item) === true;

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

@@ -7,7 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.BulletedListButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _listBulletedIcon = require("@atlaskit/editor-toolbar/list-bulleted-icon");
+var _toolbarButton = require("@atlaskit/editor-toolbar/toolbar-button");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
 var _BulletedListMenuItem = require("./BulletedListMenuItem");
 var BulletedListButton = exports.BulletedListButton = function BulletedListButton(_ref) {
   var api = _ref.api,
@@ -20,13 +22,13 @@ var BulletedListButton = exports.BulletedListButton = function BulletedListButto
     onClick = _useBulletedListInfo.onClick,
     isDisabled = _useBulletedListInfo.isDisabled,
     isSelected = _useBulletedListInfo.isSelected;
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
     content: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
       description: bulletMessage,
       keymap: _keymaps.toggleBulletList
     })
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.ListBulletedIcon, {
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_listBulletedIcon.ListBulletedIcon, {
       size: "small",
       label: ""
     }),

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

@@ -6,38 +6,41 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getBulletedListButtonGroup = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _rank = require("@atlaskit/editor-common/toolbar/rank");
+var _show = require("@atlaskit/editor-toolbar/show");
+var _toolbarButtonGroup = require("@atlaskit/editor-toolbar/toolbar-button-group");
 var _BulletedListButton = require("./BulletedListButton");
 var BulletedListButtonGroup = function BulletedListButtonGroup(_ref) {
   var children = _ref.children;
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorAppearance = _useEditorToolbar.editorAppearance;
   if (editorAppearance === 'full-page') {
-    return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
+    return /*#__PURE__*/_react.default.createElement(_show.Show, {
       above: "xl"
-    }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
+    }, /*#__PURE__*/_react.default.createElement(_toolbarButtonGroup.ToolbarButtonGroup, null, children));
   }
 };
 var getBulletedListButtonGroup = exports.getBulletedListButtonGroup = function getBulletedListButtonGroup(api) {
   return [{
-    type: _toolbar.BULLETED_LIST_BUTTON_GROUP.type,
-    key: _toolbar.BULLETED_LIST_BUTTON_GROUP.key,
+    type: _keys.BULLETED_LIST_BUTTON_GROUP.type,
+    key: _keys.BULLETED_LIST_BUTTON_GROUP.key,
     parents: [{
-      type: _toolbar.TEXT_SECTION_PRIMARY_TOOLBAR.type,
-      key: _toolbar.TEXT_SECTION_PRIMARY_TOOLBAR.key,
-      rank: _toolbar.TEXT_SECTION_PRIMARY_TOOLBAR_RANK[_toolbar.BULLETED_LIST_BUTTON_GROUP.key]
+      type: _keys.TEXT_SECTION_PRIMARY_TOOLBAR.type,
+      key: _keys.TEXT_SECTION_PRIMARY_TOOLBAR.key,
+      rank: _rank.TEXT_SECTION_PRIMARY_TOOLBAR_RANK[_keys.BULLETED_LIST_BUTTON_GROUP.key]
     }],
     component: function component(_ref2) {
       var children = _ref2.children;
       return /*#__PURE__*/_react.default.createElement(BulletedListButtonGroup, null, children);
     }
   }, {
-    type: _toolbar.BULLETED_LIST_BUTTON.type,
-    key: _toolbar.BULLETED_LIST_BUTTON.key,
+    type: _keys.BULLETED_LIST_BUTTON.type,
+    key: _keys.BULLETED_LIST_BUTTON.key,
     parents: [{
-      type: _toolbar.BULLETED_LIST_BUTTON_GROUP.type,
-      key: _toolbar.BULLETED_LIST_BUTTON_GROUP.key,
+      type: _keys.BULLETED_LIST_BUTTON_GROUP.type,
+      key: _keys.BULLETED_LIST_BUTTON_GROUP.key,
       rank: 100
     }],
     component: function component(_ref3) {

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

@@ -7,18 +7,20 @@ Object.defineProperty(exports, "__esModule", {
 exports.useBulletedListInfo = exports.BulletedListMenuItem = 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 _listBulletedIcon = require("@atlaskit/editor-toolbar/list-bulleted-icon");
+var _toolbarDropdownItem = require("@atlaskit/editor-toolbar/toolbar-dropdown-item");
+var _toolbarKeyboardShortcutHint = require("@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint");
 var useBulletedListInfo = exports.useBulletedListInfo = function useBulletedListInfo(_ref) {
   var api = _ref.api,
     parents = _ref.parents;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var bulletMessage = formatMessage(_messages.listMessages.bulletedList);
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['list', 'taskDecision'], function (states) {
+  var bulletMessage = formatMessage(_list.messages.bulletedList);
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['list', 'taskDecision'], function (states) {
       var _states$listState, _states$listState2, _states$taskDecisionS;
       return {
         bulletListActive: (_states$listState = states.listState) === null || _states$listState === void 0 ? void 0 : _states$listState.bulletListActive,
@@ -55,12 +57,12 @@ var BulletedListMenuItem = exports.BulletedListMenuItem = function BulletedListM
     isDisabled = _useBulletedListInfo.isDisabled,
     isSelected = _useBulletedListInfo.isSelected,
     shortcut = _useBulletedListInfo.shortcut;
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
-    elemBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.ListBulletedIcon, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
+    elemBefore: /*#__PURE__*/_react.default.createElement(_listBulletedIcon.ListBulletedIcon, {
       size: "small",
       label: ""
     }),
-    elemAfter: shortcut ? /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
+    elemAfter: shortcut ? /*#__PURE__*/_react.default.createElement(_toolbarKeyboardShortcutHint.ToolbarKeyboardShortcutHint, {
       shortcut: shortcut
     }) : undefined,
     isSelected: isSelected,

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

@@ -8,9 +8,12 @@ exports.IndentMenuItem = 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 _indentIcon = require("@atlaskit/editor-toolbar/indent-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 IndentMenuItem = exports.IndentMenuItem = function IndentMenuItem(_ref) {
   var api = _ref.api,
@@ -19,7 +22,7 @@ var IndentMenuItem = exports.IndentMenuItem = function IndentMenuItem(_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,
@@ -50,16 +53,16 @@ var IndentMenuItem = exports.IndentMenuItem = function IndentMenuItem(_ref) {
     }
   };
   var shortcut = (0, _keymaps.formatShortcut)(_keymaps.indent);
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
-    elemBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.IndentIcon, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
+    elemBefore: /*#__PURE__*/_react.default.createElement(_indentIcon.IndentIcon, {
       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.indentDisabled,
     ariaKeyshortcuts: shortcut,
     onClick: onClick
-  }, formatMessage(_messages.indentationMessages.indent));
+  }, formatMessage(_indentation.messages.indent));
 };

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

@@ -4,15 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getListsIndentationGroupForInlineToolbar = void 0;
-var _toolbar = require("@atlaskit/editor-common/toolbar");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _rank = require("@atlaskit/editor-common/toolbar/rank");
 var getListsIndentationGroupForInlineToolbar = exports.getListsIndentationGroupForInlineToolbar = function getListsIndentationGroupForInlineToolbar() {
   return [{
-    type: _toolbar.LISTS_INDENTATION_GROUP_INLINE.type,
-    key: _toolbar.LISTS_INDENTATION_GROUP_INLINE.key,
+    type: _keys.LISTS_INDENTATION_GROUP_INLINE.type,
+    key: _keys.LISTS_INDENTATION_GROUP_INLINE.key,
     parents: [{
-      type: _toolbar.TEXT_SECTION.type,
-      key: _toolbar.TEXT_SECTION.key,
-      rank: _toolbar.TEXT_SECTION_RANK[_toolbar.LISTS_INDENTATION_GROUP.key]
+      type: _keys.TEXT_SECTION.type,
+      key: _keys.TEXT_SECTION.key,
+      rank: _rank.TEXT_SECTION_RANK[_keys.LISTS_INDENTATION_GROUP.key]
     }]
   }];
 };

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

@@ -6,49 +6,52 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getListsIndentationGroupForPrimaryToolbar = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _rank = require("@atlaskit/editor-common/toolbar/rank");
+var _show = require("@atlaskit/editor-toolbar/show");
+var _toolbarButtonGroup = require("@atlaskit/editor-toolbar/toolbar-button-group");
 var ListsIndentationGroup = function ListsIndentationGroup(_ref) {
   var children = _ref.children;
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorAppearance = _useEditorToolbar.editorAppearance;
   if (editorAppearance === 'full-page') {
-    return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
+    return /*#__PURE__*/_react.default.createElement(_show.Show, {
       above: "xl"
-    }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
+    }, /*#__PURE__*/_react.default.createElement(_toolbarButtonGroup.ToolbarButtonGroup, null, children));
   }
 };
 var ListsIndentationGroupCollapsed = function ListsIndentationGroupCollapsed(_ref2) {
   var children = _ref2.children;
-  var _useEditorToolbar2 = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar2 = (0, _context.useEditorToolbar)(),
     editorAppearance = _useEditorToolbar2.editorAppearance;
   if (editorAppearance === 'full-page') {
-    return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
+    return /*#__PURE__*/_react.default.createElement(_show.Show, {
       below: "xl"
-    }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
+    }, /*#__PURE__*/_react.default.createElement(_toolbarButtonGroup.ToolbarButtonGroup, null, children));
   }
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children);
+  return /*#__PURE__*/_react.default.createElement(_toolbarButtonGroup.ToolbarButtonGroup, null, children);
 };
 var getListsIndentationGroupForPrimaryToolbar = exports.getListsIndentationGroupForPrimaryToolbar = function getListsIndentationGroupForPrimaryToolbar() {
   return [{
-    type: _toolbar.LISTS_INDENTATION_GROUP.type,
-    key: _toolbar.LISTS_INDENTATION_GROUP.key,
+    type: _keys.LISTS_INDENTATION_GROUP.type,
+    key: _keys.LISTS_INDENTATION_GROUP.key,
     parents: [{
-      type: _toolbar.TEXT_SECTION_PRIMARY_TOOLBAR.type,
-      key: _toolbar.TEXT_SECTION_PRIMARY_TOOLBAR.key,
-      rank: _toolbar.TEXT_SECTION_PRIMARY_TOOLBAR_RANK[_toolbar.LISTS_INDENTATION_GROUP.key]
+      type: _keys.TEXT_SECTION_PRIMARY_TOOLBAR.type,
+      key: _keys.TEXT_SECTION_PRIMARY_TOOLBAR.key,
+      rank: _rank.TEXT_SECTION_PRIMARY_TOOLBAR_RANK[_keys.LISTS_INDENTATION_GROUP.key]
     }],
     component: function component(_ref3) {
       var children = _ref3.children;
       return /*#__PURE__*/_react.default.createElement(ListsIndentationGroup, null, children);
     }
   }, {
-    type: _toolbar.LISTS_INDENTATION_GROUP_COLLAPSED.type,
-    key: _toolbar.LISTS_INDENTATION_GROUP_COLLAPSED.key,
+    type: _keys.LISTS_INDENTATION_GROUP_COLLAPSED.type,
+    key: _keys.LISTS_INDENTATION_GROUP_COLLAPSED.key,
     parents: [{
-      type: _toolbar.TEXT_SECTION_PRIMARY_TOOLBAR.type,
-      key: _toolbar.TEXT_SECTION_PRIMARY_TOOLBAR.key,
-      rank: _toolbar.TEXT_SECTION_PRIMARY_TOOLBAR_RANK[_toolbar.LISTS_INDENTATION_GROUP.key]
+      type: _keys.TEXT_SECTION_PRIMARY_TOOLBAR.type,
+      key: _keys.TEXT_SECTION_PRIMARY_TOOLBAR.key,
+      rank: _rank.TEXT_SECTION_PRIMARY_TOOLBAR_RANK[_keys.LISTS_INDENTATION_GROUP.key]
     }],
     component: function component(_ref4) {
       var children = _ref4.children;