@atlaskit/editor-plugin-insert-block 27.0.3 → 27.0.5

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

@@ -9,14 +9,18 @@ exports.InsertButton = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _ui = require("@atlaskit/editor-common/ui");
-var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
-var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
+var _Popup = _interopRequireDefault(require("@atlaskit/editor-common/Popup"));
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _useSharedPluginStateSelector = require("@atlaskit/editor-common/useSharedPluginStateSelector");
+var _constants = require("@atlaskit/editor-shared-styles/constants");
+var _addIcon = require("@atlaskit/editor-toolbar/add-icon");
+var _toolbarButton = require("@atlaskit/editor-toolbar/toolbar-button");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
+var _uiContext = require("@atlaskit/editor-toolbar/ui-context");
 var _InsertMenu = _interopRequireWildcard(require("../ElementBrowser/InsertMenu"));
 var _filterDropdownItems = require("./hooks/filterDropdownItems");
 var _useEmojiPickerPopup = require("./hooks/useEmojiPickerPopup");
@@ -44,9 +48,9 @@ var InsertButton = exports.InsertButton = function InsertButton(_ref) {
     numberOfButtons = _ref.numberOfButtons,
     onInsertBlockType = _ref.onInsertBlockType,
     toolbarConfig = _ref.toolbarConfig;
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorView = _useEditorToolbar.editorView;
-  var _useToolbarUI = (0, _editorToolbar.useToolbarUI)(),
+  var _useToolbarUI = (0, _uiContext.useToolbarUI)(),
     isDisabled = _useToolbarUI.isDisabled,
     popupsMountPoint = _useToolbarUI.popupsMountPoint,
     popupsBoundariesElement = _useToolbarUI.popupsBoundariesElement,
@@ -122,13 +126,13 @@ var InsertButton = exports.InsertButton = function InsertButton(_ref) {
         queueMicrotask(function () {
           var _api$table, _api$table$actions$in, _api$table$actions;
           api === null || api === void 0 || (_api$table = api.table) === null || _api$table === void 0 || (_api$table$actions$in = (_api$table$actions = _api$table.actions).insertTable) === null || _api$table$actions$in === void 0 || _api$table$actions$in.call(_api$table$actions, {
-            action: _analytics.ACTION.INSERTED,
-            actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-            actionSubjectId: _analytics.ACTION_SUBJECT_ID.TABLE,
+            action: _enums.ACTION.INSERTED,
+            actionSubject: _enums.ACTION_SUBJECT.DOCUMENT,
+            actionSubjectId: _enums.ACTION_SUBJECT_ID.TABLE,
             attributes: {
               inputMethod: inputMethod
             },
-            eventType: _analytics.EVENT_TYPE.TRACK
+            eventType: _enums.EVENT_TYPE.TRACK
           })(state, dispatch);
         });
         break;
@@ -194,13 +198,13 @@ var InsertButton = exports.InsertButton = function InsertButton(_ref) {
     var item = _ref3.item;
     onItemActivated({
       item: item,
-      inputMethod: _analytics.INPUT_METHOD.INSERT_MENU
+      inputMethod: _enums.INPUT_METHOD.INSERT_MENU
     });
   };
   var toggleVisibility = function toggleVisibility() {
     toggleInsertMenuOpen(!insertMenuOpen);
   };
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, insertMenuOpen && insertButtonRef.current && editorView && /*#__PURE__*/_react.default.createElement(_ui.Popup, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, insertMenuOpen && insertButtonRef.current && editorView && /*#__PURE__*/_react.default.createElement(_Popup.default, {
     target: insertButtonRef.current,
     fitHeight: _InsertMenu.DEFAULT_HEIGHT + FIT_HEIGHT_BUFFER,
     fitWidth: 350
@@ -212,7 +216,7 @@ var InsertButton = exports.InsertButton = function InsertButton(_ref) {
     scrollableElement: popupsScrollableElement,
     onUnmount: onPopupUnmount,
     focusTrap: true,
-    zIndex: _editorSharedStyles.akEditorMenuZIndex,
+    zIndex: _constants.akEditorMenuZIndex,
     preventOverflow: true,
     alignX: "right"
   }, /*#__PURE__*/_react.default.createElement(_InsertMenu.default, {
@@ -235,21 +239,21 @@ var InsertButton = exports.InsertButton = function InsertButton(_ref) {
     popupsMountPoint: popupsMountPoint,
     popupsBoundariesElement: popupsBoundariesElement,
     popupsScrollableElement: popupsScrollableElement
-  }), /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
+  }), /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
     content: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
-      description: formatMessage(_messages.toolbarInsertBlockMessages.insertMenu),
+      description: formatMessage(_insertBlock.toolbarInsertBlockMessages.insertMenu),
       keymap: _keymaps.insertElements
     })
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.AddIcon, {
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_addIcon.AddIcon, {
       size: "small",
-      label: formatMessage(_messages.toolbarInsertBlockMessages.insertMenu)
+      label: formatMessage(_insertBlock.toolbarInsertBlockMessages.insertMenu)
     }),
     ariaKeyshortcuts: (0, _keymaps.getAriaKeyshortcuts)(_keymaps.insertElements),
     ref: insertButtonRef,
     onClick: onClick,
     isSelected: insertMenuOpen,
     isDisabled: !isTypeAheadAllowed || isDisabled,
-    testId: _toolbar.TOOLBAR_BUTTON_TEST_ID.INSERT
+    testId: _keys.TOOLBAR_BUTTON_TEST_ID.INSERT
   })));
 };

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

