@atlaskit/editor-plugin-floating-toolbar 28.0.4 → 28.0.7

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 28.0.7
+
+### Patch Changes
+
+- Updated dependencies
+
+## 28.0.6
+
+### Patch Changes
+
+- Updated dependencies
+
+## 28.0.5
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 28.0.4
 
 ### Patch Changes

package/dist/cjs/floatingToolbarPlugin.js

@@ -13,14 +13,14 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
 var _camelCase = _interopRequireDefault(require("lodash/camelCase"));
-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 _errorBoundary = require("@atlaskit/editor-common/error-boundary");
-var _hooks = require("@atlaskit/editor-common/hooks");
-var _providerFactory = require("@atlaskit/editor-common/provider-factory");
+var _isSsr = require("@atlaskit/editor-common/is-ssr");
+var _Popup = _interopRequireDefault(require("@atlaskit/editor-common/Popup"));
+var _withProviders = require("@atlaskit/editor-common/provider-factory/with-providers");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
-var _ui = require("@atlaskit/editor-common/ui");
+var _useSharedPluginState2 = require("@atlaskit/editor-common/useSharedPluginState");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
@@ -119,11 +119,11 @@ var getDomRefFromSelection = function getDomRefFromSelection(view, dispatchAnaly
     console.warn(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.FLOATING_TOOLBAR,
+          component: _enums.CONTENT_COMPONENT.FLOATING_TOOLBAR,
           selection: view.state.selection.toJSON(),
           position: view.state.selection.from,
           docSize: view.state.doc.nodeSize,
@@ -243,7 +243,7 @@ function ContentComponent(_ref5) {
     popupsScrollableElement = _ref5.popupsScrollableElement,
     providerFactory = _ref5.providerFactory,
     dispatchAnalyticsEvent = _ref5.dispatchAnalyticsEvent;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'userIntent']),
+  var _useSharedPluginState = (0, _useSharedPluginState2.useSharedPluginState)(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'userIntent']),
     floatingToolbarState = _useSharedPluginState.floatingToolbarState,
     editorDisabledState = _useSharedPluginState.editorDisabledState,
     editorViewModeState = _useSharedPluginState.editorViewModeState,
@@ -259,7 +259,7 @@ function ContentComponent(_ref5) {
     // for example, trigger remix on panel will not hide the floating toolbar
     configWithNodeInfo = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$f = pluginInjectionApi.floatingToolbar) === null || _pluginInjectionApi$f === void 0 || (_pluginInjectionApi$f = _pluginInjectionApi$f.sharedState.currentState()) === null || _pluginInjectionApi$f === void 0 ? void 0 : _pluginInjectionApi$f.configWithNodeInfo;
   }
