@atlaskit/editor-core 187.9.2 → 187.10.1

package/dist/cjs/ui/styles.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.expandIconWrapperStyle = exports.clickSelectWrapperStyle = exports.buttonContentStyle = exports.buttonContentReducedSpacingStyle = void 0;
+exports.expandIconWrapperStyle = exports.clickSelectWrapperStyle = void 0;
 Object.defineProperty(exports, "scrollbarStyles", {
   enumerable: true,
   get: function get() {
@@ -17,19 +17,12 @@ Object.defineProperty(exports, "shortcutStyle", {
     return _shortcut.shortcutStyle;
   }
 });
-exports.wrapperSmallStyle = void 0;
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = require("@emotion/react");
 var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
 var _scrollbar = require("@atlaskit/editor-shared-styles/scrollbar");
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
-var wrapperSmallStyle = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  margin-left: ", ";\n  min-width: 40px;\n"])), "var(--ds-space-050, 4px)");
-exports.wrapperSmallStyle = wrapperSmallStyle;
-var expandIconWrapperStyle = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  margin-left: -8px;\n"])));
+var _templateObject, _templateObject2;
+var expandIconWrapperStyle = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  margin-left: -8px;\n"])));
 exports.expandIconWrapperStyle = expandIconWrapperStyle;
-var buttonContentStyle = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  min-width: 80px;\n  align-items: center;\n  overflow: hidden;\n  justify-content: center;\n  flex-direction: column;\n  padding: ", ";\n"])), "var(--ds-space-075, 6px)");
-exports.buttonContentStyle = buttonContentStyle;
-var buttonContentReducedSpacingStyle = (0, _react.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  padding: ", ";\n"])), "var(--ds-space-100, 8px)");
-exports.buttonContentReducedSpacingStyle = buttonContentReducedSpacingStyle;
-var clickSelectWrapperStyle = (0, _react.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  user-select: all;\n"])));
+var clickSelectWrapperStyle = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  user-select: all;\n"])));
 exports.clickSelectWrapperStyle = clickSelectWrapperStyle;

package/dist/cjs/utils/index.js

@@ -10,9 +10,6 @@ Object.defineProperty(exports, "SetAttrsStep", {
     return _steps.SetAttrsStep;
   }
 });
-exports.areBlockTypesDisabled = areBlockTypesDisabled;
-exports.canMoveDown = canMoveDown;
-exports.canMoveUp = canMoveUp;
 exports.checkNodeDown = checkNodeDown;
 exports.compose = compose;
 exports.dedupe = dedupe;
@@ -138,18 +135,16 @@ exports.sum = sum;
 exports.toJSON = toJSON;
 exports.whichTransitionEvent = whichTransitionEvent;
 var _commands = require("@atlaskit/editor-prosemirror/commands");
-var _state = require("@atlaskit/editor-prosemirror/state");
 var _editorJsonTransformer = require("@atlaskit/editor-json-transformer");
 var _cursor = require("../plugins/fake-text-cursor/cursor");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _document = require("./document");
-var _position = require("./prosemirror/position");
-var _utils2 = require("@atlaskit/editor-common/utils");
 var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _mark = require("./mark");
 var _nodes = require("./nodes");
 var _selection = require("./selection");
 var _measureEnum = _interopRequireDefault(require("./performance/measure-enum"));
+var _utils2 = require("@atlaskit/editor-common/utils");
 var _steps = require("@atlaskit/adf-schema/steps");
 function isMarkTypeCompatibleWithMark(markType, mark) {
   return !mark.type.excludes(markType) && !markType.excludes(mark.type);
@@ -157,37 +152,6 @@ function isMarkTypeCompatibleWithMark(markType, mark) {
 function isMarkTypeAllowedInNode(markType, state) {
   return (0, _commands.toggleMark)(markType)(state);
 }
-function canMoveUp(state) {
-  var selection = state.selection;
-  /**
-   * If there's a media element on the selection it will use a gap cursor to move
-   */
-  if (selection instanceof _state.NodeSelection && (0, _utils2.isMediaNode)(selection.node)) {
-    return true;
-  }
-  if (selection instanceof _state.TextSelection) {
-    if (!selection.empty) {
-      return true;
-    }
-  }
-  return !(0, _position.atTheBeginningOfDoc)(state);
-}
-function canMoveDown(state) {
-  var selection = state.selection;
-
-  /**
-   * If there's a media element on the selection it will use a gap cursor to move
-   */
-  if (selection instanceof _state.NodeSelection && (0, _utils2.isMediaNode)(selection.node)) {
-    return true;
-  }
-  if (selection instanceof _state.TextSelection) {
-    if (!selection.empty) {
-      return true;
-    }
-  }
-  return !(0, _position.atTheEndOfDoc)(state);
-}
 function isSelectionInsideLastNodeInDocument(selection) {
   var docNode = selection.$anchor.node(0);
   var rootNode = selection.$anchor.node(1);
@@ -312,46 +276,6 @@ function whichTransitionEvent() {
   }
   return;
 }
-
-/**
- * Function will create a list of wrapper blocks present in a selection.
- */
-function getSelectedWrapperNodes(state) {
-  var nodes = [];
-  if (state.selection) {
-    var _state$selection = state.selection,
-      $from = _state$selection.$from,
-      $to = _state$selection.$to;
-    var _state$schema$nodes = state.schema.nodes,
-      blockquote = _state$schema$nodes.blockquote,
-      panel = _state$schema$nodes.panel,
-      orderedList = _state$schema$nodes.orderedList,
-      bulletList = _state$schema$nodes.bulletList,
-      listItem = _state$schema$nodes.listItem,
-      codeBlock = _state$schema$nodes.codeBlock,
-      decisionItem = _state$schema$nodes.decisionItem,
-      decisionList = _state$schema$nodes.decisionList,
-      taskItem = _state$schema$nodes.taskItem,
-      taskList = _state$schema$nodes.taskList;
-    state.doc.nodesBetween($from.pos, $to.pos, function (node) {
-      if (node.isBlock && [blockquote, panel, orderedList, bulletList, listItem, codeBlock, decisionItem, decisionList, taskItem, taskList].indexOf(node.type) >= 0) {
-        nodes.push(node.type);
-      }
-    });
-  }
-  return nodes;
-}
-
-/**
- * Function will check if changing block types: Paragraph, Heading is enabled.
- */
-function areBlockTypesDisabled(state) {
-  var nodesTypes = getSelectedWrapperNodes(state);
-  var panel = state.schema.nodes.panel;
-  return nodesTypes.filter(function (type) {
-    return type !== panel;
-  }).length > 0;
-}
 var isTemporary = function isTemporary(id) {
   return id.indexOf('temporary:') === 0;
 };
@@ -410,9 +334,9 @@ var isEmptyNode = function isEmptyNode(schema) {
 };
 exports.isEmptyNode = isEmptyNode;
 var insideTableCell = function insideTableCell(state) {
-  var _state$schema$nodes2 = state.schema.nodes,
-    tableCell = _state$schema$nodes2.tableCell,
-    tableHeader = _state$schema$nodes2.tableHeader;
+  var _state$schema$nodes = state.schema.nodes,
+    tableCell = _state$schema$nodes.tableCell,
+    tableHeader = _state$schema$nodes.tableHeader;
   return (0, _utils.hasParentNodeOfType)([tableCell, tableHeader])(state.selection);
 };
 exports.insideTableCell = insideTableCell;

package/dist/cjs/utils/input-rules.js

@@ -4,14 +4,15 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ruleWithAnalytics = exports.createWrappingTextBlockRule = exports.createWrappingJoinRule = exports.createJoinNodesRule = void 0;
+exports.ruleWithAnalytics = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _analytics = require("../plugins/analytics");
-var _analytics2 = require("@atlaskit/editor-common/analytics");
 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; }
+/**
+ * @private
+ * @deprecated Use import {inputRuleWithAnalytics} from "@atlaskit/editor-common/utils"; instead
+ */
 var ruleWithAnalytics = function ruleWithAnalytics(getPayload) {
   return function (originalRule) {
     var onHandlerApply = function onHandlerApply(state, tr, matchResult) {
@@ -26,65 +27,4 @@ var ruleWithAnalytics = function ruleWithAnalytics(getPayload) {
     });
   };
 };
-exports.ruleWithAnalytics = ruleWithAnalytics;
-var createWrappingTextBlockRule = function createWrappingTextBlockRule(_ref) {
-  var match = _ref.match,
-    nodeType = _ref.nodeType,
-    getAttrs = _ref.getAttrs;
-  var handler = function handler(state, match, start, end) {
-    var fixedStart = Math.max(start, 1);
-    var $start = state.doc.resolve(fixedStart);
-    var attrs = getAttrs instanceof Function ? getAttrs(match) : getAttrs;
-    var nodeBefore = $start.node(-1);
-    if (nodeBefore && !nodeBefore.canReplaceWith($start.index(-1), $start.indexAfter(-1), nodeType)) {
-      return null;
-    }
-    return state.tr.delete(fixedStart, end).setBlockType(fixedStart, fixedStart, nodeType, attrs);
-  };
-  return (0, _prosemirrorInputRules.createRule)(match, handler);
-};
-exports.createWrappingTextBlockRule = createWrappingTextBlockRule;
-var createWrappingJoinRule = function createWrappingJoinRule(_ref2) {
-  var match = _ref2.match,
-    nodeType = _ref2.nodeType,
-    getAttrs = _ref2.getAttrs,
-    joinPredicate = _ref2.joinPredicate;
-  var handler = function handler(state, match, start, end) {
-    var attrs = (getAttrs instanceof Function ? getAttrs(match) : getAttrs) || {};
-    var tr = state.tr;
-    var fixedStart = Math.max(start, 1);
-    tr.delete(fixedStart, end);
-    var $start = tr.doc.resolve(fixedStart);
-    var range = $start.blockRange();
-    var wrapping = range && (0, _transform.findWrapping)(range, nodeType, attrs);
-    if (!wrapping || !range) {
-      return null;
-    }
-    var parentNodePosMapped = tr.mapping.map(range.start);
-    var parentNode = tr.doc.nodeAt(parentNodePosMapped);
-    var lastWrap = wrapping[wrapping.length - 1];
-    if (parentNode && lastWrap) {
-      var allowedMarks = lastWrap.type.allowedMarks(parentNode.marks) || [];
-      tr.setNodeMarkup(parentNodePosMapped, parentNode.type, parentNode.attrs, allowedMarks);
-    }
-    tr.wrap(range, wrapping);
-    var before = tr.doc.resolve(fixedStart - 1).nodeBefore;
-    if (before && before.type === nodeType && (0, _transform.canJoin)(tr.doc, fixedStart - 1) && (!joinPredicate || joinPredicate(match, before, _analytics2.JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST.JOINED_TO_LIST_ABOVE))) {
-      tr.join(fixedStart - 1);
-    }
-    return tr;
-  };
-  return (0, _prosemirrorInputRules.createRule)(match, handler);
-};
-exports.createWrappingJoinRule = createWrappingJoinRule;
-var createJoinNodesRule = function createJoinNodesRule(match, nodeType) {
-  return createWrappingJoinRule({
-    nodeType: nodeType,
-    match: match,
-    getAttrs: {},
-    joinPredicate: function joinPredicate(_, node) {
-      return node.type === nodeType;
-    }
-  });
-};
-exports.createJoinNodesRule = createJoinNodesRule;
+exports.ruleWithAnalytics = ruleWithAnalytics;

package/dist/cjs/utils/mark.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.sanitiseSelectionMarksForWrapping = exports.sanitiseMarksInSelection = exports.removeBlockMarks = exports.isMarkExcluded = exports.isMarkAllowedInRange = void 0;
+exports.sanitiseSelectionMarksForWrapping = exports.sanitiseMarksInSelection = exports.isMarkExcluded = exports.isMarkAllowedInRange = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var isMarkAllowedInRange = function isMarkAllowedInRange(doc, ranges, type) {
   var _loop = function _loop() {
@@ -40,47 +40,11 @@ var isMarkExcluded = function isMarkExcluded(type, marks) {
   }
   return false;
 };
-exports.isMarkExcluded = isMarkExcluded;
-var not = function not(fn) {
-  return function (arg) {
-    return !fn(arg);
-  };
-};
-var removeBlockMarks = function removeBlockMarks(state, marks) {
-  var selection = state.selection,
-    schema = state.schema;
-  var tr = state.tr;
-
-  // Marks might not exist in Schema
-  var marksToRemove = marks.filter(Boolean);
-  if (marksToRemove.length === 0) {
-    return undefined;
-  }
-
-  /** Saves an extra dispatch */
-  var blockMarksExists = false;
-  var hasMark = function hasMark(mark) {
-    return marksToRemove.indexOf(mark.type) > -1;
-  };
-  /**
-   * When you need to toggle the selection
-   * when another type which does not allow alignment is applied
-   */
-  state.doc.nodesBetween(selection.from, selection.to, function (node, pos) {
-    if (node.type === schema.nodes.paragraph && node.marks.some(hasMark)) {
-      blockMarksExists = true;
-      var resolvedPos = state.doc.resolve(pos);
-      var withoutBlockMarks = node.marks.filter(not(hasMark));
-      tr = tr.setNodeMarkup(resolvedPos.pos, undefined, node.attrs, withoutBlockMarks);
-    }
-  });
-  return blockMarksExists ? tr : undefined;
-};
 
 /**
  * Removes marks from nodes in the current selection that are not supported
  */
-exports.removeBlockMarks = removeBlockMarks;
+exports.isMarkExcluded = isMarkExcluded;
 var sanitiseSelectionMarksForWrapping = function sanitiseSelectionMarksForWrapping(state, newParentType) {
   var tr = state.tr;
   sanitiseMarksInSelection(tr, newParentType);

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "187.9.2";
+var version = "187.10.1";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "187.9.2",
+	"version": "187.10.1",
 	"sideEffects": false
 }

package/dist/es2019/commands/index.js

@@ -1,132 +1,5 @@
-import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, withAnalytics } from '../plugins/analytics';
-import { canMoveDown, canMoveUp } from '../utils';
-export function preventDefault() {
-  return function () {
-    return true;
-  };
-}
-export function insertNewLine() {
-  return function (state, dispatch) {
-    const {
-      $from
-    } = state.selection;
-    const parent = $from.parent;
-    const {
-      hardBreak
-    } = state.schema.nodes;
-    if (hardBreak) {
-      const hardBreakNode = hardBreak.createChecked();
-      if (parent && parent.type.validContent(Fragment.from(hardBreakNode))) {
-        if (dispatch) {
-          dispatch(state.tr.replaceSelectionWith(hardBreakNode, false));
-        }
-        return true;
-      }
-    }
-    if (state.selection instanceof TextSelection) {
-      if (dispatch) {
-        dispatch(state.tr.insertText('\n'));
-      }
-      return true;
-    }
-    return false;
-  };
-}
-export const insertNewLineWithAnalytics = withAnalytics({
-  action: ACTION.INSERTED,
-  actionSubject: ACTION_SUBJECT.TEXT,
-  actionSubjectId: ACTION_SUBJECT_ID.LINE_BREAK,
-  eventType: EVENT_TYPE.TRACK
-})(insertNewLine());
-export const createNewParagraphAbove = (state, dispatch) => {
-  const append = false;
-  if (!canMoveUp(state) && canCreateParagraphNear(state)) {
-    createParagraphNear(append)(state, dispatch);
-    return true;
-  }
-  return false;
-};
-export const createNewParagraphBelow = (state, dispatch) => {
-  const append = true;
-  if (!canMoveDown(state) && canCreateParagraphNear(state)) {
-    createParagraphNear(append)(state, dispatch);
-    return true;
-  }
-  return false;
-};
-function canCreateParagraphNear(state) {
-  const {
-    selection: {
-      $from
-    }
-  } = state;
-  const node = $from.node($from.depth);
-  const insideCodeBlock = !!node && node.type === state.schema.nodes.codeBlock;
-  const isNodeSelection = state.selection instanceof NodeSelection;
-  return $from.depth > 1 || isNodeSelection || insideCodeBlock;
-}
-export function createParagraphNear(append = true) {
-  return function (state, dispatch) {
-    const paragraph = state.schema.nodes.paragraph;
-    if (!paragraph) {
-      return false;
-    }
-    let insertPos;
-    if (state.selection instanceof TextSelection) {
-      if (topLevelNodeIsEmptyTextBlock(state)) {
-        return false;
-      }
-      insertPos = getInsertPosFromTextBlock(state, append);
-    } else {
-      insertPos = getInsertPosFromNonTextBlock(state, append);
-    }
-    const tr = state.tr.insert(insertPos, paragraph.createAndFill());
-    tr.setSelection(TextSelection.create(tr.doc, insertPos + 1));
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
-  };
-}
-function getInsertPosFromTextBlock(state, append) {
-  const {
-    $from,
-    $to
-  } = state.selection;
-  let pos;
-  if (!append) {
-    pos = $from.start(0);
-  } else {
-    pos = $to.end(0);
-  }
-  return pos;
-}
-function getInsertPosFromNonTextBlock(state, append) {
-  const {
-    $from,
-    $to
-  } = state.selection;
-  const nodeAtSelection = state.selection instanceof NodeSelection && state.doc.nodeAt(state.selection.$anchor.pos);
-  const isMediaSelection = nodeAtSelection && nodeAtSelection.type.name === 'mediaGroup';
-  let 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) {
-  const topLevelNode = state.selection.$from.node(1);
-  return topLevelNode.isTextblock && topLevelNode.type !== state.schema.nodes.codeBlock && topLevelNode.nodeSize === 2;
-}
 export function addParagraphAtEnd(tr) {
   const {
     doc: {

package/dist/es2019/labs/next/presets/default.js

@@ -8,7 +8,7 @@ import textFormattingPlugin from '../../../plugins/text-formatting';
 import { widthPlugin } from '@atlaskit/editor-plugin-width';
 import unsupportedContentPlugin from '../../../plugins/unsupported-content';
 import basePlugin from '../../../plugins/base';
-import editorDisabledPlugin from '../../../plugins/editor-disabled';
+import { editorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import typeAheadPlugin from '../../../plugins/type-ahead';
 import submitEditorPlugin from '../../../plugins/submit-editor';
 import fakeTextCursorPlugin from '../../../plugins/fake-text-cursor';

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

@@ -11,7 +11,7 @@ import newlinePreserveMarksPlugin from './pm-plugins/newline-preserve-marks';
 import inlineCursorTargetPlugin from './pm-plugins/inline-cursor-target';
 import betterTypeHistoryPlugin from './pm-plugins/better-type-history';
 import scrollGutter from './pm-plugins/scroll-gutter';
-import { keymap } from '../../utils/keymap';
+import { keymap } from '@atlaskit/editor-common/keymaps';
 import frozenEditor from './pm-plugins/frozen-editor';
 import compositionPlugin from './pm-plugins/composition';
 // Chrome >= 88

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

@@ -1,14 +1,12 @@
 import { findWrapping } from '@atlaskit/editor-prosemirror/transform';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
-import { CODE_BLOCK, BLOCK_QUOTE, PANEL, HEADINGS_BY_NAME, NORMAL_TEXT } from '../types';
-import { removeBlockMarks } from '../../../utils/mark';
+import { PanelType } from '@atlaskit/adf-schema';
+import { CellSelection } from '@atlaskit/editor-tables';
 import { shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/insert';
-import { withAnalytics as withAnalyticsDeprecated } from '../../analytics';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
-import { filterChildrenBetween } from '@atlaskit/editor-common/mark';
-import { PanelType } from '@atlaskit/adf-schema';
-import { CellSelection } from '@atlaskit/editor-tables';
+import { filterChildrenBetween, removeBlockMarks } from '@atlaskit/editor-common/utils';
+import { CODE_BLOCK, BLOCK_QUOTE, PANEL, HEADINGS_BY_NAME, NORMAL_TEXT } from '../types';
 import { transformToCodeBlockAction } from './transform-to-code-block';
 export function setBlockType(name) {
   return (state, dispatch) => {
@@ -25,17 +23,17 @@ export function setBlockType(name) {
     return false;
   };
 }
-export function setBlockTypeWithAnalytics(name, inputMethod) {
+export function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi) {
   return (state, dispatch) => {
     const {
       nodes
     } = state.schema;
     if (name === NORMAL_TEXT.name && nodes.paragraph) {
-      return setNormalTextWithAnalytics(inputMethod)(state, dispatch);
+      return setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi)(state, dispatch);
     }
     const headingBlockType = 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;
   };
@@ -86,8 +84,8 @@ function withCurrentHeadingLevel(fn) {
     return fn(level)(state, dispatch, view);
   };
 }
-export function setNormalTextWithAnalytics(inputMethod) {
-  return withCurrentHeadingLevel(previousHeadingLevel => withAnalyticsDeprecated({
+export function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi) {
+  return withCurrentHeadingLevel(previousHeadingLevel => withAnalytics(editorAnalyticsApi, {
     action: ACTION.FORMATTED,
     actionSubject: ACTION_SUBJECT.TEXT,
     eventType: EVENT_TYPE.TRACK,
@@ -121,8 +119,8 @@ export function setHeading(level) {
     return true;
   };
 }
-export const setHeadingWithAnalytics = (newHeadingLevel, inputMethod) => {
-  return withCurrentHeadingLevel(previousHeadingLevel => withAnalyticsDeprecated({
+export const setHeadingWithAnalytics = (newHeadingLevel, inputMethod, editorAnalyticsApi) => {
+  return withCurrentHeadingLevel(previousHeadingLevel => withAnalytics(editorAnalyticsApi, {
     action: ACTION.FORMATTED,
     actionSubject: ACTION_SUBJECT.TEXT,
     eventType: EVENT_TYPE.TRACK,

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

@@ -1,7 +1,6 @@
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { mapSlice } from '../../../utils/slice';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
-import { timestampToString } from '@atlaskit/editor-common/utils';
+import { timestampToString, mapSlice } from '@atlaskit/editor-common/utils';
 export function transformToCodeBlockAction(state, start, attrs) {
   const startOfCodeBlockText = state.selection.$from;
   const endPosition = state.selection.empty ? startOfCodeBlockText.end() : state.selection.$to.pos;

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

@@ -1,16 +1,16 @@
 import React from 'react';
 import { blockquote, hardBreak, heading } from '@atlaskit/adf-schema';
+import { ToolbarSize } from '@atlaskit/editor-common/types';
+import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { IconHeading, IconQuote } from '@atlaskit/editor-common/quick-insert';
+import * as keymaps from '@atlaskit/editor-common/keymaps';
 import { createPlugin, pluginKey } from './pm-plugins/main';
 import keymapPlugin from './pm-plugins/keymap';
 import inputRulePlugin from './pm-plugins/input-rule';
 import ToolbarBlockType from './ui/ToolbarBlockType';
-import WithPluginState from '../../ui/WithPluginState';
 import { setBlockTypeWithAnalytics } from './commands';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import * as keymaps from '../../keymaps';
-import { IconHeading, IconQuote } from '@atlaskit/editor-common/quick-insert';
 import { messages } from './messages';
-import { ToolbarSize } from '../../ui/Toolbar/types';
 const headingPluginOptions = ({
   formatMessage
 }, isAllowed, editorAnalyticsApi) => {
@@ -105,13 +105,19 @@ const blockTypePlugin = (options, api) => ({
       name: 'blockType',
       plugin: ({
         dispatch
-      }) => createPlugin(dispatch, options && options.lastNodeMustBeParagraph)
+      }) => {
+        var _api$dependencies$ana;
+        return 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: ({
         schema,
         featureFlags
-      }) => inputRulePlugin(schema, featureFlags)
+      }) => {
+        var _api$dependencies$ana2;
+        return inputRulePlugin(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
     // plugin as it is currently swallowing right/down arrow events inside tables
@@ -121,8 +127,8 @@ const blockTypePlugin = (options, api) => ({
         schema,
         featureFlags
       }) => {
-        var _api$dependencies$ana;
-        return keymapPlugin(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);
+        var _api$dependencies$ana3;
+        return keymapPlugin(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);
       }
     }];
   },
@@ -137,7 +143,10 @@ const blockTypePlugin = (options, api) => ({
     eventDispatcher
   }) {
     const isSmall = options && options.isUndoRedoButtonsEnabled ? toolbarSize < ToolbarSize.XXL : toolbarSize < ToolbarSize.XL;
-    const boundSetBlockType = name => setBlockTypeWithAnalytics(name, INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+    const boundSetBlockType = name => {
+      var _api$dependencies$ana4;
+      return setBlockTypeWithAnalytics(name, 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.createElement(WithPluginState, {
       editorView: editorView,
       eventDispatcher: eventDispatcher,
@@ -162,9 +171,9 @@ const blockTypePlugin = (options, api) => ({
   },
   pluginsOptions: {
     quickInsert: intl => {
-      var _api$dependencies$ana2, _api$dependencies$ana3;
+      var _api$dependencies$ana5, _api$dependencies$ana6;
       const exclude = options && options.allowBlockType && options.allowBlockType.exclude ? options.allowBlockType.exclude : [];
-      return [...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), ...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 [...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), ...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)];
     }
   }
 });