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

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-block-type
 
+## 30.0.5
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 30.0.4
 
 ### Patch Changes

package/dist/cjs/blockTypePlugin.js

@@ -12,17 +12,18 @@ var _blockquote = require("@atlaskit/adf-schema/blockquote");
 var _fontSize = require("@atlaskit/adf-schema/font-size");
 var _hardBreak = require("@atlaskit/adf-schema/hard-break");
 var _heading = require("@atlaskit/adf-schema/heading");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _assets = require("@atlaskit/editor-common/assets");
+var _keymap = require("@atlaskit/editor-common/keymap");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
+var _blockType = require("@atlaskit/editor-common/messages/block-type");
 var _types = require("@atlaskit/editor-common/types");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
-var _blockType = require("./pm-plugins/commands/block-type");
+var _blockType2 = require("./pm-plugins/commands/block-type");
 var _inputRule = _interopRequireDefault(require("./pm-plugins/input-rule"));
-var _keymap = _interopRequireDefault(require("./pm-plugins/keymap"));
+var _keymap2 = _interopRequireDefault(require("./pm-plugins/keymap"));
 var _main = require("./pm-plugins/main");
 var _FloatingToolbarComponent = require("./pm-plugins/ui/FloatingToolbarComponent");
 var _PrimaryToolbarComponent = require("./pm-plugins/ui/PrimaryToolbarComponent");
@@ -41,14 +42,14 @@ var headingPluginOptions = function headingPluginOptions(_ref, isAllowed, editor
   }, function (_v, idx) {
     var level = idx + 1;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    var descriptionDescriptor = _messages.blockTypeMessages["heading".concat(level, "Description")];
+    var descriptionDescriptor = _blockType.messages["heading".concat(level, "Description")];
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    var keyshortcut = (0, _keymaps.tooltip)(_keymaps.keymap["toggleHeading".concat(level)]);
+    var keyshortcut = (0, _keymaps.tooltip)(_keymap.keymap["toggleHeading".concat(level)]);
     var id = "heading".concat(level);
     return {
       id: id,
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      title: formatMessage(_messages.blockTypeMessages[id]),
+      title: formatMessage(_blockType.messages[id]),
       description: formatMessage(descriptionDescriptor),
       priority: 1300,
       keywords: ["h".concat(level)],
@@ -63,12 +64,12 @@ var headingPluginOptions = function headingPluginOptions(_ref, isAllowed, editor
           level: level
         }));
         editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
-          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.QUICK_INSERT,
+            inputMethod: _enums.INPUT_METHOD.QUICK_INSERT,
             newHeadingLevel: level
           }
         })(tr);