@@ -7,15 +7,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.LayoutButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _messages = require("@atlaskit/editor-common/messages");
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _layoutIcon = require("@atlaskit/editor-toolbar/layout-icon");
+var _toolbarButton = require("@atlaskit/editor-toolbar/toolbar-button");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
 var LayoutButton = exports.LayoutButton = function LayoutButton(_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;
   if (!(api !== null && api !== void 0 && api.layout)) {
     return null;
@@ -25,17 +28,17 @@ var LayoutButton = exports.LayoutButton = function LayoutButton(_ref) {
       var _api$layout;
       var state = editorView.state,
         dispatch = editorView.dispatch;
-      api === null || api === void 0 || (_api$layout = api.layout) === null || _api$layout === void 0 || _api$layout.actions.insertLayoutColumns(_analytics.INPUT_METHOD.TOOLBAR)(state, dispatch);
+      api === null || api === void 0 || (_api$layout = api.layout) === null || _api$layout === void 0 || _api$layout.actions.insertLayoutColumns(_enums.INPUT_METHOD.TOOLBAR)(state, dispatch);
     }
   };
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
-    content: formatMessage(_messages.toolbarInsertBlockMessages.columns)
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.LayoutIcon, {
-      label: formatMessage(_messages.toolbarInsertBlockMessages.columns),
+  return /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
+    content: formatMessage(_insertBlock.toolbarInsertBlockMessages.columns)
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_layoutIcon.LayoutIcon, {
+      label: formatMessage(_insertBlock.toolbarInsertBlockMessages.columns),
       size: "small"
     }),
     onClick: onClick,
-    testId: _toolbar.TOOLBAR_BUTTON_TEST_ID.LAYOUT
+    testId: _keys.TOOLBAR_BUTTON_TEST_ID.LAYOUT
   }));
 };

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

