@atlaskit/editor-core 187.9.2 → 187.10.1

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;

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

@@ -1,17 +1,17 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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';
 var headingPluginOptions = function headingPluginOptions(_ref, isAllowed, editorAnalyticsApi) {
   var formatMessage = _ref.formatMessage;
   if (!isAllowed) {
@@ -110,15 +110,17 @@ var blockTypePlugin = function blockTypePlugin(options, api) {
       return [{
         name: 'blockType',
         plugin: function plugin(_ref3) {
+          var _api$dependencies$ana;
           var dispatch = _ref3.dispatch;
-          return createPlugin(dispatch, options && options.lastNodeMustBeParagraph);
+          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: function plugin(_ref4) {
+          var _api$dependencies$ana2;
           var schema = _ref4.schema,
             featureFlags = _ref4.featureFlags;
-          return inputRulePlugin(schema, featureFlags);
+          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
@@ -126,10 +128,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 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);
+          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);
         }
       }];
     },
@@ -144,7 +146,8 @@ var blockTypePlugin = function blockTypePlugin(options, api) {
         eventDispatcher = _ref6.eventDispatcher;
       var isSmall = options && options.isUndoRedoButtonsEnabled ? toolbarSize < ToolbarSize.XXL : toolbarSize < ToolbarSize.XL;
       var boundSetBlockType = function boundSetBlockType(name) {
-        return setBlockTypeWithAnalytics(name, INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+        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,
@@ -169,9 +172,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(_toConsumableArray(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)), _toConsumableArray(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(_toConsumableArray(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)), _toConsumableArray(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/esm/plugins/block-type/pm-plugins/input-rule.js

@@ -1,11 +1,11 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-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';
 var MAX_HEADING_LEVEL = 6;
 function getHeadingLevel(match) {
   return {
@@ -29,7 +29,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 = createRule(new RegExp("".concat(leafNodeReplacementCharacter, "(#{1,6})\\s$")), function (state, match, start, end) {
@@ -40,7 +40,7 @@ function getHeadingRules(schema) {
   });
 
   // New analytics handler
-  var ruleWithHeadingAnalytics = ruleWithAnalytics(function (_state, matchResult) {
+  var ruleWithHeadingAnalytics = inputRuleWithAnalytics(function (_state, matchResult) {
     return {
       action: ACTION.FORMATTED,
       actionSubject: ACTION_SUBJECT.TEXT,
@@ -51,7 +51,7 @@ function getHeadingRules(schema) {
         newHeadingLevel: getHeadingLevel(matchResult).level
       }
     };
-  });
+  }, editorAnalyticsAPI);
   return [ruleWithHeadingAnalytics(hashRule), ruleWithHeadingAnalytics(leftNodeReplacementHashRule)];
 }
 
@@ -61,7 +61,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 = createRule(new RegExp("".concat(leafNodeReplacementCharacter, "\\s*>\\s$")), function (state, _match, start, end) {
@@ -69,7 +69,7 @@ function getBlockQuoteRules(schema) {
   });
 
   // Analytics V3 handler
-  var ruleWithBlockQuoteAnalytics = ruleWithAnalytics({
+  var ruleWithBlockQuoteAnalytics = inputRuleWithAnalytics({
     action: ACTION.FORMATTED,
     actionSubject: ACTION_SUBJECT.TEXT,
     eventType: EVENT_TYPE.TRACK,
@@ -77,7 +77,7 @@ function getBlockQuoteRules(schema) {
     attributes: {
       inputMethod: INPUT_METHOD.FORMATTING
     }
-  });
+  }, editorAnalyticsAPI);
   return [ruleWithBlockQuoteAnalytics(greatherThanRule), ruleWithBlockQuoteAnalytics(leftNodeReplacementGreatherRule)];
 }
 
@@ -87,8 +87,8 @@ function getBlockQuoteRules(schema) {
  * @param {Schema} schema
  * @returns {InputRuleWithHandler[]}
  */
-function getCodeBlockRules(schema) {
-  var ruleAnalytics = ruleWithAnalytics({
+function getCodeBlockRules(editorAnalyticsAPI, schema) {
+  var ruleAnalytics = inputRuleWithAnalytics({
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
     actionSubjectId: ACTION_SUBJECT_ID.CODE_BLOCK,
@@ -96,7 +96,7 @@ function getCodeBlockRules(schema) {
       inputMethod: INPUT_METHOD.FORMATTING
     },
     eventType: EVENT_TYPE.TRACK
-  });
+  }, editorAnalyticsAPI);
   var validMatchLength = function validMatchLength(match) {
     return match.length > 0 && match[0].length === 3;
   };
@@ -130,16 +130,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, _toConsumableArray(getHeadingRules(schema)));
+    rules.push.apply(rules, _toConsumableArray(getHeadingRules(editorAnalyticsAPI, schema)));
   }
   if (schema.nodes.blockquote) {
-    rules.push.apply(rules, _toConsumableArray(getBlockQuoteRules(schema)));
+    rules.push.apply(rules, _toConsumableArray(getBlockQuoteRules(editorAnalyticsAPI, schema)));
   }
   if (schema.nodes.codeBlock) {
-    rules.push.apply(rules, _toConsumableArray(getCodeBlockRules(schema)));
+    rules.push.apply(rules, _toConsumableArray(getCodeBlockRules(editorAnalyticsAPI, schema)));
   }
   if (rules.length !== 0) {
     return createPlugin('block-type', rules, {

package/dist/esm/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';
 var backspace = chainCommands(cleanUpAtTheStartOfDocument, deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
 var del = chainCommands(deleteEmptyParagraphAndMoveBlockUp(isNodeAWrappingBlockNode), deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
-export default function keymapPlugin(schema, featureFlags, editorAnalyticsApi) {
+export default 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, 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/esm/plugins/block-type/pm-plugins/main.js

@@ -4,11 +4,11 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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';
 var blockTypeForNode = function blockTypeForNode(node, schema) {
   if (node.type === schema.nodes.heading) {
     var maybeNode = HEADINGS_BY_LEVEL[node.attrs['level']];
@@ -63,16 +63,16 @@ var detectBlockType = function detectBlockType(availableBlockTypes, state) {
   });
   return blockType || OTHER;
 };
-var autoformatHeading = function autoformatHeading(headingLevel, view) {
+var autoformatHeading = function 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 var pluginKey = new PluginKey('blockTypePlugin');
-export var createPlugin = function createPlugin(dispatch, lastNodeMustBeParagraph) {
+export var createPlugin = function createPlugin(editorAnalyticsApi, dispatch, lastNodeMustBeParagraph) {
   var altKeyLocation = 0;
   return new SafePlugin({
     appendTransaction: function appendTransaction(_transactions, _oldState, newState) {
@@ -123,9 +123,9 @@ export var createPlugin = function createPlugin(dispatch, lastNodeMustBeParagrap
         var 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/esm/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 var messages = defineMessages({
   textStyles: {
     id: 'fabric.editor.textStyles',

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

@@ -14,12 +14,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';
 var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(ToolbarBlockType, _React$PureComponent);
   var _super = _createSuper(ToolbarBlockType);

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

@@ -1,10 +1,10 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
-var _templateObject, _templateObject2, _templateObject3;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
 /** @jsx jsx */
 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 var blockTypeMenuItemStyle = function blockTypeMenuItemStyle(tagName, selected) {
   // TEMP FIX: See https://product-fabric.atlassian.net/browse/ED-13878
   var selectedStyle = selected ? "".concat(tagName, " { color: ", "var(--ds-text, white)", " !important; }") : '';
@@ -12,5 +12,9 @@ export var blockTypeMenuItemStyle = function blockTypeMenuItemStyle(tagName, sel
     return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    ", ";\n    > {\n      h1,\n      h2,\n      h3,\n      h4,\n      h5,\n      h6 {\n        margin-top: 0;\n      }\n    }\n    ", ";\n  "])), headingsSharedStyles(themeProps), selectedStyle);
   };
 };
-export var keyboardShortcut = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  ", "\n  margin-left: 16px;\n"])), shortcutStyle);
-export var keyboardShortcutSelect = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  color: ", ";\n"])), "var(--ds-icon, ".concat(N400, ")"));
+export var keyboardShortcut = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  ", "\n  margin-left: ", ";\n"])), shortcutStyle, "var(--ds-space-200, 16px)");
+export var keyboardShortcutSelect = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  color: ", ";\n"])), "var(--ds-icon, ".concat(N400, ")"));
+export var buttonContentStyle = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\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)");
+export var buttonContentReducedSpacingStyle = css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  padding: ", ";\n"])), "var(--ds-space-100, 8px)");
+export var wrapperSmallStyle = css(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  margin-left: ", ";\n  min-width: 40px;\n"])), "var(--ds-space-050, 4px)");
+export var expandIconWrapperStyle = css(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n  margin-left: -8px;\n"])));

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

@@ -1,3 +1,5 @@
+import { createRule } from '@atlaskit/prosemirror-input-rules';
+import { createWrappingJoinRule } from '@atlaskit/editor-common/utils';
 import { WRAPPER_BLOCK_TYPES } from './types';
 export var isNodeAWrappingBlockNode = function isNodeAWrappingBlockNode(node) {
   if (!node) {
@@ -6,4 +8,70 @@ export var isNodeAWrappingBlockNode = function isNodeAWrappingBlockNode(node) {
   return WRAPPER_BLOCK_TYPES.some(function (blockNode) {
     return blockNode.name === node.type.name;
   });
-};
+};
+export var createJoinNodesRule = function createJoinNodesRule(match, nodeType) {
+  return createWrappingJoinRule({
+    nodeType: nodeType,
+    match: match,
+    getAttrs: {},
+    joinPredicate: function joinPredicate(_, node) {
+      return node.type === nodeType;
+    }
+  });
+};
+export 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 createRule(match, handler);
+};
+
+/**
+ * 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.
+ */
+export function areBlockTypesDisabled(state) {
+  var nodesTypes = getSelectedWrapperNodes(state);
+  var panel = state.schema.nodes.panel;
+  return nodesTypes.filter(function (type) {
+    return type !== panel;
+  }).length > 0;
+}

package/dist/esm/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() {
   var list = {};