@atlaskit/editor-core 187.34.2 → 187.35.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-core
 
+## 187.35.0
+
+### Minor Changes
+
+- [`3542bead318`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3542bead318) - Move block type commands to next editor plugin actions
+
+### Patch Changes
+
+- [`02e113fb1e4`](https://bitbucket.org/atlassian/atlassian-frontend/commits/02e113fb1e4) - Update test fixtures for calendar update.
+- Updated dependencies
+
 ## 187.34.2
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -185,12 +185,6 @@ Object.defineProperty(exports, "WithPluginState", {
     return _WithPluginState.default;
   }
 });
-Object.defineProperty(exports, "blockPluginStateKey", {
-  enumerable: true,
-  get: function get() {
-    return _plugins.blockPluginStateKey;
-  }
-});
 Object.defineProperty(exports, "changeColor", {
   enumerable: true,
   get: function get() {
@@ -212,7 +206,7 @@ Object.defineProperty(exports, "commitStatusPicker", {
 Object.defineProperty(exports, "createTable", {
   enumerable: true,
   get: function get() {
-    return _commands4.createTable;
+    return _commands3.createTable;
   }
 });
 Object.defineProperty(exports, "createTypeAheadTools", {
@@ -275,18 +269,6 @@ Object.defineProperty(exports, "historyPluginKey", {
     return _history.historyPluginKey;
   }
 });
-Object.defineProperty(exports, "insertBlockType", {
-  enumerable: true,
-  get: function get() {
-    return _commands3.insertBlockType;
-  }
-});
-Object.defineProperty(exports, "insertBlockTypesWithAnalytics", {
-  enumerable: true,
-  get: function get() {
-    return _commands3.insertBlockTypesWithAnalytics;
-  }
-});
 Object.defineProperty(exports, "insertDate", {
   enumerable: true,
   get: function get() {
@@ -296,7 +278,7 @@ Object.defineProperty(exports, "insertDate", {
 Object.defineProperty(exports, "insertExpand", {
   enumerable: true,
   get: function get() {
-    return _commands7.insertExpand;
+    return _commands6.insertExpand;
   }
 });
 Object.defineProperty(exports, "insertHorizontalRule", {
@@ -314,7 +296,7 @@ Object.defineProperty(exports, "insertMediaSingleNode", {
 Object.defineProperty(exports, "insertTaskDecisionCommand", {
   enumerable: true,
   get: function get() {
-    return _commands5.insertTaskDecisionCommand;
+    return _commands4.insertTaskDecisionCommand;
   }
 });
 Object.defineProperty(exports, "lightModeStatusColorPalette", {
@@ -377,34 +359,22 @@ Object.defineProperty(exports, "selectionPluginKey", {
     return _mobileSelection.selectionPluginKey;
   }
 });
-Object.defineProperty(exports, "setBlockType", {
-  enumerable: true,
-  get: function get() {
-    return _commands3.setBlockType;
-  }
-});
-Object.defineProperty(exports, "setBlockTypeWithAnalytics", {
-  enumerable: true,
-  get: function get() {
-    return _commands3.setBlockTypeWithAnalytics;
-  }
-});
 Object.defineProperty(exports, "setIsExpanded", {
   enumerable: true,
   get: function get() {
-    return _commands6.setIsExpanded;
+    return _commands5.setIsExpanded;
   }
 });
 Object.defineProperty(exports, "setKeyboardHeight", {
   enumerable: true,
   get: function get() {
-    return _commands6.setKeyboardHeight;
+    return _commands5.setKeyboardHeight;
   }
 });
 Object.defineProperty(exports, "setMobilePaddingTop", {
   enumerable: true,
   get: function get() {
-    return _commands6.setMobilePaddingTop;
+    return _commands5.setMobilePaddingTop;
   }
 });
 Object.defineProperty(exports, "setStatusPickerAt", {
@@ -493,12 +463,10 @@ var _mentions = require("./plugins/mentions");
 var _textColor = require("./plugins/text-color");
 var _changeColor = require("./plugins/text-color/commands/change-color");
 var _commands2 = require("./plugins/rule/commands");
-var _plugins = require("./plugins");
 var _toolbarAndPickerUpdates = require("./plugins/view-update-subscription/subscribe/toolbarAndPickerUpdates");
 var _typeAheadUpdates = require("./plugins/view-update-subscription/subscribe/type-ahead-updates");
-var _commands3 = require("./plugins/block-type/commands");
-var _commands4 = require("@atlaskit/editor-plugin-table/commands");
-var _commands5 = require("./plugins/tasks-and-decisions/commands");
+var _commands3 = require("@atlaskit/editor-plugin-table/commands");
+var _commands4 = require("./plugins/tasks-and-decisions/commands");
 var _eventDispatcher = require("./event-dispatcher");
 var _plugin = require("./plugins/status/plugin");
 var _actions = require("./plugins/date/actions");
@@ -508,7 +476,7 @@ var _actions2 = require("./plugins/status/actions");
 var _typeAhead = require("./plugins/type-ahead");
 var _history = require("./plugins/history");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _commands6 = require("./plugins/mobile-dimensions/commands");
+var _commands5 = require("./plugins/mobile-dimensions/commands");
 var _utils = require("./utils");
 var _utils2 = require("@atlaskit/editor-common/utils");
 var _createEditor = require("./create-editor");
@@ -516,7 +484,7 @@ var _actions3 = _interopRequireDefault(require("./actions"));
 var _portalProvider = require("@atlaskit/editor-common/portal-provider");
 var _gapCursorSelection = require("./plugins/selection/gap-cursor-selection");
 var _mobileSelection = require("./plugins/mobile-selection");
-var _commands7 = require("./plugins/expand/commands");
+var _commands6 = require("./plugins/expand/commands");
 var _WithPluginState = _interopRequireDefault(require("./ui/WithPluginState"));
 var _statusColorPalette = require("./ui/ColorPalette/Palettes/statusColorPalette");
 var _common = require("./ui/ColorPalette/Palettes/common");

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

@@ -3,27 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.cleanUpAtTheStartOfDocument = void 0;
-exports.createInsertCodeBlockTransaction = createInsertCodeBlockTransaction;
-exports.createWrapSelectionTransaction = createWrapSelectionTransaction;
-exports.insertBlockType = insertBlockType;
-exports.insertBlockTypesWithAnalytics = void 0;
+exports.insertBlockQuoteWithAnalytics = exports.cleanUpAtTheStartOfDocument = void 0;
 exports.setBlockType = setBlockType;
 exports.setBlockTypeWithAnalytics = setBlockTypeWithAnalytics;
 exports.setHeading = setHeading;
 exports.setHeadingWithAnalytics = void 0;
 exports.setNormalText = setNormalText;
 exports.setNormalTextWithAnalytics = setNormalTextWithAnalytics;
-var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _adfSchema = require("@atlaskit/adf-schema");
 var _editorTables = require("@atlaskit/editor-tables");
-var _insert = require("@atlaskit/editor-common/insert");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
-var _utils2 = require("@atlaskit/editor-common/utils");
+var _utils = require("@atlaskit/editor-common/utils");
 var _types = require("../types");
-var _transformToCodeBlock = require("./transform-to-code-block");
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, 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 normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -76,7 +67,7 @@ function withCurrentHeadingLevel(fn) {
     var _state$schema$nodes = state.schema.nodes,
       heading = _state$schema$nodes.heading,
       paragraph = _state$schema$nodes.paragraph;
-    var nodes = (0, _utils2.filterChildrenBetween)(state.doc, state.selection.from, state.selection.to, function (node) {
+    var nodes = (0, _utils.filterChildrenBetween)(state.doc, state.selection.from, state.selection.to, function (node) {
       return node.type === heading || node.type === paragraph;
     });
 
@@ -154,25 +145,11 @@ var setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel,
   });
 };
 exports.setHeadingWithAnalytics = setHeadingWithAnalytics;
-function insertBlockType(name) {
+function insertBlockQuote() {
   return function (state, dispatch) {
     var nodes = state.schema.nodes;
-    switch (name) {
-      case _types.BLOCK_QUOTE.name:
-        if (nodes.paragraph && nodes.blockquote) {
-          return wrapSelectionIn(nodes.blockquote)(state, dispatch);
-        }
-        break;
-      case _types.CODE_BLOCK.name:
-        if (nodes.codeBlock) {
-          return insertCodeBlock()(state, dispatch);
-        }
-        break;
-      case _types.PANEL.name:
-        if (nodes.panel && nodes.paragraph) {
-          return wrapSelectionIn(nodes.panel)(state, dispatch);
-        }
-        break;
+    if (nodes.paragraph && nodes.blockquote) {
+      return (0, _utils.wrapSelectionIn)(nodes.blockquote)(state, dispatch);
     }
     return false;
   };
@@ -186,190 +163,21 @@ function insertBlockType(name) {
  * otherwise Editor becomes very sad and crashes
  * @returns - command that inserts block type
  */
-var insertBlockTypesWithAnalytics = function insertBlockTypesWithAnalytics(name, inputMethod, editorAnalyticsApi) {
-  switch (name) {
-    case _types.BLOCK_QUOTE.name:
-      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,
-        attributes: {
-          inputMethod: inputMethod
-        }
-      })(insertBlockType(name));
-    case _types.CODE_BLOCK.name:
-      return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, {
-        action: _analytics.ACTION.INSERTED,
-        actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.CODE_BLOCK,
-        attributes: {
-          inputMethod: inputMethod
-        },
-        eventType: _analytics.EVENT_TYPE.TRACK
-      })(insertBlockType(name));
-    case _types.PANEL.name:
-      return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, {
-        action: _analytics.ACTION.INSERTED,
-        actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.PANEL,
-        attributes: {
-          inputMethod: inputMethod,
-          panelType: _adfSchema.PanelType.INFO // only info panels can be inserted from toolbar
-        },
-
-        eventType: _analytics.EVENT_TYPE.TRACK
-      })(insertBlockType(name));
-    default:
-      return insertBlockType(name);
-  }
-};
-
-/**
- * This function creates a new transaction that wraps the current selection
- * in the specified node type if it results in a valid transaction.
- * If not valid, it performs a safe insert operation.
- *
- * Example of when wrapping might not be valid is when attempting to wrap
- * content that is already inside a panel with another panel
- */
-exports.insertBlockTypesWithAnalytics = insertBlockTypesWithAnalytics;
-function createWrapSelectionTransaction(_ref3) {
-  var state = _ref3.state,
-    type = _ref3.type,
-    nodeAttributes = _ref3.nodeAttributes;
-  var tr = state.tr;
-  var _state$schema$marks = state.schema.marks,
-    alignment = _state$schema$marks.alignment,
-    indentation = _state$schema$marks.indentation;
-
-  /** Alignment or Indentation is not valid inside block types */
-  var removeAlignTr = (0, _utils2.removeBlockMarks)(state, [alignment, indentation]);
-  tr = removeAlignTr || tr;
-
-  /**Get range and wrapping needed for the selection*/
-  var _getWrappingOptions = getWrappingOptions(state, type, nodeAttributes),
-    range = _getWrappingOptions.range,
-    wrapping = _getWrappingOptions.wrapping;
-  if (wrapping) {
-    tr.wrap(range, wrapping).scrollIntoView();
-  } else {
-    /** We always want to append a block type */
-    (0, _utils.safeInsert)(type.createAndFill(nodeAttributes))(tr).scrollIntoView();
-  }
-  return tr;
-}
-function getWrappingOptions(state, type, nodeAttributes) {
-  var _state$selection = state.selection,
-    $from = _state$selection.$from,
-    $to = _state$selection.$to;
-  var range = $from.blockRange($to);
-  var isAllowedChild = true;
-  /**
-   * Added a check to avoid wrapping codeblock
-   */
-  if (state.selection.empty) {
-    state.doc.nodesBetween($from.pos, $to.pos, function (node) {
-      if (!isAllowedChild) {
-        return false;
-      }
-      return isAllowedChild = node.type !== state.schema.nodes.codeBlock;
-    });
-  }
-  var wrapping = isAllowedChild && range && (0, _transform.findWrapping)(range, type, nodeAttributes);
-  return {
-    range: range,
-    wrapping: wrapping
-  };
-}
-
-/**
- * Function will add wrapping node.
- * 1. If currently selected blocks can be wrapped in the wrapper type it will wrap them.
- * 2. If current block can not be wrapped inside wrapping block it will create a new block below selection,
- *  and set selection on it.
- */
-function wrapSelectionIn(type) {
-  return function (state, dispatch) {
-    var tr = createWrapSelectionTransaction({
-      state: state,
-      type: type
-    });
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
-  };
-}
-
-/**
- * This function creates a new transaction that inserts a code block,
- * if there is text selected it will wrap the current selection if not it will
- * append the codeblock to the end of the document.
- */
-function createInsertCodeBlockTransaction(_ref4) {
-  var _state$selection$$fro;
-  var state = _ref4.state;
-  var tr = state.tr;
-  var from = state.selection.from;
-  var codeBlock = state.schema.nodes.codeBlock;
-  var grandParentNodeType = (_state$selection$$fro = state.selection.$from.node(-1)) === null || _state$selection$$fro === void 0 ? void 0 : _state$selection$$fro.type;
-  var parentNodeType = state.selection.$from.parent.type;
-
-  /** We always want to append a codeBlock unless we're inserting into a paragraph
-   * AND it's a valid child of the grandparent node.
-   * Insert the current selection as codeBlock content unless it contains nodes other
-   * than paragraphs and inline.
-   */
-  var canInsertCodeBlock = (0, _insert.shouldSplitSelectedNodeOnNodeInsertion)({
-    parentNodeType: parentNodeType,
-    grandParentNodeType: grandParentNodeType,
-    content: codeBlock.createAndFill()
-  }) && contentAllowedInCodeBlock(state);
-  if (canInsertCodeBlock) {
-    tr = (0, _transformToCodeBlock.transformToCodeBlockAction)(state, from);
-  } else {
-    (0, _utils.safeInsert)(codeBlock.createAndFill())(tr).scrollIntoView();
-  }
-  return tr;
-}
-
-/**
- * Function will insert code block at current selection if block is empty or below current selection and set focus on it.
- */
-function insertCodeBlock() {
-  return function (state, dispatch) {
-    var tr = createInsertCodeBlockTransaction({
-      state: state
-    });
-    if (dispatch) {
-      dispatch(tr);
+var 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,
+    attributes: {
+      inputMethod: inputMethod
     }
-    return true;
-  };
-}
-
-/**
- * Check if the current selection contains any nodes that are not permitted
- * as codeBlock child nodes. Note that this allows paragraphs and inline nodes
- * as we extract their text content.
- */
-function contentAllowedInCodeBlock(state) {
-  var _state$selection2 = state.selection,
-    $from = _state$selection2.$from,
-    $to = _state$selection2.$to;
-  var isAllowedChild = true;
-  state.doc.nodesBetween($from.pos, $to.pos, function (node) {
-    if (!isAllowedChild) {
-      return false;
-    }
-    return isAllowedChild = node.type === state.schema.nodes.listItem || node.type === state.schema.nodes.bulletList || node.type === state.schema.nodes.orderedList || node.type === state.schema.nodes.paragraph || node.isInline || node.isText;
-  });
-  return isAllowedChild;
-}
+  })(insertBlockQuote());
+};
+exports.insertBlockQuoteWithAnalytics = insertBlockQuoteWithAnalytics;
 var cleanUpAtTheStartOfDocument = function cleanUpAtTheStartOfDocument(state, dispatch) {
-  var _ref5 = state.selection,
-    $cursor = _ref5.$cursor;
+  var _ref3 = state.selection,
+    $cursor = _ref3.$cursor;
   if ($cursor && !$cursor.nodeBefore && !$cursor.nodeAfter && $cursor.pos === 1) {
     var tr = state.tr,
       schema = state.schema;

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

@@ -21,28 +21,10 @@ Object.defineProperty(exports, "deleteBlockContent", {
     return _deleteBlockContent.deleteBlockContent;
   }
 });
-Object.defineProperty(exports, "insertBlock", {
+Object.defineProperty(exports, "insertBlockQuoteWithAnalytics", {
   enumerable: true,
   get: function get() {
-    return _insertBlock.insertBlock;
-  }
-});
-Object.defineProperty(exports, "insertBlockType", {
-  enumerable: true,
-  get: function get() {
-    return _blockType.insertBlockType;
-  }
-});
-Object.defineProperty(exports, "insertBlockTypesWithAnalytics", {
-  enumerable: true,
-  get: function get() {
-    return _blockType.insertBlockTypesWithAnalytics;
-  }
-});
-Object.defineProperty(exports, "isConvertableToCodeBlock", {
-  enumerable: true,
-  get: function get() {
-    return _transformToCodeBlock.isConvertableToCodeBlock;
+    return _blockType.insertBlockQuoteWithAnalytics;
   }
 });
 Object.defineProperty(exports, "setBlockType", {
@@ -81,14 +63,6 @@ Object.defineProperty(exports, "setNormalTextWithAnalytics", {
     return _blockType.setNormalTextWithAnalytics;
   }
 });
-Object.defineProperty(exports, "transformToCodeBlockAction", {
-  enumerable: true,
-  get: function get() {
-    return _transformToCodeBlock.transformToCodeBlockAction;
-  }
-});
 var _blockType = require("./block-type");
-var _insertBlock = require("./insert-block");
-var _transformToCodeBlock = require("./transform-to-code-block");
 var _deleteAndMoveCursor = require("./delete-and-move-cursor");
 var _deleteBlockContent = require("./delete-block-content");

package/dist/cjs/plugins/block-type/index.js

@@ -25,6 +25,7 @@ var _inputRule = _interopRequireDefault(require("./pm-plugins/input-rule"));
 var _ToolbarBlockType = _interopRequireDefault(require("./ui/ToolbarBlockType"));
 var _commands = require("./commands");
 var _messages = require("./messages");
+var _blockType = require("./commands/block-type");
 var headingPluginOptions = function headingPluginOptions(_ref, isAllowed, editorAnalyticsApi) {
   var formatMessage = _ref.formatMessage;
   if (!isAllowed) {
@@ -150,6 +151,22 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
         }
       }];
     },
+    actions: {
+      insertBlockQuote: function insertBlockQuote(inputMethod) {
+        var _api$analytics4;
+        return (0, _blockType.insertBlockQuoteWithAnalytics)(inputMethod, api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
+      },
+      setBlockType: function setBlockType(name, inputMethod) {
+        var _api$analytics5;
+        return (0, _commands.setBlockTypeWithAnalytics)(name, inputMethod, api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
+      }
+    },
+    getSharedState: function getSharedState(editorState) {
+      if (!editorState) {
+        return;
+      }
+      return _main.pluginKey.getState(editorState);
+    },
     primaryToolbarComponent: function primaryToolbarComponent(_ref7) {
       var editorView = _ref7.editorView,
         popupsMountPoint = _ref7.popupsMountPoint,
@@ -161,8 +178,8 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
         eventDispatcher = _ref7.eventDispatcher;
       var isSmall = options && options.isUndoRedoButtonsEnabled ? toolbarSize < _types.ToolbarSize.XXL : toolbarSize < _types.ToolbarSize.XL;
       var boundSetBlockType = function boundSetBlockType(name) {
-        var _api$analytics4;
-        return (0, _commands.setBlockTypeWithAnalytics)(name, _analytics.INPUT_METHOD.TOOLBAR, api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(editorView.state, editorView.dispatch);
+        var _api$analytics6;
+        return (0, _commands.setBlockTypeWithAnalytics)(name, _analytics.INPUT_METHOD.TOOLBAR, api === null || api === void 0 ? void 0 : (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions)(editorView.state, editorView.dispatch);
       };
       return /*#__PURE__*/_react.default.createElement(_withPluginState.WithPluginState, {
         editorView: editorView,
@@ -187,9 +204,9 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
     },
     pluginsOptions: {
       quickInsert: function quickInsert(intl) {
-        var _api$analytics5, _api$analytics6;
+        var _api$analytics7, _api$analytics8;
         var exclude = options && options.allowBlockType && options.allowBlockType.exclude ? options.allowBlockType.exclude : [];
-        return [].concat((0, _toConsumableArray2.default)(blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1, api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions)), (0, _toConsumableArray2.default)(headingPluginOptions(intl, exclude.indexOf('heading') === -1, api === null || api === void 0 ? void 0 : (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions)));
+        return [].concat((0, _toConsumableArray2.default)(blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1, api === null || api === void 0 ? void 0 : (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions)), (0, _toConsumableArray2.default)(headingPluginOptions(intl, exclude.indexOf('heading') === -1, api === null || api === void 0 ? void 0 : (_api$analytics8 = api.analytics) === null || _api$analytics8 === void 0 ? void 0 : _api$analytics8.actions)));
       }
     }
   };

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

@@ -6,13 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _utils2 = require("@atlaskit/editor-common/utils");
-var _transformToCodeBlock = require("../commands/transform-to-code-block");
-var _insertBlock = require("../commands/insert-block");
-var _utils3 = require("../utils");
+var _utils = require("@atlaskit/editor-common/utils");
+var _commands = require("@atlaskit/editor-common/commands");
+var _utils2 = require("../utils");
 var MAX_HEADING_LEVEL = 6;
 function getHeadingLevel(match) {
   return {
@@ -20,14 +18,14 @@ function getHeadingLevel(match) {
   };
 }
 function headingRule(nodeType, maxLevel) {
-  return (0, _utils3.createWrappingTextBlockRule)({
+  return (0, _utils2.createWrappingTextBlockRule)({
     match: new RegExp('^(#{1,' + maxLevel + '})\\s$'),
     nodeType: nodeType,
     getAttrs: getHeadingLevel
   });
 }
 function blockQuoteRule(nodeType) {
-  return (0, _utils3.createJoinNodesRule)(/^\s*>\s$/, nodeType);
+  return (0, _utils2.createJoinNodesRule)(/^\s*>\s$/, nodeType);
 }
 
 /**
@@ -41,13 +39,13 @@ function getHeadingRules(editorAnalyticsAPI, schema) {
   var hashRule = headingRule(schema.nodes.heading, MAX_HEADING_LEVEL);
   var leftNodeReplacementHashRule = (0, _prosemirrorInputRules.createRule)(new RegExp("".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, "(#{1,6})\\s$")), function (state, match, start, end) {
     var level = match[1].length;
-    return (0, _insertBlock.insertBlock)(state, schema.nodes.heading, "heading".concat(level), start, end, {
+    return (0, _commands.insertBlock)(state, schema.nodes.heading, start, end, {
       level: level
     });
   });
 
   // New analytics handler
-  var ruleWithHeadingAnalytics = (0, _utils2.inputRuleWithAnalytics)(function (_state, matchResult) {
+  var ruleWithHeadingAnalytics = (0, _utils.inputRuleWithAnalytics)(function (_state, matchResult) {
     return {
       action: _analytics.ACTION.FORMATTED,
       actionSubject: _analytics.ACTION_SUBJECT.TEXT,
@@ -72,11 +70,11 @@ function getBlockQuoteRules(editorAnalyticsAPI, schema) {
   // '> ' for blockquote
   var greatherThanRule = blockQuoteRule(schema.nodes.blockquote);
   var leftNodeReplacementGreatherRule = (0, _prosemirrorInputRules.createRule)(new RegExp("".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, "\\s*>\\s$")), function (state, _match, start, end) {
-    return (0, _insertBlock.insertBlock)(state, schema.nodes.blockquote, 'blockquote', start, end);
+    return (0, _commands.insertBlock)(state, schema.nodes.blockquote, start, end);
   });
 
   // Analytics V3 handler
-  var ruleWithBlockQuoteAnalytics = (0, _utils2.inputRuleWithAnalytics)({
+  var ruleWithBlockQuoteAnalytics = (0, _utils.inputRuleWithAnalytics)({
     action: _analytics.ACTION.FORMATTED,
     actionSubject: _analytics.ACTION_SUBJECT.TEXT,
     eventType: _analytics.EVENT_TYPE.TRACK,
@@ -87,56 +85,6 @@ function getBlockQuoteRules(editorAnalyticsAPI, schema) {
   }, editorAnalyticsAPI);
   return [ruleWithBlockQuoteAnalytics(greatherThanRule), ruleWithBlockQuoteAnalytics(leftNodeReplacementGreatherRule)];
 }
-
-/**
- * Get all code block input rules
- *
- * @param {Schema} schema
- * @returns {InputRuleWithHandler[]}
- */
-function getCodeBlockRules(editorAnalyticsAPI, schema) {
-  var ruleAnalytics = (0, _utils2.inputRuleWithAnalytics)({
-    action: _analytics.ACTION.INSERTED,
-    actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-    actionSubjectId: _analytics.ACTION_SUBJECT_ID.CODE_BLOCK,
-    attributes: {
-      inputMethod: _analytics.INPUT_METHOD.FORMATTING
-    },
-    eventType: _analytics.EVENT_TYPE.TRACK
-  }, editorAnalyticsAPI);
-  var validMatchLength = function validMatchLength(match) {
-    return match.length > 0 && match[0].length === 3;
-  };
-  var threeTildeRule = (0, _prosemirrorInputRules.createRule)(/(?!\s)(`{3,})$/, function (state, match, start, end) {
-    if (!validMatchLength(match)) {
-      return null;
-    }
-    var attributes = {};
-    if (match[4]) {
-      attributes.language = match[4];
-    }
-    if ((0, _transformToCodeBlock.isConvertableToCodeBlock)(state)) {
-      return (0, _transformToCodeBlock.transformToCodeBlockAction)(state, start, attributes);
-    }
-    var tr = state.tr;
-    tr.delete(start, end);
-    var codeBlock = tr.doc.type.schema.nodes.codeBlock.createChecked();
-    (0, _utils.safeInsert)(codeBlock)(tr);
-    return tr;
-  });
-  var leftNodeReplacementThreeTildeRule = (0, _prosemirrorInputRules.createRule)(new RegExp("((".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, "`{3,})|^\\s(`{3,}))(\\S*)$")), function (state, match, start, end) {
-    if (!validMatchLength(match)) {
-      return null;
-    }
-    var attributes = {};
-    if (match[4]) {
-      attributes.language = match[4];
-    }
-    var inlineStart = Math.max(match.index + state.selection.$from.start(), 1);
-    return (0, _insertBlock.insertBlock)(state, schema.nodes.codeBlock, 'codeblock', inlineStart, end, attributes);
-  });
-  return [ruleAnalytics(threeTildeRule), ruleAnalytics(leftNodeReplacementThreeTildeRule)];
-}
 function inputRulePlugin(editorAnalyticsAPI, schema, featureFlags) {
   var rules = [];
   if (schema.nodes.heading) {
@@ -145,9 +93,6 @@ function inputRulePlugin(editorAnalyticsAPI, schema, featureFlags) {
   if (schema.nodes.blockquote) {
     rules.push.apply(rules, (0, _toConsumableArray2.default)(getBlockQuoteRules(editorAnalyticsAPI, schema)));
   }
-  if (schema.nodes.codeBlock) {
-    rules.push.apply(rules, (0, _toConsumableArray2.default)(getCodeBlockRules(editorAnalyticsAPI, schema)));
-  }
   if (rules.length !== 0) {
     return (0, _prosemirrorInputRules.createPlugin)('block-type', rules, {
       isBlockNodeRule: true

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

@@ -28,7 +28,7 @@ function keymapPlugin(editorAnalyticsApi, schema, _featureFlags) {
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.deleteKey.common, del, list);
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.forwardDelete.mac, del, list);
   if (schema.nodes[blockTypes.BLOCK_QUOTE.nodeName]) {
-    (0, _keymaps.bindKeymapWithCommand)((0, _keymaps.findShortcutByKeymap)(_keymaps.toggleBlockQuote), (0, _commands2.insertBlockTypesWithAnalytics)(blockTypes.BLOCK_QUOTE.name, _analytics.INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
+    (0, _keymaps.bindKeymapWithCommand)((0, _keymaps.findShortcutByKeymap)(_keymaps.toggleBlockQuote), (0, _commands2.insertBlockQuoteWithAnalytics)(_analytics.INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
   }
   return (0, _keymaps.keymap)(list);
 }