@atlaskit/editor-core 187.9.0 → 187.10.0

package/dist/es2019/plugins/media/utils/media-common.js

@@ -1,7 +1,7 @@
 import { deleteSelection, splitBlock } from '@atlaskit/editor-prosemirror/commands';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findPositionOfNodeBefore } from '@atlaskit/editor-prosemirror/utils';
-import { createParagraphNear, createNewParagraphBelow } from '../../../commands';
+import { createParagraphNear, createNewParagraphBelow } from '@atlaskit/editor-common/utils';
 import { isTemporary } from '../../../utils';
 import { mapSlice } from '../../../utils/slice';
 import { walkUpTreeUntil, removeNestedEmptyEls, unwrap } from '../../../utils/dom';

package/dist/es2019/plugins/selection/pm-plugins/events/keydown.js

@@ -1,36 +1,68 @@
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+
+/*
+ * The way expand was built, no browser reconize selection on it.
+ * For instance, when a selection going to a "collapsed" expand
+ * the browser will try to send the cursor to inside the expand content (wrong),
+ * this behavior is caused because the expand content is never true hidden
+ * we just set the height to 1px.
+ *
+ * So, we need to capture a possible selection event
+ * when a collapsed exxpand is the next node in the common depth.
+ * If that is true, we create a new TextSelection and stop the event bubble
+ */
 const isCollpasedExpand = node => {
   return Boolean(node && ['expand', 'nestedExpand'].includes(node.type.name) && !node.attrs.__expanded);
 };
