@atlaskit/editor-core 187.9.2 → 187.10.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-core
 
+## 187.10.0
+
+### Minor Changes
+
+- [`1944b35b538`](https://bitbucket.org/atlassian/atlassian-frontend/commits/1944b35b538) - move common utilities to editor-common, to help with decoupling block-type plugin
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 187.9.2
 
 ### Patch Changes

package/dist/cjs/commands/index.js

@@ -5,140 +5,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.addParagraphAtEnd = addParagraphAtEnd;
-exports.createNewParagraphBelow = exports.createNewParagraphAbove = exports.clearEditorContent = exports.changeImageAlignment = void 0;
+exports.clearEditorContent = exports.changeImageAlignment = void 0;
 exports.createParagraphAtEnd = createParagraphAtEnd;
-exports.createParagraphNear = createParagraphNear;
-exports.createToggleBlockMarkOnRange = void 0;
-exports.insertNewLine = insertNewLine;
-exports.insertNewLineWithAnalytics = void 0;
-exports.preventDefault = preventDefault;
-exports.toggleBlockMark = void 0;
+exports.toggleBlockMark = exports.createToggleBlockMarkOnRange = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
-var _analytics = require("../plugins/analytics");
-var _utils = require("../utils");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function preventDefault() {
-  return function () {
-    return true;
-  };
-}
-function insertNewLine() {
-  return function (state, dispatch) {
-    var $from = state.selection.$from;
-    var parent = $from.parent;
-    var hardBreak = state.schema.nodes.hardBreak;
-    if (hardBreak) {
-      var hardBreakNode = hardBreak.createChecked();
-      if (parent && parent.type.validContent(_model.Fragment.from(hardBreakNode))) {
-        if (dispatch) {
-          dispatch(state.tr.replaceSelectionWith(hardBreakNode, false));
-        }
-        return true;
-      }
-    }
-    if (state.selection instanceof _state.TextSelection) {
-      if (dispatch) {
-        dispatch(state.tr.insertText('\n'));
-      }
-      return true;
-    }
-    return false;
-  };
-}
-var insertNewLineWithAnalytics = (0, _analytics.withAnalytics)({
-  action: _analytics.ACTION.INSERTED,
-  actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-  actionSubjectId: _analytics.ACTION_SUBJECT_ID.LINE_BREAK,
-  eventType: _analytics.EVENT_TYPE.TRACK
-})(insertNewLine());
-exports.insertNewLineWithAnalytics = insertNewLineWithAnalytics;
-var createNewParagraphAbove = function createNewParagraphAbove(state, dispatch) {
-  var append = false;
-  if (!(0, _utils.canMoveUp)(state) && canCreateParagraphNear(state)) {
-    createParagraphNear(append)(state, dispatch);
-    return true;
-  }
-  return false;
-};
-exports.createNewParagraphAbove = createNewParagraphAbove;
-var createNewParagraphBelow = function createNewParagraphBelow(state, dispatch) {
-  var append = true;
-  if (!(0, _utils.canMoveDown)(state) && canCreateParagraphNear(state)) {
-    createParagraphNear(append)(state, dispatch);
-    return true;
-  }
-  return false;
-};
-exports.createNewParagraphBelow = createNewParagraphBelow;
-function canCreateParagraphNear(state) {
-  var $from = state.selection.$from;
-  var node = $from.node($from.depth);
-  var insideCodeBlock = !!node && node.type === state.schema.nodes.codeBlock;
-  var isNodeSelection = state.selection instanceof _state.NodeSelection;
-  return $from.depth > 1 || isNodeSelection || insideCodeBlock;
-}
-function createParagraphNear() {
-  var append = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-  return function (state, dispatch) {
-    var paragraph = state.schema.nodes.paragraph;
-    if (!paragraph) {
-      return false;
-    }
-    var insertPos;
-    if (state.selection instanceof _state.TextSelection) {
-      if (topLevelNodeIsEmptyTextBlock(state)) {
-        return false;
-      }
-      insertPos = getInsertPosFromTextBlock(state, append);
-    } else {
-      insertPos = getInsertPosFromNonTextBlock(state, append);
-    }
-    var tr = state.tr.insert(insertPos, paragraph.createAndFill());
-    tr.setSelection(_state.TextSelection.create(tr.doc, insertPos + 1));
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
-  };
-}
-function getInsertPosFromTextBlock(state, append) {
-  var _state$selection = state.selection,
-    $from = _state$selection.$from,
-    $to = _state$selection.$to;
-  var pos;
-  if (!append) {
-    pos = $from.start(0);
-  } else {
-    pos = $to.end(0);
-  }
-  return pos;
-}
-function getInsertPosFromNonTextBlock(state, append) {
-  var _state$selection2 = state.selection,
-    $from = _state$selection2.$from,
-    $to = _state$selection2.$to;
-  var nodeAtSelection = state.selection instanceof _state.NodeSelection && state.doc.nodeAt(state.selection.$anchor.pos);
-  var isMediaSelection = nodeAtSelection && nodeAtSelection.type.name === 'mediaGroup';
-  var pos;
-  if (!append) {
-    // The start position is different with text block because it starts from 0
-    pos = $from.start($from.depth);
-    // The depth is different with text block because it starts from 0
-    pos = $from.depth > 0 && !isMediaSelection ? pos - 1 : pos;
-  } else {
-    pos = $to.end($to.depth);
-    pos = $to.depth > 0 && !isMediaSelection ? pos + 1 : pos;
-  }
-  return pos;
-}
-function topLevelNodeIsEmptyTextBlock(state) {
-  var topLevelNode = state.selection.$from.node(1);
-  return topLevelNode.isTextblock && topLevelNode.type !== state.schema.nodes.codeBlock && topLevelNode.nodeSize === 2;
-}
 function addParagraphAtEnd(tr) {
   var paragraph = tr.doc.type.schema.nodes.paragraph,
     doc = tr.doc;
@@ -162,9 +36,9 @@ function createParagraphAtEnd() {
 }
 var changeImageAlignment = function changeImageAlignment(align) {
   return function (state, dispatch) {
-    var _state$selection3 = state.selection,
-      from = _state$selection3.from,
-      to = _state$selection3.to;
+    var _state$selection = state.selection,
+      from = _state$selection.from,
+      to = _state$selection.to;
     var tr = state.tr;
     state.doc.nodesBetween(from, to, function (node, pos) {
       if (node.type === state.schema.nodes.mediaSingle) {
@@ -225,9 +99,9 @@ var toggleBlockMark = function toggleBlockMark(markType, getAttrs, allowedBlocks
         markApplied = toggleBlockMarkOnRange(pos, pos + cell.nodeSize, tr, state);
       });
     } else {
-      var _state$selection4 = state.selection,
-        from = _state$selection4.from,
-        to = _state$selection4.to;
+      var _state$selection2 = state.selection,
+        from = _state$selection2.from,
+        to = _state$selection2.to;
       markApplied = toggleBlockMarkOnRange(from, to, tr, state);
     }
     if (markApplied && tr.docChanged) {

package/dist/cjs/plugins/base/index.js

@@ -19,7 +19,7 @@ var _newlinePreserveMarks = _interopRequireDefault(require("./pm-plugins/newline
 var _inlineCursorTarget = _interopRequireDefault(require("./pm-plugins/inline-cursor-target"));
 var _betterTypeHistory = _interopRequireDefault(require("./pm-plugins/better-type-history"));
 var _scrollGutter = _interopRequireDefault(require("./pm-plugins/scroll-gutter"));
-var _keymap = require("../../utils/keymap");
+var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _frozenEditor = _interopRequireDefault(require("./pm-plugins/frozen-editor"));
 var _composition = _interopRequireDefault(require("./pm-plugins/composition"));
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -81,7 +81,7 @@ var basePlugin = function basePlugin(options, api) {
       {
         name: 'codeBlockIndent',
         plugin: function plugin() {
-          return (0, _keymap.keymap)(_objectSpread(_objectSpread({}, _commands.baseKeymap), {}, {
+          return (0, _keymaps.keymap)(_objectSpread(_objectSpread({}, _commands.baseKeymap), {}, {
             'Mod-[': function Mod() {
               return true;
             },

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

@@ -16,15 +16,13 @@ exports.setNormalText = setNormalText;
 exports.setNormalTextWithAnalytics = setNormalTextWithAnalytics;
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _types = require("../types");
-var _mark = require("../../../utils/mark");
-var _insert = require("@atlaskit/editor-common/insert");
-var _analytics = require("../../analytics");
-var _analytics2 = require("@atlaskit/editor-common/analytics");
-var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
-var _mark2 = require("@atlaskit/editor-common/mark");
 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 _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); }
@@ -42,15 +40,15 @@ function setBlockType(name) {
     return false;
   };
 }
-function setBlockTypeWithAnalytics(name, inputMethod) {
+function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi) {
   return function (state, dispatch) {
     var nodes = state.schema.nodes;
     if (name === _types.NORMAL_TEXT.name && nodes.paragraph) {
-      return setNormalTextWithAnalytics(inputMethod)(state, dispatch);
+      return setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi)(state, dispatch);
     }
     var headingBlockType = _types.HEADINGS_BY_NAME[name];
     if (headingBlockType && nodes.heading && headingBlockType.level) {
-      return setHeadingWithAnalytics(headingBlockType.level, inputMethod)(state, dispatch);
+      return setHeadingWithAnalytics(headingBlockType.level, inputMethod, editorAnalyticsApi)(state, dispatch);
     }
     return false;
   };
@@ -78,7 +76,7 @@ function withCurrentHeadingLevel(fn) {
     var _state$schema$nodes = state.schema.nodes,
       heading = _state$schema$nodes.heading,
       paragraph = _state$schema$nodes.paragraph;
-    var nodes = (0, _mark2.filterChildrenBetween)(state.doc, state.selection.from, state.selection.to, function (node) {
+    var nodes = (0, _utils2.filterChildrenBetween)(state.doc, state.selection.from, state.selection.to, function (node) {
       return node.type === heading || node.type === paragraph;
     });
 
@@ -106,13 +104,13 @@ function withCurrentHeadingLevel(fn) {
     return fn(level)(state, dispatch, view);
   };
 }
-function setNormalTextWithAnalytics(inputMethod) {
+function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return (0, _analytics.withAnalytics)({
-      action: _analytics2.ACTION.FORMATTED,
-      actionSubject: _analytics2.ACTION_SUBJECT.TEXT,
-      eventType: _analytics2.EVENT_TYPE.TRACK,
-      actionSubjectId: _analytics2.ACTION_SUBJECT_ID.FORMAT_HEADING,
+    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_HEADING,
       attributes: {
         inputMethod: inputMethod,
         newHeadingLevel: 0,
@@ -140,13 +138,13 @@ function setHeading(level) {
     return true;
   };
 }
-var setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod) {
+var setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod, editorAnalyticsApi) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return (0, _analytics.withAnalytics)({
-      action: _analytics2.ACTION.FORMATTED,
-      actionSubject: _analytics2.ACTION_SUBJECT.TEXT,
-      eventType: _analytics2.EVENT_TYPE.TRACK,
-      actionSubjectId: _analytics2.ACTION_SUBJECT_ID.FORMAT_HEADING,
+    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_HEADING,
       attributes: {
         inputMethod: inputMethod,
         newHeadingLevel: newHeadingLevel,
@@ -192,35 +190,35 @@ var insertBlockTypesWithAnalytics = function insertBlockTypesWithAnalytics(name,
   switch (name) {
     case _types.BLOCK_QUOTE.name:
       return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, {
-        action: _analytics2.ACTION.FORMATTED,
-        actionSubject: _analytics2.ACTION_SUBJECT.TEXT,
-        eventType: _analytics2.EVENT_TYPE.TRACK,
-        actionSubjectId: _analytics2.ACTION_SUBJECT_ID.FORMAT_BLOCK_QUOTE,
+        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: _analytics2.ACTION.INSERTED,
-        actionSubject: _analytics2.ACTION_SUBJECT.DOCUMENT,
-        actionSubjectId: _analytics2.ACTION_SUBJECT_ID.CODE_BLOCK,
+        action: _analytics.ACTION.INSERTED,
+        actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
+        actionSubjectId: _analytics.ACTION_SUBJECT_ID.CODE_BLOCK,
         attributes: {
           inputMethod: inputMethod
         },
-        eventType: _analytics2.EVENT_TYPE.TRACK
+        eventType: _analytics.EVENT_TYPE.TRACK
       })(insertBlockType(name));
     case _types.PANEL.name:
       return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, {
-        action: _analytics2.ACTION.INSERTED,
-        actionSubject: _analytics2.ACTION_SUBJECT.DOCUMENT,
-        actionSubjectId: _analytics2.ACTION_SUBJECT_ID.PANEL,
+        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: _analytics2.EVENT_TYPE.TRACK
+        eventType: _analytics.EVENT_TYPE.TRACK
       })(insertBlockType(name));
     default:
       return insertBlockType(name);
@@ -249,7 +247,7 @@ function createWrapSelectionTransaction(_ref3) {
     indentation = _state$schema$marks.indentation;
 
   /** Alignment or Indentation is not valid inside block types */
-  var removeAlignTr = (0, _mark.removeBlockMarks)(state, [alignment, indentation]);
+  var removeAlignTr = (0, _utils2.removeBlockMarks)(state, [alignment, indentation]);
   tr = removeAlignTr || tr;
   var range = $from.blockRange($to);
   var wrapping = range && (0, _transform.findWrapping)(range, type, nodeAttributes);

package/dist/cjs/plugins/block-type/commands/transform-to-code-block.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.isConvertableToCodeBlock = isConvertableToCodeBlock;
 exports.transformToCodeBlockAction = transformToCodeBlockAction;
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _slice = require("../../../utils/slice");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils = require("@atlaskit/editor-common/utils");
 function transformToCodeBlockAction(state, start, attrs) {
@@ -16,7 +15,7 @@ function transformToCodeBlockAction(state, start, attrs) {
   //when cmd+A is used to select the content. start position should be 0.
   var parentStartPosition = startOfCodeBlockText.depth === 0 ? 0 : startOfCodeBlockText.before();
   var contentSlice = state.doc.slice(startOfCodeBlockText.pos, endPosition);
-  var codeBlockSlice = (0, _slice.mapSlice)(contentSlice, function (node, parent, index) {
+  var codeBlockSlice = (0, _utils.mapSlice)(contentSlice, function (node, parent, index) {
     if (node.type === state.schema.nodes.hardBreak) {
       return state.schema.text('\n');
     }

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

@@ -15,17 +15,17 @@ Object.defineProperty(exports, "pluginKey", {
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
+var _types = require("@atlaskit/editor-common/types");
+var _withPluginState = require("@atlaskit/editor-common/with-plugin-state");
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _quickInsert = require("@atlaskit/editor-common/quick-insert");
+var keymaps = _interopRequireWildcard(require("@atlaskit/editor-common/keymaps"));
 var _main = require("./pm-plugins/main");
 var _keymap = _interopRequireDefault(require("./pm-plugins/keymap"));
 var _inputRule = _interopRequireDefault(require("./pm-plugins/input-rule"));
 var _ToolbarBlockType = _interopRequireDefault(require("./ui/ToolbarBlockType"));
-var _WithPluginState = _interopRequireDefault(require("../../ui/WithPluginState"));
 var _commands = require("./commands");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var keymaps = _interopRequireWildcard(require("../../keymaps"));
-var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _messages = require("./messages");
-var _types = require("../../ui/Toolbar/types");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var headingPluginOptions = function headingPluginOptions(_ref, isAllowed, editorAnalyticsApi) {
@@ -126,15 +126,17 @@ var blockTypePlugin = function blockTypePlugin(options, api) {
       return [{
         name: 'blockType',
         plugin: function plugin(_ref3) {
+          var _api$dependencies$ana;
           var dispatch = _ref3.dispatch;
-          return (0, _main.createPlugin)(dispatch, options && options.lastNodeMustBeParagraph);
+          return (0, _main.createPlugin)(api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions, dispatch, options && options.lastNodeMustBeParagraph);
         }
       }, {
         name: 'blockTypeInputRule',
         plugin: function plugin(_ref4) {
+          var _api$dependencies$ana2;
           var schema = _ref4.schema,
             featureFlags = _ref4.featureFlags;
-          return (0, _inputRule.default)(schema, featureFlags);
+          return (0, _inputRule.default)(api === null || api === void 0 ? void 0 : (_api$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.actions, schema, featureFlags);
         }
       },
       // Needs to be lower priority than editor-tables.tableEditing
@@ -142,10 +144,10 @@ var blockTypePlugin = function blockTypePlugin(options, api) {
       {
         name: 'blockTypeKeyMap',
         plugin: function plugin(_ref5) {
-          var _api$dependencies$ana;
+          var _api$dependencies$ana3;
           var schema = _ref5.schema,
             featureFlags = _ref5.featureFlags;
-          return (0, _keymap.default)(schema, featureFlags, api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions);
+          return (0, _keymap.default)(api === null || api === void 0 ? void 0 : (_api$dependencies$ana3 = api.dependencies.analytics) === null || _api$dependencies$ana3 === void 0 ? void 0 : _api$dependencies$ana3.actions, schema, featureFlags);
         }
       }];
     },
@@ -160,9 +162,10 @@ var blockTypePlugin = function blockTypePlugin(options, api) {
         eventDispatcher = _ref6.eventDispatcher;
       var isSmall = options && options.isUndoRedoButtonsEnabled ? toolbarSize < _types.ToolbarSize.XXL : toolbarSize < _types.ToolbarSize.XL;
       var boundSetBlockType = function boundSetBlockType(name) {
-        return (0, _commands.setBlockTypeWithAnalytics)(name, _analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+        var _api$dependencies$ana4;
+        return (0, _commands.setBlockTypeWithAnalytics)(name, _analytics.INPUT_METHOD.TOOLBAR, api === null || api === void 0 ? void 0 : (_api$dependencies$ana4 = api.dependencies.analytics) === null || _api$dependencies$ana4 === void 0 ? void 0 : _api$dependencies$ana4.actions)(editorView.state, editorView.dispatch);
       };
-      return /*#__PURE__*/_react.default.createElement(_WithPluginState.default, {
+      return /*#__PURE__*/_react.default.createElement(_withPluginState.WithPluginState, {
         editorView: editorView,
         eventDispatcher: eventDispatcher,
         plugins: {
@@ -185,9 +188,9 @@ var blockTypePlugin = function blockTypePlugin(options, api) {
     },
     pluginsOptions: {
       quickInsert: function quickInsert(intl) {
-        var _api$dependencies$ana2, _api$dependencies$ana3;
+        var _api$dependencies$ana5, _api$dependencies$ana6;
         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$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.actions)), (0, _toConsumableArray2.default)(headingPluginOptions(intl, exclude.indexOf('heading') === -1, api === null || api === void 0 ? void 0 : (_api$dependencies$ana3 = api.dependencies.analytics) === null || _api$dependencies$ana3 === void 0 ? void 0 : _api$dependencies$ana3.actions)));
+        return [].concat((0, _toConsumableArray2.default)(blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1, api === null || api === void 0 ? void 0 : (_api$dependencies$ana5 = api.dependencies.analytics) === null || _api$dependencies$ana5 === void 0 ? void 0 : _api$dependencies$ana5.actions)), (0, _toConsumableArray2.default)(headingPluginOptions(intl, exclude.indexOf('heading') === -1, api === null || api === void 0 ? void 0 : (_api$dependencies$ana6 = api.dependencies.analytics) === null || _api$dependencies$ana6 === void 0 ? void 0 : _api$dependencies$ana6.actions)));
       }
     }
   };

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

@@ -6,12 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _inputRules = require("../../../utils/input-rules");
+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 _utils = require("@atlaskit/editor-prosemirror/utils");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _utils3 = require("../utils");
 var MAX_HEADING_LEVEL = 6;
 function getHeadingLevel(match) {
   return {
@@ -19,14 +20,14 @@ function getHeadingLevel(match) {
   };
 }
 function headingRule(nodeType, maxLevel) {
-  return (0, _inputRules.createWrappingTextBlockRule)({
+  return (0, _utils3.createWrappingTextBlockRule)({
     match: new RegExp('^(#{1,' + maxLevel + '})\\s$'),
     nodeType: nodeType,
     getAttrs: getHeadingLevel
   });
 }
 function blockQuoteRule(nodeType) {
-  return (0, _inputRules.createJoinNodesRule)(/^\s*>\s$/, nodeType);
+  return (0, _utils3.createJoinNodesRule)(/^\s*>\s$/, nodeType);
 }
 
 /**
@@ -35,7 +36,7 @@ function blockQuoteRule(nodeType) {
  * @param {Schema} schema
  * @returns {InputRuleWithHandler[]}
  */
-function getHeadingRules(schema) {
+function getHeadingRules(editorAnalyticsAPI, schema) {
   // '# ' for h1, '## ' for h2 and etc
   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) {
@@ -46,7 +47,7 @@ function getHeadingRules(schema) {
   });
 
   // New analytics handler
-  var ruleWithHeadingAnalytics = (0, _inputRules.ruleWithAnalytics)(function (_state, matchResult) {
+  var ruleWithHeadingAnalytics = (0, _utils2.inputRuleWithAnalytics)(function (_state, matchResult) {
     return {
       action: _analytics.ACTION.FORMATTED,
       actionSubject: _analytics.ACTION_SUBJECT.TEXT,
@@ -57,7 +58,7 @@ function getHeadingRules(schema) {
         newHeadingLevel: getHeadingLevel(matchResult).level
       }
     };
-  });
+  }, editorAnalyticsAPI);
   return [ruleWithHeadingAnalytics(hashRule), ruleWithHeadingAnalytics(leftNodeReplacementHashRule)];
 }
 
@@ -67,7 +68,7 @@ function getHeadingRules(schema) {
  * @param {Schema} schema
  * @returns {InputRuleWithHandler[]}
  */
-function getBlockQuoteRules(schema) {
+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) {
@@ -75,7 +76,7 @@ function getBlockQuoteRules(schema) {
   });
 
   // Analytics V3 handler
-  var ruleWithBlockQuoteAnalytics = (0, _inputRules.ruleWithAnalytics)({
+  var ruleWithBlockQuoteAnalytics = (0, _utils2.inputRuleWithAnalytics)({
     action: _analytics.ACTION.FORMATTED,
     actionSubject: _analytics.ACTION_SUBJECT.TEXT,
     eventType: _analytics.EVENT_TYPE.TRACK,
@@ -83,7 +84,7 @@ function getBlockQuoteRules(schema) {
     attributes: {
       inputMethod: _analytics.INPUT_METHOD.FORMATTING
     }
-  });
+  }, editorAnalyticsAPI);
   return [ruleWithBlockQuoteAnalytics(greatherThanRule), ruleWithBlockQuoteAnalytics(leftNodeReplacementGreatherRule)];
 }
 
@@ -93,8 +94,8 @@ function getBlockQuoteRules(schema) {
  * @param {Schema} schema
  * @returns {InputRuleWithHandler[]}
  */
-function getCodeBlockRules(schema) {
-  var ruleAnalytics = (0, _inputRules.ruleWithAnalytics)({
+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,
@@ -102,7 +103,7 @@ function getCodeBlockRules(schema) {
       inputMethod: _analytics.INPUT_METHOD.FORMATTING
     },
     eventType: _analytics.EVENT_TYPE.TRACK
-  });
+  }, editorAnalyticsAPI);
   var validMatchLength = function validMatchLength(match) {
     return match.length > 0 && match[0].length === 3;
   };
@@ -136,16 +137,16 @@ function getCodeBlockRules(schema) {
   });
   return [ruleAnalytics(threeTildeRule), ruleAnalytics(leftNodeReplacementThreeTildeRule)];
 }
-function inputRulePlugin(schema, featureFlags) {
+function inputRulePlugin(editorAnalyticsAPI, schema, featureFlags) {
   var rules = [];
   if (schema.nodes.heading) {
-    rules.push.apply(rules, (0, _toConsumableArray2.default)(getHeadingRules(schema)));
+    rules.push.apply(rules, (0, _toConsumableArray2.default)(getHeadingRules(editorAnalyticsAPI, schema)));
   }
   if (schema.nodes.blockquote) {
-    rules.push.apply(rules, (0, _toConsumableArray2.default)(getBlockQuoteRules(schema)));
+    rules.push.apply(rules, (0, _toConsumableArray2.default)(getBlockQuoteRules(editorAnalyticsAPI, schema)));
   }
   if (schema.nodes.codeBlock) {
-    rules.push.apply(rules, (0, _toConsumableArray2.default)(getCodeBlockRules(schema)));
+    rules.push.apply(rules, (0, _toConsumableArray2.default)(getCodeBlockRules(editorAnalyticsAPI, schema)));
   }
   if (rules.length !== 0) {
     return (0, _prosemirrorInputRules.createPlugin)('block-type', rules, {

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

@@ -7,30 +7,28 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = keymapPlugin;
 var _history = require("@atlaskit/editor-prosemirror/history");
 var _commands = require("@atlaskit/editor-prosemirror/commands");
-var keymaps = _interopRequireWildcard(require("../../../keymaps"));
-var commands = _interopRequireWildcard(require("../../../commands"));
-var blockTypes = _interopRequireWildcard(require("../types"));
-var _keymap = require("../../../utils/keymap");
-var _commands3 = require("../commands");
+var _analytics = require("@atlaskit/editor-common/analytics");
+var keymaps = _interopRequireWildcard(require("@atlaskit/editor-common/keymaps"));
 var _utils = require("@atlaskit/editor-common/utils");
-var _analytics = require("../../analytics");
+var blockTypes = _interopRequireWildcard(require("../types"));
+var _commands2 = require("../commands");
 var _utils2 = require("../utils");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-var backspace = (0, _commands.chainCommands)(_commands3.cleanUpAtTheStartOfDocument, (0, _commands3.deleteBlockContent)(_utils2.isNodeAWrappingBlockNode), _commands3.deleteAndMoveCursor);
-var del = (0, _commands.chainCommands)((0, _utils.deleteEmptyParagraphAndMoveBlockUp)(_utils2.isNodeAWrappingBlockNode), (0, _commands3.deleteBlockContent)(_utils2.isNodeAWrappingBlockNode), _commands3.deleteAndMoveCursor);
-function keymapPlugin(schema, featureFlags, editorAnalyticsApi) {
+var backspace = (0, _commands.chainCommands)(_commands2.cleanUpAtTheStartOfDocument, (0, _commands2.deleteBlockContent)(_utils2.isNodeAWrappingBlockNode), _commands2.deleteAndMoveCursor);
+var del = (0, _commands.chainCommands)((0, _utils.deleteEmptyParagraphAndMoveBlockUp)(_utils2.isNodeAWrappingBlockNode), (0, _commands2.deleteBlockContent)(_utils2.isNodeAWrappingBlockNode), _commands2.deleteAndMoveCursor);
+function keymapPlugin(editorAnalyticsApi, schema, _featureFlags) {
   var list = {};
-  keymaps.bindKeymapWithCommand(keymaps.insertNewLine.common, commands.insertNewLineWithAnalytics, list);
-  keymaps.bindKeymapWithCommand(keymaps.moveUp.common, commands.createNewParagraphAbove, list);
-  keymaps.bindKeymapWithCommand(keymaps.moveDown.common, commands.createNewParagraphBelow, list);
+  keymaps.bindKeymapWithCommand(keymaps.insertNewLine.common, (0, _utils.insertNewLineWithAnalytics)(editorAnalyticsApi), list);
+  keymaps.bindKeymapWithCommand(keymaps.moveUp.common, _utils.createNewParagraphAbove, list);
+  keymaps.bindKeymapWithCommand(keymaps.moveDown.common, _utils.createNewParagraphBelow, list);
   keymaps.bindKeymapWithCommand(keymaps.findKeyMapForBrowser(keymaps.redo), _history.redo, list);
   keymaps.bindKeymapWithCommand(keymaps.undo.common, _history.undo, list);
   keymaps.bindKeymapWithCommand(keymaps.backspace.common, backspace, list);
   keymaps.bindKeymapWithCommand(keymaps.deleteKey.common, del, list);
   keymaps.bindKeymapWithCommand(keymaps.forwardDelete.mac, del, list);
   if (schema.nodes[blockTypes.BLOCK_QUOTE.nodeName]) {
-    keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleBlockQuote), (0, _commands3.insertBlockTypesWithAnalytics)(blockTypes.BLOCK_QUOTE.name, _analytics.INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
+    keymaps.bindKeymapWithCommand(keymaps.findShortcutByKeymap(keymaps.toggleBlockQuote), (0, _commands2.insertBlockTypesWithAnalytics)(blockTypes.BLOCK_QUOTE.name, _analytics.INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
   }
-  return (0, _keymap.keymap)(list);
+  return (0, keymaps.keymap)(list);
 }