@atlaskit/editor-core 187.9.2 → 187.10.0

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/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)];
     }
   }
 });

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

@@ -1,10 +1,10 @@
-import { createJoinNodesRule, createWrappingTextBlockRule, ruleWithAnalytics } from '../../../utils/input-rules';
-import { createRule, createPlugin } from '@atlaskit/prosemirror-input-rules';
-import { leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
-import { isConvertableToCodeBlock, transformToCodeBlockAction } from '../commands/transform-to-code-block';
-import { insertBlock } from '../commands/insert-block';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { createRule, createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 import { INPUT_METHOD, ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
+import { inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
+import { isConvertableToCodeBlock, transformToCodeBlockAction } from '../commands/transform-to-code-block';
+import { insertBlock } from '../commands/insert-block';
+import { createJoinNodesRule, createWrappingTextBlockRule } from '../utils';
 const MAX_HEADING_LEVEL = 6;
 function getHeadingLevel(match) {
   return {
@@ -28,7 +28,7 @@ function blockQuoteRule(nodeType) {
  * @param {Schema} schema
  * @returns {InputRuleWithHandler[]}
  */
-function getHeadingRules(schema) {
+function getHeadingRules(editorAnalyticsAPI, schema) {
   // '# ' for h1, '## ' for h2 and etc
   const hashRule = headingRule(schema.nodes.heading, MAX_HEADING_LEVEL);
   const leftNodeReplacementHashRule = createRule(new RegExp(`${leafNodeReplacementCharacter}(#{1,6})\\s$`), (state, match, start, end) => {
@@ -39,7 +39,7 @@ function getHeadingRules(schema) {
   });
 
   // New analytics handler
-  const ruleWithHeadingAnalytics = ruleWithAnalytics((_state, matchResult) => ({
+  const ruleWithHeadingAnalytics = inputRuleWithAnalytics((_state, matchResult) => ({
     action: ACTION.FORMATTED,
     actionSubject: ACTION_SUBJECT.TEXT,
     eventType: EVENT_TYPE.TRACK,
@@ -48,7 +48,7 @@ function getHeadingRules(schema) {
       inputMethod: INPUT_METHOD.FORMATTING,
       newHeadingLevel: getHeadingLevel(matchResult).level
     }
-  }));
+  }), editorAnalyticsAPI);
   return [ruleWithHeadingAnalytics(hashRule), ruleWithHeadingAnalytics(leftNodeReplacementHashRule)];
 }
 
@@ -58,7 +58,7 @@ function getHeadingRules(schema) {
  * @param {Schema} schema
  * @returns {InputRuleWithHandler[]}
  */
-function getBlockQuoteRules(schema) {
+function getBlockQuoteRules(editorAnalyticsAPI, schema) {
   // '> ' for blockquote
   const greatherThanRule = blockQuoteRule(schema.nodes.blockquote);
   const leftNodeReplacementGreatherRule = createRule(new RegExp(`${leafNodeReplacementCharacter}\\s*>\\s$`), (state, _match, start, end) => {
@@ -66,7 +66,7 @@ function getBlockQuoteRules(schema) {
   });
 
   // Analytics V3 handler
-  const ruleWithBlockQuoteAnalytics = ruleWithAnalytics({
+  const ruleWithBlockQuoteAnalytics = inputRuleWithAnalytics({
     action: ACTION.FORMATTED,
     actionSubject: ACTION_SUBJECT.TEXT,
     eventType: EVENT_TYPE.TRACK,
@@ -74,7 +74,7 @@ function getBlockQuoteRules(schema) {
     attributes: {
       inputMethod: INPUT_METHOD.FORMATTING
     }
-  });
+  }, editorAnalyticsAPI);
   return [ruleWithBlockQuoteAnalytics(greatherThanRule), ruleWithBlockQuoteAnalytics(leftNodeReplacementGreatherRule)];
 }
 
@@ -84,8 +84,8 @@ function getBlockQuoteRules(schema) {
  * @param {Schema} schema
  * @returns {InputRuleWithHandler[]}
  */
-function getCodeBlockRules(schema) {
-  const ruleAnalytics = ruleWithAnalytics({
+function getCodeBlockRules(editorAnalyticsAPI, schema) {
+  const ruleAnalytics = inputRuleWithAnalytics({
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
     actionSubjectId: ACTION_SUBJECT_ID.CODE_BLOCK,
@@ -93,7 +93,7 @@ function getCodeBlockRules(schema) {
       inputMethod: INPUT_METHOD.FORMATTING
     },
     eventType: EVENT_TYPE.TRACK
-  });
+  }, editorAnalyticsAPI);
   const validMatchLength = match => match.length > 0 && match[0].length === 3;
   const threeTildeRule = createRule(/(?!\s)(`{3,})$/, (state, match, start, end) => {
     if (!validMatchLength(match)) {
@@ -125,16 +125,16 @@ function getCodeBlockRules(schema) {
   });
   return [ruleAnalytics(threeTildeRule), ruleAnalytics(leftNodeReplacementThreeTildeRule)];
 }
-function inputRulePlugin(schema, featureFlags) {
+function inputRulePlugin(editorAnalyticsAPI, schema, featureFlags) {
   const rules = [];
   if (schema.nodes.heading) {
-    rules.push(...getHeadingRules(schema));
+    rules.push(...getHeadingRules(editorAnalyticsAPI, schema));
   }
   if (schema.nodes.blockquote) {
-    rules.push(...getBlockQuoteRules(schema));
+    rules.push(...getBlockQuoteRules(editorAnalyticsAPI, schema));
   }
   if (schema.nodes.codeBlock) {
-    rules.push(...getCodeBlockRules(schema));
+    rules.push(...getCodeBlockRules(editorAnalyticsAPI, schema));
   }
   if (rules.length !== 0) {
     return createPlugin('block-type', rules, {

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

@@ -1,20 +1,19 @@
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
-import * as keymaps from '../../../keymaps';
-import * as commands from '../../../commands';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import * as keymaps from '@atlaskit/editor-common/keymaps';
+import { keymap } from '@atlaskit/editor-common/keymaps';
+import { insertNewLineWithAnalytics, createNewParagraphAbove, createNewParagraphBelow, deleteEmptyParagraphAndMoveBlockUp } from '@atlaskit/editor-common/utils';
 import * as blockTypes from '../types';
-import { keymap } from '../../../utils/keymap';
 import { cleanUpAtTheStartOfDocument, deleteAndMoveCursor, deleteBlockContent, insertBlockTypesWithAnalytics } from '../commands';
-import { deleteEmptyParagraphAndMoveBlockUp } from '@atlaskit/editor-common/utils';
-import { INPUT_METHOD } from '../../analytics';
 import { isNodeAWrappingBlockNode } from '../utils';
 const backspace = chainCommands(cleanUpAtTheStartOfDocument, deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
 const del = chainCommands(deleteEmptyParagraphAndMoveBlockUp(isNodeAWrappingBlockNode), deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
-export default function keymapPlugin(schema, featureFlags, editorAnalyticsApi) {
+export default function keymapPlugin(editorAnalyticsApi, schema, _featureFlags) {
   const 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, insertNewLineWithAnalytics(editorAnalyticsApi), list);
+  keymaps.bindKeymapWithCommand(keymaps.moveUp.common, createNewParagraphAbove, list);
+  keymaps.bindKeymapWithCommand(keymaps.moveDown.common, createNewParagraphBelow, list);
   keymaps.bindKeymapWithCommand(keymaps.findKeyMapForBrowser(keymaps.redo), redo, list);
   keymaps.bindKeymapWithCommand(keymaps.undo.common, undo, list);
   keymaps.bindKeymapWithCommand(keymaps.backspace.common, backspace, list);

package/dist/es2019/plugins/block-type/pm-plugins/main.js

@@ -1,11 +1,11 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { browser } from '@atlaskit/editor-common/utils';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { NORMAL_TEXT, HEADING_1, HEADING_2, HEADING_3, HEADING_4, HEADING_5, HEADING_6, BLOCK_QUOTE, CODE_BLOCK, PANEL, OTHER, TEXT_BLOCK_TYPES, WRAPPER_BLOCK_TYPES, HEADINGS_BY_LEVEL } from '../types';
-import { areBlockTypesDisabled } from '../../../utils';
+import { HEADING_KEYS } from '../consts';
 import { setHeadingWithAnalytics, setNormalTextWithAnalytics } from '../commands';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { HEADING_KEYS } from '../../../keymaps/consts';
+import { areBlockTypesDisabled } from '../utils';
 const blockTypeForNode = (node, schema) => {
   if (node.type === schema.nodes.heading) {
     const maybeNode = HEADINGS_BY_LEVEL[node.attrs['level']];
@@ -59,16 +59,16 @@ const detectBlockType = (availableBlockTypes, state) => {
   });
   return blockType || OTHER;
 };
-const autoformatHeading = (headingLevel, view) => {
+const autoformatHeading = (headingLevel, view, editorAnalyticsApi) => {
   if (headingLevel === 0) {
-    setNormalTextWithAnalytics(INPUT_METHOD.FORMATTING)(view.state, view.dispatch);
+    setNormalTextWithAnalytics(INPUT_METHOD.FORMATTING, editorAnalyticsApi)(view.state, view.dispatch);
   } else {
-    setHeadingWithAnalytics(headingLevel, INPUT_METHOD.FORMATTING)(view.state, view.dispatch);
+    setHeadingWithAnalytics(headingLevel, INPUT_METHOD.FORMATTING, editorAnalyticsApi)(view.state, view.dispatch);
   }
   return true;
 };
 export const pluginKey = new PluginKey('blockTypePlugin');
-export const createPlugin = (dispatch, lastNodeMustBeParagraph) => {
+export const createPlugin = (editorAnalyticsApi, dispatch, lastNodeMustBeParagraph) => {
   let altKeyLocation = 0;
   return new SafePlugin({
     appendTransaction(_transactions, _oldState, newState) {
@@ -118,9 +118,9 @@ export const createPlugin = (dispatch, lastNodeMustBeParagraph) => {
         const headingLevel = HEADING_KEYS.indexOf(event.keyCode);
         if (headingLevel > -1 && event.altKey) {
           if (browser.mac && event.metaKey) {
-            return autoformatHeading(headingLevel, view);
+            return autoformatHeading(headingLevel, view, editorAnalyticsApi);
           } else if (!browser.mac && event.ctrlKey && altKeyLocation !== event.DOM_KEY_LOCATION_RIGHT) {
-            return autoformatHeading(headingLevel, view);
+            return autoformatHeading(headingLevel, view, editorAnalyticsApi);
           }
         } else if (event.key === 'Alt') {
           // event.location is for the current key only; when a user hits Ctrl-Alt-1 the

package/dist/es2019/plugins/block-type/ui/ToolbarBlockType/blocktype-button.js

@@ -4,10 +4,10 @@ import { jsx } from '@emotion/react';
 import { FormattedMessage, defineMessages } from 'react-intl-next';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import TextStyleIcon from '@atlaskit/icon/glyph/editor/text-style';
-import ToolbarButton from '../../../../ui/ToolbarButton';
-import { buttonContentStyle, buttonContentReducedSpacingStyle, wrapperSmallStyle, expandIconWrapperStyle } from '../../../../ui/styles';
 import { wrapperStyle } from '@atlaskit/editor-common/styles';
+import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import { NORMAL_TEXT } from '../../types';
+import { buttonContentStyle, buttonContentReducedSpacingStyle, wrapperSmallStyle, expandIconWrapperStyle } from './styled';
 export const messages = defineMessages({
   textStyles: {
     id: 'fabric.editor.textStyles',

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

@@ -4,12 +4,11 @@ import React from 'react';
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
-import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu';
+import { getAriaKeyshortcuts, tooltip, findKeymapByDescription } from '@atlaskit/editor-common/keymaps';
 import { separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
+import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu';
 import { blockTypeMenuItemStyle, keyboardShortcut, keyboardShortcutSelect } from './styled';
-import { tooltip, findKeymapByDescription } from '../../../../keymaps';
 import { BlockTypeButton } from './blocktype-button';
-import { getAriaKeyshortcuts } from '@atlaskit/editor-common/keymaps';
 class ToolbarBlockType extends React.PureComponent {
   constructor(...args) {
     super(...args);

package/dist/es2019/plugins/block-type/ui/ToolbarBlockType/styled.js

@@ -2,7 +2,7 @@
 import { css } from '@emotion/react';
 import { N400 } from '@atlaskit/theme/colors';
 import { headingsSharedStyles } from '@atlaskit/editor-common/styles';
-import { shortcutStyle } from '../../../../ui/styles';
+import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 export const blockTypeMenuItemStyle = (tagName, selected) => {
   // TEMP FIX: See https://product-fabric.atlassian.net/browse/ED-13878
   const selectedStyle = selected ? `${tagName} { color: ${"var(--ds-text, white)"} !important; }` : '';
@@ -23,8 +23,27 @@ export const blockTypeMenuItemStyle = (tagName, selected) => {
 };
 export const keyboardShortcut = css`
   ${shortcutStyle}
-  margin-left: 16px;
+  margin-left: ${"var(--ds-space-200, 16px)"};
 `;
 export const keyboardShortcutSelect = css`
   color: ${`var(--ds-icon, ${N400})`};
+`;
+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 wrapperSmallStyle = css`
+  margin-left: ${"var(--ds-space-050, 4px)"};
+  min-width: 40px;
+`;
+export const expandIconWrapperStyle = css`
+  margin-left: -8px;
 `;

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

@@ -1,7 +1,76 @@
+import { createRule } from '@atlaskit/prosemirror-input-rules';
+import { createWrappingJoinRule } from '@atlaskit/editor-common/utils';
 import { WRAPPER_BLOCK_TYPES } from './types';
 export const isNodeAWrappingBlockNode = node => {
   if (!node) {
     return false;
   }
   return WRAPPER_BLOCK_TYPES.some(blockNode => blockNode.name === node.type.name);
-};
+};
+export const createJoinNodesRule = (match, nodeType) => {
+  return createWrappingJoinRule({
+    nodeType,
+    match,
+    getAttrs: {},
+    joinPredicate: (_, node) => node.type === nodeType
+  });
+};
+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);
+};
+
+/**
+ * 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;
+}

package/dist/es2019/plugins/caption/pm-plugins/keymap.js

@@ -2,7 +2,7 @@ import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import * as keymaps from '../../../keymaps';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { createNewParagraphBelow } from '../../../commands';
+import { createNewParagraphBelow } from '@atlaskit/editor-common/utils';
 import { GapCursorSelection } from '../../selection/gap-cursor/selection';
 export function captionKeymap() {
   const list = {};

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';