@atlaskit/editor-plugin-toolbar 23.0.3 → 23.0.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-toolbar
 
+## 23.0.5
+
+### Patch Changes
+
+- Updated dependencies
+
+## 23.0.4
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 23.0.3
 
 ### Patch Changes

package/dist/cjs/pm-plugins/experiences/selection-toolbar-open-experience.js

@@ -6,8 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getSelectionToolbarOpenExperiencePlugin = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _experiences = require("@atlaskit/editor-common/experiences");
+var _consts = require("@atlaskit/editor-common/experiences/consts");
+var _Experience = require("@atlaskit/editor-common/experiences/Experience");
+var _ExperienceCheckDomMutation = require("@atlaskit/editor-common/experiences/ExperienceCheckDomMutation");
+var _ExperienceCheckTimeout = require("@atlaskit/editor-common/experiences/ExperienceCheckTimeout");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _visibility = require("../../ui/SelectionToolbar/visibility");
@@ -55,10 +59,10 @@ var getSelectionToolbarOpenExperiencePlugin = exports.getSelectionToolbarOpenExp
     var isCellSelection = !selection.empty && '$anchorCell' in selection;
     return (0, _visibility.isSelectionToolbarSuppressedByUserIntent)(getCurrentUserIntent === null || getCurrentUserIntent === void 0 ? void 0 : getCurrentUserIntent(), isCellSelection);
   };