@@ -84,8 +85,8 @@ var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed,
   }
   return [{
     id: 'blockquote',
-    title: formatMessage(_messages.blockTypeMessages.blockquote),
-    description: formatMessage(_messages.blockTypeMessages.blockquoteDescription),
+    title: formatMessage(_blockType.messages.blockquote),
+    description: formatMessage(_blockType.messages.blockquoteDescription),
     priority: 1300,
     keyshortcut: '>',
     icon: function icon() {
@@ -94,12 +95,12 @@ var blockquotePluginOptions = function blockquotePluginOptions(_ref2, isAllowed,
     action: function action(insert, state) {
       var tr = insert(state.schema.nodes.blockquote.createChecked({}, state.schema.nodes.paragraph.createChecked()));
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
-        action: _analytics.ACTION.FORMATTED,
-        actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_BLOCK_QUOTE,
+        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.QUICK_INSERT
+          inputMethod: _enums.INPUT_METHOD.QUICK_INSERT
         }
       })(tr);
       return tr;
@@ -205,29 +206,29 @@ var blockTypePlugin = exports.blockTypePlugin = function blockTypePlugin(_ref3)
           var _api$analytics2;
           var schema = _ref7.schema,
             featureFlags = _ref7.featureFlags;
-          return (0, _keymap.default)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, schema, featureFlags);
+          return (0, _keymap2.default)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, schema, featureFlags);
         }
       }];
     },
     actions: {
       insertBlockQuote: function insertBlockQuote(inputMethod) {
         var _api$analytics3;
-        return (0, _blockType.insertBlockQuoteWithAnalytics)(inputMethod, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
+        return (0, _blockType2.insertBlockQuoteWithAnalytics)(inputMethod, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
       }
     },
     commands: {
       setTextLevel: function setTextLevel(level, inputMethod) {
         var _api$analytics4;
         var fromBlockQuote = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-        return (0, _blockType.setBlockTypeWithAnalytics)(level, inputMethod, api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, fromBlockQuote);
+        return (0, _blockType2.setBlockTypeWithAnalytics)(level, inputMethod, api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, fromBlockQuote);
       },
       insertBlockQuote: function insertBlockQuote(inputMethod) {
         var _api$analytics5;
-        return (0, _blockType.insertBlockQuoteWithAnalyticsCommand)(inputMethod, api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
+        return (0, _blockType2.insertBlockQuoteWithAnalyticsCommand)(inputMethod, api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
       },
       clearFormatting: function clearFormatting(inputMethod) {
         var _api$analytics6;
-        return (0, _blockType.clearFormatting)(inputMethod, api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions);
+        return (0, _blockType2.clearFormatting)(inputMethod, api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions);
       }
     },
     getSharedState: function getSharedState(editorState) {

package/dist/cjs/pm-plugins/block-types.js

@@ -7,9 +7,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.toolbarBlockTypesWithRank = exports.getBlockTypesInDropdown = exports.WRAPPER_BLOCK_TYPES = exports.TEXT_BLOCK_TYPES = exports.SMALL_TEXT = exports.PANEL = exports.OTHER = exports.NORMAL_TEXT = exports.HEADING_6 = exports.HEADING_5 = exports.HEADING_4 = exports.HEADING_3 = exports.HEADING_2 = exports.HEADING_1 = exports.HEADINGS_BY_NAME = exports.HEADINGS_BY_LEVEL = exports.FORMATTING_NODE_TYPES = exports.FORMATTING_MARK_TYPES = exports.CODE_BLOCK = exports.BLOCK_QUOTE = exports.ALL_BLOCK_TYPES = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
-var _messages = require("@atlaskit/editor-common/messages");
-var _toolbar = require("@atlaskit/editor-common/toolbar");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _blockType = require("@atlaskit/editor-common/messages/block-type");
+var _keys = require("@atlaskit/editor-common/toolbar/keys");
+var _rank = require("@atlaskit/editor-common/toolbar/rank");
+var _headingFiveIcon = require("@atlaskit/editor-toolbar/heading-five-icon");
+var _headingFourIcon = require("@atlaskit/editor-toolbar/heading-four-icon");
+var _headingOneIcon = require("@atlaskit/editor-toolbar/heading-one-icon");
+var _headingSixIcon = require("@atlaskit/editor-toolbar/heading-six-icon");
+var _headingThreeIcon = require("@atlaskit/editor-toolbar/heading-three-icon");
+var _headingTwoIcon = require("@atlaskit/editor-toolbar/heading-two-icon");
+var _quoteIcon = require("@atlaskit/editor-toolbar/quote-icon");
+var _textNormalIcon = require("@atlaskit/editor-toolbar/text-normal-icon");
+var _textSmallIcon = require("@atlaskit/editor-toolbar/text-small-icon");
 var _textHeadingFive = _interopRequireDefault(require("@atlaskit/icon-lab/core/text-heading-five"));
 var _textHeadingFour = _interopRequireDefault(require("@atlaskit/icon-lab/core/text-heading-four"));
 var _textHeadingOne = _interopRequireDefault(require("@atlaskit/icon-lab/core/text-heading-one"));
@@ -22,7 +31,7 @@ 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) { (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; }
 var NORMAL_TEXT = exports.NORMAL_TEXT = {
   name: 'normal',
-  title: _messages.blockTypeMessages.normal,
+  title: _blockType.messages.normal,
   nodeName: 'paragraph',
   tagName: 'p',
   icon: /*#__PURE__*/_react.default.createElement(_text.default, {
@@ -32,17 +41,17 @@ var NORMAL_TEXT = exports.NORMAL_TEXT = {
 };
 var SMALL_TEXT = exports.SMALL_TEXT = {
   name: 'smallText',
-  title: _messages.blockTypeMessages.smallText,
+  title: _blockType.messages.smallText,
   nodeName: 'paragraph',
   markName: 'fontSize',
-  icon: /*#__PURE__*/_react.default.createElement(_editorToolbar.TextSmallIcon, {
+  icon: /*#__PURE__*/_react.default.createElement(_textSmallIcon.TextSmallIcon, {
     label: ""
   }),
   LEGACY_icon: /*#__PURE__*/_react.default.createElement(_icons.Text, null)
 };
 var HEADING_1 = exports.HEADING_1 = {
   name: 'heading1',
-  title: _messages.blockTypeMessages.heading1,
+  title: _blockType.messages.heading1,
   nodeName: 'heading',
   tagName: 'h1',
   level: 1,
@@ -53,7 +62,7 @@ var HEADING_1 = exports.HEADING_1 = {
 };
 var HEADING_2 = exports.HEADING_2 = {
   name: 'heading2',
-  title: _messages.blockTypeMessages.heading2,
+  title: _blockType.messages.heading2,
   nodeName: 'heading',
   tagName: 'h2',
   level: 2,
@@ -64,7 +73,7 @@ var HEADING_2 = exports.HEADING_2 = {
 };
 var HEADING_3 = exports.HEADING_3 = {
   name: 'heading3',
-  title: _messages.blockTypeMessages.heading3,
+  title: _blockType.messages.heading3,
   nodeName: 'heading',
   tagName: 'h3',
   level: 3,
@@ -75,7 +84,7 @@ var HEADING_3 = exports.HEADING_3 = {
 };
 var HEADING_4 = exports.HEADING_4 = {
   name: 'heading4',
-  title: _messages.blockTypeMessages.heading4,
+  title: _blockType.messages.heading4,
   nodeName: 'heading',
   tagName: 'h4',
   level: 4,
@@ -86,7 +95,7 @@ var HEADING_4 = exports.HEADING_4 = {
 };
 var HEADING_5 = exports.HEADING_5 = {
   name: 'heading5',
-  title: _messages.blockTypeMessages.heading5,
+  title: _blockType.messages.heading5,
   nodeName: 'heading',
   tagName: 'h5',
   level: 5,
@@ -97,7 +106,7 @@ var HEADING_5 = exports.HEADING_5 = {
 };
 var HEADING_6 = exports.HEADING_6 = {
   name: 'heading6',
-  title: _messages.blockTypeMessages.heading6,
+  title: _blockType.messages.heading6,
   nodeName: 'heading',
   tagName: 'h6',
   level: 6,
@@ -108,23 +117,23 @@ var HEADING_6 = exports.HEADING_6 = {
 };
 var BLOCK_QUOTE = exports.BLOCK_QUOTE = {
   name: 'blockquote',
-  title: _messages.blockTypeMessages.blockquote,
+  title: _blockType.messages.blockquote,
   nodeName: 'blockquote',
   tagName: 'blockquote'
 };
 var CODE_BLOCK = exports.CODE_BLOCK = {
   name: 'codeblock',
-  title: _messages.blockTypeMessages.codeblock,
+  title: _blockType.messages.codeblock,
   nodeName: 'codeBlock'
 };
 var PANEL = exports.PANEL = {
   name: 'panel',
-  title: _messages.blockTypeMessages.infoPanel,
+  title: _blockType.messages.infoPanel,
   nodeName: 'panel'
 };
 var OTHER = exports.OTHER = {
   name: 'other',
-  title: _messages.blockTypeMessages.other,
+  title: _blockType.messages.other,
   nodeName: ''
 };
 var TEXT_BLOCK_TYPES = exports.TEXT_BLOCK_TYPES = [NORMAL_TEXT, SMALL_TEXT, HEADING_1, HEADING_2, HEADING_3, HEADING_4, HEADING_5, HEADING_6];
@@ -143,78 +152,78 @@ var toolbarBlockTypesWithRank = exports.toolbarBlockTypesWithRank = function too
   var allowFontSize = _ref.allowFontSize;
   return _objectSpread(_objectSpread({
     normal: _objectSpread(_objectSpread({}, NORMAL_TEXT), {}, {
-      icon: /*#__PURE__*/_react.default.createElement(_editorToolbar.TextNormalIcon, {
+      icon: /*#__PURE__*/_react.default.createElement(_textNormalIcon.TextNormalIcon, {
         size: "small",
         label: ""
       }),
-      toolbarRank: _toolbar.TEXT_STYLES_MENU_SECTION_RANK[_toolbar.NORMAL_TEXT_MENU_ITEM.key],
-      toolbarKey: _toolbar.NORMAL_TEXT_MENU_ITEM.key
+      toolbarRank: _rank.TEXT_STYLES_MENU_SECTION_RANK[_keys.NORMAL_TEXT_MENU_ITEM.key],
+      toolbarKey: _keys.NORMAL_TEXT_MENU_ITEM.key
     })
   }, allowFontSize && {
     smallText: _objectSpread(_objectSpread({}, SMALL_TEXT), {}, {
-      icon: /*#__PURE__*/_react.default.createElement(_editorToolbar.TextSmallIcon, {
+      icon: /*#__PURE__*/_react.default.createElement(_textSmallIcon.TextSmallIcon, {
         size: "small",
         label: ""
       }),
-      toolbarRank: _toolbar.TEXT_STYLES_MENU_SECTION_RANK[_toolbar.SMALL_TEXT_MENU_ITEM.key],
-      toolbarKey: _toolbar.SMALL_TEXT_MENU_ITEM.key
+      toolbarRank: _rank.TEXT_STYLES_MENU_SECTION_RANK[_keys.SMALL_TEXT_MENU_ITEM.key],
+      toolbarKey: _keys.SMALL_TEXT_MENU_ITEM.key
     })
   }), {}, {
     heading1: _objectSpread(_objectSpread({}, HEADING_1), {}, {
-      icon: /*#__PURE__*/_react.default.createElement(_editorToolbar.HeadingOneIcon, {
+      icon: /*#__PURE__*/_react.default.createElement(_headingOneIcon.HeadingOneIcon, {
         size: "small",
         label: ""
       }),
-      toolbarRank: _toolbar.TEXT_STYLES_MENU_SECTION_RANK[_toolbar.HEADING_1_MENU_ITEM.key],
-      toolbarKey: _toolbar.HEADING_1_MENU_ITEM.key
+      toolbarRank: _rank.TEXT_STYLES_MENU_SECTION_RANK[_keys.HEADING_1_MENU_ITEM.key],
+      toolbarKey: _keys.HEADING_1_MENU_ITEM.key
     }),
     heading2: _objectSpread(_objectSpread({}, HEADING_2), {}, {
-      icon: /*#__PURE__*/_react.default.createElement(_editorToolbar.HeadingTwoIcon, {
+      icon: /*#__PURE__*/_react.default.createElement(_headingTwoIcon.HeadingTwoIcon, {
         size: "small",
         label: ""
       }),
-      toolbarRank: _toolbar.TEXT_STYLES_MENU_SECTION_RANK[_toolbar.HEADING_2_MENU_ITEM.key],
-      toolbarKey: _toolbar.HEADING_2_MENU_ITEM.key
+      toolbarRank: _rank.TEXT_STYLES_MENU_SECTION_RANK[_keys.HEADING_2_MENU_ITEM.key],
+      toolbarKey: _keys.HEADING_2_MENU_ITEM.key
     }),
     heading3: _objectSpread(_objectSpread({}, HEADING_3), {}, {
-      icon: /*#__PURE__*/_react.default.createElement(_editorToolbar.HeadingThreeIcon, {
+      icon: /*#__PURE__*/_react.default.createElement(_headingThreeIcon.HeadingThreeIcon, {
         size: "small",
         label: ""
       }),
-      toolbarRank: _toolbar.TEXT_STYLES_MENU_SECTION_RANK[_toolbar.HEADING_3_MENU_ITEM.key],
-      toolbarKey: _toolbar.HEADING_3_MENU_ITEM.key
+      toolbarRank: _rank.TEXT_STYLES_MENU_SECTION_RANK[_keys.HEADING_3_MENU_ITEM.key],
+      toolbarKey: _keys.HEADING_3_MENU_ITEM.key
     }),
     heading4: _objectSpread(_objectSpread({}, HEADING_4), {}, {
-      icon: /*#__PURE__*/_react.default.createElement(_editorToolbar.HeadingFourIcon, {
+      icon: /*#__PURE__*/_react.default.createElement(_headingFourIcon.HeadingFourIcon, {
         size: "small",
         label: ""
       }),
-      toolbarRank: _toolbar.TEXT_STYLES_MENU_SECTION_RANK[_toolbar.HEADING_4_MENU_ITEM.key],
-      toolbarKey: _toolbar.HEADING_4_MENU_ITEM.key
+      toolbarRank: _rank.TEXT_STYLES_MENU_SECTION_RANK[_keys.HEADING_4_MENU_ITEM.key],
+      toolbarKey: _keys.HEADING_4_MENU_ITEM.key
     }),
     heading5: _objectSpread(_objectSpread({}, HEADING_5), {}, {
-      icon: /*#__PURE__*/_react.default.createElement(_editorToolbar.HeadingFiveIcon, {
+      icon: /*#__PURE__*/_react.default.createElement(_headingFiveIcon.HeadingFiveIcon, {
         size: "small",
         label: ""
       }),
-      toolbarRank: _toolbar.TEXT_STYLES_MENU_SECTION_RANK[_toolbar.HEADING_5_MENU_ITEM.key],
-      toolbarKey: _toolbar.HEADING_5_MENU_ITEM.key
+      toolbarRank: _rank.TEXT_STYLES_MENU_SECTION_RANK[_keys.HEADING_5_MENU_ITEM.key],
+      toolbarKey: _keys.HEADING_5_MENU_ITEM.key
     }),
     heading6: _objectSpread(_objectSpread({}, HEADING_6), {}, {
-      icon: /*#__PURE__*/_react.default.createElement(_editorToolbar.HeadingSixIcon, {
+      icon: /*#__PURE__*/_react.default.createElement(_headingSixIcon.HeadingSixIcon, {
         size: "small",
         label: ""
       }),
-      toolbarRank: _toolbar.TEXT_STYLES_MENU_SECTION_RANK[_toolbar.HEADING_6_MENU_ITEM.key],
-      toolbarKey: _toolbar.HEADING_6_MENU_ITEM.key
+      toolbarRank: _rank.TEXT_STYLES_MENU_SECTION_RANK[_keys.HEADING_6_MENU_ITEM.key],
+      toolbarKey: _keys.HEADING_6_MENU_ITEM.key
     }),
     blockquote: _objectSpread(_objectSpread({}, BLOCK_QUOTE), {}, {
-      icon: /*#__PURE__*/_react.default.createElement(_editorToolbar.QuoteIcon, {
+      icon: /*#__PURE__*/_react.default.createElement(_quoteIcon.QuoteIcon, {
         size: "small",
         label: ""
       }),
-      toolbarRank: _toolbar.TEXT_STYLES_MENU_SECTION_RANK[_toolbar.BLOCK_QUOTE_MENU_ITEM.key],
-      toolbarKey: _toolbar.BLOCK_QUOTE_MENU_ITEM.key
+      toolbarRank: _rank.TEXT_STYLES_MENU_SECTION_RANK[_keys.BLOCK_QUOTE_MENU_ITEM.key],
+      toolbarKey: _keys.BLOCK_QUOTE_MENU_ITEM.key
     })
   });
 };

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

@@ -15,16 +15,17 @@ exports.setNormalText = setNormalText;
 exports.setNormalTextWithAnalytics = setNormalTextWithAnalytics;
 exports.setSmallText = setSmallText;
 exports.setSmallTextWithAnalytics = setSmallTextWithAnalytics;
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _commands = require("@atlaskit/editor-common/commands");
-var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var _utils = require("@atlaskit/editor-common/utils");
+var _wrapSelectionIn = require("@atlaskit/editor-common/utils/wrap-selection-in");
+var _withAnalytics = require("@atlaskit/editor-common/withAnalytics");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _editorTables = require("@atlaskit/editor-tables");
+var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _blockTypes = require("../block-types");
 var _utils2 = require("../utils");
 var _clearFormatting = require("./clear-formatting");
-var _wrapSelectionIn = require("./wrapSelectionIn");
+var _wrapSelectionIn2 = require("./wrapSelectionIn");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -56,7 +57,7 @@ function setHeading(level, fromBlockQuote) {
     var tr = _ref2.tr;
     var selection = tr.selection,
       schema = tr.doc.type.schema;
-    var ranges = selection instanceof _editorTables.CellSelection ? selection.ranges : [selection];
+    var ranges = selection instanceof _cellSelection.CellSelection ? selection.ranges : [selection];
     ranges.forEach(function (_ref3) {
       var $from = _ref3.$from,
         $to = _ref3.$to;
@@ -92,7 +93,7 @@ function setHeading(level, fromBlockQuote) {
     var fontSize = schema.marks.fontSize;
     if (fontSize) {
       var allowedBlocks = [schema.nodes.paragraph, schema.nodes.heading];
-      if (selection instanceof _editorTables.CellSelection) {
+      if (selection instanceof _cellSelection.CellSelection) {
         selection.forEachCell(function (cell, pos) {
           (0, _commands.createToggleBlockMarkOnRangeNext)(fontSize, function () {
             return false;
@@ -163,7 +164,7 @@ function setSmallText(fromBlockQuote) {
       var to = tr.mapping.map($to.pos);
       tr.setBlockType(from, to, paragraph);
       applySmallFontSize(from, to, tr);
-    } else if (selection instanceof _editorTables.CellSelection) {
+    } else if (selection instanceof _cellSelection.CellSelection) {
       var mapFrom = tr.steps.length;
       selection.forEachCell(function (cell, pos) {
         var from = tr.mapping.slice(mapFrom).map(pos);
@@ -186,10 +187,10 @@ function setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQuo
     return function (_ref6) {
       var tr = _ref6.tr;
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
-        action: _analytics.ACTION.FORMATTED,
-        actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_SMALL_TEXT,
+        action: _enums.ACTION.FORMATTED,
+        actionSubject: _enums.ACTION_SUBJECT.TEXT,
+        eventType: _enums.EVENT_TYPE.TRACK,
+        actionSubjectId: _enums.ACTION_SUBJECT_ID.FORMAT_SMALL_TEXT,
         attributes: {
           inputMethod: inputMethod,
           previousBlockType: previousHeadingLevel !== undefined ? String(previousHeadingLevel) : undefined
@@ -208,7 +209,7 @@ function setNormalText(fromBlockQuote) {
       schema = tr.doc.type.schema;
 
     // Apply normal text to the selection range (handles non-list content)
-    var ranges = selection instanceof _editorTables.CellSelection ? selection.ranges : [selection];
+    var ranges = selection instanceof _cellSelection.CellSelection ? selection.ranges : [selection];
     ranges.forEach(function (_ref8) {
       var $from = _ref8.$from,
         $to = _ref8.$to;
@@ -234,7 +235,7 @@ function setNormalText(fromBlockQuote) {
     // Remove fontSize mark from any lists the selection touches
     var fontSize = schema.marks.fontSize;
     if (fontSize) {
-      if (selection instanceof _editorTables.CellSelection) {
+      if (selection instanceof _cellSelection.CellSelection) {
         selection.forEachCell(function (cell, pos) {
           (0, _commands.createToggleBlockMarkOnRangeNext)(fontSize, function () {
             return false;
@@ -263,7 +264,7 @@ function clearFormatting(inputMethod, editorAnalyticsApi) {
       if (!markType) {
         return;
       }
-      if (tr.selection instanceof _editorTables.CellSelection) {
+      if (tr.selection instanceof _cellSelection.CellSelection) {
         (0, _clearFormatting.cellSelectionNodesBetween)(tr.selection, tr.doc, function (node, pos) {
           var isTableCell = node.type === schema.nodes.tableCell || node.type === schema.nodes.tableHeader;
           if (!isTableCell) {
@@ -285,7 +286,7 @@ function clearFormatting(inputMethod, editorAnalyticsApi) {
       var _tr$selection2 = tr.selection,
         $from = _tr$selection2.$from,
         $to = _tr$selection2.$to;
-      if (tr.selection instanceof _editorTables.CellSelection) {
+      if (tr.selection instanceof _cellSelection.CellSelection) {
         (0, _clearFormatting.cellSelectionNodesBetween)(tr.selection, tr.doc, (0, _clearFormatting.clearNodeFormattingOnSelection)(schema, tr, formattedNodeType, nodeName, formattingCleared));
       } else {
         tr.doc.nodesBetween($from.pos, $to.pos, (0, _clearFormatting.clearNodeFormattingOnSelection)(schema, tr, formattedNodeType, nodeName, formattingCleared));
@@ -294,10 +295,10 @@ function clearFormatting(inputMethod, editorAnalyticsApi) {
     tr.setStoredMarks([]);
     if (formattingCleared.length) {
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
-        action: _analytics.ACTION.FORMATTED,
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_CLEAR,
+        action: _enums.ACTION.FORMATTED,
+        eventType: _enums.EVENT_TYPE.TRACK,
+        actionSubject: _enums.ACTION_SUBJECT.TEXT,
+        actionSubjectId: _enums.ACTION_SUBJECT_ID.FORMAT_CLEAR,
         attributes: {
           inputMethod: inputMethod,
           formattingCleared: formattingCleared,
@@ -350,10 +351,10 @@ function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQu
     return function (_ref1) {
       var tr = _ref1.tr;
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
-        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: inputMethod,
           newHeadingLevel: 0,
@@ -371,10 +372,10 @@ var setHeadingWithAnalytics = exports.setHeadingWithAnalytics = function setHead
     return function (_ref10) {
       var tr = _ref10.tr;
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
-        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: inputMethod,
           newHeadingLevel: newHeadingLevel,
@@ -391,7 +392,7 @@ function insertBlockQuote() {
   return function (state, dispatch) {
     var nodes = state.schema.nodes;
     if (nodes.paragraph && nodes.blockquote) {
-      return (0, _utils.wrapSelectionIn)(nodes.blockquote)(state, dispatch);
+      return (0, _wrapSelectionIn.wrapSelectionIn)(nodes.blockquote)(state, dispatch);
     }
     return false;
   };
@@ -406,11 +407,11 @@ function insertBlockQuote() {
  * @returns - command that inserts block type
  */
 var insertBlockQuoteWithAnalytics = exports.insertBlockQuoteWithAnalytics = function insertBlockQuoteWithAnalytics(inputMethod, editorAnalyticsApi) {
-  return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, {
-    action: _analytics.ACTION.FORMATTED,
-    actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-    eventType: _analytics.EVENT_TYPE.TRACK,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_BLOCK_QUOTE,
+  return (0, _withAnalytics.withAnalytics)(editorAnalyticsApi, {
+    action: _enums.ACTION.FORMATTED,
+    actionSubject: _enums.ACTION_SUBJECT.TEXT,
+    eventType: _enums.EVENT_TYPE.TRACK,
+    actionSubjectId: _enums.ACTION_SUBJECT_ID.FORMAT_BLOCK_QUOTE,
     attributes: {
       inputMethod: inputMethod
     }
@@ -422,15 +423,15 @@ function insertBlockQuoteWithAnalyticsCommand(inputMethod, editorAnalyticsApi) {
       var tr = _ref11.tr;
       var nodes = tr.doc.type.schema.nodes;
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
-        action: _analytics.ACTION.FORMATTED,
-        actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_BLOCK_QUOTE,
+        action: _enums.ACTION.FORMATTED,
+        actionSubject: _enums.ACTION_SUBJECT.TEXT,
+        eventType: _enums.EVENT_TYPE.TRACK,
+        actionSubjectId: _enums.ACTION_SUBJECT_ID.FORMAT_BLOCK_QUOTE,
         attributes: {
           inputMethod: inputMethod
         }
       })(tr);
-      return (0, _wrapSelectionIn.wrapSelectionInBlockType)(nodes.blockquote)({
+      return (0, _wrapSelectionIn2.wrapSelectionInBlockType)(nodes.blockquote)({
         tr: tr
       });
     };

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

@@ -6,21 +6,21 @@ Object.defineProperty(exports, "__esModule", {
 exports.cellSelectionNodesBetween = exports.FORMATTING_NODE_TYPES = exports.FORMATTING_MARK_TYPES = void 0;
 exports.clearNodeFormattingOnSelection = clearNodeFormattingOnSelection;
 exports.formatTypes = void 0;
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 // Functions duplicated from platform/packages/editor/editor-plugin-text-formatting/src/editor-commands/clear-formatting.ts
 // TODO: ED-26959 - Refactor to avoid duplication.
 var FORMATTING_NODE_TYPES = exports.FORMATTING_NODE_TYPES = ['heading', 'blockquote'];
 var FORMATTING_MARK_TYPES = exports.FORMATTING_MARK_TYPES = ['em', 'code', 'strike', 'strong', 'underline', 'textColor', 'subsup', 'backgroundColor'];
 var formatTypes = exports.formatTypes = {
-  em: _analytics.ACTION_SUBJECT_ID.FORMAT_ITALIC,
-  code: _analytics.ACTION_SUBJECT_ID.FORMAT_CODE,
-  strike: _analytics.ACTION_SUBJECT_ID.FORMAT_STRIKE,
-  strong: _analytics.ACTION_SUBJECT_ID.FORMAT_STRONG,
-  underline: _analytics.ACTION_SUBJECT_ID.FORMAT_UNDERLINE,
-  textColor: _analytics.ACTION_SUBJECT_ID.FORMAT_COLOR,
+  em: _enums.ACTION_SUBJECT_ID.FORMAT_ITALIC,
+  code: _enums.ACTION_SUBJECT_ID.FORMAT_CODE,
+  strike: _enums.ACTION_SUBJECT_ID.FORMAT_STRIKE,
+  strong: _enums.ACTION_SUBJECT_ID.FORMAT_STRONG,
+  underline: _enums.ACTION_SUBJECT_ID.FORMAT_UNDERLINE,
+  textColor: _enums.ACTION_SUBJECT_ID.FORMAT_COLOR,
   subsup: 'subsup',
-  backgroundColor: _analytics.ACTION_SUBJECT_ID.FORMAT_BACKGROUND_COLOR
+  backgroundColor: _enums.ACTION_SUBJECT_ID.FORMAT_BACKGROUND_COLOR
 };
 var cellSelectionNodesBetween = exports.cellSelectionNodesBetween = function cellSelectionNodesBetween(selection, doc, f, startPos) {
   selection.forEachCell(function (cell, cellPos) {