@atlaskit/editor-plugin-block-type 30.0.3 → 30.0.5

package/dist/cjs/pm-plugins/input-rule.js

@@ -6,12 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _commands = require("@atlaskit/editor-common/commands");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _insertBlock = require("@atlaskit/editor-common/commands/insert-block");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
-var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
-var _utils2 = require("./utils");
+var _inputRules = require("@atlaskit/editor-common/utils/input-rules");
+var _constants = require("@atlaskit/prosemirror-input-rules/constants");
+var _utils2 = require("@atlaskit/prosemirror-input-rules/utils");
+var _utils3 = require("./utils");
 var MAX_HEADING_LEVEL = 6;
 
 // Ignored via go/ees005
@@ -23,7 +25,7 @@ function getHeadingLevel(match) {
   };
 }
 function headingRule(nodeType, maxLevel) {
-  return (0, _utils2.createWrappingTextBlockRule)({
+  return (0, _utils3.createWrappingTextBlockRule)({
     // Ignored via go/ees005
     // eslint-disable-next-line require-unicode-regexp
     match: new RegExp('^(#{1,' + maxLevel + '})\\s$'),
@@ -32,7 +34,7 @@ function headingRule(nodeType, maxLevel) {
   });
 }
 function blockQuoteRule(nodeType) {
-  return (0, _utils2.createJoinNodesRule)(BLOCK_QUOTE_REGEX, nodeType);
+  return (0, _utils3.createJoinNodesRule)(BLOCK_QUOTE_REGEX, nodeType);
 }
 
 /**
@@ -47,22 +49,22 @@ function getHeadingRules(editorAnalyticsAPI, schema) {
   var leftNodeReplacementHashRule = (0, _utils.createRule)(
   // Ignored via go/ees005
   // eslint-disable-next-line require-unicode-regexp
-  new RegExp("".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, "(#{1,6})\\s$")), function (state, match, start, end) {
+  new RegExp("".concat(_constants.leafNodeReplacementCharacter, "(#{1,6})\\s$")), function (state, match, start, end) {
     var level = match[1].length;
-    return (0, _commands.insertBlock)(state, schema.nodes.heading, start, end, {
+    return (0, _insertBlock.insertBlock)(state, schema.nodes.heading, start, end, {
       level: level
     });
   });
 
   // New analytics handler
-  var ruleWithHeadingAnalytics = (0, _utils.inputRuleWithAnalytics)(function (_state, matchResult) {
+  var ruleWithHeadingAnalytics = (0, _inputRules.inputRuleWithAnalytics)(function (_state, matchResult) {
     return {
-      action: _analytics.ACTION.FORMATTED,
-      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-      eventType: _analytics.EVENT_TYPE.TRACK,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_HEADING,
+      action: _enums.ACTION.FORMATTED,
+      actionSubject: _enums.ACTION_SUBJECT.TEXT,
+      eventType: _enums.EVENT_TYPE.TRACK,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.FORMAT_HEADING,
       attributes: {
-        inputMethod: _analytics.INPUT_METHOD.FORMATTING,
+        inputMethod: _enums.INPUT_METHOD.FORMATTING,
         newHeadingLevel: getHeadingLevel(matchResult).level
       }
     };
@@ -82,18 +84,18 @@ function getBlockQuoteRules(editorAnalyticsAPI, schema) {
   var leftNodeReplacementGreatherRule = (0, _utils.createRule)(
   // Ignored via go/ees005
   // eslint-disable-next-line require-unicode-regexp
-  new RegExp("".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, "\\s*>\\s$")), function (state, _match, start, end) {
-    return (0, _commands.insertBlock)(state, schema.nodes.blockquote, start, end);
+  new RegExp("".concat(_constants.leafNodeReplacementCharacter, "\\s*>\\s$")), function (state, _match, start, end) {
+    return (0, _insertBlock.insertBlock)(state, schema.nodes.blockquote, start, end);
   });
 
   // Analytics V3 handler
-  var ruleWithBlockQuoteAnalytics = (0, _utils.inputRuleWithAnalytics)({
-    action: _analytics.ACTION.FORMATTED,
-    actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-    eventType: _analytics.EVENT_TYPE.TRACK,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_BLOCK_QUOTE,
+  var ruleWithBlockQuoteAnalytics = (0, _inputRules.inputRuleWithAnalytics)({
+    action: _enums.ACTION.FORMATTED,
+    actionSubject: _enums.ACTION_SUBJECT.TEXT,
+    eventType: _enums.EVENT_TYPE.TRACK,
+    actionSubjectId: _enums.ACTION_SUBJECT_ID.FORMAT_BLOCK_QUOTE,
     attributes: {
-      inputMethod: _analytics.INPUT_METHOD.FORMATTING
+      inputMethod: _enums.INPUT_METHOD.FORMATTING
     }
   }, editorAnalyticsAPI);
   return [ruleWithBlockQuoteAnalytics(greatherThanRule), ruleWithBlockQuoteAnalytics(leftNodeReplacementGreatherRule)];
@@ -107,7 +109,7 @@ function inputRulePlugin(editorAnalyticsAPI, schema, featureFlags) {
     rules.push.apply(rules, (0, _toConsumableArray2.default)(getBlockQuoteRules(editorAnalyticsAPI, schema)));
   }
   if (rules.length !== 0) {
-    return new _safePlugin.SafePlugin((0, _prosemirrorInputRules.createPlugin)('block-type', rules, {
+    return new _safePlugin.SafePlugin((0, _utils2.createPlugin)('block-type', rules, {
       isBlockNodeRule: true
     }));
   }

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

@@ -5,10 +5,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = keymapPlugin;
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _keymap = require("@atlaskit/editor-common/keymap");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _utils = require("@atlaskit/editor-common/utils");
-var _commands = require("@atlaskit/editor-prosemirror/commands");
+var _commands = require("@atlaskit/editor-common/utils/commands");
+var _commands2 = require("@atlaskit/editor-prosemirror/commands");
 var _redo = require("@atlaskit/prosemirror-history/redo");
 var _undo = require("@atlaskit/prosemirror-history/undo");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
@@ -17,19 +18,19 @@ var _blockType = require("./commands/block-type");
 var _deleteAndMoveCursor = require("./commands/delete-and-move-cursor");
 var _deleteBlockContent = require("./commands/delete-block-content");
 var _splitHeadingWithTrailingSpace = require("./commands/split-heading-with-trailing-space");
-var _utils2 = require("./utils");
+var _utils = require("./utils");
 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); }
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-namespace
 
-var backspaceCommand = (0, _commands.chainCommands)(_blockType.cleanUpAtTheStartOfDocument, (0, _deleteBlockContent.deleteBlockContent)(_utils2.isNodeAWrappingBlockNode), _deleteAndMoveCursor.deleteAndMoveCursor);
-var del = (0, _commands.chainCommands)((0, _utils.deleteEmptyParagraphAndMoveBlockUp)(_utils2.isNodeAWrappingBlockNode), (0, _deleteBlockContent.deleteBlockContent)(_utils2.isNodeAWrappingBlockNode), _deleteAndMoveCursor.deleteAndMoveCursor);
+var backspaceCommand = (0, _commands2.chainCommands)(_blockType.cleanUpAtTheStartOfDocument, (0, _deleteBlockContent.deleteBlockContent)(_utils.isNodeAWrappingBlockNode), _deleteAndMoveCursor.deleteAndMoveCursor);
+var del = (0, _commands2.chainCommands)((0, _commands.deleteEmptyParagraphAndMoveBlockUp)(_utils.isNodeAWrappingBlockNode), (0, _deleteBlockContent.deleteBlockContent)(_utils.isNodeAWrappingBlockNode), _deleteAndMoveCursor.deleteAndMoveCursor);
 function keymapPlugin(editorAnalyticsApi, schema, _featureFlags) {
   var list = {};
   (0, _keymaps.bindKeymapWithCommand)(
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  _keymaps.insertNewLine.common, (0, _utils.insertNewLineWithAnalytics)(editorAnalyticsApi), list);
+  _keymaps.insertNewLine.common, (0, _commands.insertNewLineWithAnalytics)(editorAnalyticsApi), list);
 
   // Fixes the "Enter after a heading with trailing whitespace creates another
   // heading instead of a paragraph" bug. The command is a no-op (returns false)
@@ -41,10 +42,10 @@ function keymapPlugin(editorAnalyticsApi, schema, _featureFlags) {
   }
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  (0, _keymaps.bindKeymapWithCommand)(_keymaps.moveUp.common, _utils.createNewParagraphAbove, list);
+  (0, _keymaps.bindKeymapWithCommand)(_keymaps.moveUp.common, _commands.createNewParagraphAbove, list);
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  (0, _keymaps.bindKeymapWithCommand)(_keymaps.moveDown.common, _utils.createNewParagraphBelow, list);
+  (0, _keymaps.bindKeymapWithCommand)(_keymaps.moveDown.common, _commands.createNewParagraphBelow, list);
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   (0, _keymaps.bindKeymapWithCommand)((0, _keymaps.findKeyMapForBrowser)(_keymaps.redo), _redo.redo, list);
@@ -65,7 +66,7 @@ function keymapPlugin(editorAnalyticsApi, schema, _featureFlags) {
     (0, _keymaps.bindKeymapWithCommand)(
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    (0, _keymaps.findShortcutByKeymap)(_keymaps.toggleBlockQuote), (0, _blockType.insertBlockQuoteWithAnalytics)(_analytics.INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
+    (0, _keymaps.findShortcutByKeymap)(_keymaps.toggleBlockQuote), (0, _blockType.insertBlockQuoteWithAnalytics)(_enums.INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
   }
-  return (0, _keymaps.keymap)(list);
+  return (0, _keymap.keymap)(list);
 }

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.pluginKey = exports.createPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _blockType = require("@atlaskit/editor-common/block-type");
 var _browser = require("@atlaskit/editor-common/browser");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
@@ -82,9 +82,9 @@ var detectBlockType = function detectBlockType(availableBlockTypes, state) {
 };
 var autoformatHeading = function autoformatHeading(headingLevel, editorAnalyticsApi) {
   if (headingLevel === 0) {
-    return (0, _blockType2.setNormalTextWithAnalytics)(_analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi);
+    return (0, _blockType2.setNormalTextWithAnalytics)(_enums.INPUT_METHOD.FORMATTING, editorAnalyticsApi);
   }
-  return (0, _blockType2.setHeadingWithAnalytics)(headingLevel, _analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi);
+  return (0, _blockType2.setHeadingWithAnalytics)(headingLevel, _enums.INPUT_METHOD.FORMATTING, editorAnalyticsApi);
 };
 var pluginKey = exports.pluginKey = new _state.PluginKey('blockTypePlugin');
 var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMustBeParagraph, includeBlockQuoteAsTextstyleOption, allowFontSize) {
@@ -163,10 +163,10 @@ var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispa
         } else if (event.keyCode === _consts.KEY_7 && event.altKey) {
           if (browser.mac && event.metaKey) {
             var _editorAPI$core$actio3, _editorAPI$core3;
-            return (_editorAPI$core$actio3 = editorAPI === null || editorAPI === void 0 || (_editorAPI$core3 = editorAPI.core) === null || _editorAPI$core3 === void 0 ? void 0 : _editorAPI$core3.actions.execute((0, _blockType2.setSmallTextWithAnalytics)(_analytics.INPUT_METHOD.SHORTCUT, editorAnalyticsApi))) !== null && _editorAPI$core$actio3 !== void 0 ? _editorAPI$core$actio3 : false;
+            return (_editorAPI$core$actio3 = editorAPI === null || editorAPI === void 0 || (_editorAPI$core3 = editorAPI.core) === null || _editorAPI$core3 === void 0 ? void 0 : _editorAPI$core3.actions.execute((0, _blockType2.setSmallTextWithAnalytics)(_enums.INPUT_METHOD.SHORTCUT, editorAnalyticsApi))) !== null && _editorAPI$core$actio3 !== void 0 ? _editorAPI$core$actio3 : false;
           } else if (!browser.mac && event.ctrlKey && altKeyLocation !== event.DOM_KEY_LOCATION_RIGHT) {
             var _editorAPI$core$actio4, _editorAPI$core4;
-            return (_editorAPI$core$actio4 = editorAPI === null || editorAPI === void 0 || (_editorAPI$core4 = editorAPI.core) === null || _editorAPI$core4 === void 0 ? void 0 : _editorAPI$core4.actions.execute((0, _blockType2.setSmallTextWithAnalytics)(_analytics.INPUT_METHOD.SHORTCUT, editorAnalyticsApi))) !== null && _editorAPI$core$actio4 !== void 0 ? _editorAPI$core$actio4 : false;
+            return (_editorAPI$core$actio4 = editorAPI === null || editorAPI === void 0 || (_editorAPI$core4 = editorAPI.core) === null || _editorAPI$core4 === void 0 ? void 0 : _editorAPI$core4.actions.execute((0, _blockType2.setSmallTextWithAnalytics)(_enums.INPUT_METHOD.SHORTCUT, editorAnalyticsApi))) !== null && _editorAPI$core$actio4 !== void 0 ? _editorAPI$core$actio4 : false;
           }
         } else if (event.key === 'Alt') {
           // event.location is for the current key only; when a user hits Ctrl-Alt-1 the

package/dist/cjs/pm-plugins/ui/FloatingToolbarComponent.js

@@ -7,8 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FloatingToolbarComponent = FloatingToolbarComponent;
 var _react = _interopRequireWildcard(require("react"));
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _hooks = require("@atlaskit/editor-common/hooks");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _ToolbarBlockType = _interopRequireDefault(require("./ToolbarBlockType"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -20,7 +20,7 @@ var FloatingToolbarSettings = {
 };
 function FloatingToolbarComponent(_ref) {
   var api = _ref.api;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['blockType'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['blockType'], function (states) {
       var _states$blockTypeStat, _states$blockTypeStat2, _states$blockTypeStat3, _states$blockTypeStat4, _states$blockTypeStat5;
       return {
         currentBlockType: (_states$blockTypeStat = states.blockTypeState) === null || _states$blockTypeStat === void 0 ? void 0 : _states$blockTypeStat.currentBlockType,
@@ -37,15 +37,15 @@ function FloatingToolbarComponent(_ref) {
     formattingIsPresent = _useSharedPluginState.formattingIsPresent;
   var boundSetBlockType = (0, _react.useCallback)(function (name, fromBlockQuote) {
     var _api$core, _api$blockType;
-    return api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 || (_api$blockType = _api$blockType.commands) === null || _api$blockType === void 0 ? void 0 : _api$blockType.setTextLevel(name, _analytics.INPUT_METHOD.FLOATING_TB, fromBlockQuote));
+    return api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 || (_api$blockType = _api$blockType.commands) === null || _api$blockType === void 0 ? void 0 : _api$blockType.setTextLevel(name, _enums.INPUT_METHOD.FLOATING_TB, fromBlockQuote));
   }, [api]);
   var wrapBlockQuote = (0, _react.useCallback)(function () {
     var _api$core2, _api$blockType2;
-    return api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(api === null || api === void 0 || (_api$blockType2 = api.blockType) === null || _api$blockType2 === void 0 || (_api$blockType2 = _api$blockType2.commands) === null || _api$blockType2 === void 0 ? void 0 : _api$blockType2.insertBlockQuote(_analytics.INPUT_METHOD.FLOATING_TB));
+    return api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(api === null || api === void 0 || (_api$blockType2 = api.blockType) === null || _api$blockType2 === void 0 || (_api$blockType2 = _api$blockType2.commands) === null || _api$blockType2 === void 0 ? void 0 : _api$blockType2.insertBlockQuote(_enums.INPUT_METHOD.FLOATING_TB));
   }, [api]);
   var clearFormatting = (0, _react.useCallback)(function () {
     var _api$core3, _api$blockType3;
-    return api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(api === null || api === void 0 || (_api$blockType3 = api.blockType) === null || _api$blockType3 === void 0 || (_api$blockType3 = _api$blockType3.commands) === null || _api$blockType3 === void 0 ? void 0 : _api$blockType3.clearFormatting(_analytics.INPUT_METHOD.FLOATING_TB));
+    return api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(api === null || api === void 0 || (_api$blockType3 = api.blockType) === null || _api$blockType3 === void 0 || (_api$blockType3 = _api$blockType3.commands) === null || _api$blockType3 === void 0 ? void 0 : _api$blockType3.clearFormatting(_enums.INPUT_METHOD.FLOATING_TB));
   }, [api]);
   return /*#__PURE__*/_react.default.createElement(_ToolbarBlockType.default, {
     isSmall: FloatingToolbarSettings.isSmall,

package/dist/cjs/pm-plugins/ui/PrimaryToolbarComponent.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.PrimaryToolbarComponent = PrimaryToolbarComponent;
 var _react = _interopRequireDefault(require("react"));
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _hooks = require("@atlaskit/editor-common/hooks");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
 var _ToolbarBlockType = _interopRequireDefault(require("./ToolbarBlockType"));
 function PrimaryToolbarComponent(_ref) {
   var api = _ref.api,
@@ -18,7 +18,7 @@ function PrimaryToolbarComponent(_ref) {
     popupsBoundariesElement = _ref.popupsBoundariesElement,
     popupsScrollableElement = _ref.popupsScrollableElement,
     shouldUseDefaultRole = _ref.shouldUseDefaultRole;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['blockType'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['blockType'], function (states) {
       var _states$blockTypeStat, _states$blockTypeStat2, _states$blockTypeStat3, _states$blockTypeStat4, _states$blockTypeStat5;
       return {
         currentBlockType: (_states$blockTypeStat = states.blockTypeState) === null || _states$blockTypeStat === void 0 ? void 0 : _states$blockTypeStat.currentBlockType,
@@ -35,15 +35,15 @@ function PrimaryToolbarComponent(_ref) {
     formattingIsPresent = _useSharedPluginState.formattingIsPresent;
   var boundSetBlockType = function boundSetBlockType(name, fromBlockQuote) {
     var _api$core, _api$blockType;
-    return api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 || (_api$blockType = _api$blockType.commands) === null || _api$blockType === void 0 ? void 0 : _api$blockType.setTextLevel(name, _analytics.INPUT_METHOD.TOOLBAR, fromBlockQuote));
+    return api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 || (_api$blockType = _api$blockType.commands) === null || _api$blockType === void 0 ? void 0 : _api$blockType.setTextLevel(name, _enums.INPUT_METHOD.TOOLBAR, fromBlockQuote));
   };
   var wrapBlockQuote = function wrapBlockQuote() {
     var _api$core2, _api$blockType2;
-    return api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(api === null || api === void 0 || (_api$blockType2 = api.blockType) === null || _api$blockType2 === void 0 || (_api$blockType2 = _api$blockType2.commands) === null || _api$blockType2 === void 0 ? void 0 : _api$blockType2.insertBlockQuote(_analytics.INPUT_METHOD.TOOLBAR));
+    return api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(api === null || api === void 0 || (_api$blockType2 = api.blockType) === null || _api$blockType2 === void 0 || (_api$blockType2 = _api$blockType2.commands) === null || _api$blockType2 === void 0 ? void 0 : _api$blockType2.insertBlockQuote(_enums.INPUT_METHOD.TOOLBAR));
   };
   var clearFormatting = function clearFormatting() {
     var _api$core3, _api$blockType3;
-    return api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(api === null || api === void 0 || (_api$blockType3 = api.blockType) === null || _api$blockType3 === void 0 || (_api$blockType3 = _api$blockType3.commands) === null || _api$blockType3 === void 0 ? void 0 : _api$blockType3.clearFormatting(_analytics.INPUT_METHOD.TOOLBAR));
+    return api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(api === null || api === void 0 || (_api$blockType3 = api.blockType) === null || _api$blockType3 === void 0 || (_api$blockType3 = _api$blockType3.commands) === null || _api$blockType3 === void 0 ? void 0 : _api$blockType3.clearFormatting(_enums.INPUT_METHOD.TOOLBAR));
   };
   return /*#__PURE__*/_react.default.createElement(_ToolbarBlockType.default, {
     isSmall: isSmall,

package/dist/cjs/pm-plugins/ui/ToolbarBlockType/HeadingButton.js

@@ -9,12 +9,13 @@ exports.HeadingButton = void 0;
 var _runtime = require("@compiled/react/runtime");
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _getEditorUgcToken = _interopRequireDefault(require("@atlaskit/editor-common/get-editor-ugc-token"));
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _ugcTokens = require("@atlaskit/editor-common/ugc-tokens");
-var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _useSharedPluginStateSelector = require("@atlaskit/editor-common/useSharedPluginStateSelector");
+var _toolbarDropdownItem = require("@atlaskit/editor-toolbar/toolbar-dropdown-item");
+var _toolbarKeyboardShortcutHint = require("@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint");
 var _utils = require("../../utils");
 var _editorUGCToken;
 /* eslint-disable @atlaskit/ui-styling-standard/no-unsafe-values */
@@ -22,42 +23,42 @@ var _editorUGCToken;
 var headingTextProps = {
   normal: {
     style: {
-      font: (0, _ugcTokens.editorUGCToken)('editor.font.body')
+      font: (0, _getEditorUgcToken.default)('editor.font.body')
     }
   },
   smallText: {
     style: {
-      font: (_editorUGCToken = (0, _ugcTokens.editorUGCToken)('editor.font.body.small')) !== null && _editorUGCToken !== void 0 ? _editorUGCToken : (0, _ugcTokens.editorUGCToken)('editor.font.body')
+      font: (_editorUGCToken = (0, _getEditorUgcToken.default)('editor.font.body.small')) !== null && _editorUGCToken !== void 0 ? _editorUGCToken : (0, _getEditorUgcToken.default)('editor.font.body')
     }
   },
   heading1: {
     style: {
-      font: (0, _ugcTokens.editorUGCToken)('editor.font.heading.h1')
+      font: (0, _getEditorUgcToken.default)('editor.font.heading.h1')
     }
   },
   heading2: {
     style: {
-      font: (0, _ugcTokens.editorUGCToken)('editor.font.heading.h2')
+      font: (0, _getEditorUgcToken.default)('editor.font.heading.h2')
     }
   },
   heading3: {
     style: {
-      font: (0, _ugcTokens.editorUGCToken)('editor.font.heading.h3')
+      font: (0, _getEditorUgcToken.default)('editor.font.heading.h3')
     }
   },
   heading4: {
     style: {
-      font: (0, _ugcTokens.editorUGCToken)('editor.font.heading.h4')
+      font: (0, _getEditorUgcToken.default)('editor.font.heading.h4')
     }
   },
   heading5: {
     style: {
-      font: (0, _ugcTokens.editorUGCToken)('editor.font.heading.h5')
+      font: (0, _getEditorUgcToken.default)('editor.font.heading.h5')
     }
   },
   heading6: {
     style: {
-      font: (0, _ugcTokens.editorUGCToken)('editor.font.heading.h6')
+      font: (0, _getEditorUgcToken.default)('editor.font.heading.h6')
     }
   }
 };
@@ -89,7 +90,7 @@ var HeadingButton = exports.HeadingButton = function HeadingButton(_ref2) {
     formatMessage = _useIntl.formatMessage;
   var currentBlockType = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockType.currentBlockType');
   var availableBlockTypesInDropdown = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockType.availableBlockTypesInDropdown');
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorView = _useEditorToolbar.editorView;
   if (!(availableBlockTypesInDropdown !== null && availableBlockTypesInDropdown !== void 0 && availableBlockTypesInDropdown.some(function (availableBlockType) {
     return availableBlockType.name === blockType.name;
@@ -103,13 +104,13 @@ var HeadingButton = exports.HeadingButton = function HeadingButton(_ref2) {
     if (isDisabled) {
       return;
     }
-    api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 || (_api$blockType = _api$blockType.commands) === null || _api$blockType === void 0 ? void 0 : _api$blockType.setTextLevel(blockType.name, _analytics.INPUT_METHOD.TOOLBAR, fromBlockQuote));
+    api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 || (_api$blockType = _api$blockType.commands) === null || _api$blockType === void 0 ? void 0 : _api$blockType.setTextLevel(blockType.name, _enums.INPUT_METHOD.TOOLBAR, fromBlockQuote));
   };
   var shortcut = (0, _keymaps.formatShortcut)(shortcuts[blockType.name]);
   var isSelected = (currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name) === blockType.name;
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
     elemBefore: blockType.icon,
-    elemAfter: shortcut ? /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
+    elemAfter: shortcut ? /*#__PURE__*/_react.default.createElement(_toolbarKeyboardShortcutHint.ToolbarKeyboardShortcutHint, {
       shortcut: shortcut
     }) : undefined,
     onClick: onClick,

package/dist/cjs/pm-plugins/ui/ToolbarBlockType/QuoteButton.js

@@ -7,11 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.QuoteButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _useSharedPluginStateSelector = require("@atlaskit/editor-common/useSharedPluginStateSelector");
+var _toolbarDropdownItem = require("@atlaskit/editor-toolbar/toolbar-dropdown-item");
+var _toolbarKeyboardShortcutHint = require("@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint");
 var _utils = require("../../utils");
 var shouldDisableQuoteButton = function shouldDisableQuoteButton(state) {
   if (!state) {
@@ -26,7 +27,7 @@ var QuoteButton = exports.QuoteButton = function QuoteButton(_ref) {
     formatMessage = _useIntl.formatMessage;
   var availableBlockTypesInDropdown = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockType.availableBlockTypesInDropdown');
   var currentBlockType = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockType.currentBlockType');
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorView = _useEditorToolbar.editorView;
   if (!(availableBlockTypesInDropdown !== null && availableBlockTypesInDropdown !== void 0 && availableBlockTypesInDropdown.some(function (availableBlockType) {
     return availableBlockType.name === blockType.name;
@@ -39,13 +40,13 @@ var QuoteButton = exports.QuoteButton = function QuoteButton(_ref) {
     if (isDisabled) {
       return;
     }
-    api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 || (_api$blockType = _api$blockType.commands) === null || _api$blockType === void 0 ? void 0 : _api$blockType.insertBlockQuote(_analytics.INPUT_METHOD.TOOLBAR));
+    api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 || (_api$blockType = _api$blockType.commands) === null || _api$blockType === void 0 ? void 0 : _api$blockType.insertBlockQuote(_enums.INPUT_METHOD.TOOLBAR));
   };
   var shortcut = (0, _keymaps.formatShortcut)(_keymaps.toggleBlockQuote);
   var isSelected = currentBlockType === blockType;
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
     elemBefore: blockType.icon,
-    elemAfter: shortcut ? /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
+    elemAfter: shortcut ? /*#__PURE__*/_react.default.createElement(_toolbarKeyboardShortcutHint.ToolbarKeyboardShortcutHint, {
       shortcut: shortcut
     }) : undefined,
     onClick: onClick,

package/dist/cjs/pm-plugins/ui/ToolbarBlockType/TextStylesMenuButton.js

@@ -7,10 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.TextStylesMenuButton = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
-var _hooks = require("@atlaskit/editor-common/hooks");
-var _messages = require("@atlaskit/editor-common/messages");
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _toolbar = require("@atlaskit/editor-common/messages/toolbar");
+var _context = require("@atlaskit/editor-common/toolbar/context");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _textIcon = require("@atlaskit/editor-toolbar/text-icon");
+var _toolbarDropdownMenu = require("@atlaskit/editor-toolbar/toolbar-dropdown-menu");
+var _toolbarTooltip = require("@atlaskit/editor-toolbar/toolbar-tooltip");
 var _blockTypes = require("../../block-types");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var selectPluginState = function selectPluginState(state) {
@@ -21,7 +23,7 @@ var selectPluginState = function selectPluginState(state) {
   };
 };
 var usePluginState = function usePluginState(api) {
-  return (0, _hooks.useSharedPluginStateWithSelector)(api, ['blockType'], selectPluginState);
+  return (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['blockType'], selectPluginState);
 };
 var TextStylesMenuButton = exports.TextStylesMenuButton = function TextStylesMenuButton(_ref) {
   var _Object$values$find;
@@ -36,7 +38,7 @@ var TextStylesMenuButton = exports.TextStylesMenuButton = function TextStylesMen
   var blockTypes = (0, _blockTypes.toolbarBlockTypesWithRank)({
     allowFontSize: allowFontSize
   });
-  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+  var _useEditorToolbar = (0, _context.useEditorToolbar)(),
     editorAppearance = _useEditorToolbar.editorAppearance;
   var CurrentIcon = (_Object$values$find = Object.values(blockTypes).find(function (blockType) {
     return blockType.name === (currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name);
@@ -45,27 +47,27 @@ var TextStylesMenuButton = exports.TextStylesMenuButton = function TextStylesMen
   var TriggerIcon = (0, _react.useMemo)(function () {
     if (editorAppearance === 'full-page') {
       var hasCurrentBlockType = currentBlockType && CurrentIcon;
-      var Icon = hasCurrentBlockType ? CurrentIcon : _editorToolbar.TextIcon;
+      var Icon = hasCurrentBlockType ? CurrentIcon : _textIcon.TextIcon;
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(Icon, {
         label: "",
         size: "small"
       }), hasCurrentBlockType ? formatMessage(currentBlockType.title) : formatMessage(normalText.title));
     }
     return CurrentIcon ? /*#__PURE__*/_react.default.createElement(CurrentIcon, {
-      label: "".concat(currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name, " ").concat(formatMessage(_messages.toolbarMessages.textStylesTooltip)),
+      label: "".concat(currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name, " ").concat(formatMessage(_toolbar.toolbarMessages.textStylesTooltip)),
       size: "small"
-    }) : /*#__PURE__*/_react.default.createElement(_editorToolbar.TextIcon, {
-      label: formatMessage(_messages.toolbarMessages.textStylesTooltip),
+    }) : /*#__PURE__*/_react.default.createElement(_textIcon.TextIcon, {
+      label: formatMessage(_toolbar.toolbarMessages.textStylesTooltip),
       size: "small"
     });
   }, [editorAppearance, currentBlockType, CurrentIcon, normalText, formatMessage]);
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownMenu, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownMenu.ToolbarDropdownMenu, {
     isDisabled: blockTypesDisabled,
     iconBefore: TriggerIcon,
-    tooltipComponent: /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarTooltip, {
-      content: formatMessage(_messages.toolbarMessages.textStylesTooltip)
+    tooltipComponent: /*#__PURE__*/_react.default.createElement(_toolbarTooltip.ToolbarTooltip, {
+      content: formatMessage(_toolbar.toolbarMessages.textStylesTooltip)
     }),
-    label: formatMessage(_messages.toolbarMessages.textStyles, {
+    label: formatMessage(_toolbar.toolbarMessages.textStyles, {
       blockTypeName: currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name
     }),
     shouldRenderToParent: true

package/dist/cjs/pm-plugins/ui/ToolbarBlockType/blocktype-button.js

@@ -8,9 +8,10 @@ exports.BlockTypeButton = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntl = require("react-intl");
-var _messages = require("@atlaskit/editor-common/messages");
-var _styles = require("@atlaskit/editor-common/styles");
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _toolbar = require("@atlaskit/editor-common/messages/toolbar");
+var _expand = require("@atlaskit/editor-common/styles/expand");
+var _plugins = require("@atlaskit/editor-common/styles/plugins");
+var _ToolbarButton = _interopRequireDefault(require("@atlaskit/editor-common/ui-menu/ToolbarButton"));
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/core/chevron-down"));
 var _text = _interopRequireDefault(require("@atlaskit/icon/core/text"));
 var _primitives = require("@atlaskit/primitives");
@@ -37,10 +38,10 @@ var buttonContentReducedSpacingStyle = (0, _primitives.xcss)({
 });
 var BlockTypeButton = exports.BlockTypeButton = function BlockTypeButton(props) {
   var blockTypeName = props.blockTypeName || '';
-  var labelTextStyles = props.formatMessage(_messages.toolbarMessages.textStyles, {
+  var labelTextStyles = props.formatMessage(_toolbar.toolbarMessages.textStyles, {
     blockTypeName: blockTypeName
   });
-  var toolipTextStyles = props.formatMessage(_messages.toolbarMessages.textStylesTooltip);
+  var toolipTextStyles = props.formatMessage(_toolbar.toolbarMessages.textStylesTooltip);
   var icon = (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1') && props.blockTypeIcon ? props.blockTypeIcon : (0, _react2.jsx)(_text.default, {
     label: labelTextStyles,
     spacing: "spacious",
@@ -48,7 +49,7 @@ var BlockTypeButton = exports.BlockTypeButton = function BlockTypeButton(props)
   });
   var chevronIconSpacing = (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1') ? 'spacious' : 'none';
   var shouldUseIconAsButton = props.isSmall || (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1');
-  return (0, _react2.jsx)(_uiMenu.ToolbarButton, {
+  return (0, _react2.jsx)(_ToolbarButton.default, {
     spacing: props.isReducedSpacing ? 'none' : 'default',
     selected: props.selected
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -63,11 +64,11 @@ var BlockTypeButton = exports.BlockTypeButton = function BlockTypeButton(props)
     "aria-expanded": props['aria-expanded'],
     iconAfter: (0, _react2.jsx)("span", {
       // 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: [_styles.wrapperStyle, props.isSmall && _styled.wrapperSmallStyle],
+      css: [_plugins.wrapperStyle, props.isSmall && _styled.wrapperSmallStyle],
       "data-testid": "toolbar-block-type-text-styles-icon"
     }, (0, _react2.jsx)(_react.default.Fragment, null, shouldUseIconAsButton && icon, (0, _react2.jsx)("span", {
       // 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: _styles.expandIconContainerStyle
+      css: _expand.expandIconContainerStyle
     }, (0, _react2.jsx)(_chevronDown.default, {
       spacing: chevronIconSpacing,
       label: "",