@@ -7,21 +7,24 @@ Object.defineProperty(exports, "__esModule", {
 exports.MediaButton = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _hooks = require("@atlaskit/editor-common/hooks");
-var _messages = require("@atlaskit/editor-common/messages");
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _isOfflineMode = require("@atlaskit/editor-common/connectivity/isOfflineMode");
+var _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _imageIcon = require("@atlaskit/editor-toolbar/image-icon");
+var _toolbarButton = require("@atlaskit/editor-toolbar/toolbar-button");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
+var _uiContext = require("@atlaskit/editor-toolbar/ui-context");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 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); }
 var MediaButton = exports.MediaButton = function MediaButton(_ref) {
   var api = _ref.api;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var _useToolbarUI = (0, _editorToolbar.useToolbarUI)(),
+  var _useToolbarUI = (0, _uiContext.useToolbarUI)(),
     popupsMountPoint = _useToolbarUI.popupsMountPoint;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['media', 'connectivity'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['media', 'connectivity'], function (states) {
       var _states$mediaState, _states$mediaState2, _states$connectivityS;
       return {
         showMediaPicker: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.showMediaPicker,
@@ -55,27 +58,27 @@ var MediaButton = exports.MediaButton = function MediaButton(_ref) {
       showMediaPicker();
     }
     api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.fireAnalyticsEvent({
-      action: _analytics.ACTION.OPENED,
-      actionSubject: _analytics.ACTION_SUBJECT.PICKER,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.PICKER_MEDIA,
+      action: _enums.ACTION.OPENED,
+      actionSubject: _enums.ACTION_SUBJECT.PICKER,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.PICKER_MEDIA,
       attributes: {
-        inputMethod: _analytics.INPUT_METHOD.TOOLBAR
+        inputMethod: _enums.INPUT_METHOD.TOOLBAR
       },
-      eventType: _analytics.EVENT_TYPE.UI
+      eventType: _enums.EVENT_TYPE.UI
     });
   };
-  var isOffline = (0, _editorPluginConnectivity.isOfflineMode)(connectivityMode);
+  var isOffline = (0, _isOfflineMode.isOfflineMode)(connectivityMode);
   var isDisabled = isOffline || !(allowsUploads || (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_ssr_toolbar_optimistic') && isUploadPending);
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
-    content: formatMessage(_messages.toolbarInsertBlockMessages.addMediaFiles)
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.ImageIcon, {
-      label: formatMessage(_messages.toolbarInsertBlockMessages.addMediaFiles),
+  return /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
+    content: formatMessage(_insertBlock.toolbarInsertBlockMessages.addMediaFiles)
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_imageIcon.ImageIcon, {
+      label: formatMessage(_insertBlock.toolbarInsertBlockMessages.addMediaFiles),
       size: "small"
     }),
     onClick: onClick,
     ref: mediaButtonRef,
     isDisabled: isDisabled,
-    testId: _toolbar.TOOLBAR_BUTTON_TEST_ID.MEDIA
+    testId: _keys.TOOLBAR_BUTTON_TEST_ID.MEDIA
   }));
 };

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

@@ -7,18 +7,20 @@ Object.defineProperty(exports, "__esModule", {
 exports.MentionButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _hooks = require("@atlaskit/editor-common/hooks");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 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 _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _mentionIcon = require("@atlaskit/editor-toolbar/mention-icon");
+var _toolbarButton = require("@atlaskit/editor-toolbar/toolbar-button");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var MentionButton = exports.MentionButton = function MentionButton(_ref) {
   var api = _ref.api;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['mention', 'typeAhead'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['mention', 'typeAhead'], function (states) {
       var _states$mentionState, _states$mentionState2, _states$mentionState3, _states$typeAheadStat;
       return {
         canInsertMention: (_states$mentionState = states.mentionState) === null || _states$mentionState === void 0 ? void 0 : _states$mentionState.canInsertMention,
@@ -38,25 +40,25 @@ var MentionButton = exports.MentionButton = function MentionButton(_ref) {
   }
   var onClick = function onClick() {
     var _api$mention;
-    api === null || api === void 0 || (_api$mention = api.mention) === null || _api$mention === void 0 || (_api$mention = _api$mention.actions) === null || _api$mention === void 0 || _api$mention.openTypeAhead(_analytics.INPUT_METHOD.TOOLBAR);
+    api === null || api === void 0 || (_api$mention = api.mention) === null || _api$mention === void 0 || (_api$mention = _api$mention.actions) === null || _api$mention === void 0 || _api$mention.openTypeAhead(_enums.INPUT_METHOD.TOOLBAR);
   };
 
   // The SSR state cannot resolve providers. Keep pending and available visually identical,
   // while preserving known selection restrictions and settled provider failures.
   var isDisabled = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_ssr_toolbar_optimistic') ? canInsertMention === false || hasMentionState && isTypeAheadAllowed === false || mentionProviderStatus !== 'pending' && hasMentionState && !mentionProvider : !canInsertMention || !mentionProvider || !isTypeAheadAllowed;
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
     content: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
-      description: formatMessage(_messages.toolbarInsertBlockMessages.mention),
+      description: formatMessage(_insertBlock.toolbarInsertBlockMessages.mention),
       keymap: _keymaps.insertMention
     })
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.MentionIcon, {
-      label: formatMessage(_messages.toolbarInsertBlockMessages.mention),
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_mentionIcon.MentionIcon, {
+      label: formatMessage(_insertBlock.toolbarInsertBlockMessages.mention),
       size: "small"
     }),
     onClick: onClick,
     ariaKeyshortcuts: "Shift+2 Space",
     isDisabled: isDisabled,
-    testId: _toolbar.TOOLBAR_BUTTON_TEST_ID.MENTION
+    testId: _keys.TOOLBAR_BUTTON_TEST_ID.MENTION
   }));
 };

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

@@ -7,16 +7,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.TableButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 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 _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _tableIcon = require("@atlaskit/editor-toolbar/table-icon");
+var _toolbarButton = require("@atlaskit/editor-toolbar/toolbar-button");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
 var TableButton = exports.TableButton = function TableButton(_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;
   if (!(api !== null && api !== void 0 && api.table)) {
     return null;
@@ -29,29 +32,29 @@ var TableButton = exports.TableButton = function TableButton(_ref) {
       queueMicrotask(function () {
         var _api$table, _api$table$actions$in, _api$table$actions;
         api === null || api === void 0 || (_api$table = api.table) === null || _api$table === void 0 || (_api$table$actions$in = (_api$table$actions = _api$table.actions).insertTable) === null || _api$table$actions$in === void 0 || _api$table$actions$in.call(_api$table$actions, {
-          action: _analytics.ACTION.INSERTED,
-          actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-          actionSubjectId: _analytics.ACTION_SUBJECT_ID.TABLE,
+          action: _enums.ACTION.INSERTED,
+          actionSubject: _enums.ACTION_SUBJECT.DOCUMENT,
+          actionSubjectId: _enums.ACTION_SUBJECT_ID.TABLE,
           attributes: {
-            inputMethod: _analytics.INPUT_METHOD.TOOLBAR
+            inputMethod: _enums.INPUT_METHOD.TOOLBAR
           },
-          eventType: _analytics.EVENT_TYPE.TRACK
+          eventType: _enums.EVENT_TYPE.TRACK
         })(state, dispatch);
       });
     }
   };
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
     content: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
-      description: formatMessage(_messages.toolbarInsertBlockMessages.table),
+      description: formatMessage(_insertBlock.toolbarInsertBlockMessages.table),
       keymap: _keymaps.toggleTable
     })
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.TableIcon, {
-      label: formatMessage(_messages.toolbarInsertBlockMessages.table),
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_tableIcon.TableIcon, {
+      label: formatMessage(_insertBlock.toolbarInsertBlockMessages.table),
       size: "small"
     }),
     onClick: onClick,
     ariaKeyshortcuts: (0, _keymaps.getAriaKeyshortcuts)(_keymaps.toggleTable),
