@atlaskit/editor-plugin-selection-toolbar 27.0.3 → 27.0.5

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-selection-toolbar
 
+## 27.0.5
+
+### Patch Changes
+
+- [`dbf4584638609`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/dbf4584638609) -
+  Deduplicate the node types collected for the selection toolbar so large selections no longer build
+  an entry per node, behind the `platform_editor_reduce_memory_leaks` experiment.
+- Updated dependencies
+
+## 27.0.4
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 27.0.3
 
 ### Patch Changes

package/dist/cjs/pm-plugins/get-selection-node-types.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getSelectionNodeTypes = getSelectionNodeTypes;
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
+function getSelectionNodeTypes(state) {
+  var _state$selection = state.selection,
+    from = _state$selection.from,
+    to = _state$selection.to;
+  if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_reduce_memory_leaks')) {
+    var _selectionNodeTypes = new Set();
+    state.doc.nodesBetween(from, to, function (node) {
+      _selectionNodeTypes.add(node.type);
+    });
+    return Array.from(_selectionNodeTypes);
+  }
+  var selectionNodeTypes = [];
+  state.doc.nodesBetween(from, to, function (node) {
+    if (selectionNodeTypes.indexOf(node.type) !== 0) {
+      selectionNodeTypes.push(node.type);
+    }
+  });
+  return selectionNodeTypes;
+}

package/dist/cjs/selectionToolbarPlugin.js

@@ -10,10 +10,11 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _react = _interopRequireDefault(require("react"));
 var _bindEventListener = require("bind-event-listener");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _utils = require("@atlaskit/editor-common/utils");
+var _calculateToolbarPosition = require("@atlaskit/editor-common/utils/calculate-toolbar-position");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _commands = require("./pm-plugins/commands");
+var _getSelectionNodeTypes = require("./pm-plugins/get-selection-node-types");
 var _pluginKey = require("./pm-plugins/plugin-key");
 var _pinToolbarConfig = require("./ui/pin-toolbar-config");
 var _PrimaryToolbarComponent = require("./ui/PrimaryToolbarComponent");
@@ -326,12 +327,12 @@ var selectionToolbarPlugin = exports.selectionToolbarPlugin = function selection
         var onPositionCalculated;
         var toolbarTitle = 'Selection toolbar';
         if (isCellSelection && isEditorControlsEnabled) {
-          onPositionCalculated = (0, _utils.calculateToolbarPositionOnCellSelection)(toolbarTitle);
+          onPositionCalculated = (0, _calculateToolbarPosition.calculateToolbarPositionOnCellSelection)(toolbarTitle);
         } else {
-          var calcToolbarPosition = config.preferenceToolbarAboveSelection ? _utils.calculateToolbarPositionAboveSelection : _utils.calculateToolbarPositionTrackHead;
+          var calcToolbarPosition = config.preferenceToolbarAboveSelection ? _calculateToolbarPosition.calculateToolbarPositionAboveSelection : _calculateToolbarPosition.calculateToolbarPositionTrackHead;
           onPositionCalculated = calcToolbarPosition(toolbarTitle);
         }
-        var nodeType = getSelectionNodeTypes(state);
+        var nodeType = (0, _getSelectionNodeTypes.getSelectionNodeTypes)(state);
         return _objectSpread(_objectSpread({
           title: 'Selection toolbar',
           nodeType: nodeType,
@@ -348,15 +349,6 @@ var selectionToolbarPlugin = exports.selectionToolbarPlugin = function selection
     }) ? primaryToolbarComponent : undefined
   };
 };