-const findFixedProblematicNodePosition = ($pos, direction) => {
-  if ($pos.pos === 0 || $pos.depth === 0) {
+
+/**
+ * ED-18072 - Cannot shift + arrow past bodied extension if it is not empty
+ */
+const isBodiedExtension = node => {
+  return Boolean(node && ['bodiedExtension'].includes(node.type.name));
+};
+const isProblematicNode = node => {
+  return isCollpasedExpand(node) || isBodiedExtension(node);
+};
+const findFixedProblematicNodePosition = (doc, $head, direction) => {
+  if ($head.pos === 0 || $head.depth === 0) {
     return null;
   }
-  const pos = direction === 'up' ? $pos.before() : $pos.after();
-  const $posResolved = $pos.doc.resolve(pos);
-  const maybeExpandNode = direction === 'up' ? $posResolved.nodeBefore : $posResolved.nodeAfter;
-  if (maybeExpandNode && isCollpasedExpand(maybeExpandNode)) {
-    const nodeSize = maybeExpandNode.nodeSize;
-    const expandPosition = direction === 'up' ? pos - nodeSize : pos + nodeSize;
-    const startPosNode = Math.max(expandPosition, 0);
-    const $startPosNode = $pos.doc.resolve(Math.min(startPosNode, $pos.doc.content.size));
-    return $startPosNode;
+  if (direction === 'up') {
+    const pos = $head.before();
+    const $posResolved = $head.doc.resolve(pos);
+    const maybeProblematicNode = $posResolved.nodeBefore;
+    if (maybeProblematicNode && isProblematicNode(maybeProblematicNode)) {
+      const nodeSize = maybeProblematicNode.nodeSize;
+      const nodeStartPosition = pos - nodeSize;
+
+      // ($head.pos - 1) will correspond to (nodeStartPosition + nodeSize) when we are at the start of the text node
+      const isAtEndOfProblematicNode = $head.pos - 1 === nodeStartPosition + nodeSize;
+      if (isAtEndOfProblematicNode) {
+        const startPosNode = Math.max(nodeStartPosition, 0);
+        const $startPosNode = $head.doc.resolve(Math.min(startPosNode, $head.doc.content.size));
+        return $startPosNode;
+      }
+    }
+  }
+  if (direction === 'down') {
+    const pos = $head.after();
+    const maybeProblematicNode = doc.nodeAt(pos);
+    if (maybeProblematicNode && isProblematicNode(maybeProblematicNode) && $head.pos + 1 === pos) {
+      const nodeSize = maybeProblematicNode.nodeSize;
+      const nodePosition = pos + nodeSize;
+      const startPosNode = Math.max(nodePosition, 0);
+      const $startPosNode = $head.doc.resolve(Math.min(startPosNode, $head.doc.content.size));
+      return $startPosNode;
+    }
   }
   return null;
 };
 export const onKeydown = (view, event) => {
   /*
-   * This workaround is needed for some specific situation with collapsed expand.
-   *
-   * The way expand was built, no browser reconize selection on it.
-   * For instance, when a selection going to a "collapsed" expand
-   * the browser will try to send the cursor to inside the expand content (wrong),
-   * this behavior is caused because the expand content is never true hidden
-   * we just set the height to 1px.
-   *
-   * So, we need to capture a possible selection event
-   * when a collapsed exxpand is the next node in the common depth.
-   * If that is true, we create a new TextSelection and stop the event bubble
+   * This workaround is needed for some specific situations.
+   * - expand collapse
+   * - bodied extension
    */
   if (!(event instanceof KeyboardEvent)) {
     return false;
@@ -42,6 +74,7 @@ export const onKeydown = (view, event) => {
     return false;
   }
   const {
+    doc,
     selection: {
       $head,
       $anchor
@@ -51,9 +84,12 @@ export const onKeydown = (view, event) => {
     return false;
   }
   const direction = ['ArrowLeft', 'ArrowUp', 'Home'].includes(event.key) ? 'up' : 'down';
-  const $fixedProblematicNodePosition = findFixedProblematicNodePosition($head, direction);
+  const $fixedProblematicNodePosition = findFixedProblematicNodePosition(doc, $head, direction);
   if ($fixedProblematicNodePosition) {
-    const forcedTextSelection = TextSelection.create(view.state.doc, $anchor.pos, $fixedProblematicNodePosition.pos);
+    // an offset is used here so that left arrow selects the first character before the node (consistent with arrow right)
+    const headOffset = event.key === 'ArrowLeft' ? -1 : 0;
+    const head = $fixedProblematicNodePosition.pos + headOffset;
+    const forcedTextSelection = TextSelection.create(view.state.doc, $anchor.pos, head);
     const tr = view.state.tr;
     tr.setSelection(forcedTextSelection);
     view.dispatch(tr);

package/dist/es2019/plugins/tasks-and-decisions/pm-plugins/keymaps.js

@@ -4,7 +4,7 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { uuid } from '@atlaskit/adf-schema';
-import { filterCommand as filter, isEmptySelectionAtStart, deleteEmptyParagraphAndMoveBlockUp, isEmptySelectionAtEnd } from '@atlaskit/editor-common/utils';
+import { filterCommand as filter, isEmptySelectionAtStart, isEmptySelectionAtEnd, deleteEmptyParagraphAndMoveBlockUp } from '@atlaskit/editor-common/utils';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INDENT_DIRECTION, INDENT_TYPE, INPUT_METHOD, withAnalytics } from '../../analytics';
 import { insertTaskDecisionWithAnalytics } from '../commands';
 import { joinAtCut, liftSelection, wrapSelectionInTaskList } from './commands';

package/dist/es2019/plugins/undo-redo/pm-plugins/keymaps.js

@@ -1,5 +1,5 @@
 import * as keymaps from '../../../keymaps';
-import { keymap } from '../../../utils/keymap';
+import { keymap } from '@atlaskit/editor-common/keymaps';
 import { redoFromKeyboard, undoFromKeyboard } from '../commands';
 export function keymapPlugin() {
   const list = {};

package/dist/es2019/ui/styles.js

@@ -1,25 +1,9 @@
 import { css } from '@emotion/react';
 export { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 export { scrollbarStyles } from '@atlaskit/editor-shared-styles/scrollbar';
-export const wrapperSmallStyle = css`
-  margin-left: ${"var(--ds-space-050, 4px)"};
-  min-width: 40px;
-`;
 export const expandIconWrapperStyle = css`
   margin-left: -8px;
 `;
-export const buttonContentStyle = css`
-  display: flex;
-  min-width: 80px;
-  align-items: center;
-  overflow: hidden;
-  justify-content: center;
-  flex-direction: column;
-  padding: ${"var(--ds-space-075, 6px)"};
-`;
-export const buttonContentReducedSpacingStyle = css`
-  padding: ${"var(--ds-space-100, 8px)"};
-`;
 export const clickSelectWrapperStyle = css`
   user-select: all;
 `;

package/dist/es2019/utils/index.js

@@ -1,11 +1,8 @@
 import { toggleMark } from '@atlaskit/editor-prosemirror/commands';
-import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { FakeTextCursorSelection } from '../plugins/fake-text-cursor/cursor';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { isNodeEmpty } from './document';
-import { atTheBeginningOfDoc, atTheEndOfDoc } from './prosemirror/position';
-import { isMediaNode } from '@atlaskit/editor-common/utils';
 export { insideTable } from '@atlaskit/editor-common/core-utils';
 export { isNodeEmpty, findFarthestParentNode, isSelectionEndOfParagraph, nodesBetweenChanged, getNodesCount } from './document';
 export { sanitiseMarksInSelection } from './mark';
@@ -18,41 +15,6 @@ function isMarkTypeCompatibleWithMark(markType, mark) {
 function isMarkTypeAllowedInNode(markType, state) {
   return toggleMark(markType)(state);
 }
-export function canMoveUp(state) {
-  const {
-    selection
-  } = state;
-  /**
-   * If there's a media element on the selection it will use a gap cursor to move
-   */
-  if (selection instanceof NodeSelection && isMediaNode(selection.node)) {
-    return true;
-  }
-  if (selection instanceof TextSelection) {
-    if (!selection.empty) {
-      return true;
-    }
-  }
-  return !atTheBeginningOfDoc(state);
-}
-export function canMoveDown(state) {
-  const {
-    selection
-  } = state;
-
-  /**
-   * If there's a media element on the selection it will use a gap cursor to move
-   */
-  if (selection instanceof NodeSelection && isMediaNode(selection.node)) {
-    return true;
-  }
-  if (selection instanceof TextSelection) {
-    if (!selection.empty) {
-      return true;
-    }
-  }
-  return !atTheEndOfDoc(state);
-}
 export function isSelectionInsideLastNodeInDocument(selection) {
   const docNode = selection.$anchor.node(0);
   const rootNode = selection.$anchor.node(1);
@@ -177,48 +139,6 @@ export function whichTransitionEvent() {
   }
   return;
 }
-
-/**
- * Function will create a list of wrapper blocks present in a selection.
- */
-function getSelectedWrapperNodes(state) {
-  const nodes = [];
-  if (state.selection) {
-    const {
-      $from,
-      $to
-    } = state.selection;
-    const {
-      blockquote,
-      panel,
-      orderedList,
-      bulletList,
-      listItem,
-      codeBlock,
-      decisionItem,
-      decisionList,
-      taskItem,
-      taskList
-    } = state.schema.nodes;
-    state.doc.nodesBetween($from.pos, $to.pos, 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.
- */
-export function areBlockTypesDisabled(state) {
-  const nodesTypes = getSelectedWrapperNodes(state);
-  const {
-    panel
-  } = state.schema.nodes;
-  return nodesTypes.filter(type => type !== panel).length > 0;
-}
 export const isTemporary = id => {
   return id.indexOf('temporary:') === 0;
 };

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

@@ -1,7 +1,8 @@
-import { canJoin, findWrapping } from '@atlaskit/editor-prosemirror/transform';
-import { createRule } from '@atlaskit/prosemirror-input-rules';
 import { addAnalytics } from '../plugins/analytics';
-import { JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST } from '@atlaskit/editor-common/analytics';
+/**
+ * @private
+ * @deprecated Use import {inputRuleWithAnalytics} from "@atlaskit/editor-common/utils"; instead
+ */
 export const ruleWithAnalytics = getPayload => {
   return originalRule => {
     const onHandlerApply = (state, tr, matchResult) => {
@@ -16,62 +17,4 @@ export const ruleWithAnalytics = getPayload => {
       onHandlerApply
     };
   };
-};
-export const createWrappingTextBlockRule = ({
-  match,
-  nodeType,
-  getAttrs
-}) => {
-  const handler = (state, match, start, end) => {
-    const fixedStart = Math.max(start, 1);
-    const $start = state.doc.resolve(fixedStart);
-    const attrs = getAttrs instanceof Function ? getAttrs(match) : getAttrs;
-    const 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 createRule(match, handler);
-};
-export const createWrappingJoinRule = ({
-  match,
-  nodeType,
-  getAttrs,
-  joinPredicate
-}) => {
-  const handler = (state, match, start, end) => {
-    const attrs = (getAttrs instanceof Function ? getAttrs(match) : getAttrs) || {};
-    const tr = state.tr;
-    const fixedStart = Math.max(start, 1);
-    tr.delete(fixedStart, end);
-    const $start = tr.doc.resolve(fixedStart);
-    const range = $start.blockRange();
-    const wrapping = range && findWrapping(range, nodeType, attrs);
-    if (!wrapping || !range) {
-      return null;
-    }
-    const parentNodePosMapped = tr.mapping.map(range.start);
-    const parentNode = tr.doc.nodeAt(parentNodePosMapped);
-    const lastWrap = wrapping[wrapping.length - 1];
-    if (parentNode && lastWrap) {
-      const allowedMarks = lastWrap.type.allowedMarks(parentNode.marks) || [];
-      tr.setNodeMarkup(parentNodePosMapped, parentNode.type, parentNode.attrs, allowedMarks);
-    }
-    tr.wrap(range, wrapping);
-    const before = tr.doc.resolve(fixedStart - 1).nodeBefore;
-    if (before && before.type === nodeType && canJoin(tr.doc, fixedStart - 1) && (!joinPredicate || joinPredicate(match, before, JOIN_SCENARIOS_WHEN_TYPING_TO_INSERT_LIST.JOINED_TO_LIST_ABOVE))) {
-      tr.join(fixedStart - 1);
-    }
-    return tr;
-  };
-  return createRule(match, handler);
-};
-export const createJoinNodesRule = (match, nodeType) => {
-  return createWrappingJoinRule({
-    nodeType,
-    match,
-    getAttrs: {},
-    joinPredicate: (_, node) => node.type === nodeType
-  });
 };

package/dist/es2019/utils/mark.js

@@ -24,39 +24,6 @@ export const isMarkExcluded = (type, marks) => {
   }
   return false;
 };
-const not = fn => arg => !fn(arg);
-export const removeBlockMarks = (state, marks) => {
-  const {
-    selection,
-    schema
-  } = state;
-  let {
-    tr
-  } = state;
-
-  // Marks might not exist in Schema
-  const marksToRemove = marks.filter(Boolean);
-  if (marksToRemove.length === 0) {
-    return undefined;
-  }
-
-  /** Saves an extra dispatch */
-  let blockMarksExists = false;
-  const hasMark = mark => 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, (node, pos) => {
-    if (node.type === schema.nodes.paragraph && node.marks.some(hasMark)) {
-      blockMarksExists = true;
-      const resolvedPos = state.doc.resolve(pos);
-      const 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

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.9.0";
+export const version = "187.10.0";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

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

package/dist/esm/commands/index.js

@@ -1,126 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _defineProperty(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; }
-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) {
-    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(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 var insertNewLineWithAnalytics = withAnalytics({
-  action: ACTION.INSERTED,
-  actionSubject: ACTION_SUBJECT.TEXT,
-  actionSubjectId: ACTION_SUBJECT_ID.LINE_BREAK,
-  eventType: EVENT_TYPE.TRACK
-})(insertNewLine());
-export var createNewParagraphAbove = function createNewParagraphAbove(state, dispatch) {
-  var append = false;
-  if (!canMoveUp(state) && canCreateParagraphNear(state)) {
-    createParagraphNear(append)(state, dispatch);
-    return true;
-  }
-  return false;
-};
-export var createNewParagraphBelow = function createNewParagraphBelow(state, dispatch) {
-  var append = true;
-  if (!canMoveDown(state) && canCreateParagraphNear(state)) {
-    createParagraphNear(append)(state, dispatch);
-    return true;
-  }
-  return false;
-};
-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 NodeSelection;
-  return $from.depth > 1 || isNodeSelection || insideCodeBlock;
-}
-export 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 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(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 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;
-}
 export function addParagraphAtEnd(tr) {
   var paragraph = tr.doc.type.schema.nodes.paragraph,
     doc = tr.doc;
@@ -144,9 +26,9 @@ export function createParagraphAtEnd() {
 }
 export 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) {
@@ -205,9 +87,9 @@ export var toggleBlockMark = function toggleBlockMark(markType, getAttrs, allowe
         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/esm/plugins/base/index.js

@@ -14,7 +14,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/esm/plugins/block-type/commands/block-type.js

@@ -3,15 +3,13 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
 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 function (state, dispatch) {
@@ -26,15 +24,15 @@ export function setBlockType(name) {
     return false;
   };
 }
-export function setBlockTypeWithAnalytics(name, inputMethod) {
+export function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi) {
   return function (state, dispatch) {
     var nodes = state.schema.nodes;
     if (name === NORMAL_TEXT.name && nodes.paragraph) {
-      return setNormalTextWithAnalytics(inputMethod)(state, dispatch);
+      return setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi)(state, dispatch);
     }
     var 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;
   };
@@ -90,9 +88,9 @@ function withCurrentHeadingLevel(fn) {
     return fn(level)(state, dispatch, view);
   };
 }
-export function setNormalTextWithAnalytics(inputMethod) {
+export function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return withAnalyticsDeprecated({
+    return withAnalytics(editorAnalyticsApi, {
       action: ACTION.FORMATTED,
       actionSubject: ACTION_SUBJECT.TEXT,
       eventType: EVENT_TYPE.TRACK,
@@ -124,9 +122,9 @@ export function setHeading(level) {
     return true;
   };
 }
-export var setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod) {
+export var setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod, editorAnalyticsApi) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return withAnalyticsDeprecated({
+    return withAnalytics(editorAnalyticsApi, {
       action: ACTION.FORMATTED,
       actionSubject: ACTION_SUBJECT.TEXT,
       eventType: EVENT_TYPE.TRACK,

package/dist/esm/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) {
   var startOfCodeBlockText = state.selection.$from;
   var endPosition = state.selection.empty ? startOfCodeBlockText.end() : state.selection.$to.pos;