-  if ((0, _coreUtils.isSSR)()) {
+  if ((0, _isSsr.isSSR)()) {
     return null;
   }
   if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {
@@ -374,10 +374,10 @@ function ContentComponent(_ref5) {
             var _pluginInjectionApi$e;
             var editorContentMode = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 || (_pluginInjectionApi$e = _pluginInjectionApi$e.sharedState.currentState()) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.mode;
             dispatchAnalyticsEvent({
-              action: _analytics.ACTION.CLICKED,
-              actionSubject: _analytics.ACTION_SUBJECT.BUTTON,
-              actionSubjectId: _analytics.ACTION_SUBJECT_ID.FLOATING_TOOLBAR_OVERFLOW,
-              eventType: _analytics.EVENT_TYPE.UI,
+              action: _enums.ACTION.CLICKED,
+              actionSubject: _enums.ACTION_SUBJECT.BUTTON,
+              actionSubjectId: _enums.ACTION_SUBJECT_ID.FLOATING_TOOLBAR_OVERFLOW,
+              eventType: _enums.EVENT_TYPE.UI,
               attributes: {
                 editorContentMode: editorContentMode
               }
@@ -421,11 +421,11 @@ function ContentComponent(_ref5) {
   var scrollable = config.scrollable;
   var confirmDialogOptions = typeof ((_confirmButtonItem = confirmButtonItem) === null || _confirmButtonItem === void 0 ? void 0 : _confirmButtonItem.confirmDialog) === 'function' ? (_confirmButtonItem2 = confirmButtonItem) === null || _confirmButtonItem2 === void 0 ? void 0 : _confirmButtonItem2.confirmDialog() : (_confirmButtonItem3 = confirmButtonItem) === null || _confirmButtonItem3 === void 0 ? void 0 : _confirmButtonItem3.confirmDialog;
   return /*#__PURE__*/_react.default.createElement(_errorBoundary.ErrorBoundary, {
-    component: _analytics.ACTION_SUBJECT.FLOATING_TOOLBAR_PLUGIN,
+    component: _enums.ACTION_SUBJECT.FLOATING_TOOLBAR_PLUGIN,
     componentId: (0, _camelCase.default)(title),
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     fallbackComponent: null
-  }, /*#__PURE__*/_react.default.createElement(_ui.Popup, {
+  }, /*#__PURE__*/_react.default.createElement(_Popup.default, {
     ariaLabel: title,
     role: 'toolbar',
     offset: offset,
@@ -449,7 +449,7 @@ function ContentComponent(_ref5) {
     } : {},
     focusTrap: focusTrap,
     preventOverflow: preventPopupOverflow
-  }, /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders, {
+  }, /*#__PURE__*/_react.default.createElement(_withProviders.WithProviders, {
     providerFactory: providerFactory
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     ,
@@ -607,10 +607,10 @@ function floatingToolbarPluginFactory(options) {
           if (pluginState !== null && pluginState !== void 0 && pluginState.suppressedToolbar && !(prevPluginState !== null && prevPluginState !== void 0 && prevPluginState.suppressedToolbar)) {
             var _api$analytics2;
             api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.fireAnalyticsEvent({
-              action: _analytics.ACTION.SUPPRESSED,
-              actionSubject: _analytics.ACTION_SUBJECT.FLOATING_TOOLBAR_PLUGIN,
-              actionSubjectId: _analytics.ACTION_SUBJECT_ID.FLOATING_TOOLBAR,
-              eventType: _analytics.EVENT_TYPE.TRACK
+              action: _enums.ACTION.SUPPRESSED,
+              actionSubject: _enums.ACTION_SUBJECT.FLOATING_TOOLBAR_PLUGIN,
+              actionSubjectId: _enums.ACTION_SUBJECT_ID.FLOATING_TOOLBAR,
+              eventType: _enums.EVENT_TYPE.TRACK
             });
           }
         }

package/dist/cjs/pm-plugins/toolbar-data/plugin-factory.js

@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getPluginState = exports.createPluginState = exports.createCommand = void 0;
-var _utils = require("@atlaskit/editor-common/utils");
+var _pluginStateFactory = require("@atlaskit/editor-common/utils/plugin-state-factory");
 var _pluginKey = require("./plugin-key");
 var _reducer = require("./reducer");
-var dest = (0, _utils.pluginFactory)(_pluginKey.pluginKey, _reducer.reducer);
+var dest = (0, _pluginStateFactory.pluginFactory)(_pluginKey.pluginKey, _reducer.reducer);
 var createPluginState = exports.createPluginState = dest.createPluginState;
 var createCommand = exports.createCommand = dest.createCommand;
 var getPluginState = exports.getPluginState = dest.getPluginState;

package/dist/cjs/ui/CheckboxModal.js

@@ -11,7 +11,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _button = _interopRequireDefault(require("@atlaskit/button/default/button"));
 var _checkbox = require("@atlaskit/checkbox/checkbox");
-var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
+var _messages = _interopRequireDefault(require("@atlaskit/editor-common/floating-toolbar/messages"));
 var _modalBody = _interopRequireDefault(require("@atlaskit/modal-dialog/modal-body"));
 var _modalDialog = _interopRequireDefault(require("@atlaskit/modal-dialog/modal-dialog"));
 var _modalFooter = _interopRequireDefault(require("@atlaskit/modal-dialog/modal-footer"));
@@ -30,9 +30,9 @@ var CheckboxModal = exports.CheckboxModal = function CheckboxModal(props) {
     options = props.options,
     formatMessage = props.intl.formatMessage,
     testId = props.testId;
-  var heading = (options === null || options === void 0 ? void 0 : options.title) || formatMessage(_floatingToolbar.messages.confirmModalDefaultHeading);
-  var okButtonLabel = (options === null || options === void 0 ? void 0 : options.okButtonLabel) || formatMessage(_floatingToolbar.messages.confirmModalOK);
-  var cancelButtonLabel = (options === null || options === void 0 ? void 0 : options.cancelButtonLabel) || formatMessage(_floatingToolbar.messages.confirmModalCancel);
+  var heading = (options === null || options === void 0 ? void 0 : options.title) || formatMessage(_messages.default.confirmModalDefaultHeading);
+  var okButtonLabel = (options === null || options === void 0 ? void 0 : options.okButtonLabel) || formatMessage(_messages.default.confirmModalOK);
+  var cancelButtonLabel = (options === null || options === void 0 ? void 0 : options.cancelButtonLabel) || formatMessage(_messages.default.confirmModalCancel);
   var checkboxlabel = options === null || options === void 0 ? void 0 : options.checkboxLabel;
   var childrenInfo = options === null || options === void 0 || (_options$getChildrenI = options.getChildrenInfo) === null || _options$getChildrenI === void 0 ? void 0 : _options$getChildrenI.call(options);
   var ListComponent = function ListComponent(_ref) {
@@ -57,7 +57,7 @@ var CheckboxModal = exports.CheckboxModal = function CheckboxModal(props) {
       amount = props.amount;
     return /*#__PURE__*/_react.default.createElement("li", {
       id: id
-    }, formatMessage(_floatingToolbar.messages.confirmModalListUnit, {
+    }, formatMessage(_messages.default.confirmModalListUnit, {
       name: name,
       amount: amount
     }));

package/dist/cjs/ui/Dropdown.js

@@ -14,8 +14,9 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
-var _ui = require("@atlaskit/editor-common/ui");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _Button = _interopRequireDefault(require("@atlaskit/editor-common/FloatingToolbar/Button"));
+var _types = require("@atlaskit/editor-common/ui-menu/ArrowKeyNavigationProvider/types");
+var _DropdownContainer = require("@atlaskit/editor-common/ui-menu/DropdownContainer");
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/core/chevron-down"));
 var _Divider = require("./Divider");
 var _DropdownMenu = _interopRequireWildcard(require("./DropdownMenu"));
@@ -162,7 +163,7 @@ var Dropdown = exports.default = /*#__PURE__*/function (_Component) {
         var TriggerIcon = hideExpandIcon ? icon : (0, _react2.jsx)(CompositeIcon, {
           icon: icon
         });
-        trigger = (0, _react2.jsx)(_ui.FloatingToolbarButton, {
+        trigger = (0, _react2.jsx)(_Button.default, {
           testId: buttonTestId,
           title: title,
           icon: TriggerIcon,
@@ -177,7 +178,7 @@ var Dropdown = exports.default = /*#__PURE__*/function (_Component) {
           areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
         });
       } else {
-        trigger = (0, _react2.jsx)(_ui.FloatingToolbarButton, {
+        trigger = (0, _react2.jsx)(_Button.default, {
           testId: buttonTestId,
           iconAfter: (0, _react2.jsx)("span", {
             css: dropdownExpandContainer
@@ -215,7 +216,7 @@ var Dropdown = exports.default = /*#__PURE__*/function (_Component) {
          * Refer to the PR for more details:
          * https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/137394/overview?commentId=8130003
          */
-        (0, _react2.jsx)(_uiMenu.DropdownContainer, {
+        (0, _react2.jsx)(_DropdownContainer.DropdownContainer, {
           alignX: alignX,
           mountTo: mountPoint,
           boundariesElement: boundariesElement,
@@ -232,7 +233,7 @@ var Dropdown = exports.default = /*#__PURE__*/function (_Component) {
           // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
           ,
           arrowKeyNavigationProviderOptions: {
-            type: _uiMenu.ArrowKeyNavigationType.MENU
+            type: _types.ArrowKeyNavigationType.MENU
           },
           shouldFitContainer: shouldFitContainer
         }, Array.isArray(options) ? this.renderArrayOptions(options) : typeof options === 'function' ? this.renderArrayOptions(this.makeArrayOptionsFromCallback(options)) : options.render({

package/dist/cjs/ui/DropdownMenu.js

@@ -8,7 +8,8 @@ exports.menuItemDimensions = exports.itemSpacing = exports.default = void 0;
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntl = require("react-intl");
-var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
+var _DropdownMenuItem = require("@atlaskit/editor-common/DropdownMenuItem");
+var _DropdownSeparator = require("@atlaskit/editor-common/DropdownSeparator");
 var _headingItem = _interopRequireDefault(require("@atlaskit/menu/heading-item"));
 /**
  * @jsxRuntime classic
@@ -65,7 +66,7 @@ var Dropdown = /*#__PURE__*/(0, _react.memo)(function (props) {
       return item && (!('hidden' in item) || !item.hidden);
     }).map(function (item, idx) {
       if (!('type' in item)) {
-        return (0, _react2.jsx)(_floatingToolbar.DropdownMenuItem
+        return (0, _react2.jsx)(_DropdownMenuItem.DropdownMenuItem
         // Ignored via go/ees005
         // eslint-disable-next-line react/no-array-index-key
         , {
@@ -80,7 +81,7 @@ var Dropdown = /*#__PURE__*/(0, _react.memo)(function (props) {
       }
       if (item.type === 'separator') {
         // eslint-disable-next-line react/no-array-index-key
-        return (0, _react2.jsx)(_floatingToolbar.DropdownSeparator, {
+        return (0, _react2.jsx)(_DropdownSeparator.DropdownSeparator, {
           key: idx
         });
       }
@@ -108,7 +109,7 @@ var Dropdown = /*#__PURE__*/(0, _react.memo)(function (props) {
   }, items.filter(function (item) {
     return !item.hidden;
   }).map(function (item, idx) {
-    return (0, _react2.jsx)(_floatingToolbar.DropdownMenuItem
+    return (0, _react2.jsx)(_DropdownMenuItem.DropdownMenuItem
     // Ignored via go/ees005
     // eslint-disable-next-line react/no-array-index-key
     , {

package/dist/cjs/ui/EmojiPickerButton.js

@@ -10,9 +10,10 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _button = _interopRequireDefault(require("@atlaskit/button/icon/button"));
-var _hooks = require("@atlaskit/editor-common/hooks");
-var _ui = require("@atlaskit/editor-common/ui");
+var _Popup = _interopRequireDefault(require("@atlaskit/editor-common/Popup"));
 var _uiReact = require("@atlaskit/editor-common/ui-react");
+var _withReactEditorViewOuterListeners = _interopRequireDefault(require("@atlaskit/editor-common/ui-react/with-react-editor-view-outer-listeners"));
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
 var _emoji = require("@atlaskit/emoji");
 var _emojiAdd = _interopRequireDefault(require("@atlaskit/icon/core/emoji-add"));
 var _Tooltip = _interopRequireDefault(require("@atlaskit/tooltip/Tooltip"));
@@ -40,7 +41,7 @@ var selector = function selector(states) {
   return (_states$emojiState = states.emojiState) === null || _states$emojiState === void 0 ? void 0 : _states$emojiState.emojiProvider;
 };
 var EmojiPickerWithProvider = function EmojiPickerWithProvider(props) {
-  var emojiProvider = (0, _hooks.useSharedPluginStateWithSelector)(props.pluginInjectionApi, ['emoji'], selector);
+  var emojiProvider = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(props.pluginInjectionApi, ['emoji'], selector);
   var setOutsideClickTargetRef = (0, _react.useContext)(_uiReact.OutsideClickTargetRefContext);
   if (!emojiProvider) {
     return null;
@@ -57,7 +58,7 @@ var EmojiPickerWithProvider = function EmojiPickerWithProvider(props) {
 // written down.
 var EMOJI_PICKER_MAX_HEIGHT = 431;
 var EMOJI_PICKER_MAX_WIDTH = 352;
-var EmojiPickerWithListener = (0, _uiReact.withReactEditorViewOuterListeners)(EmojiPickerWithProvider);
+var EmojiPickerWithListener = (0, _withReactEditorViewOuterListeners.default)(EmojiPickerWithProvider);
 var EmojiPickerButton = exports.EmojiPickerButton = function EmojiPickerButton(props) {
   var buttonRef = _react.default.useRef(null);
   var _React$useState = _react.default.useState(false),
@@ -104,7 +105,7 @@ var EmojiPickerButton = exports.EmojiPickerButton = function EmojiPickerButton(p
     if (!buttonRef.current || !isPopupOpen) {
       return;
     }
-    return (0, _react2.jsx)(_ui.Popup, {
+    return (0, _react2.jsx)(_Popup.default, {
       target: buttonRef.current
       // Ignored via go/ees005
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

package/dist/cjs/ui/ExtensionsPlaceholder.js

@@ -13,10 +13,11 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactLoadable = _interopRequireDefault(require("react-loadable"));
 var _reactLooselyLazy = require("react-loosely-lazy");
 var _buttonGroup = _interopRequireDefault(require("@atlaskit/button/button-group"));
-var _extensions = require("@atlaskit/editor-common/extensions");
+var _moduleHelpers = require("@atlaskit/editor-common/extensions/module-helpers");
+var _Button = _interopRequireDefault(require("@atlaskit/editor-common/FloatingToolbar/Button"));
+var _Separator = _interopRequireDefault(require("@atlaskit/editor-common/FloatingToolbar/Separator"));
 var _nesting = require("@atlaskit/editor-common/nesting");
-var _ui = require("@atlaskit/editor-common/ui");
-var _utils = require("@atlaskit/editor-common/utils");
+var _nodes = require("@atlaskit/editor-common/utils/nodes");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _Dropdown = _interopRequireDefault(require("./Dropdown"));
 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 _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
@@ -120,7 +121,7 @@ var ExtensionButton = function ExtensionButton(props) {
     if (typeof item.action !== 'function') {
       throw new Error("'action' of context toolbar item '".concat(item.key, "' is not a function"));
     }
-    var targetNodeAdf = (0, _utils.nodeToJSON)(node);
+    var targetNodeAdf = (0, _nodes.nodeToJSON)(node);
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     item.action(targetNodeAdf, extensionApi);
@@ -137,7 +138,7 @@ var ExtensionButton = function ExtensionButton(props) {
     }
     return '';
   };
-  return /*#__PURE__*/_react.default.createElement(_ui.FloatingToolbarButton, {
+  return /*#__PURE__*/_react.default.createElement(_Button.default, {
     title: item.label,
     ariaLabel: getAriaLabel(),
     icon: item.icon ? /*#__PURE__*/_react.default.createElement(ExtensionIcon, {
@@ -207,12 +208,12 @@ var ExtensionsPlaceholder = exports.ExtensionsPlaceholder = function ExtensionsP
     }
   }, []);
   var nodeAdf = _react.default.useMemo(function () {
-    return (0, _utils.nodeToJSON)(node);
+    return (0, _nodes.nodeToJSON)(node);
   }, [node]);
   var extensionItems = _react.default.useMemo(function () {
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    return (0, _extensions.getContextualToolbarItemsFromModule)(extensions, nodeAdf, extensionApi);
+    return (0, _moduleHelpers.getContextualToolbarItemsFromModule)(extensions, nodeAdf, extensionApi);
   }, [extensions, nodeAdf, extensionApi]);
   if (!extensionItems.length) {
     return null;
@@ -222,7 +223,7 @@ var ExtensionsPlaceholder = exports.ExtensionsPlaceholder = function ExtensionsP
   // but count fragment as 1 child, so here we create the children manually.
   var children = [];
   if (separator && ['start', 'both'].includes(separator)) {
-    children.push( /*#__PURE__*/_react.default.createElement(_ui.FloatingToolbarSeparator, {
+    children.push( /*#__PURE__*/_react.default.createElement(_Separator.default, {
       areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
     }));
   }
@@ -273,13 +274,13 @@ var ExtensionsPlaceholder = exports.ExtensionsPlaceholder = function ExtensionsP
       }));
     }
     if (index < extensionItems.length - 1) {
-      children.push( /*#__PURE__*/_react.default.createElement(_ui.FloatingToolbarSeparator, {
+      children.push( /*#__PURE__*/_react.default.createElement(_Separator.default, {
         areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
       }));
     }
   });
   if (separator && ['end', 'both'].includes(separator)) {
-    children.push( /*#__PURE__*/_react.default.createElement(_ui.FloatingToolbarSeparator, {
+    children.push( /*#__PURE__*/_react.default.createElement(_Separator.default, {
       areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
     }));
   }

package/dist/cjs/ui/Input.js

@@ -9,7 +9,7 @@ exports.Input = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
-var _ui = require("@atlaskit/editor-common/ui");
+var _styles = require("@atlaskit/editor-common/PanelTextInput/styles");
 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); }
 /**
  * @jsxRuntime classic
@@ -42,7 +42,7 @@ var Input = exports.Input = function Input(props) {
     onSubmit: handleSubmit
   }, (0, _react2.jsx)("input", {
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-    css: _ui.panelTextInput,
+    css: _styles.panelTextInput,
     value: text,
     onChange: handleChange,
     placeholder: placeholder,

package/dist/cjs/ui/ScrollButton.js

@@ -11,7 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _bindEventListener = require("bind-event-listener");
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _button = _interopRequireDefault(require("@atlaskit/button/icon/button"));
-var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
+var _messages = _interopRequireDefault(require("@atlaskit/editor-common/floating-toolbar/messages"));
 var _chevronLeft = _interopRequireDefault(require("@atlaskit/icon/core/chevron-left"));
 var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/core/chevron-right"));
 var _primitives = require("@atlaskit/primitives");
@@ -139,7 +139,7 @@ var ScrollButton = exports.ScrollButton = function ScrollButton(_ref) {
     xcss: [side === 'left' ? leftSideStyles : rightSideStyles, buttonCommonStyles]
   }, /*#__PURE__*/_react.default.createElement(_button.default, {
     appearance: "subtle",
-    label: intl.formatMessage(side === 'left' ? _floatingToolbar.messages.floatingToolbarScrollLeft : _floatingToolbar.messages.floatingToolbarScrollRight),
+    label: intl.formatMessage(side === 'left' ? _messages.default.floatingToolbarScrollLeft : _messages.default.floatingToolbarScrollRight),
     onClick: onClick,
     isDisabled: disabled
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)

package/dist/cjs/ui/ScrollButtons.js

@@ -10,8 +10,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
-var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
-var _ui = require("@atlaskit/editor-common/ui");
+var _messages = _interopRequireDefault(require("@atlaskit/editor-common/floating-toolbar/messages"));
+var _Button = _interopRequireDefault(require("@atlaskit/editor-common/FloatingToolbar/Button"));
 var _chevronLeft = _interopRequireDefault(require("@atlaskit/icon/core/chevron-left"));
 var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/core/chevron-right"));
 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); }
@@ -151,19 +151,19 @@ var ScrollButtons = exports.ScrollButtons = function ScrollButtons(_ref) {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,
     className: "scroll-buttons"
-  }, (0, _react2.jsx)(_ui.FloatingToolbarButton, {
-    title: intl.formatMessage(_floatingToolbar.messages.floatingToolbarScrollLeft),
+  }, (0, _react2.jsx)(_Button.default, {
+    title: intl.formatMessage(_messages.default.floatingToolbarScrollLeft),
     icon: (0, _react2.jsx)(LeftIcon, {
-      label: intl.formatMessage(_floatingToolbar.messages.floatingToolbarScrollLeft),
+      label: intl.formatMessage(_messages.default.floatingToolbarScrollLeft),
       size: "small"
     }),
     onClick: scrollLeft,
     disabled: !canScrollLeft || disabled,
     areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
-  }), (0, _react2.jsx)(_ui.FloatingToolbarButton, {
-    title: intl.formatMessage(_floatingToolbar.messages.floatingToolbarScrollRight),
+  }), (0, _react2.jsx)(_Button.default, {
+    title: intl.formatMessage(_messages.default.floatingToolbarScrollRight),
     icon: (0, _react2.jsx)(RightIcon, {
-      label: intl.formatMessage(_floatingToolbar.messages.floatingToolbarScrollRight),
+      label: intl.formatMessage(_messages.default.floatingToolbarScrollRight),
       size: "small"
     }),
     onClick: scrollRight,

package/dist/cjs/ui/SimpleModal.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.SimpleModal = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _button = _interopRequireDefault(require("@atlaskit/button/default/button"));
-var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
+var _messages = _interopRequireDefault(require("@atlaskit/editor-common/floating-toolbar/messages"));
 var _modalBody = _interopRequireDefault(require("@atlaskit/modal-dialog/modal-body"));
 var _modalDialog = _interopRequireDefault(require("@atlaskit/modal-dialog/modal-dialog"));
 var _modalFooter = _interopRequireDefault(require("@atlaskit/modal-dialog/modal-footer"));
@@ -20,9 +20,9 @@ var SimpleModal = exports.SimpleModal = function SimpleModal(props) {
     options = props.options,
     formatMessage = props.intl.formatMessage,
     testId = props.testId;
-  var heading = (options === null || options === void 0 ? void 0 : options.title) || formatMessage(_floatingToolbar.messages.confirmModalDefaultHeading);
-  var okButtonLabel = (options === null || options === void 0 ? void 0 : options.okButtonLabel) || formatMessage(_floatingToolbar.messages.confirmModalOK);
-  var cancelButtonLabel = (options === null || options === void 0 ? void 0 : options.cancelButtonLabel) || formatMessage(_floatingToolbar.messages.confirmModalCancel);
+  var heading = (options === null || options === void 0 ? void 0 : options.title) || formatMessage(_messages.default.confirmModalDefaultHeading);
+  var okButtonLabel = (options === null || options === void 0 ? void 0 : options.okButtonLabel) || formatMessage(_messages.default.confirmModalOK);
+  var cancelButtonLabel = (options === null || options === void 0 ? void 0 : options.cancelButtonLabel) || formatMessage(_messages.default.confirmModalCancel);
   return /*#__PURE__*/_react.default.createElement(_modalDialog.default, {
     onClose: onClose,
     testId: testId

package/dist/cjs/ui/Toolbar.js

@@ -18,13 +18,17 @@ var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntl = require("react-intl");
 var _buttonGroup = _interopRequireDefault(require("@atlaskit/button/button-group"));
+var _announcer = _interopRequireDefault(require("@atlaskit/editor-common/announcer"));
 var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
-var _messages = _interopRequireDefault(require("@atlaskit/editor-common/messages"));
+var _messages = _interopRequireDefault(require("@atlaskit/editor-common/floating-toolbar/messages"));
+var _Button = _interopRequireDefault(require("@atlaskit/editor-common/FloatingToolbar/Button"));
+var _Separator = _interopRequireDefault(require("@atlaskit/editor-common/FloatingToolbar/Separator"));
+var _messages2 = _interopRequireDefault(require("@atlaskit/editor-common/messages"));
 var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
-var _ui = require("@atlaskit/editor-common/ui");
-var _uiColor = require("@atlaskit/editor-common/ui-color");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
-var _editorPalette = require("@atlaskit/editor-palette");
+var _paletteMessagesTokenModeNames = require("@atlaskit/editor-common/ui-color/ColorPalette/paletteMessagesTokenModeNames");
+var _ColorPickerButton = _interopRequireDefault(require("@atlaskit/editor-common/ui-menu/ColorPickerButton"));
+var _ToolbarArrowKeyNavigationProvider = require("@atlaskit/editor-common/ui-menu/ToolbarArrowKeyNavigationProvider");
+var _background = require("@atlaskit/editor-palette/background");
 var _showMoreHorizontal = _interopRequireDefault(require("@atlaskit/icon/core/show-more-horizontal"));
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _forceFocus = require("../pm-plugins/force-focus");
@@ -128,7 +132,7 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
           }
           return 'currentColor';
         };
-        return (0, _react2.jsx)(_ui.FloatingToolbarButton
+        return (0, _react2.jsx)(_Button.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: item.className,
@@ -229,7 +233,7 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
         return (0, _react2.jsx)(_Dropdown.default, {
           alignX: areAnyNewToolbarFlagsEnabled ? 'right' : undefined,
           key: idx,
-          title: intl.formatMessage(_messages.default.viewMore),
+          title: intl.formatMessage(_messages2.default.viewMore),
           icon: (0, _react2.jsx)(_showMoreHorizontal.default, {
             label: "",
             spacing: "spacious"
@@ -316,7 +320,7 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
         }
         if (item.selectType === 'color') {
           var _item$hexToPaletteCol, _item$paletteColorToo;
-          return (0, _react2.jsx)(_uiMenu.ColorPickerButton, {
+          return (0, _react2.jsx)(_ColorPickerButton.default, {
             skipFocusButtonAfterPick: true,
             key: idx,
             isAriaExpanded: item.isAriaExpanded,
@@ -333,8 +337,8 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
             placement: "Panels",
             mountPoint: emojiAndColourPickerMountPoint,
             setDisableParentScroll: scrollable ? setDisableScroll : undefined,
-            hexToPaletteColor: (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_lovability_dividers') ? (_item$hexToPaletteCol = item.hexToPaletteColor) !== null && _item$hexToPaletteCol !== void 0 ? _item$hexToPaletteCol : _editorPalette.hexToEditorBackgroundPaletteColor : _editorPalette.hexToEditorBackgroundPaletteColor,
-            paletteColorTooltipMessages: (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_lovability_dividers') ? (_item$paletteColorToo = item.paletteColorTooltipMessages) !== null && _item$paletteColorToo !== void 0 ? _item$paletteColorToo : _uiColor.backgroundPaletteTooltipMessages : _uiColor.backgroundPaletteTooltipMessages,
+            hexToPaletteColor: (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_lovability_dividers') ? (_item$hexToPaletteCol = item.hexToPaletteColor) !== null && _item$hexToPaletteCol !== void 0 ? _item$hexToPaletteCol : _background.hexToEditorBackgroundPaletteColor : _background.hexToEditorBackgroundPaletteColor,
+            paletteColorTooltipMessages: (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_lovability_dividers') ? (_item$paletteColorToo = item.paletteColorTooltipMessages) !== null && _item$paletteColorToo !== void 0 ? _item$paletteColorToo : _paletteMessagesTokenModeNames.backgroundPaletteTooltipMessages : _paletteMessagesTokenModeNames.backgroundPaletteTooltipMessages,
             returnEscToButton: item.returnEscToButton
           });
         }
@@ -379,13 +383,13 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
         });
       case 'separator':
         if (areAnyNewToolbarFlagsEnabled) {
-          return item.fullHeight ? (0, _react2.jsx)(_ui.FloatingToolbarSeparator, {
+          return item.fullHeight ? (0, _react2.jsx)(_Separator.default, {
             key: idx,
             fullHeight: true,
             areAnyNewToolbarFlagsEnabled: true
           }) : null;
         }
-        return (0, _react2.jsx)(_ui.FloatingToolbarSeparator, {
+        return (0, _react2.jsx)(_Separator.default, {
           key: idx,
           fullHeight: item.fullHeight,
           areAnyNewToolbarFlagsEnabled: false
@@ -714,7 +718,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
       var hasSelect = items.find(function (item) {
         return item.type === 'select' && item.selectType === 'list';
       });
-      return (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_uiMenu.ToolbarArrowKeyNavigationProvider, {
+      return (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_ToolbarArrowKeyNavigationProvider.ToolbarArrowKeyNavigationProvider, {
         editorView: this.props.editorView,
         handleEscape: this.handleEscape,
         disableArrowKeyNavigation: !this.shouldHandleArrowKeys(),
@@ -726,15 +730,15 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         css: function css() {
           return [toolbarContainerBase, toolbarContainer(areAnyNewToolbarFlagsEnabled, scrollable, hasSelect !== undefined, firstElementIsSelect, _this2.props.containerSurface)];
         },
-        "aria-label": intl.formatMessage(_floatingToolbar.messages.floatingToolbarAriaLabel),
+        "aria-label": intl.formatMessage(_messages.default.floatingToolbarAriaLabel),
         role: "toolbar",
         "data-testid": "editor-floating-toolbar"
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
         ,
         className: className,
         onMouseDown: areAnyNewToolbarFlagsEnabled ? this.captureMouseEvent : undefined
-      }, (0, _react2.jsx)(_ui.Announcer, {
-        text: mediaAssistiveMessage ? "".concat(mediaAssistiveMessage, ", ").concat(intl.formatMessage(_floatingToolbar.messages.floatingToolbarAnnouncer)) : intl.formatMessage(_floatingToolbar.messages.floatingToolbarAnnouncer),
+      }, (0, _react2.jsx)(_announcer.default, {
+        text: mediaAssistiveMessage ? "".concat(mediaAssistiveMessage, ", ").concat(intl.formatMessage(_messages.default.floatingToolbarAnnouncer)) : intl.formatMessage(_messages.default.floatingToolbarAnnouncer),
         delay: 250
       }), scrollable && areAnyNewToolbarFlagsEnabled && (0, _react2.jsx)(_ScrollButton.ScrollButton, {
         intl: intl,

package/dist/es2019/floatingToolbarPlugin.js

@@ -1,15 +1,13 @@
 import React from 'react';
 import camelCase from 'lodash/camelCase';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { isSSR } from '@atlaskit/editor-common/core-utils';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
-import {
-// Deprecated API - Look at removing this sometime in the future
-useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { WithProviders } from '@atlaskit/editor-common/provider-factory';
+import { isSSR } from '@atlaskit/editor-common/is-ssr';
+import Popup from '@atlaskit/editor-common/Popup';
+import { WithProviders } from '@atlaskit/editor-common/provider-factory/with-providers';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
-import { Popup } from '@atlaskit/editor-common/ui';
+import { useSharedPluginState } from '@atlaskit/editor-common/useSharedPluginState';
 import { AllSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags/fg';

package/dist/es2019/pm-plugins/toolbar-data/plugin-factory.js

@@ -1,4 +1,4 @@
-import { pluginFactory } from '@atlaskit/editor-common/utils';
+import { pluginFactory } from '@atlaskit/editor-common/utils/plugin-state-factory';
 import { pluginKey } from './plugin-key';
 import { reducer } from './reducer';
 const dest = pluginFactory(pluginKey, reducer);

package/dist/es2019/ui/CheckboxModal.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import React, { useState } from 'react';
 import Button from '@atlaskit/button/default/button';
 import { Checkbox } from '@atlaskit/checkbox/checkbox';
-import { messages } from '@atlaskit/editor-common/floating-toolbar';
+import messages from '@atlaskit/editor-common/floating-toolbar/messages';
 import ModalBody from '@atlaskit/modal-dialog/modal-body';
 import Modal from '@atlaskit/modal-dialog/modal-dialog';
 import ModalFooter from '@atlaskit/modal-dialog/modal-footer';

package/dist/es2019/ui/Dropdown.js

@@ -8,8 +8,9 @@ import React, { Component } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { css, jsx } from '@emotion/react';
-import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
-import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';
+import Button from '@atlaskit/editor-common/FloatingToolbar/Button';
+import { ArrowKeyNavigationType } from '@atlaskit/editor-common/ui-menu/ArrowKeyNavigationProvider/types';
+import { DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu/DropdownContainer';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import { Divider } from './Divider';
 import DropdownMenu, { itemSpacing, menuItemDimensions } from './DropdownMenu';

package/dist/es2019/ui/DropdownMenu.js

@@ -8,7 +8,8 @@ import { css, jsx } from '@emotion/react';
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 
 import { injectIntl } from 'react-intl';
-import { DropdownMenuItem, DropdownSeparator } from '@atlaskit/editor-common/floating-toolbar';
+import { DropdownMenuItem } from '@atlaskit/editor-common/DropdownMenuItem';
+import { DropdownSeparator } from '@atlaskit/editor-common/DropdownSeparator';
 import HeadingItem from '@atlaskit/menu/heading-item';
 export const menuItemDimensions = {
   width: 175,

package/dist/es2019/ui/EmojiPickerButton.js

@@ -7,9 +7,10 @@ import React, { useCallback, useContext } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import IconButton from '@atlaskit/button/icon/button';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { Popup } from '@atlaskit/editor-common/ui';
-import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-react';
+import Popup from '@atlaskit/editor-common/Popup';
+import { OutsideClickTargetRefContext } from '@atlaskit/editor-common/ui-react';
+import withReactEditorViewOuterListeners from '@atlaskit/editor-common/ui-react/with-react-editor-view-outer-listeners';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { EmojiPicker } from '@atlaskit/emoji';
 import EmojiAddIcon from '@atlaskit/icon/core/emoji-add';
 import Tooltip from '@atlaskit/tooltip/Tooltip';

package/dist/es2019/ui/ExtensionsPlaceholder.js

@@ -3,10 +3,11 @@ import Loadable from 'react-loadable';
 // oxlint-disable-next-line @atlassian/no-restricted-imports
 import { lazy, LazySuspense } from 'react-loosely-lazy';
 import ButtonGroup from '@atlaskit/button/button-group';
-import { getContextualToolbarItemsFromModule } from '@atlaskit/editor-common/extensions';
+import { getContextualToolbarItemsFromModule } from '@atlaskit/editor-common/extensions/module-helpers';
+import Button from '@atlaskit/editor-common/FloatingToolbar/Button';
+import Separator from '@atlaskit/editor-common/FloatingToolbar/Separator';
 import { isNestedTablesSupported, isSelectionTableNestedInTable } from '@atlaskit/editor-common/nesting';
-import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
-import { nodeToJSON } from '@atlaskit/editor-common/utils';
+import { nodeToJSON } from '@atlaskit/editor-common/utils/nodes';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import Dropdown from './Dropdown';
 const noop = () => null;

package/dist/es2019/ui/Input.js

@@ -6,7 +6,7 @@ import React, { useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { jsx } from '@emotion/react';
-import { panelTextInput } from '@atlaskit/editor-common/ui';
+import { panelTextInput } from '@atlaskit/editor-common/PanelTextInput/styles';
 export const Input = props => {
   const {
     defaultValue,

package/dist/es2019/ui/ScrollButton.js

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { bind } from 'bind-event-listener';
 import rafSchedule from 'raf-schd';
 import IconButton from '@atlaskit/button/icon/button';
-import { messages } from '@atlaskit/editor-common/floating-toolbar';
+import messages from '@atlaskit/editor-common/floating-toolbar/messages';
 import ChevronLeftLargeIcon from '@atlaskit/icon/core/chevron-left';
 import ChevronRightLargeIcon from '@atlaskit/icon/core/chevron-right';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss

package/dist/es2019/ui/ScrollButtons.js

@@ -7,8 +7,8 @@ import React, { useEffect, useRef, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { css, jsx } from '@emotion/react';
 import rafSchedule from 'raf-schd';
-import { messages } from '@atlaskit/editor-common/floating-toolbar';
-import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
+import messages from '@atlaskit/editor-common/floating-toolbar/messages';
+import Button from '@atlaskit/editor-common/FloatingToolbar/Button';
 import ChevronLeftLargeIcon from '@atlaskit/icon/core/chevron-left';
 import ChevronRightLargeIcon from '@atlaskit/icon/core/chevron-right';
 // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage

package/dist/es2019/ui/SimpleModal.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import Button from '@atlaskit/button/default/button';
-import { messages } from '@atlaskit/editor-common/floating-toolbar';
+import messages from '@atlaskit/editor-common/floating-toolbar/messages';
 import ModalBody from '@atlaskit/modal-dialog/modal-body';
 import Modal from '@atlaskit/modal-dialog/modal-dialog';
 import ModalFooter from '@atlaskit/modal-dialog/modal-footer';

package/dist/es2019/ui/Toolbar.js

@@ -12,13 +12,17 @@ import React, { Component } from 'react';
 import { css, jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl';
 import ButtonGroup from '@atlaskit/button/button-group';
-import { areSameItems, messages } from '@atlaskit/editor-common/floating-toolbar';
+import Announcer from '@atlaskit/editor-common/announcer';
+import { areSameItems } from '@atlaskit/editor-common/floating-toolbar';
+import messages from '@atlaskit/editor-common/floating-toolbar/messages';
+import Button from '@atlaskit/editor-common/FloatingToolbar/Button';
+import Separator from '@atlaskit/editor-common/FloatingToolbar/Separator';
 import commonMessages from '@atlaskit/editor-common/messages';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
-import { Announcer, FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
-import { backgroundPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color';
-import { ColorPickerButton, ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
-import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
+import { backgroundPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color/ColorPalette/paletteMessagesTokenModeNames';
+import ColorPickerButton from '@atlaskit/editor-common/ui-menu/ColorPickerButton';
+import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu/ToolbarArrowKeyNavigationProvider';
+import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette/background';
 import ShowMoreHorizontalIcon from '@atlaskit/icon/core/show-more-horizontal';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { checkShouldForceFocusAndApply, forceFocusSelector } from '../pm-plugins/force-focus';

package/dist/esm/floatingToolbarPlugin.js

@@ -4,16 +4,14 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React from 'react';
 import camelCase from 'lodash/camelCase';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { isSSR } from '@atlaskit/editor-common/core-utils';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE } from '@atlaskit/editor-common/analytics/types/enums';
 import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
-import {
-// Deprecated API - Look at removing this sometime in the future
-useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { WithProviders } from '@atlaskit/editor-common/provider-factory';
+import { isSSR } from '@atlaskit/editor-common/is-ssr';
+import Popup from '@atlaskit/editor-common/Popup';
+import { WithProviders } from '@atlaskit/editor-common/provider-factory/with-providers';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
-import { Popup } from '@atlaskit/editor-common/ui';
+import { useSharedPluginState } from '@atlaskit/editor-common/useSharedPluginState';
 import { AllSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags/fg';

package/dist/esm/pm-plugins/toolbar-data/plugin-factory.js

@@ -1,4 +1,4 @@
-import { pluginFactory } from '@atlaskit/editor-common/utils';
+import { pluginFactory } from '@atlaskit/editor-common/utils/plugin-state-factory';
 import { pluginKey } from './plugin-key';
 import { reducer } from './reducer';
 var dest = pluginFactory(pluginKey, reducer);

package/dist/esm/ui/CheckboxModal.js

@@ -3,7 +3,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useState } from 'react';
 import Button from '@atlaskit/button/default/button';
 import { Checkbox } from '@atlaskit/checkbox/checkbox';
-import { messages } from '@atlaskit/editor-common/floating-toolbar';
+import messages from '@atlaskit/editor-common/floating-toolbar/messages';
 import ModalBody from '@atlaskit/modal-dialog/modal-body';
 import Modal from '@atlaskit/modal-dialog/modal-dialog';
 import ModalFooter from '@atlaskit/modal-dialog/modal-footer';

package/dist/esm/ui/Dropdown.js

@@ -17,8 +17,9 @@ import React, { Component } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { css, jsx } from '@emotion/react';
-import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
-import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';
+import Button from '@atlaskit/editor-common/FloatingToolbar/Button';
+import { ArrowKeyNavigationType } from '@atlaskit/editor-common/ui-menu/ArrowKeyNavigationProvider/types';
+import { DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu/DropdownContainer';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import { Divider } from './Divider';
 import DropdownMenu, { itemSpacing, menuItemDimensions } from './DropdownMenu';

package/dist/esm/ui/DropdownMenu.js

@@ -8,7 +8,8 @@ import { css, jsx } from '@emotion/react';
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 
 import { injectIntl } from 'react-intl';
-import { DropdownMenuItem, DropdownSeparator } from '@atlaskit/editor-common/floating-toolbar';
+import { DropdownMenuItem } from '@atlaskit/editor-common/DropdownMenuItem';
+import { DropdownSeparator } from '@atlaskit/editor-common/DropdownSeparator';
 import HeadingItem from '@atlaskit/menu/heading-item';
 export var menuItemDimensions = {
   width: 175,

package/dist/esm/ui/EmojiPickerButton.js

@@ -8,9 +8,10 @@ import React, { useCallback, useContext } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import IconButton from '@atlaskit/button/icon/button';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { Popup } from '@atlaskit/editor-common/ui';
-import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-react';
+import Popup from '@atlaskit/editor-common/Popup';
+import { OutsideClickTargetRefContext } from '@atlaskit/editor-common/ui-react';
+import withReactEditorViewOuterListeners from '@atlaskit/editor-common/ui-react/with-react-editor-view-outer-listeners';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import { EmojiPicker } from '@atlaskit/emoji';
 import EmojiAddIcon from '@atlaskit/icon/core/emoji-add';
 import Tooltip from '@atlaskit/tooltip/Tooltip';

package/dist/esm/ui/ExtensionsPlaceholder.js

@@ -6,10 +6,11 @@ import Loadable from 'react-loadable';
 // oxlint-disable-next-line @atlassian/no-restricted-imports
 import { lazy, LazySuspense } from 'react-loosely-lazy';
 import ButtonGroup from '@atlaskit/button/button-group';
-import { getContextualToolbarItemsFromModule } from '@atlaskit/editor-common/extensions';
+import { getContextualToolbarItemsFromModule } from '@atlaskit/editor-common/extensions/module-helpers';
+import Button from '@atlaskit/editor-common/FloatingToolbar/Button';
+import Separator from '@atlaskit/editor-common/FloatingToolbar/Separator';
 import { isNestedTablesSupported, isSelectionTableNestedInTable } from '@atlaskit/editor-common/nesting';
-import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
-import { nodeToJSON } from '@atlaskit/editor-common/utils';
+import { nodeToJSON } from '@atlaskit/editor-common/utils/nodes';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import Dropdown from './Dropdown';
 var noop = function noop() {

package/dist/esm/ui/Input.js

@@ -7,7 +7,7 @@ import React, { useState } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { jsx } from '@emotion/react';
-import { panelTextInput } from '@atlaskit/editor-common/ui';
+import { panelTextInput } from '@atlaskit/editor-common/PanelTextInput/styles';
 export var Input = function Input(props) {
   var defaultValue = props.defaultValue,
     onBlur = props.onBlur,

package/dist/esm/ui/ScrollButton.js

@@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react';
 import { bind } from 'bind-event-listener';
 import rafSchedule from 'raf-schd';
 import IconButton from '@atlaskit/button/icon/button';
-import { messages } from '@atlaskit/editor-common/floating-toolbar';
+import messages from '@atlaskit/editor-common/floating-toolbar/messages';
 import ChevronLeftLargeIcon from '@atlaskit/icon/core/chevron-left';
 import ChevronRightLargeIcon from '@atlaskit/icon/core/chevron-right';
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss

package/dist/esm/ui/ScrollButtons.js

@@ -8,8 +8,8 @@ import React, { useEffect, useRef, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { css, jsx } from '@emotion/react';
 import rafSchedule from 'raf-schd';
-import { messages } from '@atlaskit/editor-common/floating-toolbar';
-import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
+import messages from '@atlaskit/editor-common/floating-toolbar/messages';
+import Button from '@atlaskit/editor-common/FloatingToolbar/Button';
 import ChevronLeftLargeIcon from '@atlaskit/icon/core/chevron-left';
 import ChevronRightLargeIcon from '@atlaskit/icon/core/chevron-right';
 // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage

package/dist/esm/ui/SimpleModal.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import Button from '@atlaskit/button/default/button';
-import { messages } from '@atlaskit/editor-common/floating-toolbar';
+import messages from '@atlaskit/editor-common/floating-toolbar/messages';
 import ModalBody from '@atlaskit/modal-dialog/modal-body';
 import Modal from '@atlaskit/modal-dialog/modal-dialog';
 import ModalFooter from '@atlaskit/modal-dialog/modal-footer';

package/dist/esm/ui/Toolbar.js

@@ -21,13 +21,17 @@ import React, { Component } from 'react';
 import { css, jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl';
 import ButtonGroup from '@atlaskit/button/button-group';
-import { areSameItems, messages } from '@atlaskit/editor-common/floating-toolbar';
+import Announcer from '@atlaskit/editor-common/announcer';
+import { areSameItems } from '@atlaskit/editor-common/floating-toolbar';
+import messages from '@atlaskit/editor-common/floating-toolbar/messages';
+import Button from '@atlaskit/editor-common/FloatingToolbar/Button';
+import Separator from '@atlaskit/editor-common/FloatingToolbar/Separator';
 import commonMessages from '@atlaskit/editor-common/messages';
 import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
-import { Announcer, FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
-import { backgroundPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color';
-import { ColorPickerButton, ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
-import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
+import { backgroundPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color/ColorPalette/paletteMessagesTokenModeNames';
+import ColorPickerButton from '@atlaskit/editor-common/ui-menu/ColorPickerButton';
+import { ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu/ToolbarArrowKeyNavigationProvider';
+import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette/background';
 import ShowMoreHorizontalIcon from '@atlaskit/icon/core/show-more-horizontal';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { checkShouldForceFocusAndApply, forceFocusSelector } from '../pm-plugins/force-focus';

package/dist/types/floatingToolbarPlugin.d.ts

@@ -1,8 +1,10 @@
 import React from 'react';
 import type { IntlShape } from 'react-intl';
-import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
+import type ProviderFactory from '@atlaskit/editor-common/provider-factory/provider-factory';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { ExtractInjectionAPI, FloatingToolbarConfig, FloatingToolbarHandler, UiComponentFactoryParams } from '@atlaskit/editor-common/types';
+import type { FloatingToolbarConfig, FloatingToolbarHandler } from '@atlaskit/editor-common/types/floating-toolbar';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
+import type { UiComponentFactoryParams } from '@atlaskit/editor-common/types/ui-components';
 import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';

package/dist/types/floatingToolbarPluginType.d.ts

@@ -1,17 +1,18 @@
-import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import type { FloatingToolbarConfig, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
-import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type { ContextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
-import type { CopyButtonPlugin } from '@atlaskit/editor-plugin-copy-button';
-import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
-import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
-import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
-import type { EmojiPlugin } from '@atlaskit/editor-plugin-emoji';
-import type { ExtensionPlugin } from '@atlaskit/editor-plugin-extension';
-import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
-import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction';
-import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
-import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
+import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
+import type { FloatingToolbarConfig } from '@atlaskit/editor-common/types/floating-toolbar';
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types/next-editor-plugin';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics/analyticsPluginType';
+import type { ContextPanelPlugin } from '@atlaskit/editor-plugin-context-panel/contextPanelPluginType';
+import type { CopyButtonPlugin } from '@atlaskit/editor-plugin-copy-button/copyButtonPluginType';
+import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations/decorationsPluginType';
+import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled/editorDisabledPluginType';
+import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode/editorViewmodePluginType';
+import type { EmojiPlugin } from '@atlaskit/editor-plugin-emoji/emojiPluginType';
+import type { ExtensionPlugin } from '@atlaskit/editor-plugin-extension/extensionPluginType';
+import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags/featureFlagsPluginType';
+import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction/interaction-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 { Node, NodeType } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 export type ConfigWithNodeInfo = {

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

@@ -1,4 +1,5 @@
-import type { INPUT_METHOD, EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics/api';
+import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import type { NodeType } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 export declare const copyNode: (nodeType: NodeType | Array<NodeType>, editorAnalyticsApi?: EditorAnalyticsAPI | undefined, inputMethod?: INPUT_METHOD) => ({ tr }: {

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

@@ -1,3 +1,3 @@
-import type { Command } from '@atlaskit/editor-common/types';
+import type { Command } from '@atlaskit/editor-common/types/command';
 export declare const showConfirmDialog: (buttonIndex: number, optionIndex?: number) => Command;
 export declare const hideConfirmDialog: () => Command;

package/dist/types/pm-plugins/toolbar-data/plugin-factory.d.ts

@@ -1,5 +1,5 @@
 import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
-import type { Command } from '@atlaskit/editor-common/types';
+import type { Command } from '@atlaskit/editor-common/types/command';
 import type { EditorState, SafeStateField, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { FloatingToolbarPluginData } from '../../floatingToolbarPluginType';
 import type { FloatingToolbarPluginAction } from './types';

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

@@ -1,4 +1,4 @@
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
-import type { ConfirmationDialogProps } from '@atlaskit/editor-common/types';
+import type { ConfirmationDialogProps } from '@atlaskit/editor-common/types/floating-toolbar';
 export declare const CheckboxModal: (props: ConfirmationDialogProps & WrappedComponentProps) => React.JSX.Element;

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { WithIntlProps, WrappedComponentProps } from 'react-intl';
-import type { ConfirmationDialogProps } from '@atlaskit/editor-common/types';
+import type { ConfirmationDialogProps } from '@atlaskit/editor-common/types/floating-toolbar';
 export declare const ConfirmationModal: React.FC<WithIntlProps<ConfirmationDialogProps & WrappedComponentProps>> & {
     WrappedComponent: React.ComponentType<ConfirmationDialogProps & WrappedComponentProps>;
 };

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

@@ -5,7 +5,8 @@
 import type { ReactElement } from 'react';
 import React, { Component } from 'react';
 import { jsx } from '@emotion/react';
-import type { CommandDispatch, DropdownOptions, ExtensionDropdownOptions, FloatingToolbarOverflowDropdownOptions } from '@atlaskit/editor-common/types';
+import type { CommandDispatch } from '@atlaskit/editor-common/types/command';
+import type { DropdownOptions, ExtensionDropdownOptions, FloatingToolbarOverflowDropdownOptions } from '@atlaskit/editor-common/types/floating-toolbar';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export interface Props {

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

@@ -1,7 +1,8 @@
 import type { ComponentType, FC } from 'react';
 import type { WithIntlProps, WrappedComponentProps } from 'react-intl';
-import type { ExtensionAPI, ExtensionProvider } from '@atlaskit/editor-common/extensions';
-import type { DropdownOptionT, FloatingToolbarOverflowDropdownOptions } from '@atlaskit/editor-common/types';
+import type { ExtensionAPI } from '@atlaskit/editor-common/extensions/extension-handler';
+import type { ExtensionProvider } from '@atlaskit/editor-common/extensions/extension-provider';
+import type { DropdownOptionT, FloatingToolbarOverflowDropdownOptions } from '@atlaskit/editor-common/types/floating-toolbar';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { ButtonItemProps } from '@atlaskit/menu/types';
 export declare const menuItemDimensions: {

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

@@ -1,5 +1,5 @@
-import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type ProviderFactory from '@atlaskit/editor-common/provider-factory/provider-factory';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { EmojiId } from '@atlaskit/emoji';
 import type { FloatingToolbarPlugin } from '../floatingToolbarPluginType';

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

@@ -1,6 +1,7 @@
 import React from 'react';
-import type { ExtensionAPI, ExtensionProvider } from '@atlaskit/editor-common/extensions';
-import type { ApplyChangeHandler } from '@atlaskit/editor-plugin-context-panel';
+import type { ExtensionAPI } from '@atlaskit/editor-common/extensions/extension-handler';
+import type { ExtensionProvider } from '@atlaskit/editor-common/extensions/extension-provider';
+import type { ApplyChangeHandler } from '@atlaskit/editor-plugin-context-panel/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 interface Props {

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { SelectOption } from '@atlaskit/editor-common/types';
+import type { SelectOption } from '@atlaskit/editor-common/types/floating-toolbar';
 import type { ValueType } from '@atlaskit/select/types';
 export interface Props {
     ariaLabel?: string;

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

@@ -1,4 +1,4 @@
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl';
-import type { ConfirmationDialogProps } from '@atlaskit/editor-common/types';
+import type { ConfirmationDialogProps } from '@atlaskit/editor-common/types/floating-toolbar';
 export declare const SimpleModal: (props: ConfirmationDialogProps & WrappedComponentProps) => React.JSX.Element;

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

@@ -4,11 +4,11 @@
  */
 import React from 'react';
 import type { WithIntlProps, WrappedComponentProps } from 'react-intl';
-import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
-import type { ExtensionProvider } from '@atlaskit/editor-common/extensions';
+import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics/types/dispatch-analytics-event';
+import type { ExtensionProvider } from '@atlaskit/editor-common/extensions/extension-provider';
 import type { Item } from '@atlaskit/editor-common/floating-toolbar';
-import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type ProviderFactory from '@atlaskit/editor-common/provider-factory/provider-factory';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { FloatingToolbarPlugin } from '../floatingToolbarPluginType';

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

@@ -1,2 +1,3 @@
-import type { Command, FloatingToolbarOverflowDropdown } from '@atlaskit/editor-common/types';
+import type { Command } from '@atlaskit/editor-common/types/command';
+import type { FloatingToolbarOverflowDropdown } from '@atlaskit/editor-common/types/floating-toolbar';
 export declare const consolidateOverflowDropdownItems: (overflowDropdowns: FloatingToolbarOverflowDropdown<Command>[]) => FloatingToolbarOverflowDropdown<Command>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-floating-toolbar",
-	"version": "28.0.4",
+	"version": "28.0.7",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -44,7 +44,7 @@
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/primitives": "^22.5.0",
 		"@atlaskit/select": "^23.1.0",
-		"@atlaskit/tmp-editor-statsig": "^231.0.0",
+		"@atlaskit/tmp-editor-statsig": "^234.0.0",
 		"@atlaskit/tokens": "^20.4.0",
 		"@atlaskit/tooltip": "^24.4.0",
 		"@babel/runtime": "^7.0.0",
@@ -56,7 +56,7 @@
 		"react-loosely-lazy": "^1.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^130.3.0",
+		"@atlaskit/editor-common": "^130.5.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"