-function getSelectionNodeTypes(state) {
-  var selectionNodeTypes = [];
-  state.doc.nodesBetween(state.selection.from, state.selection.to, function (node) {
-    if (selectionNodeTypes.indexOf(node.type) !== 0) {
-      selectionNodeTypes.push(node.type);
-    }
-  });
-  return selectionNodeTypes;
-}
 var _hasNestedSpanWithText = function hasNestedSpanWithText(element, text) {
   if (element.tagName === 'SPAN' && element.innerHTML === text) {
     return true;

package/dist/cjs/ui/MenuSection.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.MenuSection = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _toolbarDropdownItemSection = require("@atlaskit/editor-toolbar/toolbar-dropdown-item-section");
 var usePluginState = function usePluginState(_api) {
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorViewMode = _useEditorToolbar.editorViewMode;
   return {
     editorViewMode: editorViewMode
@@ -24,7 +24,7 @@ var MenuSection = exports.MenuSection = function MenuSection(_ref) {
   if (!isEdit) {
     return null;
   }
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItemSection.ToolbarDropdownItemSection, {
     hasSeparator: isEdit
   }, children);
 };

package/dist/cjs/ui/PinButton.js

@@ -7,20 +7,22 @@ Object.defineProperty(exports, "__esModule", {
 exports.PinButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _hooks = require("@atlaskit/editor-common/hooks");
-var _messages = require("@atlaskit/editor-common/messages");
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _selectionToolbar = require("@atlaskit/editor-common/messages/selection-toolbar");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _pinnedIcon = require("@atlaskit/editor-toolbar/pinned-icon");
+var _toolbarButton = require("@atlaskit/editor-toolbar/toolbar-button");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
 var PinButton = exports.PinButton = function PinButton(_ref) {
   var api = _ref.api;
   var intl = (0, _reactIntl.useIntl)();
-  var message = intl.formatMessage(_messages.selectionToolbarMessages.toolbarPositionPinedAtTop);
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var message = intl.formatMessage(_selectionToolbar.selectionToolbarMessages.toolbarPositionPinedAtTop);
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     isDisabled = _useEditorToolbar.isOffline;
   // Pin/unpin is meaningless when a runtime override forces `'always-pinned'`
   // (e.g. Markdown Mode source / preview view). Subscribe so we re-render and
   // hide ourselves on flip.
-  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;
   });
@@ -34,10 +36,10 @@ var PinButton = exports.PinButton = function PinButton(_ref) {
     }
     api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 ? void 0 : _api$userPreferences.actions.updateUserPreference('toolbarDockingPosition', 'none'));
   };
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
     content: message
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.PinnedIcon, {
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_pinnedIcon.PinnedIcon, {
       size: "small",
       label: ""
     }),

package/dist/cjs/ui/PinMenuItem.js

@@ -7,15 +7,17 @@ Object.defineProperty(exports, "__esModule", {
 exports.PinMenuItem = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _hooks = require("@atlaskit/editor-common/hooks");
-var _messages = require("@atlaskit/editor-common/messages");
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _selectionToolbar = require("@atlaskit/editor-common/messages/selection-toolbar");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _pinIcon = require("@atlaskit/editor-toolbar/pin-icon");
+var _pinnedIcon = require("@atlaskit/editor-toolbar/pinned-icon");
+var _toolbarDropdownItem = require("@atlaskit/editor-toolbar/toolbar-dropdown-item");
 var shouldShowPinMenuItem = function shouldShowPinMenuItem(editMode) {
   return editMode !== 'view';
 };
 var usePluginState = function usePluginState(_api) {
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorViewMode = _useEditorToolbar.editorViewMode,
     editorToolbarDockingPreference = _useEditorToolbar.editorToolbarDockingPreference,
     isOffline = _useEditorToolbar.isOffline;
@@ -33,7 +35,7 @@ var PinMenuItem = exports.PinMenuItem = function PinMenuItem(_ref) {
   var api = _ref.api,
     disablePin = _ref.disablePin;
   var intl = (0, _reactIntl.useIntl)();
-  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;
   });
@@ -52,14 +54,14 @@ var PinMenuItem = exports.PinMenuItem = function PinMenuItem(_ref) {
     }
     api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 ? void 0 : _api$userPreferences.actions.updateUserPreference('toolbarDockingPosition', isToolbarDocked ? 'none' : 'top'));
   };
-  var message = intl.formatMessage(isToolbarDocked ? _messages.selectionToolbarMessages.toolbarPositionPinedAtTop : _messages.selectionToolbarMessages.toolbarPositionUnpinnedConcise);
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+  var message = intl.formatMessage(isToolbarDocked ? _selectionToolbar.selectionToolbarMessages.toolbarPositionPinedAtTop : _selectionToolbar.selectionToolbarMessages.toolbarPositionUnpinnedConcise);
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
     onClick: onClick,
     isDisabled: isDisabled,
-    elemBefore: isToolbarDocked ? /*#__PURE__*/_react.default.createElement(_editorToolbar.PinnedIcon, {
+    elemBefore: isToolbarDocked ? /*#__PURE__*/_react.default.createElement(_pinnedIcon.PinnedIcon, {
       size: "small",
       label: ""
-    }) : /*#__PURE__*/_react.default.createElement(_editorToolbar.PinIcon, {
+    }) : /*#__PURE__*/_react.default.createElement(_pinIcon.PinIcon, {
       size: "small",
       label: ""
     })

package/dist/cjs/ui/PrimaryToolbarComponent.js

@@ -11,10 +11,10 @@ require("./PrimaryToolbarComponent.compiled.css");
 var React = _interopRequireWildcard(require("react"));
 var _runtime = require("@compiled/react/runtime");
 var _reactIntl = require("react-intl");
-var _messages = require("@atlaskit/editor-common/messages");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
-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 _selectionToolbar = require("@atlaskit/editor-common/messages/selection-toolbar");
+var _ToolbarButton = _interopRequireDefault(require("@atlaskit/editor-common/ui-menu/ToolbarButton"));
+var _useSharedPluginStateSelector = require("@atlaskit/editor-common/useSharedPluginStateSelector");
 var _pin = _interopRequireDefault(require("@atlaskit/icon/core/pin"));
 var _pinFilled = _interopRequireDefault(require("@atlaskit/icon/core/pin-filled"));
 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); }
@@ -29,11 +29,11 @@ var PrimaryToolbarComponent = exports.PrimaryToolbarComponent = function Primary
     disabled = _ref.disabled;
   var intl = (0, _reactIntl.useIntl)();
   var mode = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'connectivity.mode');
-  var isOffline = (0, _editorPluginConnectivity.isOfflineMode)(mode);
+  var isOffline = (0, _isOfflineMode.isOfflineMode)(mode);
   var isDockedToTop = (api === null || api === void 0 || (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.sharedState.currentState()) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.preferences) === null || _api$userPreferences === void 0 ? void 0 : _api$userPreferences.toolbarDockingPosition) === 'top';
   if (isDockedToTop) {
-    return /*#__PURE__*/React.createElement(_uiMenu.ToolbarButton, {
-      "aria-label": intl.formatMessage(_messages.selectionToolbarMessages.toolbarPositionPinedAtTop)
+    return /*#__PURE__*/React.createElement(_ToolbarButton.default, {
+      "aria-label": intl.formatMessage(_selectionToolbar.selectionToolbarMessages.toolbarPositionPinedAtTop)
       // eslint-disable-next-line @atlaskit/design-system/no-unsafe-style-overrides -- Ignored via go/DSP-18766
       ,
 
@@ -48,12 +48,12 @@ var PrimaryToolbarComponent = exports.PrimaryToolbarComponent = function Primary
         var _api$core$actions$exe, _api$userPreferences2;
         return (_api$core$actions$exe = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences2 = api.userPreferences) === null || _api$userPreferences2 === void 0 ? void 0 : _api$userPreferences2.actions.updateUserPreference('toolbarDockingPosition', 'none'))) !== null && _api$core$actions$exe !== void 0 ? _api$core$actions$exe : false;
       },
-      title: intl.formatMessage(_messages.selectionToolbarMessages.toolbarPositionPinedAtTop),
+      title: intl.formatMessage(_selectionToolbar.selectionToolbarMessages.toolbarPositionPinedAtTop),
       className: (0, _runtime.ax)(["_ca0q12x7 _n3td12x7 _19bv12x7 _u5f312x7"])
     });
   }
