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

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

@@ -17,13 +17,15 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _messages = require("@atlaskit/editor-common/messages");
-var _styles = require("@atlaskit/editor-common/styles");
-var _ui = require("@atlaskit/editor-common/ui");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
+var _Popup = _interopRequireDefault(require("@atlaskit/editor-common/Popup"));
+var _plugins = require("@atlaskit/editor-common/styles/plugins");
+var _TableSelector = require("@atlaskit/editor-common/TableSelector");
+var _ToolbarButton = _interopRequireDefault(require("@atlaskit/editor-common/ui-menu/ToolbarButton"));
 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 _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
@@ -71,7 +73,7 @@ var EmojiPicker = function EmojiPicker(props) {
     onPickerRef: setOutsideClickTargetRef
   }, props));
 };
-var EmojiPickerWithListeners = (0, _uiReact.withReactEditorViewOuterListeners)(EmojiPicker);
+var EmojiPickerWithListeners = (0, _withReactEditorViewOuterListeners.default)(EmojiPicker);
 var tableButtonWrapper = exports.tableButtonWrapper = function tableButtonWrapper(_ref) {
   var isTableSelectorOpen = _ref.isTableSelectorOpen,
     isButtonDisabled = _ref.isButtonDisabled;
@@ -116,15 +118,15 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
         var isPlusMenuOpen = _this.state.isPlusMenuOpen;
         if (isPlusMenuOpen) {
           return dispatchAnalyticsEvent({
-            action: _analytics.ACTION.OPENED,
-            actionSubject: _analytics.ACTION_SUBJECT.PLUS_MENU,
-            eventType: _analytics.EVENT_TYPE.UI
+            action: _enums.ACTION.OPENED,
+            actionSubject: _enums.ACTION_SUBJECT.PLUS_MENU,
+            eventType: _enums.EVENT_TYPE.UI
           });
         }
         return dispatchAnalyticsEvent({
-          action: _analytics.ACTION.CLOSED,
-          actionSubject: _analytics.ACTION_SUBJECT.PLUS_MENU,
-          eventType: _analytics.EVENT_TYPE.UI
+          action: _enums.ACTION.CLOSED,
+          actionSubject: _enums.ACTION_SUBJECT.PLUS_MENU,
+          eventType: _enums.EVENT_TYPE.UI
         });
       });
     });