-  var experience = new _experiences.Experience(_experiences.EXPERIENCE_ID.TOOLBAR_OPEN, {
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.SELECTION_TOOLBAR,
+  var experience = new _Experience.Experience(_consts.EXPERIENCE_ID.TOOLBAR_OPEN, {
+    actionSubjectId: _enums.ACTION_SUBJECT_ID.SELECTION_TOOLBAR,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-    checks: [new _experiences.ExperienceCheckTimeout({
+    checks: [new _ExperienceCheckTimeout.ExperienceCheckTimeout({
       durationMs: 1000,
       onTimeout: function onTimeout() {
         var _editorView2, _editorView3;
@@ -79,7 +83,7 @@ var getSelectionToolbarOpenExperiencePlugin = exports.getSelectionToolbarOpenExp
           };
         }
       }
-    }), new _experiences.ExperienceCheckDomMutation({
+    }), new _ExperienceCheckDomMutation.ExperienceCheckDomMutation({
       onDomMutation: function onDomMutation(_ref2) {
         var mutations = _ref2.mutations;
         if (mutations.some(isSelectionToolbarAddedInMutation)) {

package/dist/cjs/toolbarPlugin.js

@@ -13,7 +13,7 @@ var _bindEventListener = require("bind-event-listener");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _editorToolbarModel = require("@atlaskit/editor-toolbar-model");
+var _createRegistry = require("@atlaskit/editor-toolbar-model/create-registry");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _selectionToolbarOpenExperience = require("./pm-plugins/experiences/selection-toolbar-open-experience");
 var _pluginKey = require("./pm-plugins/plugin-key");
@@ -85,7 +85,7 @@ var toolbarPlugin = exports.toolbarPlugin = function toolbarPlugin(_ref) {
     _config$contextualFor = config.contextualFormattingEnabled,
     contextualFormattingEnabled = _config$contextualFor === void 0 ? 'always-pinned' : _config$contextualFor,
     breakpointPreset = config.breakpointPreset;
-  var registry = (0, _editorToolbarModel.createComponentRegistry)();
+  var registry = (0, _createRegistry.createComponentRegistry)();
   registry.register((0, _toolbarComponents.getToolbarComponents)(contextualFormattingEnabled, api, breakpointPreset));
   return {
     name: 'toolbar',

package/dist/cjs/ui/OverflowMenu.js

@@ -7,18 +7,20 @@ Object.defineProperty(exports, "__esModule", {
 exports.OverflowMenu = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _messages = require("@atlaskit/editor-common/messages");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _toolbar = require("@atlaskit/editor-common/messages/toolbar");
+var _showMoreHorizontal = require("@atlaskit/editor-toolbar/show-more-horizontal");
+var _toolbarDropdownMenu = require("@atlaskit/editor-toolbar/toolbar-dropdown-menu");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
 var OverflowMenu = exports.OverflowMenu = function OverflowMenu(_ref) {
   var children = _ref.children;
   var intl = (0, _reactIntl.useIntl)();
-  var tooltipContent = intl.formatMessage(_messages.toolbarMessages.selectionToolbarOverflowMenuTooltip);
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownMenu, {
+  var tooltipContent = intl.formatMessage(_toolbar.toolbarMessages.selectionToolbarOverflowMenuTooltip);
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownMenu.ToolbarDropdownMenu, {
     label: tooltipContent,
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.ShowMoreHorizontalIcon, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_showMoreHorizontal.ShowMoreHorizontalIcon, {
       label: ""
     }),
-    tooltipComponent: /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
+    tooltipComponent: /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
       content: tooltipContent,
       position: "top"
     })

package/dist/cjs/ui/OverflowMenuSection.js

@@ -6,16 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.OverflowMenuSection = 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 _toolbarDropdownItemSection = require("@atlaskit/editor-toolbar/toolbar-dropdown-item-section");
 var OverflowMenuSection = exports.OverflowMenuSection = function OverflowMenuSection(_ref) {
   var children = _ref.children;
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorViewMode = _useEditorToolbar.editorViewMode;
   var isEdit = editorViewMode === 'edit';
 
   // only show separator in edit mode, when the pinned toolbar option is available
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItemSection.ToolbarDropdownItemSection, {
     hasSeparator: isEdit
   }, children);
 };

package/dist/cjs/ui/OverflowSection.js

@@ -6,18 +6,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.OverflowSection = 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 _toolbarSection = require("@atlaskit/editor-toolbar/toolbar-section");
 var OverflowSection = exports.OverflowSection = function OverflowSection(_ref) {
   var children = _ref.children,
     hasSeparator = _ref.hasSeparator,
     testId = _ref.testId;
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorAppearance = _useEditorToolbar.editorAppearance;
   if (editorAppearance === 'full-page') {
     return null;
   }
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarSection, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarSection.ToolbarSection, {
     hasSeparator: hasSeparator,
     testId: testId
   }, children);

package/dist/cjs/ui/PrimaryToolbar.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.PrimaryToolbar = 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 _toolbar = require("@atlaskit/editor-toolbar/toolbar");
 var isFullPage = function isFullPage(editorAppearance) {
   return editorAppearance === 'full-page' || editorAppearance === 'full-width';
 };
@@ -20,9 +20,9 @@ var getBreakpointPreset = function getBreakpointPreset(breakpointPreset, editorA
 var PrimaryToolbar = exports.PrimaryToolbar = function PrimaryToolbar(_ref) {
   var children = _ref.children,
     breakpointPreset = _ref.breakpointPreset;
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorAppearance = _useEditorToolbar.editorAppearance;
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.PrimaryToolbar, {
+  return /*#__PURE__*/_react.default.createElement(_toolbar.PrimaryToolbar, {
     testId: "editor-primary-toolbar",
     breakpointPreset: getBreakpointPreset(breakpointPreset, editorAppearance)
   }, children);

package/dist/cjs/ui/Section.js

@@ -6,23 +6,24 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Section = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _hooks = require("@atlaskit/editor-common/hooks");
-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 _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _toolbarSection = require("@atlaskit/editor-toolbar/toolbar-section");
 var shouldShowSection = function shouldShowSection(editMode, toolbar, toolbarDocking, contextualFormattingEnabled) {
   if (editMode === 'view') {
     return false;
   }
-  if ((toolbar === null || toolbar === void 0 ? void 0 : toolbar.key) === _toolbar.TOOLBARS.INLINE_TEXT_TOOLBAR) {
+  if ((toolbar === null || toolbar === void 0 ? void 0 : toolbar.key) === _keys.TOOLBARS.INLINE_TEXT_TOOLBAR) {
     return toolbarDocking !== 'top' || contextualFormattingEnabled === 'always-inline';
   }
-  if ((toolbar === null || toolbar === void 0 ? void 0 : toolbar.key) === _toolbar.TOOLBARS.PRIMARY_TOOLBAR) {
+  if ((toolbar === null || toolbar === void 0 ? void 0 : toolbar.key) === _keys.TOOLBARS.PRIMARY_TOOLBAR) {
     return toolbarDocking !== 'none' || contextualFormattingEnabled === 'always-pinned';
   }
   return false;
 };
 var usePluginState = function usePluginState(_api) {
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorViewMode = _useEditorToolbar.editorViewMode,
     editorToolbarDockingPreference = _useEditorToolbar.editorToolbarDockingPreference,
     editorAppearance = _useEditorToolbar.editorAppearance;
@@ -45,7 +46,7 @@ var Section = exports.Section = function Section(_ref) {
     editorViewMode = _usePluginState.editorViewMode,
     editorToolbarDockingPreference = _usePluginState.editorToolbarDockingPreference,
     editorAppearance = _usePluginState.editorAppearance;
-  var runtimeOverride = (0, _hooks.useSharedPluginStateWithSelector)(api, ['toolbar'], function (states) {
+  var runtimeOverride = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['toolbar'], function (states) {
     var _states$toolbarState;
     return (_states$toolbarState = states.toolbarState) === null || _states$toolbarState === void 0 ? void 0 : _states$toolbarState.contextualFormattingModeOverride;
   });
@@ -58,8 +59,8 @@ var Section = exports.Section = function Section(_ref) {
   }
   var isFullPage = editorAppearance === 'full-page';
   var hasSeparator = showSeparatorInFullPagePrimaryToolbar && isFullPage;
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarSection, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarSection.ToolbarSection, {
     testId: testId,
-    hasSeparator: hasSeparator ? _editorToolbar.SeparatorPosition.START : hasSeparator
+    hasSeparator: hasSeparator ? _toolbarSection.SeparatorPosition.START : hasSeparator
   }, children);
 };

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

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -7,31 +8,36 @@ Object.defineProperty(exports, "__esModule", {
 exports.SelectionToolbarWithErrorBoundary = exports.SelectionToolbar = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _coreUtils = require("@atlaskit/editor-common/core-utils");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _isOfflineMode = require("@atlaskit/editor-common/connectivity/isOfflineMode");
 var _errorBoundary = require("@atlaskit/editor-common/error-boundary");
-var _hooks = require("@atlaskit/editor-common/hooks");
-var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _isSsr = require("@atlaskit/editor-common/is-ssr");
+var _error = require("@atlaskit/editor-common/monitoring/error");
+var _Popup = _interopRequireDefault(require("@atlaskit/editor-common/Popup"));
 var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _ui = require("@atlaskit/editor-common/ui");
-var _utils = require("@atlaskit/editor-common/utils");
-var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _EditorToolbarUIProvider = require("@atlaskit/editor-common/toolbar/EditorToolbarUIProvider");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _calculateToolbarPosition = require("@atlaskit/editor-common/utils/calculate-toolbar-position");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
-var _editorToolbarModel = require("@atlaskit/editor-toolbar-model");
+var _constants = require("@atlaskit/editor-shared-styles/constants");
+var _toolbarModelRenderer = require("@atlaskit/editor-toolbar-model/toolbar-model-renderer");
+var _toolbarButtonGroup = require("@atlaskit/editor-toolbar/toolbar-button-group");
+var _toolbarDropdownItemSection = require("@atlaskit/editor-toolbar/toolbar-dropdown-item-section");
+var _toolbarSection = require("@atlaskit/editor-toolbar/toolbar-section");
+var _uiContext = require("@atlaskit/editor-toolbar/ui-context");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _consts = require("../consts");
 var _keyboardConfig = require("./keyboard-config");
-var _utils2 = require("./utils");
+var _utils = require("./utils");
 var _visibility = require("./visibility");
 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 isToolbarComponent = function isToolbarComponent(component) {
   return component.type === 'toolbar' && component.key === 'inline-text-toolbar';
 };
 var usePluginState = function usePluginState(api) {
-  return (0, _hooks.useSharedPluginStateWithSelector)(api, ['connectivity', 'userPreferences', 'toolbar', 'selection', 'userIntent', 'editorViewMode'], function (state) {
+  return (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['connectivity', 'userPreferences', 'toolbar', 'selection', 'userIntent', 'editorViewMode'], function (state) {
     var _state$connectivitySt, _state$userPreference, _state$toolbarState, _state$toolbarState2, _state$toolbarState3, _state$selectionState, _state$userIntentStat, _state$editorViewMode;
     return {
       connectivityStateMode: (_state$connectivitySt = state.connectivityState) === null || _state$connectivitySt === void 0 ? void 0 : _state$connectivitySt.mode,
@@ -54,11 +60,11 @@ var useOnPositionCalculated = function useOnPositionCalculated(editorView) {
       });
       var isCellSelection = ('$anchorCell' in editorView.state.selection);
       if (isCellSelection && isEditorControlsEnabled) {
-        return (0, _utils.calculateToolbarPositionOnCellSelection)(_consts.SELECTION_TOOLBAR_LABEL)(editorView, position);
+        return (0, _calculateToolbarPosition.calculateToolbarPositionOnCellSelection)(_consts.SELECTION_TOOLBAR_LABEL)(editorView, position);
       }
-      return (0, _utils.calculateToolbarPositionTrackHead)(_consts.SELECTION_TOOLBAR_LABEL)(editorView, position);
+      return (0, _calculateToolbarPosition.calculateToolbarPositionTrackHead)(_consts.SELECTION_TOOLBAR_LABEL)(editorView, position);
     } catch (error) {
-      (0, _monitoring.logException)(error, {
+      (0, _error.logException)(error, {
         location: 'editor-plugin-toolbar/selectionToolbar'
       });
       return position;
@@ -90,9 +96,9 @@ var SelectionToolbar = exports.SelectionToolbar = function SelectionToolbar(_ref
   var keyboardNavigation = (0, _react.useMemo)(function () {
     return (0, _keyboardConfig.getKeyboardNavigationConfig)(editorView, intl, api);
   }, [editorView, intl, api]);
-  var _useToolbarUI = (0, _editorToolbar.useToolbarUI)(),
+  var _useToolbarUI = (0, _uiContext.useToolbarUI)(),
     isDisabled = _useToolbarUI.isDisabled;
-  var isOffline = (0, _editorPluginConnectivity.isOfflineMode)(connectivityStateMode);
+  var isOffline = (0, _isOfflineMode.isOfflineMode)(connectivityStateMode);
   var isTextSelection = !editorView.state.selection.empty && editorView.state.selection instanceof _state.TextSelection;
   var isAllSelection = !editorView.state.selection.empty && editorView.state.selection instanceof _state.AllSelection;
   var isCellSelection = !editorView.state.selection.empty && '$anchorCell' in editorView.state.selection;
@@ -102,15 +108,15 @@ var SelectionToolbar = exports.SelectionToolbar = function SelectionToolbar(_ref
   }
   if (!(isTextSelection || isCellSelection || isAllSelection) || currentUserIntent === 'dragging' || !shouldShowToolbar || currentUserIntent === 'blockMenuOpen' ||
   // hide toolbar when user intent is not default, except when it's dragHandleSelected without cell selection
-  (0, _visibility.isSelectionToolbarSuppressedByUserIntent)(currentUserIntent, isCellSelection) || (0, _coreUtils.isSSR)()) {
+  (0, _visibility.isSelectionToolbarSuppressedByUserIntent)(currentUserIntent, isCellSelection) || (0, _isSsr.isSSR)()) {
     return null;
   }
-  var toolbarContent = /*#__PURE__*/_react.default.createElement(_toolbar.EditorToolbarProvider, {
+  var toolbarContent = /*#__PURE__*/_react.default.createElement(_context.EditorToolbarProvider, {
     editorView: editorView,
     editorToolbarDockingPreference: editorToolbarDockingPreference,
     editorViewMode: editorViewMode !== null && editorViewMode !== void 0 ? editorViewMode : 'edit',
     isOffline: isOffline
-  }, /*#__PURE__*/_react.default.createElement(_toolbar.EditorToolbarUIProvider, {
+  }, /*#__PURE__*/_react.default.createElement(_EditorToolbarUIProvider.EditorToolbarUIProvider, {
     api: api,
     isDisabled: isDisabled
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
@@ -120,25 +126,25 @@ var SelectionToolbar = exports.SelectionToolbar = function SelectionToolbar(_ref
       api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.fireAnalyticsEvent(payload);
     },
     keyboardNavigation: keyboardNavigation
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbarModel.ToolbarModelRenderer, {
+  }, /*#__PURE__*/_react.default.createElement(_toolbarModelRenderer.ToolbarModelRenderer, {
     toolbar: toolbar,
     components: components
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     ,
     fallbacks: {
-      section: _editorToolbar.ToolbarSection,
-      menuSection: _editorToolbar.ToolbarDropdownItemSection,
-      group: _editorToolbar.ToolbarButtonGroup
+      section: _toolbarSection.ToolbarSection,
+      menuSection: _toolbarDropdownItemSection.ToolbarDropdownItemSection,
+      group: _toolbarButtonGroup.ToolbarButtonGroup
     }
   })));
-  return /*#__PURE__*/_react.default.createElement(_ui.Popup
+  return /*#__PURE__*/_react.default.createElement(_Popup.default
   // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
   , {
     offset: [0, 10],
-    target: (0, _utils2.getDomRefFromSelection)(editorView),
+    target: (0, _utils.getDomRefFromSelection)(editorView),
     onPositionCalculated: onPositionCalculated,
     mountTo: mountPoint,
-    zIndex: _editorSharedStyles.akEditorFloatingDialogZIndex
+    zIndex: _constants.akEditorFloatingDialogZIndex
   }, (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_toolbar_multi_editor_fix') ? /*#__PURE__*/_react.default.createElement("div", {
     onMouseUpCapture: onToolbarMouseUp
   }, toolbarContent) : toolbarContent);
@@ -151,8 +157,8 @@ var SelectionToolbarWithErrorBoundary = exports.SelectionToolbarWithErrorBoundar
     disableSelectionToolbarWhenPinned = _ref3.disableSelectionToolbarWhenPinned,
     onToolbarMouseUp = _ref3.onToolbarMouseUp;
   return /*#__PURE__*/_react.default.createElement(_errorBoundary.ErrorBoundary, {
-    component: _analytics.ACTION_SUBJECT.TOOLBAR,
-    componentId: _analytics.ACTION_SUBJECT_ID.SELECTION_TOOLBAR,
+    component: _enums.ACTION_SUBJECT.TOOLBAR,
+    componentId: _enums.ACTION_SUBJECT_ID.SELECTION_TOOLBAR,
     dispatchAnalyticsEvent: api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions.fireAnalyticsEvent,
     fallbackComponent: null
   }, /*#__PURE__*/_react.default.createElement(SelectionToolbar, {

package/dist/cjs/ui/SelectionToolbar/keyboard-config.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getKeyboardNavigationConfig = void 0;
 var _browserApis = require("@atlaskit/browser-apis");
-var _messages = require("@atlaskit/editor-common/messages");
-var _monitoring = require("@atlaskit/editor-common/monitoring");
-var _ui = require("@atlaskit/editor-common/ui");
+var _fullPage = require("@atlaskit/editor-common/messages/full-page");
+var _error = require("@atlaskit/editor-common/monitoring/error");
+var _uiToolbar = require("@atlaskit/editor-common/ui-toolbar");
 var _toolbar = require("../utils/toolbar");
 var getKeyboardNavigationConfig = exports.getKeyboardNavigationConfig = function getKeyboardNavigationConfig(editorView, intl, api) {
   if (!(editorView.dom instanceof HTMLElement)) {
@@ -41,7 +41,7 @@ var getKeyboardNavigationConfig = exports.getKeyboardNavigationConfig = function
         event.stopPropagation();
       } catch (error) {
         if (error instanceof Error) {
-          (0, _monitoring.logException)(error, {
+          (0, _error.logException)(error, {
             location: 'editor-plugin-toolbar/selectionToolbar'
           });
         }
@@ -58,13 +58,13 @@ var getKeyboardNavigationConfig = exports.getKeyboardNavigationConfig = function
         event.stopPropagation();
       } catch (error) {
         if (error instanceof Error) {
-          (0, _monitoring.logException)(error, {
+          (0, _error.logException)(error, {
             location: 'editor-plugin-toolbar/selectionToolbar'
           });
         }
       }
     },
-    ariaControls: _ui.EDIT_AREA_ID,
-    ariaLabel: intl.formatMessage(_messages.fullPageMessages.toolbarLabel)
+    ariaControls: _uiToolbar.EDIT_AREA_ID,
+    ariaLabel: intl.formatMessage(_fullPage.messages.toolbarLabel)
   };
 };

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

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getDomRefFromSelection = void 0;
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _error = require("@atlaskit/editor-common/monitoring/error");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var getDomRefFromSelection = exports.getDomRefFromSelection = function getDomRefFromSelection(view, dispatchAnalyticsEvent) {
   try {
@@ -17,11 +17,11 @@ var getDomRefFromSelection = exports.getDomRefFromSelection = function getDomRef
   } catch (error) {
     if (dispatchAnalyticsEvent) {
       var payload = {
-        action: _analytics.ACTION.ERRORED,
-        actionSubject: _analytics.ACTION_SUBJECT.CONTENT_COMPONENT,
-        eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+        action: _enums.ACTION.ERRORED,
+        actionSubject: _enums.ACTION_SUBJECT.CONTENT_COMPONENT,
+        eventType: _enums.EVENT_TYPE.OPERATIONAL,
         attributes: {
-          component: _analytics.CONTENT_COMPONENT.SELECTION_TOOLBAR,
+          component: _enums.CONTENT_COMPONENT.SELECTION_TOOLBAR,
           selection: view.state.selection.toJSON(),
           position: view.state.selection.from,
           docSize: view.state.doc.nodeSize,
@@ -34,7 +34,7 @@ var getDomRefFromSelection = exports.getDomRefFromSelection = function getDomRef
       dispatchAnalyticsEvent(payload);
     }
     if (error instanceof Error) {
-      (0, _monitoring.logException)(error, {
+      (0, _error.logException)(error, {
         location: 'editor-plugin-toolbar/selectionToolbar'
       });
     }

package/dist/cjs/ui/TextCollapsedMenu.js

@@ -7,8 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.TextCollapsedMenu = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _messages = require("@atlaskit/editor-common/messages");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _toolbar = require("@atlaskit/editor-common/messages/toolbar");
+var _textIcon = require("@atlaskit/editor-toolbar/text-icon");
+var _toolbarDropdownMenu = require("@atlaskit/editor-toolbar/toolbar-dropdown-menu");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
 /**
  * Basic version of existing 'Text Styles' Menu - which doesn't dynamically change icon
  * and is also placeholder to render all other menus in the collapsed state.
@@ -17,14 +19,14 @@ var TextCollapsedMenu = exports.TextCollapsedMenu = function TextCollapsedMenu(_
   var children = _ref.children;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownMenu, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.TextIcon, {
-      label: formatMessage(_messages.toolbarMessages.textStylesTooltip),
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownMenu.ToolbarDropdownMenu, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_textIcon.TextIcon, {
+      label: formatMessage(_toolbar.toolbarMessages.textStylesTooltip),
       size: "small"
     }),
     enableMaxHeight: true,
-    tooltipComponent: /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
-      content: formatMessage(_messages.toolbarMessages.textStylesTooltip)
+    tooltipComponent: /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
+      content: formatMessage(_toolbar.toolbarMessages.textStylesTooltip)
     })
   }, children);
 };