-  return /*#__PURE__*/React.createElement(_uiMenu.ToolbarButton, {
-    "aria-label": intl.formatMessage(_messages.selectionToolbarMessages.toolbarPositionUnpined)
+  return /*#__PURE__*/React.createElement(_ToolbarButton.default, {
+    "aria-label": intl.formatMessage(_selectionToolbar.selectionToolbarMessages.toolbarPositionUnpined)
     // eslint-disable-next-line @atlaskit/design-system/no-unsafe-style-overrides -- Ignored via go/DSP-18766
     ,
 
@@ -68,7 +68,7 @@ var PrimaryToolbarComponent = exports.PrimaryToolbarComponent = function Primary
       var _api$core$actions$exe2, _api$userPreferences3;
       return (_api$core$actions$exe2 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences3 = api.userPreferences) === null || _api$userPreferences3 === void 0 ? void 0 : _api$userPreferences3.actions.updateUserPreference('toolbarDockingPosition', 'top'))) !== null && _api$core$actions$exe2 !== void 0 ? _api$core$actions$exe2 : false;
     },
-    title: intl.formatMessage(_messages.selectionToolbarMessages.toolbarPositionUnpined),
+    title: intl.formatMessage(_selectionToolbar.selectionToolbarMessages.toolbarPositionUnpined),
     className: (0, _runtime.ax)(["_ca0q12x7 _n3td12x7 _19bv12x7 _u5f312x7"])
   });
 };

package/dist/cjs/ui/overflow-toolbar-config.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getOverflowPrimaryToolbarConfig = void 0;
 var React = _interopRequireWildcard(require("react"));
 var _runtime = require("@compiled/react/runtime");
-var _messages = require("@atlaskit/editor-common/messages");
+var _selectionToolbar = require("@atlaskit/editor-common/messages/selection-toolbar");
 var _dockToolbarTop = _interopRequireDefault(require("@atlaskit/icon-lab/core/dock-toolbar-top"));
 var _checkMark = _interopRequireDefault(require("@atlaskit/icon/core/check-mark"));
 var _minus = _interopRequireDefault(require("@atlaskit/icon/core/minus"));