@@ -160,7 +162,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
       }
     });
     (0, _defineProperty2.default)(_this, "toggleEmojiPicker", function () {
-      var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _analytics.INPUT_METHOD.TOOLBAR;
+      var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _enums.INPUT_METHOD.TOOLBAR;
       _this.setState(function (prevState) {
         return {
           emojiPickerOpen: !prevState.emojiPickerOpen
@@ -170,13 +172,13 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
           var dispatchAnalyticsEvent = _this.props.dispatchAnalyticsEvent;
           if (dispatchAnalyticsEvent) {
             dispatchAnalyticsEvent({
-              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: inputMethod
               },
-              eventType: _analytics.EVENT_TYPE.UI
+              eventType: _enums.EVENT_TYPE.UI
             });
           }
         }
@@ -184,7 +186,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
     });
     (0, _defineProperty2.default)(_this, "handleEmojiPressEscape", function () {
       var _this$emojiButtonRef;
-      _this.toggleEmojiPicker(_analytics.INPUT_METHOD.KEYBOARD);
+      _this.toggleEmojiPicker(_enums.INPUT_METHOD.KEYBOARD);
       (_this$emojiButtonRef = _this.emojiButtonRef) === null || _this$emojiButtonRef === void 0 || (_this$emojiButtonRef = _this$emojiButtonRef.deref()) === null || _this$emojiButtonRef === void 0 || _this$emojiButtonRef.focus();
     });
     (0, _defineProperty2.default)(_this, "handleEmojiClickOutside", function (e) {
@@ -195,7 +197,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
       // Ignored via go/ees005
       // eslint-disable-next-line @atlaskit/editor/no-as-casting
       if (e.target && !isDetachedElement(e.target)) {
-        _this.toggleEmojiPicker(_analytics.INPUT_METHOD.TOOLBAR);
+        _this.toggleEmojiPicker(_enums.INPUT_METHOD.TOOLBAR);
       }
     });
     (0, _defineProperty2.default)(_this, "getToolbarButtonTestId", function (btn) {
@@ -230,7 +232,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
       }
     });
     (0, _defineProperty2.default)(_this, "toggleTableSelector", function () {
-      var _inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _analytics.INPUT_METHOD.TOOLBAR;
+      var _inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _enums.INPUT_METHOD.TOOLBAR;
       _this.setState(function (prevState) {
         return {
           isTableSelectorOpen: !prevState.isTableSelectorOpen
@@ -238,12 +240,12 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
       });
     });
     (0, _defineProperty2.default)(_this, "handleSelectedTableSize", function (rowsCount, colsCount) {
-      _this.insertTableWithSize(_analytics.INPUT_METHOD.TOOLBAR, rowsCount, colsCount)();
+      _this.insertTableWithSize(_enums.INPUT_METHOD.TOOLBAR, rowsCount, colsCount)();
       _this.toggleTableSelector();
     });
     (0, _defineProperty2.default)(_this, "handleTableSelectorPressEscape", function () {
       var _this$tableSelectorBu;
-      _this.toggleTableSelector(_analytics.INPUT_METHOD.KEYBOARD);
+      _this.toggleTableSelector(_enums.INPUT_METHOD.KEYBOARD);
       (_this$tableSelectorBu = _this.tableSelectorButtonRef.current) === null || _this$tableSelectorBu === void 0 || _this$tableSelectorBu.focus();
     });
     (0, _defineProperty2.default)(_this, "handleTableSelectorClickOutside", function (e) {
@@ -251,7 +253,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
       // Ignored via go/ees005
       // eslint-disable-next-line @atlaskit/editor/no-as-casting
       if (e.target && !isDetachedElement(e.target)) {
-        _this.toggleTableSelector(_analytics.INPUT_METHOD.TOOLBAR);
+        _this.toggleTableSelector(_enums.INPUT_METHOD.TOOLBAR);
       }
     });
     (0, _defineProperty2.default)(_this, "handleClick", function () {
@@ -303,13 +305,13 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
       queueMicrotask(function () {
         var _pluginInjectionApi$t, _pluginInjectionApi$t2, _pluginInjectionApi$t3;
         pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$t = pluginInjectionApi.table) === null || _pluginInjectionApi$t === void 0 || (_pluginInjectionApi$t2 = (_pluginInjectionApi$t3 = _pluginInjectionApi$t.actions).insertTable) === null || _pluginInjectionApi$t2 === void 0 || _pluginInjectionApi$t2.call(_pluginInjectionApi$t3, {
-          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);
       });
     });
@@ -320,7 +322,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
         // workaround to solve race condition where cursor is not placed correctly inside table
         queueMicrotask(function () {
           var _pluginInjectionApi$c3, _pluginInjectionApi$t4;
-          pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c3 = pluginInjectionApi.core) === null || _pluginInjectionApi$c3 === void 0 || _pluginInjectionApi$c3.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$t4 = pluginInjectionApi.table) === null || _pluginInjectionApi$t4 === void 0 ? void 0 : _pluginInjectionApi$t4.commands.insertTableWithSize(rowsCount, colsCount, _analytics.INPUT_METHOD.PICKER));
+          pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c3 = pluginInjectionApi.core) === null || _pluginInjectionApi$c3 === void 0 || _pluginInjectionApi$c3.actions.execute(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$t4 = pluginInjectionApi.table) === null || _pluginInjectionApi$t4 === void 0 ? void 0 : _pluginInjectionApi$t4.commands.insertTableWithSize(rowsCount, colsCount, _enums.INPUT_METHOD.PICKER));
         });
       };
     });
@@ -367,13 +369,13 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
         onShowMediaPicker(args);
         if (dispatchAnalyticsEvent) {
           dispatchAnalyticsEvent({
-            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: inputMethod
             },
-            eventType: _analytics.EVENT_TYPE.UI
+            eventType: _enums.EVENT_TYPE.UI
           });
         }
       }