-    testId: _toolbar.TOOLBAR_BUTTON_TEST_ID.TABLE
+    testId: _keys.TOOLBAR_BUTTON_TEST_ID.TABLE
   }));
 };

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

@@ -7,9 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.TableSizePicker = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
-var _messages = require("@atlaskit/editor-common/messages");
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _moreItemsIcon = require("@atlaskit/editor-toolbar/more-items-icon");
+var _toolbarButton = require("@atlaskit/editor-toolbar/toolbar-button");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
+var _uiContext = require("@atlaskit/editor-toolbar/ui-context");
 var _useTableSelectorPopup = require("./hooks/useTableSelectorPopup");
 var _TableSelectorPopupWrapper = require("./popups/TableSelectorPopupWrapper");
 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); }
@@ -19,7 +22,7 @@ var TableSizePicker = exports.TableSizePicker = function TableSizePicker(_ref) {
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var tableSizePickerRef = (0, _react.useRef)(null);
-  var _useToolbarUI = (0, _editorToolbar.useToolbarUI)(),
+  var _useToolbarUI = (0, _uiContext.useToolbarUI)(),
     popupsMountPoint = _useToolbarUI.popupsMountPoint,
     popupsBoundariesElement = _useToolbarUI.popupsBoundariesElement,
     popupsScrollableElement = _useToolbarUI.popupsScrollableElement;
@@ -47,15 +50,15 @@ var TableSizePicker = exports.TableSizePicker = function TableSizePicker(_ref) {
     popupsMountPoint: popupsMountPoint,
     popupsBoundariesElement: popupsBoundariesElement,
     popupsScrollableElement: popupsScrollableElement
-  }), /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
-    content: formatMessage(_messages.toolbarInsertBlockMessages.tableSelector)
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.MoreItemsIcon, {
-      label: formatMessage(_messages.toolbarInsertBlockMessages.tableSelector)
+  }), /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
+    content: formatMessage(_insertBlock.toolbarInsertBlockMessages.tableSelector)
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_moreItemsIcon.MoreItemsIcon, {
+      label: formatMessage(_insertBlock.toolbarInsertBlockMessages.tableSelector)
     }),
     onClick: onClick,
     isSelected: tableSelectorPopup.isOpen,
     ref: tableSizePickerRef,
-    testId: _toolbar.TOOLBAR_BUTTON_TEST_ID.TABLE_SELECTOR
+    testId: _keys.TOOLBAR_BUTTON_TEST_ID.TABLE_SELECTOR
   })));
 };

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

