@atlaskit/editor-plugin-undo-redo 26.0.4 → 26.0.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-undo-redo
 
+## 26.0.6
+
+### Patch Changes
+
+- Updated dependencies
+
+## 26.0.5
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 26.0.4
 
 ### Patch Changes

package/dist/cjs/pm-plugins/attach-input-meta.js

@@ -8,10 +8,10 @@ exports.attachInputMetaWithAnalytics = exports.attachInputMeta = void 0;
 exports.getChanges = getChanges;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _document = require("@atlaskit/editor-common/utils/document");
-var _enums = require("./enums");
+var _withAnalytics = require("@atlaskit/editor-common/withAnalytics");
+var _enums2 = require("./enums");
 var _pluginKey = require("./plugin-key");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -36,14 +36,14 @@ var attachInputMeta = exports.attachInputMeta = function attachInputMeta(inputSo
 };
 var inputSourceToInputMethod = function inputSourceToInputMethod(inputSource) {
   switch (inputSource) {
-    case _enums.InputSource.EXTERNAL:
-      return _analytics.INPUT_METHOD.EXTERNAL;
-    case _enums.InputSource.KEYBOARD:
-      return _analytics.INPUT_METHOD.KEYBOARD;
-    case _enums.InputSource.TOOLBAR:
-      return _analytics.INPUT_METHOD.TOOLBAR;
+    case _enums2.InputSource.EXTERNAL:
+      return _enums.INPUT_METHOD.EXTERNAL;
+    case _enums2.InputSource.KEYBOARD:
+      return _enums.INPUT_METHOD.KEYBOARD;
+    case _enums2.InputSource.TOOLBAR:
+      return _enums.INPUT_METHOD.TOOLBAR;
     default:
-      return _analytics.INPUT_METHOD.EXTERNAL;
+      return _enums.INPUT_METHOD.EXTERNAL;
   }
 };
 function getNodesWithDifferingAttributes(_ref) {
@@ -91,13 +91,13 @@ function getChanges(_ref2) {
 var attachInputMetaWithAnalytics = exports.attachInputMetaWithAnalytics = function attachInputMetaWithAnalytics(editorAnalyticsAPI) {
   return function (inputSource, action) {
     return function (command) {
-      return attachInputMeta(inputSource)((0, _editorAnalytics.withAnalytics)(editorAnalyticsAPI, function (_ref3, _ref4) {
+      return attachInputMeta(inputSource)((0, _withAnalytics.withAnalytics)(editorAnalyticsAPI, function (_ref3, _ref4) {
         var before = _ref3.doc;
         var after = _ref4.currentDoc;
         return {
-          eventType: _analytics.EVENT_TYPE.TRACK,
+          eventType: _enums.EVENT_TYPE.TRACK,
           action: action,
-          actionSubject: _analytics.ACTION_SUBJECT.EDITOR,
+          actionSubject: _enums.ACTION_SUBJECT.EDITOR,
           attributes: _objectSpread({
             inputMethod: inputSourceToInputMethod(inputSource)
           }, getChanges({

package/dist/cjs/pm-plugins/commands.js

@@ -4,24 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.undoFromToolbarWithAnalytics = exports.undoFromToolbar = exports.undoFromKeyboardWithAnalytics = exports.undoFromKeyboard = exports.redoFromToolbarWithAnalytics = exports.redoFromToolbar = exports.redoFromKeyboardWithAnalytics = exports.redoFromKeyboard = void 0;
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _redo = require("@atlaskit/prosemirror-history/redo");
 var _undo = require("@atlaskit/prosemirror-history/undo");
 var _attachInputMeta = require("./attach-input-meta");
-var _enums = require("./enums");
-var undoFromKeyboard = exports.undoFromKeyboard = (0, _attachInputMeta.attachInputMeta)(_enums.InputSource.KEYBOARD)(_undo.undo);
-var redoFromKeyboard = exports.redoFromKeyboard = (0, _attachInputMeta.attachInputMeta)(_enums.InputSource.KEYBOARD)(_redo.redo);
-var undoFromToolbar = exports.undoFromToolbar = (0, _attachInputMeta.attachInputMeta)(_enums.InputSource.TOOLBAR)(_undo.undo);
-var redoFromToolbar = exports.redoFromToolbar = (0, _attachInputMeta.attachInputMeta)(_enums.InputSource.TOOLBAR)(_redo.redo);
+var _enums2 = require("./enums");
+var undoFromKeyboard = exports.undoFromKeyboard = (0, _attachInputMeta.attachInputMeta)(_enums2.InputSource.KEYBOARD)(_undo.undo);
+var redoFromKeyboard = exports.redoFromKeyboard = (0, _attachInputMeta.attachInputMeta)(_enums2.InputSource.KEYBOARD)(_redo.redo);
+var undoFromToolbar = exports.undoFromToolbar = (0, _attachInputMeta.attachInputMeta)(_enums2.InputSource.TOOLBAR)(_undo.undo);
+var redoFromToolbar = exports.redoFromToolbar = (0, _attachInputMeta.attachInputMeta)(_enums2.InputSource.TOOLBAR)(_redo.redo);
 var undoFromKeyboardWithAnalytics = exports.undoFromKeyboardWithAnalytics = function undoFromKeyboardWithAnalytics(editorAnalyticsAPI) {
-  return (0, _attachInputMeta.attachInputMetaWithAnalytics)(editorAnalyticsAPI)(_enums.InputSource.KEYBOARD, _analytics.ACTION.UNDO_PERFORMED)(_undo.undo);
+  return (0, _attachInputMeta.attachInputMetaWithAnalytics)(editorAnalyticsAPI)(_enums2.InputSource.KEYBOARD, _enums.ACTION.UNDO_PERFORMED)(_undo.undo);
 };
 var redoFromKeyboardWithAnalytics = exports.redoFromKeyboardWithAnalytics = function redoFromKeyboardWithAnalytics(editorAnalyticsAPI) {
-  return (0, _attachInputMeta.attachInputMetaWithAnalytics)(editorAnalyticsAPI)(_enums.InputSource.KEYBOARD, _analytics.ACTION.REDO_PERFORMED)(_redo.redo);
+  return (0, _attachInputMeta.attachInputMetaWithAnalytics)(editorAnalyticsAPI)(_enums2.InputSource.KEYBOARD, _enums.ACTION.REDO_PERFORMED)(_redo.redo);
 };
 var undoFromToolbarWithAnalytics = exports.undoFromToolbarWithAnalytics = function undoFromToolbarWithAnalytics(editorAnalyticsAPI) {
-  return (0, _attachInputMeta.attachInputMetaWithAnalytics)(editorAnalyticsAPI)(_enums.InputSource.TOOLBAR, _analytics.ACTION.UNDO_PERFORMED)(_undo.undo);
+  return (0, _attachInputMeta.attachInputMetaWithAnalytics)(editorAnalyticsAPI)(_enums2.InputSource.TOOLBAR, _enums.ACTION.UNDO_PERFORMED)(_undo.undo);
 };
 var redoFromToolbarWithAnalytics = exports.redoFromToolbarWithAnalytics = function redoFromToolbarWithAnalytics(editorAnalyticsAPI) {
-  return (0, _attachInputMeta.attachInputMetaWithAnalytics)(editorAnalyticsAPI)(_enums.InputSource.TOOLBAR, _analytics.ACTION.REDO_PERFORMED)(_redo.redo);
+  return (0, _attachInputMeta.attachInputMetaWithAnalytics)(editorAnalyticsAPI)(_enums2.InputSource.TOOLBAR, _enums.ACTION.REDO_PERFORMED)(_redo.redo);
 };

package/dist/cjs/ui/ToolbarUndoRedo/RedoButton.js

@@ -7,20 +7,22 @@ Object.defineProperty(exports, "__esModule", {
 exports.RedoButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _undoRedo = require("@atlaskit/editor-common/messages/undo-redo");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _redoIcon = require("@atlaskit/editor-toolbar/redo-icon");
+var _toolbarButton = require("@atlaskit/editor-toolbar/toolbar-button");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
 var _commands = require("../../pm-plugins/commands");
 var _utils = require("../../pm-plugins/utils");
 var RedoButton = exports.RedoButton = function RedoButton(_ref) {
   var api = _ref.api;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorView = _useEditorToolbar.editorView;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['history'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['history'], function (states) {
       var _states$historyState;
       return {
         canRedo: (_states$historyState = states.historyState) === null || _states$historyState === void 0 ? void 0 : _states$historyState.canRedo
@@ -33,14 +35,14 @@ var RedoButton = exports.RedoButton = function RedoButton(_ref) {
       (0, _utils.forceFocus)(editorView, api)((0, _commands.redoFromToolbarWithAnalytics)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions));
     }
   };
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
     content: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
-      description: formatMessage(_messages.undoRedoMessages.redo),
+      description: formatMessage(_undoRedo.messages.redo),
       keymap: _keymaps.redo
     })
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.RedoIcon, {
-      label: formatMessage(_messages.undoRedoMessages.redo),
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_redoIcon.RedoIcon, {
+      label: formatMessage(_undoRedo.messages.redo),
       size: "small"
     }),
     onClick: handleRedo,

package/dist/cjs/ui/ToolbarUndoRedo/UndoButton.js

@@ -7,20 +7,22 @@ Object.defineProperty(exports, "__esModule", {
 exports.UndoButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _undoRedo = require("@atlaskit/editor-common/messages/undo-redo");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _toolbarButton = require("@atlaskit/editor-toolbar/toolbar-button");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
+var _undoIcon = require("@atlaskit/editor-toolbar/undo-icon");
 var _commands = require("../../pm-plugins/commands");
 var _utils = require("../../pm-plugins/utils");
 var UndoButton = exports.UndoButton = function UndoButton(_ref) {
   var api = _ref.api;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorView = _useEditorToolbar.editorView;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['history'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['history'], function (states) {
       var _states$historyState;
       return {
         canUndo: (_states$historyState = states.historyState) === null || _states$historyState === void 0 ? void 0 : _states$historyState.canUndo
@@ -33,14 +35,14 @@ var UndoButton = exports.UndoButton = function UndoButton(_ref) {
       (0, _utils.forceFocus)(editorView, api)((0, _commands.undoFromToolbarWithAnalytics)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions));
     }
   };
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
     content: /*#__PURE__*/_react.default.createElement(_keymaps.ToolTipContent, {
-      description: formatMessage(_messages.undoRedoMessages.undo),
+      description: formatMessage(_undoRedo.messages.undo),
       keymap: _keymaps.undo
     })
-  }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButton, {
-    iconBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.UndoIcon, {
-      label: formatMessage(_messages.undoRedoMessages.undo),
+  }, /*#__PURE__*/_react.default.createElement(_toolbarButton.ToolbarButton, {
+    iconBefore: /*#__PURE__*/_react.default.createElement(_undoIcon.UndoIcon, {
+      label: formatMessage(_undoRedo.messages.undo),
       size: "small"
     }),
     onClick: handleUndo,

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

@@ -7,11 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.ToolbarUndoRedo = void 0;
 var _react = require("@emotion/react");
 var _reactIntl = require("react-intl");
-var _hooks = require("@atlaskit/editor-common/hooks");
+var _toolbarButton = require("@atlaskit/editor-common/analytics/types/toolbar-button");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
-var _styles = require("@atlaskit/editor-common/styles");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _undoRedo = require("@atlaskit/editor-common/messages/undo-redo");
+var _plugins = require("@atlaskit/editor-common/styles/plugins");
+var _ToolbarButton = _interopRequireDefault(require("@atlaskit/editor-common/ui-menu/ToolbarButton"));
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
 var _redo = _interopRequireDefault(require("@atlaskit/icon/core/redo"));
 var _undo = _interopRequireDefault(require("@atlaskit/icon/core/undo"));
 var _commands = require("../../pm-plugins/commands");
@@ -29,7 +30,7 @@ var ToolbarUndoRedo = exports.ToolbarUndoRedo = function ToolbarUndoRedo(_ref) {
     editorView = _ref.editorView,
     api = _ref.api,
     formatMessage = _ref.intl.formatMessage;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['history'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['history'], function (states) {
       var _states$historyState, _states$historyState2;
       return {
         canUndo: (_states$historyState = states.historyState) === null || _states$historyState === void 0 ? void 0 : _states$historyState.canUndo,
@@ -46,16 +47,16 @@ var ToolbarUndoRedo = exports.ToolbarUndoRedo = function ToolbarUndoRedo(_ref) {
     var _api$analytics2;
     (0, _utils.forceFocus)(editorView, api)((0, _commands.redoFromToolbarWithAnalytics)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions));
   };
-  var labelUndo = formatMessage(_messages.undoRedoMessages.undo);
-  var labelRedo = formatMessage(_messages.undoRedoMessages.redo);
+  var labelUndo = formatMessage(_undoRedo.messages.undo);
+  var labelRedo = formatMessage(_undoRedo.messages.redo);
   return (
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
     (0, _react.jsx)("span", {
       css:
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
-      _styles.buttonGroupStyle
-    }, (0, _react.jsx)(_uiMenu.ToolbarButton, {
-      buttonId: _uiMenu.TOOLBAR_BUTTON.UNDO,
+      _plugins.buttonGroupStyle
+    }, (0, _react.jsx)(_ToolbarButton.default, {
+      buttonId: _toolbarButton.TOOLBAR_ACTION_SUBJECT_ID.UNDO,
       spacing: isReducedSpacing ? 'none' : 'default',
       onClick: handleUndo,
       disabled: !canUndo || disabled,
@@ -71,9 +72,9 @@ var ToolbarUndoRedo = exports.ToolbarUndoRedo = function ToolbarUndoRedo(_ref) {
         spacing: "spacious"
       }),
       testId: "ak-editor-toolbar-button-undo"
-    }), (0, _react.jsx)(_uiMenu.ToolbarButton, {
+    }), (0, _react.jsx)(_ToolbarButton.default, {
       spacing: isReducedSpacing ? 'none' : 'default',
-      buttonId: _uiMenu.TOOLBAR_BUTTON.REDO,
+      buttonId: _toolbarButton.TOOLBAR_ACTION_SUBJECT_ID.REDO,
       onClick: handleRedo,
       disabled: !canRedo || disabled,
       title: (0, _react.jsx)(_keymaps.ToolTipContent, {
@@ -91,7 +92,7 @@ var ToolbarUndoRedo = exports.ToolbarUndoRedo = function ToolbarUndoRedo(_ref) {
     }), !(api !== null && api !== void 0 && api.primaryToolbar) && /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage */
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
     (0, _react.jsx)("span", {
-      css: _styles.separatorStyles
+      css: _plugins.separatorStyles
     }))
   );
 };

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

@@ -6,34 +6,36 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getToolbarComponents = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _rank = require("@atlaskit/editor-common/toolbar/rank");
+var _show = require("@atlaskit/editor-toolbar/show");
+var _toolbarButtonGroup = require("@atlaskit/editor-toolbar/toolbar-button-group");
 var _RedoButton = require("./RedoButton");
 var _UndoButton = require("./UndoButton");
 var getToolbarComponents = exports.getToolbarComponents = function getToolbarComponents(api) {
   var _api$toolbar;
   var breakpointPreset = api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.actions.getBreakpointPreset();
   return [{
-    type: _toolbar.UNDO_CHANGES_GROUP.type,
-    key: _toolbar.UNDO_CHANGES_GROUP.key,
+    type: _keys.UNDO_CHANGES_GROUP.type,
+    key: _keys.UNDO_CHANGES_GROUP.key,
     parents: [{
-      type: _toolbar.TRACK_CHANGES_SECTION.type,
-      key: _toolbar.TRACK_CHANGES_SECTION.key,
-      rank: _toolbar.TRACK_CHANGES_SECTION_RANK[_toolbar.UNDO_CHANGES_GROUP.key]
+      type: _keys.TRACK_CHANGES_SECTION.type,
+      key: _keys.TRACK_CHANGES_SECTION.key,
+      rank: _rank.TRACK_CHANGES_SECTION_RANK[_keys.UNDO_CHANGES_GROUP.key]
     }],
     component: function component(_ref) {
       var children = _ref.children;
-      return breakpointPreset === 'jsm-comment' ? /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
+      return breakpointPreset === 'jsm-comment' ? /*#__PURE__*/_react.default.createElement(_show.Show, {
         above: "lg"
-      }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children)) : /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children);
+      }, /*#__PURE__*/_react.default.createElement(_toolbarButtonGroup.ToolbarButtonGroup, null, children)) : /*#__PURE__*/_react.default.createElement(_toolbarButtonGroup.ToolbarButtonGroup, null, children);
     }
   }, {
-    type: _toolbar.UNDO_BUTTON.type,
-    key: _toolbar.UNDO_BUTTON.key,
+    type: _keys.UNDO_BUTTON.type,
+    key: _keys.UNDO_BUTTON.key,
     parents: [{
-      type: _toolbar.UNDO_CHANGES_GROUP.type,
-      key: _toolbar.UNDO_CHANGES_GROUP.key,
-      rank: _toolbar.UNDO_CHANGES_GROUP_RANK[_toolbar.UNDO_BUTTON.key]
+      type: _keys.UNDO_CHANGES_GROUP.type,
+      key: _keys.UNDO_CHANGES_GROUP.key,
+      rank: _rank.UNDO_CHANGES_GROUP_RANK[_keys.UNDO_BUTTON.key]
     }],
     component: function component() {
       return /*#__PURE__*/_react.default.createElement(_UndoButton.UndoButton, {
@@ -41,26 +43,26 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
       });
     }
   }, {
-    type: _toolbar.REDO_CHANGES_GROUP.type,
-    key: _toolbar.REDO_CHANGES_GROUP.key,
+    type: _keys.REDO_CHANGES_GROUP.type,
+    key: _keys.REDO_CHANGES_GROUP.key,
     parents: [{
-      type: _toolbar.TRACK_CHANGES_SECTION.type,
-      key: _toolbar.TRACK_CHANGES_SECTION.key,
-      rank: _toolbar.TRACK_CHANGES_SECTION_RANK[_toolbar.REDO_CHANGES_GROUP.key]
+      type: _keys.TRACK_CHANGES_SECTION.type,
+      key: _keys.TRACK_CHANGES_SECTION.key,
+      rank: _rank.TRACK_CHANGES_SECTION_RANK[_keys.REDO_CHANGES_GROUP.key]
     }],
     component: function component(_ref2) {
       var children = _ref2.children;
-      return breakpointPreset === 'jsm-comment' ? /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
+      return breakpointPreset === 'jsm-comment' ? /*#__PURE__*/_react.default.createElement(_show.Show, {
         above: "lg"
-      }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children)) : /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children);
+      }, /*#__PURE__*/_react.default.createElement(_toolbarButtonGroup.ToolbarButtonGroup, null, children)) : /*#__PURE__*/_react.default.createElement(_toolbarButtonGroup.ToolbarButtonGroup, null, children);
     }
   }, {
-    type: _toolbar.REDO_BUTTON.type,
-    key: _toolbar.REDO_BUTTON.key,
+    type: _keys.REDO_BUTTON.type,
+    key: _keys.REDO_BUTTON.key,
     parents: [{
-      type: _toolbar.REDO_CHANGES_GROUP.type,
-      key: _toolbar.REDO_CHANGES_GROUP.key,
-      rank: _toolbar.REDO_CHANGES_GROUP_RANK[_toolbar.REDO_BUTTON.key]
+      type: _keys.REDO_CHANGES_GROUP.type,
+      key: _keys.REDO_CHANGES_GROUP.key,
+      rank: _rank.REDO_CHANGES_GROUP_RANK[_keys.REDO_BUTTON.key]
     }],
     component: function component() {
       return /*#__PURE__*/_react.default.createElement(_RedoButton.RedoButton, {

package/dist/cjs/undoRedoPlugin.js

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.undoRedoPlugin = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _redo = require("@atlaskit/prosemirror-history/redo");
 var _undo = require("@atlaskit/prosemirror-history/undo");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _attachInputMeta = require("./pm-plugins/attach-input-meta");
-var _enums = require("./pm-plugins/enums");
+var _enums2 = require("./pm-plugins/enums");
 var _keymaps = require("./pm-plugins/keymaps");
 var _main = require("./pm-plugins/main");
 var _utils = require("./pm-plugins/utils");
@@ -61,14 +61,14 @@ var undoRedoPlugin = exports.undoRedoPlugin = function undoRedoPlugin(_ref) {
     if (!editorViewRef.current) {
       return false;
     }
-    return (0, _utils.forceFocus)(editorViewRef.current, api)((0, _attachInputMeta.attachInputMetaWithAnalytics)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(inputSource || _enums.InputSource.EXTERNAL, _analytics.ACTION.UNDO_PERFORMED)(_undo.undo));
+    return (0, _utils.forceFocus)(editorViewRef.current, api)((0, _attachInputMeta.attachInputMetaWithAnalytics)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(inputSource || _enums2.InputSource.EXTERNAL, _enums.ACTION.UNDO_PERFORMED)(_undo.undo));
   };
   var handleRedo = function handleRedo(inputSource) {
     var _api$analytics2;
     if (!editorViewRef.current) {
       return false;
     }
-    return (0, _utils.forceFocus)(editorViewRef.current, api)((0, _attachInputMeta.attachInputMetaWithAnalytics)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)(inputSource || _enums.InputSource.EXTERNAL, _analytics.ACTION.REDO_PERFORMED)(_redo.redo));
+    return (0, _utils.forceFocus)(editorViewRef.current, api)((0, _attachInputMeta.attachInputMetaWithAnalytics)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)(inputSource || _enums2.InputSource.EXTERNAL, _enums.ACTION.REDO_PERFORMED)(_redo.redo));
   };
   var showPrimaryToolbarComponent = !(api !== null && api !== void 0 && api.primaryToolbar) && !isToolbarAIFCEnabled && showToolbarButton;
   return {

package/dist/es2019/pm-plugins/attach-input-meta.js

@@ -1,6 +1,6 @@
-import { ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
+import { ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
+import { withAnalytics } from '@atlaskit/editor-common/withAnalytics';
 import { InputSource } from './enums';
 import { pluginKey as undoPluginKey } from './plugin-key';
 export const attachInputMeta = inputSource => command => (state, dispatch) => {

package/dist/es2019/pm-plugins/commands.js

@@ -1,4 +1,4 @@
-import { ACTION } from '@atlaskit/editor-common/analytics';
+import { ACTION } from '@atlaskit/editor-common/analytics/types/enums';
 import { redo } from '@atlaskit/prosemirror-history/redo';
 import { undo } from '@atlaskit/prosemirror-history/undo';
 import { attachInputMeta, attachInputMetaWithAnalytics } from './attach-input-meta';

package/dist/es2019/ui/ToolbarUndoRedo/RedoButton.js

@@ -1,10 +1,12 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { getAriaKeyshortcuts, redo as redoKeymap, ToolTipContent } from '@atlaskit/editor-common/keymaps';
-import { undoRedoMessages } from '@atlaskit/editor-common/messages';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { ToolbarButton, RedoIcon, ToolbarTooltip } from '@atlaskit/editor-toolbar';
+import { messages as undoRedoMessages } from '@atlaskit/editor-common/messages/undo-redo';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { RedoIcon } from '@atlaskit/editor-toolbar/redo-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 import { redoFromToolbarWithAnalytics } from '../../pm-plugins/commands';
 import { forceFocus } from '../../pm-plugins/utils';
 export const RedoButton = ({

package/dist/es2019/ui/ToolbarUndoRedo/UndoButton.js

@@ -1,10 +1,12 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { getAriaKeyshortcuts, ToolTipContent, undo as undoKeymap } from '@atlaskit/editor-common/keymaps';
-import { undoRedoMessages } from '@atlaskit/editor-common/messages';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { ToolbarButton, ToolbarTooltip, UndoIcon } from '@atlaskit/editor-toolbar';
+import { messages as undoRedoMessages } from '@atlaskit/editor-common/messages/undo-redo';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
+import { UndoIcon } from '@atlaskit/editor-toolbar/undo-icon';
 import { undoFromToolbarWithAnalytics } from '../../pm-plugins/commands';
 import { forceFocus } from '../../pm-plugins/utils';
 export const UndoButton = ({

package/dist/es2019/ui/ToolbarUndoRedo/index.js

@@ -6,11 +6,12 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { TOOLBAR_ACTION_SUBJECT_ID as TOOLBAR_BUTTON } from '@atlaskit/editor-common/analytics/types/toolbar-button';
 import { getAriaKeyshortcuts, redoAlt, tooltip, ToolTipContent, undo as undoKeymap } from '@atlaskit/editor-common/keymaps';
-import { undoRedoMessages } from '@atlaskit/editor-common/messages';
-import { buttonGroupStyle, separatorStyles } from '@atlaskit/editor-common/styles';
-import { TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import { messages as undoRedoMessages } from '@atlaskit/editor-common/messages/undo-redo';
+import { buttonGroupStyle, separatorStyles } from '@atlaskit/editor-common/styles/plugins';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import RedoIcon from '@atlaskit/icon/core/redo';
 import UndoIcon from '@atlaskit/icon/core/undo';
 import { redoFromToolbarWithAnalytics, undoFromToolbarWithAnalytics } from '../../pm-plugins/commands';

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

@@ -1,6 +1,8 @@
 import React from 'react';
-import { UNDO_BUTTON, REDO_BUTTON, UNDO_CHANGES_GROUP_RANK, UNDO_CHANGES_GROUP, REDO_CHANGES_GROUP_RANK, REDO_CHANGES_GROUP, TRACK_CHANGES_SECTION, TRACK_CHANGES_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
-import { Show, ToolbarButtonGroup } from '@atlaskit/editor-toolbar';
+import { UNDO_BUTTON, REDO_BUTTON, UNDO_CHANGES_GROUP, REDO_CHANGES_GROUP, TRACK_CHANGES_SECTION } from '@atlaskit/editor-common/toolbar/keys';
+import { UNDO_CHANGES_GROUP_RANK, REDO_CHANGES_GROUP_RANK, TRACK_CHANGES_SECTION_RANK } from '@atlaskit/editor-common/toolbar/rank';
+import { Show } from '@atlaskit/editor-toolbar/show';
+import { ToolbarButtonGroup } from '@atlaskit/editor-toolbar/toolbar-button-group';
 import { RedoButton } from './RedoButton';
 import { UndoButton } from './UndoButton';
 export const getToolbarComponents = api => {

package/dist/es2019/undoRedoPlugin.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ACTION } from '@atlaskit/editor-common/analytics';
+import { ACTION } from '@atlaskit/editor-common/analytics/types/enums';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { redo } from '@atlaskit/prosemirror-history/redo';
 import { undo } from '@atlaskit/prosemirror-history/undo';

package/dist/esm/pm-plugins/attach-input-meta.js

@@ -2,9 +2,9 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _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 { ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
+import { ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics/types/enums';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
+import { withAnalytics } from '@atlaskit/editor-common/withAnalytics';
 import { InputSource } from './enums';
 import { pluginKey as undoPluginKey } from './plugin-key';
 export var attachInputMeta = function attachInputMeta(inputSource) {

package/dist/esm/pm-plugins/commands.js

@@ -1,4 +1,4 @@
-import { ACTION } from '@atlaskit/editor-common/analytics';
+import { ACTION } from '@atlaskit/editor-common/analytics/types/enums';
 import { redo } from '@atlaskit/prosemirror-history/redo';
 import { undo } from '@atlaskit/prosemirror-history/undo';
 import { attachInputMeta, attachInputMetaWithAnalytics } from './attach-input-meta';

package/dist/esm/ui/ToolbarUndoRedo/RedoButton.js

@@ -1,10 +1,12 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { getAriaKeyshortcuts, redo as redoKeymap, ToolTipContent } from '@atlaskit/editor-common/keymaps';
-import { undoRedoMessages } from '@atlaskit/editor-common/messages';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { ToolbarButton, RedoIcon, ToolbarTooltip } from '@atlaskit/editor-toolbar';
+import { messages as undoRedoMessages } from '@atlaskit/editor-common/messages/undo-redo';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { RedoIcon } from '@atlaskit/editor-toolbar/redo-icon';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
 import { redoFromToolbarWithAnalytics } from '../../pm-plugins/commands';
 import { forceFocus } from '../../pm-plugins/utils';
 export var RedoButton = function RedoButton(_ref) {

package/dist/esm/ui/ToolbarUndoRedo/UndoButton.js

@@ -1,10 +1,12 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { getAriaKeyshortcuts, ToolTipContent, undo as undoKeymap } from '@atlaskit/editor-common/keymaps';
-import { undoRedoMessages } from '@atlaskit/editor-common/messages';
-import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
-import { ToolbarButton, ToolbarTooltip, UndoIcon } from '@atlaskit/editor-toolbar';
+import { messages as undoRedoMessages } from '@atlaskit/editor-common/messages/undo-redo';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar/context';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
+import { ToolbarButton } from '@atlaskit/editor-toolbar/toolbar-button';
+import { ToolbarTooltip } from '@atlaskit/editor-toolbar/toolbar-tooltip';
+import { UndoIcon } from '@atlaskit/editor-toolbar/undo-icon';
 import { undoFromToolbarWithAnalytics } from '../../pm-plugins/commands';
 import { forceFocus } from '../../pm-plugins/utils';
 export var UndoButton = function UndoButton(_ref) {

package/dist/esm/ui/ToolbarUndoRedo/index.js

@@ -6,11 +6,12 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl';
-import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { TOOLBAR_ACTION_SUBJECT_ID as TOOLBAR_BUTTON } from '@atlaskit/editor-common/analytics/types/toolbar-button';
 import { getAriaKeyshortcuts, redoAlt, tooltip, ToolTipContent, undo as undoKeymap } from '@atlaskit/editor-common/keymaps';
-import { undoRedoMessages } from '@atlaskit/editor-common/messages';
-import { buttonGroupStyle, separatorStyles } from '@atlaskit/editor-common/styles';
-import { TOOLBAR_BUTTON, ToolbarButton } from '@atlaskit/editor-common/ui-menu';
+import { messages as undoRedoMessages } from '@atlaskit/editor-common/messages/undo-redo';
+import { buttonGroupStyle, separatorStyles } from '@atlaskit/editor-common/styles/plugins';
+import ToolbarButton from '@atlaskit/editor-common/ui-menu/ToolbarButton';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/useSharedPluginStateWithSelector';
 import RedoIcon from '@atlaskit/icon/core/redo';
 import UndoIcon from '@atlaskit/icon/core/undo';
 import { redoFromToolbarWithAnalytics, undoFromToolbarWithAnalytics } from '../../pm-plugins/commands';

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

@@ -1,6 +1,8 @@
 import React from 'react';
-import { UNDO_BUTTON, REDO_BUTTON, UNDO_CHANGES_GROUP_RANK, UNDO_CHANGES_GROUP, REDO_CHANGES_GROUP_RANK, REDO_CHANGES_GROUP, TRACK_CHANGES_SECTION, TRACK_CHANGES_SECTION_RANK } from '@atlaskit/editor-common/toolbar';
-import { Show, ToolbarButtonGroup } from '@atlaskit/editor-toolbar';
+import { UNDO_BUTTON, REDO_BUTTON, UNDO_CHANGES_GROUP, REDO_CHANGES_GROUP, TRACK_CHANGES_SECTION } from '@atlaskit/editor-common/toolbar/keys';
+import { UNDO_CHANGES_GROUP_RANK, REDO_CHANGES_GROUP_RANK, TRACK_CHANGES_SECTION_RANK } from '@atlaskit/editor-common/toolbar/rank';
+import { Show } from '@atlaskit/editor-toolbar/show';
+import { ToolbarButtonGroup } from '@atlaskit/editor-toolbar/toolbar-button-group';
 import { RedoButton } from './RedoButton';
 import { UndoButton } from './UndoButton';
 export var getToolbarComponents = function getToolbarComponents(api) {

package/dist/esm/undoRedoPlugin.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ACTION } from '@atlaskit/editor-common/analytics';
+import { ACTION } from '@atlaskit/editor-common/analytics/types/enums';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { redo } from '@atlaskit/prosemirror-history/redo';
 import { undo } from '@atlaskit/prosemirror-history/undo';

package/dist/types/pm-plugins/attach-input-meta.d.ts

@@ -1,5 +1,6 @@
-import type { EditorAnalyticsAPI, ACTION } from '@atlaskit/editor-common/analytics';
-import type { HigherOrderCommand, Command } from '@atlaskit/editor-common/types';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics/api';
+import type { ACTION } from '@atlaskit/editor-common/analytics/types/enums';
+import type { HigherOrderCommand, Command } from '@atlaskit/editor-common/types/command';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import { InputSource } from './enums';
 type AttachInputMeta = (inputSource: InputSource) => HigherOrderCommand;

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

@@ -1,5 +1,5 @@
-import { type EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { Command } from '@atlaskit/editor-common/types';
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics/api';
+import type { Command } from '@atlaskit/editor-common/types/command';
 export declare const undoFromKeyboard: Command;
 export declare const redoFromKeyboard: Command;
 export declare const undoFromToolbar: Command;

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

@@ -1,5 +1,5 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { UndoRedoPlugin } from '../undoRedoPluginType';
 /**
  *

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

@@ -1,2 +1,2 @@
-import type { PMPluginFactory } from '@atlaskit/editor-common/types';
+import type { PMPluginFactory } from '@atlaskit/editor-common/types/plugin-factory';
 export declare const createPlugin: PMPluginFactory;

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

@@ -1,4 +1,5 @@
-import type { Command, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { Command } from '@atlaskit/editor-common/types/command';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { UndoRedoPlugin } from '../undoRedoPluginType';
 export declare const closeTypeAheadAndRunCommand: (editorView: EditorView, api: ExtractInjectionAPI<UndoRedoPlugin> | undefined) => (command: Command) => boolean;

package/dist/types/ui/ToolbarUndoRedo/RedoButton.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 { UndoRedoPlugin } from '../../undoRedoPluginType';
 type RedoButtonProps = {
     api?: ExtractInjectionAPI<UndoRedoPlugin>;

package/dist/types/ui/ToolbarUndoRedo/UndoButton.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 { UndoRedoPlugin } from '../../undoRedoPluginType';
 type UndoButtonProps = {
     api?: ExtractInjectionAPI<UndoRedoPlugin>;

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

@@ -5,7 +5,7 @@
 import type { ComponentType, FC } from 'react';
 import { jsx } from '@emotion/react';
 import type { WithIntlProps, WrappedComponentProps } from 'react-intl';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { UndoRedoPlugin } from '../../undoRedoPluginType';
 export interface Props {

package/dist/types/ui/ToolbarUndoRedo/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 { UndoRedoPlugin } from '../../undoRedoPluginType';
 export declare const getToolbarComponents: (api?: ExtractInjectionAPI<UndoRedoPlugin>) => RegisterComponent[];

package/dist/types/undoRedoPluginType.d.ts

@@ -1,9 +1,9 @@
-import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
-import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type { HistoryPlugin } from '@atlaskit/editor-plugin-history';
-import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
-import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
-import type { TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types/next-editor-plugin';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics/analyticsPluginType';
+import type { HistoryPlugin } from '@atlaskit/editor-plugin-history/historyPluginType';
+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 { TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead/type-ahead-plugin-type';
 import type { InputSource } from './pm-plugins/enums';
 export type UndoRedoAction = (inputSource?: InputSource) => boolean;
 export type UndoRedoPlugin = NextEditorPlugin<'undoRedoPlugin', {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-undo-redo",
-	"version": "26.0.4",
+	"version": "26.0.6",
 	"description": "Undo redo plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		"@atlaskit/icon": "^38.0.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/prosemirror-history": "^1.3.0",
-		"@atlaskit/tmp-editor-statsig": "^230.0.0",
+		"@atlaskit/tmp-editor-statsig": "^232.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},