@@ -20,13 +20,13 @@ var getOverflowPrimaryToolbarConfig = exports.getOverflowPrimaryToolbarConfig =
     intl = _ref.intl;
   return [{
     items: [{
-      content: /*#__PURE__*/React.createElement(_headingItem.default, null, intl.formatMessage(_messages.selectionToolbarMessages.toolbarAppears)),
+      content: /*#__PURE__*/React.createElement(_headingItem.default, null, intl.formatMessage(_selectionToolbar.selectionToolbarMessages.toolbarAppears)),
       value: {
         name: ''
       },
       isDisabled: true
     }, {
-      content: intl.formatMessage(_messages.selectionToolbarMessages.toolbarPositionInline),
+      content: intl.formatMessage(_selectionToolbar.selectionToolbarMessages.toolbarPositionInline),
       value: {
         name: 'contextual'
       },
@@ -38,7 +38,7 @@ var getOverflowPrimaryToolbarConfig = exports.getOverflowPrimaryToolbarConfig =
         label: ''
       })
     }, {
-      content: intl.formatMessage(_messages.selectionToolbarMessages.toolbarPositionFixedAtTop),
+      content: intl.formatMessage(_selectionToolbar.selectionToolbarMessages.toolbarPositionFixedAtTop),
       value: {
         name: 'fixed'
       },

package/dist/cjs/ui/pin-toolbar-config.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getPinOptionToolbarConfig = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _messages = require("@atlaskit/editor-common/messages");
-var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
+var _isOfflineMode = require("@atlaskit/editor-common/connectivity/isOfflineMode");
+var _selectionToolbar = require("@atlaskit/editor-common/messages/selection-toolbar");
 var _pin = _interopRequireDefault(require("@atlaskit/icon/core/pin"));
 var _pinFilled = _interopRequireDefault(require("@atlaskit/icon/core/pin-filled"));
 // oxlint-disable-next-line import/no-duplicates
@@ -17,7 +17,7 @@ var getPinOptionToolbarConfig = exports.getPinOptionToolbarConfig = function get
   var api = _ref.api,
     toolbarDocking = _ref.toolbarDocking,
     intl = _ref.intl;
-  var isOffline = (0, _editorPluginConnectivity.isOfflineMode)(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode);
+  var isOffline = (0, _isOfflineMode.isOfflineMode)(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode);
   var pinButton = {
     disabled: isOffline,
     id: 'editor.toolbar.unpined',
@@ -30,7 +30,7 @@ var getPinOptionToolbarConfig = exports.getPinOptionToolbarConfig = function get
       var _api$core$actions$exe, _api$userPreferences;
       return (_api$core$actions$exe = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 ? void 0 : _api$userPreferences.actions.updateUserPreference('toolbarDockingPosition', 'top'))) !== null && _api$core$actions$exe !== void 0 ? _api$core$actions$exe : false;
     },
-    title: intl.formatMessage(_messages.selectionToolbarMessages.toolbarPositionUnpined),
+    title: intl.formatMessage(_selectionToolbar.selectionToolbarMessages.toolbarPositionUnpined),
     type: 'button'
   };
   var isDockedToTop = toolbarDocking === 'top';
@@ -48,7 +48,7 @@ var getPinOptionToolbarConfig = exports.getPinOptionToolbarConfig = function get
         return (_api$core$actions$exe2 = api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 || (_api$userPreferences2 = api.userPreferences) === null || _api$userPreferences2 === void 0 ? void 0 : _api$userPreferences2.actions.updateUserPreference('toolbarDockingPosition', 'none'))) !== null && _api$core$actions$exe2 !== void 0 ? _api$core$actions$exe2 : false;
       },
       type: 'button',