@@ -7,16 +7,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.TaskListButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 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 _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _taskIcon = require("@atlaskit/editor-toolbar/task-icon");
+var _toolbarButton = require("@atlaskit/editor-toolbar/toolbar-button");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
 var TaskListButton = exports.TaskListButton = function TaskListButton(_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;
   if (!(api !== null && api !== void 0 && api.taskDecision)) {
     return null;
@@ -26,21 +29,21 @@ var TaskListButton = exports.TaskListButton = function TaskListButton(_ref) {
       var _api$taskDecision;
       var state = editorView.state,
         dispatch = editorView.dispatch;
-      api === null || api === void 0 || (_api$taskDecision = api.taskDecision) === null || _api$taskDecision === void 0 || _api$taskDecision.actions.insertTaskDecision('taskList', _analytics.INPUT_METHOD.TOOLBAR)(state, dispatch);
+      api === null || api === void 0 || (_api$taskDecision = api.taskDecision) === null || _api$taskDecision === void 0 || _api$taskDecision.actions.insertTaskDecision('taskList', _enums.INPUT_METHOD.TOOLBAR)(state, dispatch);
     }
   };
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
     content: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
-      description: formatMessage(_messages.toolbarInsertBlockMessages.action),
+      description: formatMessage(_insertBlock.toolbarInsertBlockMessages.action),
       keymap: _keymaps.insertTaskList
     })
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.TaskIcon, {
-      label: formatMessage(_messages.toolbarInsertBlockMessages.action),
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_taskIcon.TaskIcon, {
+      label: formatMessage(_insertBlock.toolbarInsertBlockMessages.action),
       size: "small"
     }),
     onClick: onClick,
     ariaKeyshortcuts: "[ ] Space",
-    testId: _toolbar.TOOLBAR_BUTTON_TEST_ID.TASK_LIST
+    testId: _keys.TOOLBAR_BUTTON_TEST_ID.TASK_LIST
   }));
 };

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

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.useEmojiPickerPopup = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _usePopupManager = require("./usePopupManager");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -21,13 +21,13 @@ var useEmojiPickerPopup = exports.useEmojiPickerPopup = function useEmojiPickerP
         if (isOpen) {
           var _api$analytics;
           api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.fireAnalyticsEvent({
-            action: _analytics.ACTION.OPENED,
-            actionSubject: _analytics.ACTION_SUBJECT.PICKER,
-            actionSubjectId: _analytics.ACTION_SUBJECT_ID.PICKER_EMOJI,
+            action: _enums.ACTION.OPENED,
+            actionSubject: _enums.ACTION_SUBJECT.PICKER,
+            actionSubjectId: _enums.ACTION_SUBJECT_ID.PICKER_EMOJI,
             attributes: {
-              inputMethod: _analytics.INPUT_METHOD.TOOLBAR
+              inputMethod: _enums.INPUT_METHOD.TOOLBAR
             },
-            eventType: _analytics.EVENT_TYPE.UI
+            eventType: _enums.EVENT_TYPE.UI
           });
         }
       }
@@ -36,7 +36,7 @@ var useEmojiPickerPopup = exports.useEmojiPickerPopup = function useEmojiPickerP
   var handleSelectedEmoji = (0, _react.useCallback)(function (emojiId) {
     var _api$emoji;
     api === null || api === void 0 || api.core.actions.focus();
-    api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$emoji = api.emoji) === null || _api$emoji === void 0 ? void 0 : _api$emoji.commands.insertEmoji(emojiId, _analytics.INPUT_METHOD.PICKER));
+    api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$emoji = api.emoji) === null || _api$emoji === void 0 ? void 0 : _api$emoji.commands.insertEmoji(emojiId, _enums.INPUT_METHOD.PICKER));
     popupManager.close();
     return true;
   }, [api, popupManager]);

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