@@ -427,7 +429,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
       var _pluginInjectionApi$c6, _pluginInjectionApi$e3;
       var pluginInjectionApi = _this.props.pluginInjectionApi;
       _this.props.editorView.focus();
-      pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c6 = pluginInjectionApi.core) === null || _pluginInjectionApi$c6 === void 0 || _pluginInjectionApi$c6.actions.execute((_pluginInjectionApi$e3 = pluginInjectionApi.emoji) === null || _pluginInjectionApi$e3 === void 0 ? void 0 : _pluginInjectionApi$e3.commands.insertEmoji(emojiId, _analytics.INPUT_METHOD.PICKER));
+      pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c6 = pluginInjectionApi.core) === null || _pluginInjectionApi$c6 === void 0 || _pluginInjectionApi$c6.actions.execute((_pluginInjectionApi$e3 = pluginInjectionApi.emoji) === null || _pluginInjectionApi$e3 === void 0 ? void 0 : _pluginInjectionApi$e3.commands.insertEmoji(emojiId, _enums.INPUT_METHOD.PICKER));
       _this.toggleEmojiPicker();
       return true;
     });
@@ -516,14 +518,14 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
     (0, _defineProperty2.default)(_this, "insertToolbarMenuItem", function (btn) {
       return _this.onItemActivated({
         item: btn,
-        inputMethod: _analytics.INPUT_METHOD.TOOLBAR
+        inputMethod: _enums.INPUT_METHOD.TOOLBAR
       });
     });
     (0, _defineProperty2.default)(_this, "insertInsertMenuItem", function (_ref5) {
       var item = _ref5.item;
       return _this.onItemActivated({
         item: item,
-        inputMethod: _analytics.INPUT_METHOD.INSERT_MENU
+        inputMethod: _enums.INPUT_METHOD.INSERT_MENU
       });
     });
     return _this;
@@ -587,7 +589,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
           return (_this2$props$pluginIn = _this2.props.pluginInjectionApi) === null || _this2$props$pluginIn === void 0 || (_this2$props$pluginIn = _this2$props$pluginIn.core) === null || _this2$props$pluginIn === void 0 || (_this2$props$pluginIn = _this2$props$pluginIn.actions) === null || _this2$props$pluginIn === void 0 ? void 0 : _this2$props$pluginIn.focus();
         });
       };