-      title: intl.formatMessage(_messages.selectionToolbarMessages.toolbarPositionPinedAtTop)
+      title: intl.formatMessage(_selectionToolbar.selectionToolbarMessages.toolbarPositionPinedAtTop)
     };
   }
   return [{

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

@@ -6,18 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getToolbarComponents = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _toolbar = require("@atlaskit/editor-common/toolbar");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _rank = require("@atlaskit/editor-common/toolbar/rank");
 var _MenuSection = require("./MenuSection");
 var _PinButton = require("./PinButton");
 var _PinMenuItem = require("./PinMenuItem");
 var getToolbarComponents = exports.getToolbarComponents = function getToolbarComponents(api, contextualFormattingEnabled, disablePin) {
   var components = [{
-    type: _toolbar.PIN_MENU_SECTION.type,
-    key: _toolbar.PIN_MENU_SECTION.key,
+    type: _keys.PIN_MENU_SECTION.type,
+    key: _keys.PIN_MENU_SECTION.key,
     parents: [{
-      type: _toolbar.OVERFLOW_MENU.type,
-      key: _toolbar.OVERFLOW_MENU.key,
-      rank: _toolbar.OVERFLOW_MENU_RANK[_toolbar.PIN_MENU_SECTION.key]
+      type: _keys.OVERFLOW_MENU.type,
+      key: _keys.OVERFLOW_MENU.key,
+      rank: _rank.OVERFLOW_MENU_RANK[_keys.PIN_MENU_SECTION.key]
     }],
     component: function component(_ref) {
       var children = _ref.children;
@@ -26,12 +27,12 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
       }, children);
     }
   }, {
-    type: _toolbar.PIN_MENU_ITEM.type,
-    key: _toolbar.PIN_MENU_ITEM.key,
+    type: _keys.PIN_MENU_ITEM.type,
+    key: _keys.PIN_MENU_ITEM.key,
     parents: [{
-      type: _toolbar.PIN_MENU_SECTION.type,
-      key: _toolbar.PIN_MENU_SECTION.key,
-      rank: _toolbar.PIN_MENU_SECTION_RANK[_toolbar.PIN_MENU_ITEM.key]
+      type: _keys.PIN_MENU_SECTION.type,
+      key: _keys.PIN_MENU_SECTION.key,
+      rank: _rank.PIN_MENU_SECTION_RANK[_keys.PIN_MENU_ITEM.key]
     }],
     component: function component() {
       return /*#__PURE__*/_react.default.createElement(_PinMenuItem.PinMenuItem, {
@@ -44,20 +45,20 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
   // Add pin button to primary toolbar when contextual formatting is enabled
   if (contextualFormattingEnabled) {
     var pinButtonComponents = [{
-      type: _toolbar.PIN_GROUP.type,
-      key: _toolbar.PIN_GROUP.key,
+      type: _keys.PIN_GROUP.type,
+      key: _keys.PIN_GROUP.key,
       parents: [{
-        type: _toolbar.PIN_SECTION.type,
-        key: _toolbar.PIN_SECTION.key,
-        rank: _toolbar.PIN_SECTION_RANK[_toolbar.PIN_GROUP.key]
+        type: _keys.PIN_SECTION.type,
+        key: _keys.PIN_SECTION.key,
+        rank: _rank.PIN_SECTION_RANK[_keys.PIN_GROUP.key]
       }]
     }, {
-      type: _toolbar.PIN_BUTTON.type,
-      key: _toolbar.PIN_BUTTON.key,
+      type: _keys.PIN_BUTTON.type,
+      key: _keys.PIN_BUTTON.key,
       parents: [{
-        type: _toolbar.PIN_GROUP.type,
-        key: _toolbar.PIN_GROUP.key,
-        rank: _toolbar.PIN_GROUP_RANK[_toolbar.PIN_BUTTON.key]
+        type: _keys.PIN_GROUP.type,
+        key: _keys.PIN_GROUP.key,
+        rank: _rank.PIN_GROUP_RANK[_keys.PIN_BUTTON.key]
       }],
       component: function component() {
         return /*#__PURE__*/_react.default.createElement(_PinButton.PinButton, {

package/dist/es2019/pm-plugins/get-selection-node-types.js

@@ -0,0 +1,21 @@
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+export function getSelectionNodeTypes(state) {
+  const {
+    from,
+    to
+  } = state.selection;
+  if (isExperimentEnabled('platform_editor_reduce_memory_leaks')) {
+    const selectionNodeTypes = new Set();
+    state.doc.nodesBetween(from, to, node => {
+      selectionNodeTypes.add(node.type);
+    });
+    return Array.from(selectionNodeTypes);
+  }
+  const selectionNodeTypes = [];
+  state.doc.nodesBetween(from, to, node => {
+    if (selectionNodeTypes.indexOf(node.type) !== 0) {
+      selectionNodeTypes.push(node.type);
+    }
+  });
+  return selectionNodeTypes;
+}

package/dist/es2019/selectionToolbarPlugin.js

@@ -1,10 +1,11 @@
 import React from 'react';
 import { bind } from 'bind-event-listener';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { calculateToolbarPositionAboveSelection, calculateToolbarPositionOnCellSelection, calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils';
+import { calculateToolbarPositionAboveSelection, calculateToolbarPositionOnCellSelection, calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils/calculate-toolbar-position';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { toggleToolbar, updateToolbarDocking } from './pm-plugins/commands';
+import { getSelectionNodeTypes } from './pm-plugins/get-selection-node-types';
 import { selectionToolbarPluginKey } from './pm-plugins/plugin-key';
 import { getPinOptionToolbarConfig } from './ui/pin-toolbar-config';
 import { PrimaryToolbarComponent } from './ui/PrimaryToolbarComponent';
@@ -343,15 +344,6 @@ export const selectionToolbarPlugin = ({
     }) ? primaryToolbarComponent : undefined
   };
 };
-function getSelectionNodeTypes(state) {
-  const selectionNodeTypes = [];
-  state.doc.nodesBetween(state.selection.from, state.selection.to, node => {
-    if (selectionNodeTypes.indexOf(node.type) !== 0) {
-      selectionNodeTypes.push(node.type);
-    }
-  });
-  return selectionNodeTypes;
-}
 const hasNestedSpanWithText = (element, text) => {
   if (element.tagName === 'SPAN' && element.innerHTML === text) {
     return true;

package/dist/es2019/ui/MenuSection.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar/toolbar-dropdown-item-section';
 const usePluginState = _api => {
   const {
     editorViewMode

package/dist/es2019/ui/PinButton.js

@@ -1,9 +1,11 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { selectionToolbarMessages } from '@atlaskit/editor-common/messages';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { PinnedIcon, ToolbarButton, ToolbarTooltip } from '@atlaskit/editor-toolbar';
+import { selectionToolbarMessages } from '@atlaskit/editor-common/messages/selection-toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { PinnedIcon } from '@atlaskit/editor-toolbar/pinned-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 export const PinButton = ({
   api
 }) => {

package/dist/es2019/ui/PinMenuItem.js

@@ -1,9 +1,11 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { selectionToolbarMessages } from '@atlaskit/editor-common/messages';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { PinIcon, PinnedIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { selectionToolbarMessages } from '@atlaskit/editor-common/messages/selection-toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { PinIcon } from '@atlaskit/editor-toolbar/pin-icon';
+import { PinnedIcon } from '@atlaskit/editor-toolbar/pinned-icon';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
 const shouldShowPinMenuItem = editMode => {
   return editMode !== 'view';
 };

package/dist/es2019/ui/PrimaryToolbarComponent.js

@@ -3,10 +3,10 @@ import "./PrimaryToolbarComponent.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useIntl } from 'react-intl';
-import { selectionToolbarMessages } from '@atlaskit/editor-common/messages';
-import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
+import { selectionToolbarMessages } from '@atlaskit/editor-common/messages/selection-toolbar';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/useSharedPluginStateSelector';
 import PinIcon from '@atlaskit/icon/core/pin';
 import PinFilledIcon from '@atlaskit/icon/core/pin-filled';
 const buttonStyles = null;

package/dist/es2019/ui/overflow-toolbar-config.js

@@ -1,7 +1,7 @@
 /* overflow-toolbar-config.tsx generated by @compiled/babel-plugin v3.0.2 */
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
-import { selectionToolbarMessages } from '@atlaskit/editor-common/messages';
+import { selectionToolbarMessages } from '@atlaskit/editor-common/messages/selection-toolbar';
 import DockToolbarTopIcon from '@atlaskit/icon-lab/core/dock-toolbar-top';
 import CheckMarkIcon from '@atlaskit/icon/core/check-mark';
 import MinusIcon from '@atlaskit/icon/core/minus';

package/dist/es2019/ui/pin-toolbar-config.js

@@ -1,8 +1,9 @@
 import React from 'react';
-import { selectionToolbarMessages } from '@atlaskit/editor-common/messages';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
+import { selectionToolbarMessages } from '@atlaskit/editor-common/messages/selection-toolbar';
+
 // oxlint-disable-next-line import/no-duplicates
 
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import PinIcon from '@atlaskit/icon/core/pin';
 import PinFilledIcon from '@atlaskit/icon/core/pin-filled';
 export const getPinOptionToolbarConfig = ({

package/dist/es2019/ui/toolbar-components.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import { OVERFLOW_MENU, OVERFLOW_MENU_RANK, PIN_BUTTON, PIN_GROUP, PIN_MENU_ITEM, PIN_MENU_SECTION, PIN_MENU_SECTION_RANK, PIN_GROUP_RANK, PIN_SECTION, PIN_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
+import { OVERFLOW_MENU, PIN_BUTTON, PIN_GROUP, PIN_MENU_ITEM, PIN_MENU_SECTION, PIN_SECTION } from '@atlaskit/editor-common/toolbar/keys';
+import { OVERFLOW_MENU_RANK, PIN_MENU_SECTION_RANK, PIN_GROUP_RANK, PIN_SECTION_RANK } from '@atlaskit/editor-common/toolbar/rank';
 import { MenuSection } from './MenuSection';
 import { PinButton } from './PinButton';
 import { PinMenuItem } from './PinMenuItem';

package/dist/esm/pm-plugins/get-selection-node-types.js

@@ -0,0 +1,20 @@
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+export function getSelectionNodeTypes(state) {
+  var _state$selection = state.selection,
+    from = _state$selection.from,
+    to = _state$selection.to;
+  if (isExperimentEnabled('platform_editor_reduce_memory_leaks')) {
+    var _selectionNodeTypes = new Set();
+    state.doc.nodesBetween(from, to, function (node) {
+      _selectionNodeTypes.add(node.type);
+    });
+    return Array.from(_selectionNodeTypes);
+  }
+  var selectionNodeTypes = [];
+  state.doc.nodesBetween(from, to, function (node) {
+    if (selectionNodeTypes.indexOf(node.type) !== 0) {
+      selectionNodeTypes.push(node.type);
+    }
+  });
+  return selectionNodeTypes;
+}

package/dist/esm/selectionToolbarPlugin.js

@@ -5,10 +5,11 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React from 'react';
 import { bind } from 'bind-event-listener';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { calculateToolbarPositionAboveSelection, calculateToolbarPositionOnCellSelection, calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils';
+import { calculateToolbarPositionAboveSelection, calculateToolbarPositionOnCellSelection, calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils/calculate-toolbar-position';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { toggleToolbar, updateToolbarDocking } from './pm-plugins/commands';
+import { getSelectionNodeTypes } from './pm-plugins/get-selection-node-types';
 import { selectionToolbarPluginKey } from './pm-plugins/plugin-key';
 import { getPinOptionToolbarConfig } from './ui/pin-toolbar-config';
 import { PrimaryToolbarComponent } from './ui/PrimaryToolbarComponent';
@@ -341,15 +342,6 @@ export var selectionToolbarPlugin = function selectionToolbarPlugin(_ref) {
     }) ? primaryToolbarComponent : undefined
   };
 };
-function getSelectionNodeTypes(state) {
-  var selectionNodeTypes = [];
-  state.doc.nodesBetween(state.selection.from, state.selection.to, function (node) {
-    if (selectionNodeTypes.indexOf(node.type) !== 0) {
-      selectionNodeTypes.push(node.type);
-    }
-  });
-  return selectionNodeTypes;
-}
 var _hasNestedSpanWithText = function hasNestedSpanWithText(element, text) {
   if (element.tagName === 'SPAN' && element.innerHTML === text) {
     return true;

package/dist/esm/ui/MenuSection.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar/toolbar-dropdown-item-section';
 var usePluginState = function usePluginState(_api) {
   var _useEditorToolbar = useEditorToolbar(),
     editorViewMode = _useEditorToolbar.editorViewMode;

package/dist/esm/ui/PinButton.js

@@ -1,9 +1,11 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { selectionToolbarMessages } from '@atlaskit/editor-common/messages';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { PinnedIcon, ToolbarButton, ToolbarTooltip } from '@atlaskit/editor-toolbar';
+import { selectionToolbarMessages } from '@atlaskit/editor-common/messages/selection-toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { PinnedIcon } from '@atlaskit/editor-toolbar/pinned-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 export var PinButton = function PinButton(_ref) {
   var api = _ref.api;
   var intl = useIntl();

package/dist/esm/ui/PinMenuItem.js

@@ -1,9 +1,11 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { selectionToolbarMessages } from '@atlaskit/editor-common/messages';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { PinIcon, PinnedIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { selectionToolbarMessages } from '@atlaskit/editor-common/messages/selection-toolbar';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { PinIcon } from '@atlaskit/editor-toolbar/pin-icon';
+import { PinnedIcon } from '@atlaskit/editor-toolbar/pinned-icon';
+import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar/toolbar-dropdown-item';
 var shouldShowPinMenuItem = function shouldShowPinMenuItem(editMode) {
   return editMode !== 'view';
 };

package/dist/esm/ui/PrimaryToolbarComponent.js

@@ -3,10 +3,10 @@ import "./PrimaryToolbarComponent.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useIntl } from 'react-intl';
-import { selectionToolbarMessages } from '@atlaskit/editor-common/messages';
-import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
-import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
+import { selectionToolbarMessages } from '@atlaskit/editor-common/messages/selection-toolbar';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
+import { useSharedPluginStateSelector } from '@atlaskit/editor-common/useSharedPluginStateSelector';
 import PinIcon from '@atlaskit/icon/core/pin';
 import PinFilledIcon from '@atlaskit/icon/core/pin-filled';
 var buttonStyles = null;

package/dist/esm/ui/overflow-toolbar-config.js

@@ -1,7 +1,7 @@
 /* overflow-toolbar-config.tsx generated by @compiled/babel-plugin v3.0.2 */
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
-import { selectionToolbarMessages } from '@atlaskit/editor-common/messages';
+import { selectionToolbarMessages } from '@atlaskit/editor-common/messages/selection-toolbar';
 import DockToolbarTopIcon from '@atlaskit/icon-lab/core/dock-toolbar-top';
 import CheckMarkIcon from '@atlaskit/icon/core/check-mark';
 import MinusIcon from '@atlaskit/icon/core/minus';

package/dist/esm/ui/pin-toolbar-config.js

@@ -1,8 +1,9 @@
 import React from 'react';
-import { selectionToolbarMessages } from '@atlaskit/editor-common/messages';
+import { isOfflineMode } from '@atlaskit/editor-common/connectivity/isOfflineMode';
+import { selectionToolbarMessages } from '@atlaskit/editor-common/messages/selection-toolbar';
+
 // oxlint-disable-next-line import/no-duplicates
 
-import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import PinIcon from '@atlaskit/icon/core/pin';
 import PinFilledIcon from '@atlaskit/icon/core/pin-filled';
 export var getPinOptionToolbarConfig = function getPinOptionToolbarConfig(_ref) {

package/dist/esm/ui/toolbar-components.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import { OVERFLOW_MENU, OVERFLOW_MENU_RANK, PIN_BUTTON, PIN_GROUP, PIN_MENU_ITEM, PIN_MENU_SECTION, PIN_MENU_SECTION_RANK, PIN_GROUP_RANK, PIN_SECTION, PIN_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
+import { OVERFLOW_MENU, PIN_BUTTON, PIN_GROUP, PIN_MENU_ITEM, PIN_MENU_SECTION, PIN_SECTION } from '@atlaskit/editor-common/toolbar/keys';
+import { OVERFLOW_MENU_RANK, PIN_MENU_SECTION_RANK, PIN_GROUP_RANK, PIN_SECTION_RANK } from '@atlaskit/editor-common/toolbar/rank';
 import { MenuSection } from './MenuSection';
 import { PinButton } from './PinButton';
 import { PinMenuItem } from './PinMenuItem';

package/dist/types/pm-plugins/calculate-toolbar-position.d.ts

@@ -3,7 +3,7 @@
  * of the toolbar in different products, i.e confluence comments and annotations.
  * Work to add the toolbar to more products has been paused at the time of writing.
  */
-import type { PopupPosition as Position } from '@atlaskit/editor-common/ui';
+import type { Position } from '@atlaskit/editor-common/Popup/utils';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export declare const calculateToolbarPositionTrackHead: (toolbarTitle: string) => (editorView: EditorView, nextPos: Position) => Position;
 export type CoordsAtPos = {

package/dist/types/pm-plugins/commands.d.ts

@@ -1,4 +1,4 @@
-import type { EditorCommand } from '@atlaskit/editor-common/types';
+import type { EditorCommand } from '@atlaskit/editor-common/types/editor-command';
 import type { ToolbarDocking } from '../types';
 export declare const toggleToolbar: ({ hide }: {
     hide: boolean;

package/dist/types/pm-plugins/get-selection-node-types.d.ts

@@ -0,0 +1,3 @@
+import type { NodeType } from '@atlaskit/editor-prosemirror/model';
+import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+export declare function getSelectionNodeTypes(state: EditorState): NodeType[];

package/dist/types/selectionToolbarPluginType.d.ts

@@ -1,12 +1,13 @@
-import type { NextEditorPlugin, OptionalPlugin, UserPreferencesProvider } from '@atlaskit/editor-common/types';
-import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type { BlockControlsPlugin } from '@atlaskit/editor-plugin-block-controls';
-import type { ConnectivityPlugin } from '@atlaskit/editor-plugin-connectivity';
-import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
-import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
-import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
-import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
-import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-preferences';
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types/next-editor-plugin';
+import type { UserPreferencesProvider } from '@atlaskit/editor-common/types/user-preferences';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics/analyticsPluginType';
+import type { BlockControlsPlugin } from '@atlaskit/editor-plugin-block-controls/blockControlsPluginType';
+import type { ConnectivityPlugin } from '@atlaskit/editor-plugin-connectivity/connectivityPluginType';
+import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode/editorViewmodePluginType';
+import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar/primary-toolbar-plugin-type';
+import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar/toolbar-plugin-type';
+import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent/user-intent-plugin-type';
+import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-preferences/user-preferences-plugin-type';
 import type { ToolbarDocking } from './types';
 export type SelectionToolbarPluginOptions = {
     /**

package/dist/types/types/index.d.ts

@@ -1,4 +1,4 @@
-import type { UserPreferences } from '@atlaskit/editor-common/types';
+import type { UserPreferences } from '@atlaskit/editor-common/types/user-preferences';
 export type SelectionToolbarPluginOptions = {
     /**
      * When set to true, placing the toolbar above the selection will be preferenced.

package/dist/types/ui/MenuSection.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { SelectionToolbarPlugin } from '../selectionToolbarPluginType';
 type MenuSectionProps = {
     api: ExtractInjectionAPI<SelectionToolbarPlugin> | undefined;

package/dist/types/ui/PinButton.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { SelectionToolbarPlugin } from '../selectionToolbarPluginType';
 export declare const PinButton: ({ api, }: {
     api?: ExtractInjectionAPI<SelectionToolbarPlugin>;

package/dist/types/ui/PinMenuItem.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { SelectionToolbarPlugin } from '../selectionToolbarPluginType';
 type PinMenuItemProps = {
     api?: ExtractInjectionAPI<SelectionToolbarPlugin>;

package/dist/types/ui/PrimaryToolbarComponent.d.ts

@@ -1,4 +1,4 @@
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { SelectionToolbarPlugin } from '../selectionToolbarPluginType';
 type PrimaryToolbarComponentProps = {
     api?: ExtractInjectionAPI<SelectionToolbarPlugin>;

package/dist/types/ui/overflow-toolbar-config.d.ts

@@ -4,8 +4,8 @@
  * @jsxFrag
  */
 import type { IntlShape } from 'react-intl';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { MenuItem } from '@atlaskit/editor-common/ui-menu';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
+import type { MenuItem } from '@atlaskit/editor-common/ui-menu/DropdownMenu/types';
 import type { SelectionToolbarPlugin } from '../selectionToolbarPluginType';
 type OverflowToobarConfigOptions = {
     api?: ExtractInjectionAPI<SelectionToolbarPlugin>;

package/dist/types/ui/pin-toolbar-config.d.ts

@@ -1,6 +1,7 @@
 import type { IntlShape } from 'react-intl';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { Command, FloatingToolbarItem } from '@atlaskit/editor-common/types';
+import type { Command } from '@atlaskit/editor-common/types/command';
+import type { FloatingToolbarItem } from '@atlaskit/editor-common/types/floating-toolbar';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { SelectionToolbarPlugin } from '../selectionToolbarPluginType';
 type PinToobarConfig = {
     api?: ExtractInjectionAPI<SelectionToolbarPlugin>;

package/dist/types/ui/toolbar-components.d.ts

@@ -1,4 +1,4 @@
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { RegisterComponent } from '@atlaskit/editor-toolbar-model';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
+import type { RegisterComponent } from '@atlaskit/editor-toolbar-model/types';
 import type { SelectionToolbarPlugin } from '../selectionToolbarPluginType';
 export declare const getToolbarComponents: (api?: ExtractInjectionAPI<SelectionToolbarPlugin>, contextualFormattingEnabled?: boolean, disablePin?: boolean) => RegisterComponent[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection-toolbar",
-	"version": "27.0.3",
+	"version": "27.0.5",
 	"description": "@atlaskit/editor-plugin-selection-toolbar for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -41,8 +41,9 @@
 		"@atlaskit/icon": "^38.0.0",
 		"@atlaskit/icon-lab": "^7.11.0",
 		"@atlaskit/menu": "^11.0.0",
+		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
-		"@atlaskit/tmp-editor-statsig": "^230.0.0",
+		"@atlaskit/tmp-editor-statsig": "^232.0.0",
 		"@atlaskit/tokens": "^20.4.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0"