@@ -8,8 +8,8 @@ exports.useInsertButtonState = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _reactIntl = require("react-intl");
-var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
-var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
+var _isOfflineMode = require("@atlaskit/editor-common/connectivity/isOfflineMode");
+var _useSharedPluginStateSelector = require("@atlaskit/editor-common/useSharedPluginStateSelector");
 var _createItems = require("../../ToolbarInsertBlock/create-items");
 var _filterDropdownItems = require("./filterDropdownItems");
 var useInsertButtonState = exports.useInsertButtonState = function useInsertButtonState(_ref) {
@@ -43,7 +43,7 @@ var useInsertButtonState = exports.useInsertButtonState = function useInsertButt
   // Computed values
   var mediaUploadsEnabled = mediaAllowsUploads;
   var mediaSupported = mediaAllowsUploads !== undefined;
-  var isEditorOffline = (0, _editorPluginConnectivity.isOfflineMode)(connectivityMode);
+  var isEditorOffline = (0, _isOfflineMode.isOfflineMode)(connectivityMode);
   var imageUploadSupported = !!(api !== null && api !== void 0 && api.imageUpload);
   var mentionsDisabled = !canInsertMention;
   var linkSupported = canInsertLink !== undefined;

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

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.useTableSelectorPopup = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _usePopupManager = require("./usePopupManager");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -21,7 +21,7 @@ var useTableSelectorPopup = exports.useTableSelectorPopup = function useTableSel
     // workaround to solve race condition where cursor is not placed correctly inside table
     queueMicrotask(function () {
       var _api$core, _api$table;
-      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$table = api.table) === null || _api$table === void 0 ? void 0 : _api$table.commands.insertTableWithSize(rowsCount, colsCount, _analytics.INPUT_METHOD.PICKER));
+      api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$table = api.table) === null || _api$table === void 0 ? void 0 : _api$table.commands.insertTableWithSize(rowsCount, colsCount, _enums.INPUT_METHOD.PICKER));
     });
     popupManager.close();
   }, [api, popupManager]);

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

@@ -6,9 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.EmojiPickerPopup = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _ui = require("@atlaskit/editor-common/ui");
+var _Popup = _interopRequireDefault(require("@atlaskit/editor-common/Popup"));
 var _uiReact = require("@atlaskit/editor-common/ui-react");
-var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _withReactEditorViewOuterListeners = _interopRequireDefault(require("@atlaskit/editor-common/ui-react/with-react-editor-view-outer-listeners"));
+var _constants = require("@atlaskit/editor-shared-styles/constants");
 var _picker = require("@atlaskit/emoji/picker");
 var EmojiPicker = function EmojiPicker(props) {
   var setOutsideClickTargetRef = _react.default.useContext(_uiReact.OutsideClickTargetRefContext);
@@ -19,7 +20,7 @@ var EmojiPicker = function EmojiPicker(props) {
     onSelection: props.onSelection
   });
 };
-var EmojiPickerWithListeners = (0, _uiReact.withReactEditorViewOuterListeners)(EmojiPicker);
+var EmojiPickerWithListeners = (0, _withReactEditorViewOuterListeners.default)(EmojiPicker);
 var EmojiPickerPopup = exports.EmojiPickerPopup = function EmojiPickerPopup(_ref) {
   var contentId = _ref.contentId,
     isOpen = _ref.isOpen,
@@ -35,7 +36,7 @@ var EmojiPickerPopup = exports.EmojiPickerPopup = function EmojiPickerPopup(_ref
   if (!isOpen || !targetRef.current || !emojiProvider) {
     return null;
   }
-  return /*#__PURE__*/_react.default.createElement(_ui.Popup, {
+  return /*#__PURE__*/_react.default.createElement(_Popup.default, {
     target: targetRef.current,
     fitHeight: 350,
     fitWidth: 350
@@ -47,7 +48,7 @@ var EmojiPickerPopup = exports.EmojiPickerPopup = function EmojiPickerPopup(_ref
     scrollableElement: popupsScrollableElement,
     onUnmount: onUnmount,
     focusTrap: true,
-    zIndex: _editorSharedStyles.akEditorMenuZIndex
+    zIndex: _constants.akEditorMenuZIndex
   }, /*#__PURE__*/_react.default.createElement(EmojiPickerWithListeners, {
     contentId: contentId,
     emojiProvider: emojiProvider,

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.TableSelectorPopupWrapper = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _ui = require("@atlaskit/editor-common/ui");
+var _TableSelector = require("@atlaskit/editor-common/TableSelector");
 var TableSelectorPopupWrapper = exports.TableSelectorPopupWrapper = function TableSelectorPopupWrapper(_ref) {
   var isOpen = _ref.isOpen,
     targetRef = _ref.targetRef,
@@ -21,7 +21,7 @@ var TableSelectorPopupWrapper = exports.TableSelectorPopupWrapper = function Tab
   if (!isOpen || !targetRef.current) {
     return null;
   }
-  return /*#__PURE__*/_react.default.createElement(_ui.TableSelectorPopup, {
+  return /*#__PURE__*/_react.default.createElement(_TableSelector.TableSelectorPopup, {
     allowOutsideSelection: true,
     target: targetRef.current,
     onUnmount: onUnmount,