-      return (0, _react2.jsx)(_ui.Popup, {
+      return (0, _react2.jsx)(_Popup.default, {
         target: ref.deref(),
         fitHeight: 350,
         fitWidth: 350
@@ -599,7 +601,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
         scrollableElement: popupsScrollableElement,
         onUnmount: onUnmount,
         focusTrap: true,
-        zIndex: _editorSharedStyles.akEditorMenuZIndex
+        zIndex: _constants.akEditorMenuZIndex
       }, (0, _react2.jsx)(EmojiPickerWithListeners, {
         contentId: this.props.emojiContentId,
         emojiProvider: emojiProvider,
@@ -634,7 +636,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
         var _pluginInjectionApi$c7;
         return pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$c7 = pluginInjectionApi.core) === null || _pluginInjectionApi$c7 === void 0 || (_pluginInjectionApi$c7 = _pluginInjectionApi$c7.actions) === null || _pluginInjectionApi$c7 === void 0 ? void 0 : _pluginInjectionApi$c7.focus();
       };
-      return (0, _react2.jsx)(_ui.TableSelectorPopup, {
+      return (0, _react2.jsx)(_TableSelector.TableSelectorPopup, {
         allowOutsideSelection: true,
         target: ref,
         onUnmount: onUnmount,
@@ -714,9 +716,9 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
       return (0, _react2.jsx)("span", {
         css:
         // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
-        _styles.buttonGroupStyle
+        _plugins.buttonGroupStyle
       }, toolbarButtons.map(function (btn) {
-        return (0, _react2.jsx)(_uiMenu.ToolbarButton, {
+        return (0, _react2.jsx)(_ToolbarButton.default, {
           item: btn,
           testId: _this3.getToolbarButtonTestId(btn),
           ref: _this3.handleToolbarRef(btn.value.name),
@@ -737,7 +739,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
           isTableSelectorOpen: isTableSelectorOpen,
           isButtonDisabled: (_tableButton = tableButton) === null || _tableButton === void 0 ? void 0 : _tableButton.isDisabled
         })
-      }, isTableButtonVisible && (0, _react2.jsx)(_uiMenu.ToolbarButton
+      }, isTableButtonVisible && (0, _react2.jsx)(_ToolbarButton.default
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop, @atlaskit/design-system/no-unsafe-style-overrides -- Ignored via go/DSP-18766
       , {
         className: "table-toolbar-btn",
@@ -754,7 +756,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
         "aria-haspopup": tableButton ? tableButton['aria-haspopup'] : undefined,
         "aria-keyshortcuts": tableButton ? tableButton['aria-keyshortcuts'] : undefined,
         onItemClick: this.insertToolbarMenuItem
-      }), isTableButtonVisible && (0, _react2.jsx)(_uiMenu.ToolbarButton
+      }), isTableButtonVisible && (0, _react2.jsx)(_ToolbarButton.default
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop, @atlaskit/design-system/no-unsafe-style-overrides -- Ignored via go/DSP-18766
       , {
         className: "table-selector-toolbar-btn",
@@ -773,7 +775,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
         onItemClick: this.insertToolbarMenuItem,
         onKeyDown: this.handleTableSelectorOpenByKeyboard
       })), (0, _react2.jsx)("span", {
-        css: _styles.wrapperStyle
+        css: _plugins.wrapperStyle
       }, this.renderPopup(), this.renderTableSelectorPopup(), (0, _react2.jsx)(_blockInsertMenu.BlockInsertMenu, {
         popupsMountPoint: this.props.popupsMountPoint,
         popupsBoundariesElement: this.props.popupsBoundariesElement,
@@ -781,7 +783,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
         disabled: (_this$props$isDisable = this.props.isDisabled) !== null && _this$props$isDisable !== void 0 ? _this$props$isDisable : false,
         editorView: this.props.editorView,
         spacing: this.props.isReducedSpacing ? 'none' : 'default',
-        label: this.props.intl.formatMessage(_messages.toolbarInsertBlockMessages.insertMenu),
+        label: this.props.intl.formatMessage(_insertBlock.toolbarInsertBlockMessages.insertMenu),
         open: this.state.isPlusMenuOpen,
         plusButtonRef: (_this$plusButtonRef = this.plusButtonRef) === null || _this$plusButtonRef === void 0 ? void 0 : _this$plusButtonRef.deref(),
         items: this.state.dropdownItems,
@@ -798,7 +800,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
       })), (!((_this$props$pluginInj = this.props.pluginInjectionApi) !== null && _this$props$pluginInj !== void 0 && _this$props$pluginInj.primaryToolbar) && this.props.showSeparator || isFullPageAppearance && (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1')) && /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage */
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
       (0, _react2.jsx)("span", {
-        css: _styles.separatorStyles
+        css: _plugins.separatorStyles
       }));
     }
   }], [{

package/dist/cjs/ui/ToolbarInsertBlock/item.js

@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
+var _main = require("@atlaskit/editor-shared-styles/shortcut/main");
 var _fieldText = _interopRequireDefault(require("@atlaskit/icon-lab/core/field-text"));
 var _lozenge = _interopRequireDefault(require("@atlaskit/icon-lab/core/lozenge"));
 var _angleBrackets = _interopRequireDefault(require("@atlaskit/icon/core/angle-brackets"));
@@ -50,7 +50,7 @@ var from = function from(init) {
     elemAfter: init.shortcut ?
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
     (0, _react2.jsx)("div", {
-      css: _shortcut.shortcutStyle
+      css: _main.shortcutStyle
     }, init.shortcut) : undefined,
     'aria-label': init.shortcut ? init.content + ' ' + init.shortcut : init.content,
     'aria-haspopup': init['aria-haspopup'],

package/dist/cjs/ui/registered-insert-menu/RegisteredInsertButton.js

@@ -9,13 +9,14 @@ exports.RegisteredInsertButton = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
-var _hooks = require("@atlaskit/editor-common/hooks");
+var _isOfflineMode = require("@atlaskit/editor-common/connectivity/isOfflineMode");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
+var _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
+var _Popup = _interopRequireDefault(require("@atlaskit/editor-common/Popup"));
 var _useMenuPopupSizing = require("@atlaskit/editor-common/quick-insert/use-menu-popup-sizing");
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _ui = require("@atlaskit/editor-common/ui");
-var _connectivityPluginType = require("@atlaskit/editor-plugin-connectivity/connectivityPluginType");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
 var _constants = require("@atlaskit/editor-shared-styles/constants");
 var _addIcon = require("@atlaskit/editor-toolbar/add-icon");
 var _toolbarButton = require("@atlaskit/editor-toolbar/toolbar-button");
@@ -31,7 +32,7 @@ var POPUP_OFFSET = [0, 3];
  */
 var RegisteredInsertButton = exports.RegisteredInsertButton = function RegisteredInsertButton(_ref) {
   var api = _ref.api;
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorView = _useEditorToolbar.editorView;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
@@ -53,7 +54,7 @@ var RegisteredInsertButton = exports.RegisteredInsertButton = function Registere
     offset: POPUP_OFFSET[1],
     isOpen: isOpen
   });
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['connectivity', 'typeAhead'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['connectivity', 'typeAhead'], function (states) {
       var _states$connectivityS, _states$typeAheadStat;
       return {
         connectivityMode: (_states$connectivityS = states.connectivityState) === null || _states$connectivityS === void 0 ? void 0 : _states$connectivityS.mode,
@@ -90,14 +91,14 @@ var RegisteredInsertButton = exports.RegisteredInsertButton = function Registere
   }
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__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(_toolbarButton.ToolbarButton, {
     ariaKeyshortcuts: (0, _keymaps.getAriaKeyshortcuts)(_keymaps.insertElements),
     iconBefore: /*#__PURE__*/_react.default.createElement(_addIcon.AddIcon, {
       size: "small",
-      label: formatMessage(_messages.toolbarInsertBlockMessages.insertMenu)
+      label: formatMessage(_insertBlock.toolbarInsertBlockMessages.insertMenu)
     }),
     isDisabled: !isAllowed || isDisabled,
     isSelected: isOpen,
@@ -105,8 +106,8 @@ var RegisteredInsertButton = exports.RegisteredInsertButton = function Registere
       return close(true);
     } : open,
     ref: buttonRef,
-    testId: _toolbar.TOOLBAR_BUTTON_TEST_ID.INSERT
-  })), isOpen && buttonRef.current && /*#__PURE__*/_react.default.createElement(_ui.Popup, {
+    testId: _keys.TOOLBAR_BUTTON_TEST_ID.INSERT
+  })), isOpen && buttonRef.current && /*#__PURE__*/_react.default.createElement(_Popup.default, {
     alignX: "right",
     boundariesElement: popupsBoundariesElement,
     fitHeight: menuHeight,
@@ -122,7 +123,7 @@ var RegisteredInsertButton = exports.RegisteredInsertButton = function Registere
     api: api,
     maxHeight: menuHeight,
     editorView: editorView,
-    isOffline: (0, _connectivityPluginType.isOfflineMode)(connectivityMode),
+    isOffline: (0, _isOfflineMode.isOfflineMode)(connectivityMode),
     onClose: closeAndRestoreFocus,
     onDismiss: closeForSelection,
     onSelect: closeForSelection,

package/dist/cjs/ui/registered-insert-menu/RegisteredInsertMenu.js

@@ -14,7 +14,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
 var _browserApis = require("@atlaskit/browser-apis");
-var _messages = require("@atlaskit/editor-common/messages");
+var _insertBlock = require("@atlaskit/editor-common/messages/insert-block");
 var _keys = require("@atlaskit/editor-common/quick-insert/keys");
 var _registeredMenuModel = require("@atlaskit/editor-common/quick-insert/registered-menu-model");
 var _typeAheadIsSectionOverflowItemKey = require("@atlaskit/editor-common/type-ahead-is-section-overflow-item-key");
@@ -179,7 +179,7 @@ var RegisteredInsertMenu = exports.RegisteredInsertMenu = function RegisteredIns
     emptyStateHandler: emptyStateHandler,
     isOffline: isOffline,
     listId: listId,
-    listLabel: formatMessage(_messages.toolbarInsertBlockMessages.insertMenu),
+    listLabel: formatMessage(_insertBlock.toolbarInsertBlockMessages.insertMenu),
     maxHeight: maxHeight,
     menuOpenId: menuOpenId,
     model: model,

package/dist/cjs/ui/registered-insert-menu/RegisteredInsertMenuContent.js

@@ -10,6 +10,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _keys = require("@atlaskit/editor-common/quick-insert/keys");
 var _ui = require("@atlaskit/editor-common/ui");
+var _withOuterListeners = _interopRequireDefault(require("@atlaskit/editor-common/with-outer-listeners"));
 var _RegisteredInsertMenu = require("./RegisteredInsertMenu");
 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 RegisteredInsertMenuContainer = function RegisteredInsertMenuContainer(_ref) {
@@ -19,7 +20,7 @@ var RegisteredInsertMenuContainer = function RegisteredInsertMenuContainer(_ref)
     ref: setOutsideClickTargetRef
   }, children);
 };
-var RegisteredInsertMenuWithListeners = (0, _ui.withOuterListeners)(RegisteredInsertMenuContainer);
+var RegisteredInsertMenuWithListeners = (0, _withOuterListeners.default)(RegisteredInsertMenuContainer);
 var RegisteredInsertMenuContent = exports.RegisteredInsertMenuContent = function RegisteredInsertMenuContent(_ref2) {
   var _api$quickInsert;
   var api = _ref2.api,

package/dist/cjs/ui/registered-insert-menu/RegisteredInsertMenuItem.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.RegisteredInsertMenuItem = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _insert = require("@atlaskit/editor-common/insert");
 var _provider = require("@atlaskit/editor-common/quick-insert/provider");
 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); }
@@ -32,7 +32,7 @@ var RegisteredInsertMenuItem = exports.RegisteredInsertMenuItem = function Regis
       };
       var transaction = selectionHandler({
         insert: insert,
-        source: _analytics.INPUT_METHOD.INSERT_MENU
+        source: _enums.INPUT_METHOD.INSERT_MENU
       });
       if (transaction) {
         editorView.dispatch(transaction);

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

@@ -7,16 +7,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.CodeBlockButton = 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 _blockType = require("@atlaskit/editor-common/messages/block-type");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _codeIcon = require("@atlaskit/editor-toolbar/code-icon");
+var _toolbarButton = require("@atlaskit/editor-toolbar/toolbar-button");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
 var CodeBlockButton = exports.CodeBlockButton = function CodeBlockButton(_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.codeBlock)) {
     return null;
@@ -24,17 +26,17 @@ var CodeBlockButton = exports.CodeBlockButton = function CodeBlockButton(_ref) {
   var onClick = function onClick() {
     if (editorView) {
       var _api$codeBlock;
-      api === null || api === void 0 || (_api$codeBlock = api.codeBlock) === null || _api$codeBlock === void 0 || _api$codeBlock.actions.insertCodeBlock(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+      api === null || api === void 0 || (_api$codeBlock = api.codeBlock) === null || _api$codeBlock === void 0 || _api$codeBlock.actions.insertCodeBlock(_enums.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.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.blockTypeMessages.codeblock),
+      description: formatMessage(_blockType.messages.codeblock),
       keymap: _keymaps.toggleCodeBlock
     })
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.CodeIcon, {
-      label: formatMessage(_messages.blockTypeMessages.codeblock),
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_codeIcon.CodeIcon, {
+      label: formatMessage(_blockType.messages.codeblock),
       size: "small"
     }),
     onClick: onClick,

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

@@ -7,11 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.EmojiButton = void 0;
 var _react = _interopRequireWildcard(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 _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 _emojiIcon = require("@atlaskit/editor-toolbar/emoji-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 _useEmojiPickerPopup = require("./hooks/useEmojiPickerPopup");
 var _EmojiPickerPopup = require("./popups/EmojiPickerPopup");
 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); }
@@ -20,11 +23,11 @@ var EmojiButton = exports.EmojiButton = function EmojiButton(_ref) {
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var emojiButtonRef = (0, _react.useRef)(null);
-  var _useToolbarUI = (0, _editorToolbar.useToolbarUI)(),
+  var _useToolbarUI = (0, _uiContext.useToolbarUI)(),
     popupsMountPoint = _useToolbarUI.popupsMountPoint,
     popupsBoundariesElement = _useToolbarUI.popupsBoundariesElement,
     popupsScrollableElement = _useToolbarUI.popupsScrollableElement;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['emoji', 'typeAhead'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['emoji', 'typeAhead'], function (states) {
       var _states$emojiState, _states$emojiState2, _states$typeAheadStat;
       return {
         contentId: (_states$emojiState = states.emojiState) === null || _states$emojiState === void 0 ? void 0 : _states$emojiState.contentId,
@@ -54,14 +57,14 @@ var EmojiButton = exports.EmojiButton = function EmojiButton(_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.emoji),
+      description: formatMessage(_insertBlock.toolbarInsertBlockMessages.emoji),
       keymap: _keymaps.insertEmoji
     })
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.EmojiIcon, {
-      label: formatMessage(_messages.toolbarInsertBlockMessages.emoji),
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_emojiIcon.EmojiIcon, {
+      label: formatMessage(_insertBlock.toolbarInsertBlockMessages.emoji),
       size: "small"
     }),
     ariaKeyshortcuts: "Shift+;",
@@ -73,6 +76,6 @@ var EmojiButton = exports.EmojiButton = function EmojiButton(_ref) {
     },
     isSelected: emojiPickerPopup.isOpen,
     isDisabled: !isTypeAheadAllowed || !emojiProviderPromise,
-    testId: _toolbar.TOOLBAR_BUTTON_TEST_ID.EMOJI
+    testId: _keys.TOOLBAR_BUTTON_TEST_ID.EMOJI
   })));
 };

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

@@ -7,16 +7,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.ImageButton = 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 _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _isOfflineMode = require("@atlaskit/editor-common/connectivity/isOfflineMode");
+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 _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 ImageButton = exports.ImageButton = function ImageButton(_ref) {
   var api = _ref.api;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['connectivity', 'imageUpload'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['connectivity', 'imageUpload'], function (states) {
       var _states$connectivityS, _states$imageUploadSt;
       return {
         connectivityMode: (_states$connectivityS = states.connectivityState) === null || _states$connectivityS === void 0 ? void 0 : _states$connectivityS.mode,
@@ -25,9 +28,9 @@ var ImageButton = exports.ImageButton = function ImageButton(_ref) {
     }),
     connectivityMode = _useSharedPluginState.connectivityMode,
     imageUploadEnabled = _useSharedPluginState.imageUploadEnabled;
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorView = _useEditorToolbar.editorView;
-  var isOffline = (0, _editorPluginConnectivity.isOfflineMode)(connectivityMode);
+  var isOffline = (0, _isOfflineMode.isOfflineMode)(connectivityMode);
   var onClick = function onClick() {
     if (editorView) {
       var _api$imageUpload;
@@ -36,15 +39,15 @@ var ImageButton = exports.ImageButton = function ImageButton(_ref) {
       api === null || api === void 0 || (_api$imageUpload = api.imageUpload) === null || _api$imageUpload === void 0 || _api$imageUpload.actions.startUpload()(state, dispatch);
     }
   };
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
-    content: formatMessage(_messages.toolbarInsertBlockMessages.image)
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.ImageIcon, {
-      label: formatMessage(_messages.toolbarInsertBlockMessages.image),
+  return /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
+    content: formatMessage(_insertBlock.toolbarInsertBlockMessages.image)
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_imageIcon.ImageIcon, {
+      label: formatMessage(_insertBlock.toolbarInsertBlockMessages.image),
       size: "small"
     }),
     onClick: onClick,
     isDisabled: !imageUploadEnabled || isOffline,
-    testId: _toolbar.TOOLBAR_BUTTON_TEST_ID.IMAGE
+    testId: _keys.TOOLBAR_BUTTON_TEST_ID.IMAGE
   }));
 };