@atlaskit/editor-plugin-block-type 2.0.0 → 3.0.1

package/dist/es2019/plugin/commands/index.js

@@ -1,8 +1,3 @@
 export { cleanUpAtTheStartOfDocument, insertBlockQuoteWithAnalytics, setBlockType, setBlockTypeWithAnalytics, setHeadingWithAnalytics, setNormalText, setNormalTextWithAnalytics } from './block-type';
 export { deleteAndMoveCursor } from './delete-and-move-cursor';
-export { deleteBlockContent } from './delete-block-content';
-/**
- * @private
- * @deprecated use import from @atlaskit/editor-common/commands
- */
-export { setHeading } from '@atlaskit/editor-common/commands';
+export { deleteBlockContent } from './delete-block-content';

package/dist/es2019/plugin/index.js

@@ -112,18 +112,15 @@ const blockTypePlugin = ({
       name: 'blockType',
       plugin: ({
         dispatch
-      }) => {
-        var _api$analytics;
-        return createPlugin(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, dispatch, options && options.lastNodeMustBeParagraph);
-      }
+      }) => createPlugin(api, dispatch, options && options.lastNodeMustBeParagraph)
     }, {
       name: 'blockTypeInputRule',
       plugin: ({
         schema,
         featureFlags
       }) => {
-        var _api$analytics2;
-        return inputRulePlugin(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, schema, featureFlags);
+        var _api$analytics;
+        return inputRulePlugin(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, schema, featureFlags);
       }
     },
     // Needs to be lower priority than editor-tables.tableEditing
@@ -134,19 +131,21 @@ const blockTypePlugin = ({
         schema,
         featureFlags
       }) => {
-        var _api$analytics3;
-        return keymapPlugin(api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, schema, featureFlags);
+        var _api$analytics2;
+        return keymapPlugin(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, schema, featureFlags);
       }
     }];
   },
   actions: {
     insertBlockQuote(inputMethod) {
+      var _api$analytics3;
+      return insertBlockQuoteWithAnalytics(inputMethod, api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
+    }
+  },
+  commands: {
+    setTextLevel(level, inputMethod) {
       var _api$analytics4;
-      return insertBlockQuoteWithAnalytics(inputMethod, api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
-    },
-    setBlockType(name, inputMethod) {
-      var _api$analytics5;
-      return setBlockTypeWithAnalytics(name, inputMethod, api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
+      return setBlockTypeWithAnalytics(level, inputMethod, api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
     }
   },
   getSharedState(editorState) {
@@ -167,8 +166,8 @@ const blockTypePlugin = ({
   }) {
     const isSmall = options && options.isUndoRedoButtonsEnabled ? toolbarSize < ToolbarSize.XXL : toolbarSize < ToolbarSize.XL;
     const boundSetBlockType = name => {
-      var _api$analytics6;
-      return setBlockTypeWithAnalytics(name, INPUT_METHOD.TOOLBAR, api === null || api === void 0 ? void 0 : (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions)(editorView.state, editorView.dispatch);
+      var _api$analytics5;
+      api === null || api === void 0 ? void 0 : api.core.actions.execute(setBlockTypeWithAnalytics(name, INPUT_METHOD.TOOLBAR, api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions));
     };
     return /*#__PURE__*/React.createElement(WithPluginState, {
       editorView: editorView,
@@ -183,7 +182,7 @@ const blockTypePlugin = ({
           isSmall: isSmall,
           isDisabled: disabled,
           isReducedSpacing: isToolbarReducedSpacing,
-          setBlockType: boundSetBlockType,
+          setTextLevel: boundSetBlockType,
           pluginState: pluginState,
           popupsMountPoint: popupsMountPoint,
           popupsBoundariesElement: popupsBoundariesElement,
@@ -194,9 +193,9 @@ const blockTypePlugin = ({
   },
   pluginsOptions: {
     quickInsert: intl => {
-      var _api$analytics7, _api$analytics8;
+      var _api$analytics6, _api$analytics7;
       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$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions), ...headingPluginOptions(intl, exclude.indexOf('heading') === -1, api === null || api === void 0 ? void 0 : (_api$analytics8 = api.analytics) === null || _api$analytics8 === void 0 ? void 0 : _api$analytics8.actions)];
+      return [...blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1, api === null || api === void 0 ? void 0 : (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions), ...headingPluginOptions(intl, exclude.indexOf('heading') === -1, api === null || api === void 0 ? void 0 : (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions)];
     }
   }
 });

package/dist/es2019/plugin/pm-plugins/main.js

@@ -59,16 +59,16 @@ const detectBlockType = (availableBlockTypes, state) => {
   });
   return blockType || OTHER;
 };
-const autoformatHeading = (headingLevel, view, editorAnalyticsApi) => {
+const autoformatHeading = (headingLevel, editorAnalyticsApi) => {
   if (headingLevel === 0) {
-    setNormalTextWithAnalytics(INPUT_METHOD.FORMATTING, editorAnalyticsApi)(view.state, view.dispatch);
-  } else {
-    setHeadingWithAnalytics(headingLevel, INPUT_METHOD.FORMATTING, editorAnalyticsApi)(view.state, view.dispatch);
+    return setNormalTextWithAnalytics(INPUT_METHOD.FORMATTING, editorAnalyticsApi);
   }
-  return true;
+  return setHeadingWithAnalytics(headingLevel, INPUT_METHOD.FORMATTING, editorAnalyticsApi);
 };
 export const pluginKey = new PluginKey('blockTypePlugin');
-export const createPlugin = (editorAnalyticsApi, dispatch, lastNodeMustBeParagraph) => {
+export const createPlugin = (editorAPI, dispatch, lastNodeMustBeParagraph) => {
+  var _editorAPI$analytics;
+  const editorAnalyticsApi = editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions;
   let altKeyLocation = 0;
   return new SafePlugin({
     appendTransaction(_transactions, _oldState, newState) {
@@ -118,9 +118,11 @@ export const createPlugin = (editorAnalyticsApi, dispatch, lastNodeMustBeParagra
         const headingLevel = HEADING_KEYS.indexOf(event.keyCode);
         if (headingLevel > -1 && event.altKey) {
           if (browser.mac && event.metaKey) {
-            return autoformatHeading(headingLevel, view, editorAnalyticsApi);
+            var _editorAPI$core$actio;
+            return (_editorAPI$core$actio = editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.core.actions.execute(autoformatHeading(headingLevel, editorAnalyticsApi))) !== null && _editorAPI$core$actio !== void 0 ? _editorAPI$core$actio : false;
           } else if (!browser.mac && event.ctrlKey && altKeyLocation !== event.DOM_KEY_LOCATION_RIGHT) {
-            return autoformatHeading(headingLevel, view, editorAnalyticsApi);
+            var _editorAPI$core$actio2;
+            return (_editorAPI$core$actio2 = editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.core.actions.execute(autoformatHeading(headingLevel, editorAnalyticsApi))) !== null && _editorAPI$core$actio2 !== void 0 ? _editorAPI$core$actio2 : false;
           }
         } else if (event.key === 'Alt') {
           // event.location is for the current key only; when a user hits Ctrl-Alt-1 the

package/dist/es2019/plugin/ui/ToolbarBlockType/index.js

@@ -83,7 +83,7 @@ class ToolbarBlockType extends React.PureComponent {
       shouldCloseMenu = true
     }) => {
       const blockType = item.value;
-      this.props.setBlockType(blockType.name);
+      this.props.setTextLevel(blockType.name);
       if (shouldCloseMenu) {
         this.setState({
           ...this.state,

package/dist/esm/i18n/nl.js

@@ -16,17 +16,17 @@ export default {
   'fabric.editor.errorPanel': 'Foutpaneel',
   'fabric.editor.errorPanel.description': 'Bijschrift voor fouten maken in een gekleurd paneel',
   'fabric.editor.heading1': 'Koptekst 1',
-  'fabric.editor.heading1Description': 'Dit gebruiken voor een kop op het hoogste niveau',
+  'fabric.editor.heading1Description': 'Gebruik dit voor een kop op het hoogste niveau',
   'fabric.editor.heading2': 'Koptekst 2',
-  'fabric.editor.heading2Description': 'Dit gebruiken voor belangrijke gedeelten',
+  'fabric.editor.heading2Description': 'Gebruik dit voor belangrijke gedeelten',
   'fabric.editor.heading3': 'Koptekst 3',
-  'fabric.editor.heading3Description': 'Dit gebruiken voor subsecties en groepskoppen',
+  'fabric.editor.heading3Description': 'Gebruik dit voor subsecties en groepskoppen',
   'fabric.editor.heading4': 'Koptekst 4',
-  'fabric.editor.heading4Description': 'Dit gebruiken voor diepe koppen',
+  'fabric.editor.heading4Description': 'Gebruik dit voor diepe koppen',
   'fabric.editor.heading5': 'Koptekst 5',
-  'fabric.editor.heading5Description': 'Dit gebruiken voor het groeperen van lijstitems',
+  'fabric.editor.heading5Description': 'Gebruik dit voor het groeperen van lijstitems',
   'fabric.editor.heading6': 'Koptekst 6',
-  'fabric.editor.heading6Description': 'Dit gebruiken voor koppen op laag niveau',
+  'fabric.editor.heading6Description': 'Gebruik dit voor koppen op laag niveau',
   'fabric.editor.infoPanel': 'Infopaneel',
   'fabric.editor.infoPanel.description': 'Informatie markeren in een gekleurd paneel',
   'fabric.editor.normal': 'Normale tekst',

package/dist/esm/plugin/commands/block-type.js

@@ -2,61 +2,84 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 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 { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { setHeading } from '@atlaskit/editor-common/commands';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { filterChildrenBetween, wrapSelectionIn } from '@atlaskit/editor-common/utils';
 import { CellSelection } from '@atlaskit/editor-tables';
 import { HEADINGS_BY_NAME, NORMAL_TEXT } from '../block-types';
 export function setBlockType(name) {
-  return function (state, dispatch) {
-    var nodes = state.schema.nodes;
+  return function (_ref) {
+    var tr = _ref.tr;
+    var nodes = tr.doc.type.schema.nodes;
     if (name === NORMAL_TEXT.name && nodes.paragraph) {
-      return setNormalText()(state, dispatch);
+      return setNormalText()({
+        tr: tr
+      });
     }
     var headingBlockType = HEADINGS_BY_NAME[name];
     if (headingBlockType && nodes.heading && headingBlockType.level) {
-      return setHeading(headingBlockType.level)(state, dispatch);
+      return setHeading(headingBlockType.level)({
+        tr: tr
+      });
     }
-    return false;
+    return null;
+  };
+}
+export function setHeading(level) {
+  return function (_ref2) {
+    var tr = _ref2.tr;
+    var selection = tr.selection,
+      schema = tr.doc.type.schema;
+    var ranges = selection instanceof CellSelection ? selection.ranges : [selection];
+    ranges.forEach(function (_ref3) {
+      var $from = _ref3.$from,
+        $to = _ref3.$to;
+      tr.setBlockType($from.pos, $to.pos, schema.nodes.heading, {
+        level: level
+      });
+    });
+    return tr;
   };
 }
 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, editorAnalyticsApi)(state, dispatch);
+  return function (_ref4) {
+    var tr = _ref4.tr;
+    var nodes = tr.doc.type.schema.nodes;
+    if (name === 'normal' && nodes.paragraph) {
+      return setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi)({
+        tr: tr
+      });
     }
     var headingBlockType = HEADINGS_BY_NAME[name];
     if (headingBlockType && nodes.heading && headingBlockType.level) {
-      return setHeadingWithAnalytics(headingBlockType.level, inputMethod, editorAnalyticsApi)(state, dispatch);
+      return setHeadingWithAnalytics(headingBlockType.level, inputMethod, editorAnalyticsApi)({
+        tr: tr
+      });
     }
-    return false;
+    return null;
   };
 }
 export function setNormalText() {
-  return function (state, dispatch) {
-    var selection = state.selection,
-      schema = state.schema,
-      tr = state.tr;
+  return function (_ref5) {
+    var tr = _ref5.tr;
+    var selection = tr.selection,
+      schema = tr.doc.type.schema;
     var ranges = selection instanceof CellSelection ? selection.ranges : [selection];
-    ranges.forEach(function (_ref) {
-      var $from = _ref.$from,
-        $to = _ref.$to;
+    ranges.forEach(function (_ref6) {
+      var $from = _ref6.$from,
+        $to = _ref6.$to;
       tr.setBlockType($from.pos, $to.pos, schema.nodes.paragraph);
     });
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
+    return tr;
   };
 }
 function withCurrentHeadingLevel(fn) {
-  return function (state, dispatch, view) {
+  return function (_ref7) {
+    var tr = _ref7.tr;
     // Find all headings and paragraphs of text
-    var _state$schema$nodes = state.schema.nodes,
-      heading = _state$schema$nodes.heading,
-      paragraph = _state$schema$nodes.paragraph;
-    var nodes = filterChildrenBetween(state.doc, state.selection.from, state.selection.to, function (node) {
+    var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
+      heading = _tr$doc$type$schema$n.heading,
+      paragraph = _tr$doc$type$schema$n.paragraph;
+    var nodes = filterChildrenBetween(tr.doc, tr.selection.from, tr.selection.to, function (node) {
       return node.type === heading || node.type === paragraph;
     });
 
@@ -81,37 +104,51 @@ function withCurrentHeadingLevel(fn) {
     } finally {
       _iterator.f();
     }
-    return fn(level)(state, dispatch, view);
+    return fn(level)({
+      tr: tr
+    });
   };
 }
 export function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return withAnalytics(editorAnalyticsApi, {
-      action: ACTION.FORMATTED,
-      actionSubject: ACTION_SUBJECT.TEXT,
-      eventType: EVENT_TYPE.TRACK,
-      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_HEADING,
-      attributes: {
-        inputMethod: inputMethod,
-        newHeadingLevel: 0,
-        previousHeadingLevel: previousHeadingLevel
-      }
-    })(setNormalText());
+    return function (_ref8) {
+      var tr = _ref8.tr;
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
+        action: ACTION.FORMATTED,
+        actionSubject: ACTION_SUBJECT.TEXT,
+        eventType: EVENT_TYPE.TRACK,
+        actionSubjectId: ACTION_SUBJECT_ID.FORMAT_HEADING,
+        attributes: {
+          inputMethod: inputMethod,
+          newHeadingLevel: 0,
+          previousHeadingLevel: previousHeadingLevel
+        }
+      })(tr);
+      return setNormalText()({
+        tr: tr
+      });
+    };
   });
 }
 export var setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod, editorAnalyticsApi) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return withAnalytics(editorAnalyticsApi, {
-      action: ACTION.FORMATTED,
-      actionSubject: ACTION_SUBJECT.TEXT,
-      eventType: EVENT_TYPE.TRACK,
-      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_HEADING,
-      attributes: {
-        inputMethod: inputMethod,
-        newHeadingLevel: newHeadingLevel,
-        previousHeadingLevel: previousHeadingLevel
-      }
-    })(setHeading(newHeadingLevel));
+    return function (_ref9) {
+      var tr = _ref9.tr;
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
+        action: ACTION.FORMATTED,
+        actionSubject: ACTION_SUBJECT.TEXT,
+        eventType: EVENT_TYPE.TRACK,
+        actionSubjectId: ACTION_SUBJECT_ID.FORMAT_HEADING,
+        attributes: {
+          inputMethod: inputMethod,
+          newHeadingLevel: newHeadingLevel,
+          previousHeadingLevel: previousHeadingLevel
+        }
+      })(tr);
+      return setHeading(newHeadingLevel)({
+        tr: tr
+      });
+    };
   });
 };
 function insertBlockQuote() {
@@ -144,8 +181,8 @@ export var insertBlockQuoteWithAnalytics = function insertBlockQuoteWithAnalytic
   })(insertBlockQuote());
 };
 export var cleanUpAtTheStartOfDocument = function cleanUpAtTheStartOfDocument(state, dispatch) {
-  var _ref2 = state.selection,
-    $cursor = _ref2.$cursor;
+  var _ref10 = state.selection,
+    $cursor = _ref10.$cursor;
   if ($cursor && !$cursor.nodeBefore && !$cursor.nodeAfter && $cursor.pos === 1) {
     var tr = state.tr,
       schema = state.schema;

package/dist/esm/plugin/commands/index.js

@@ -1,8 +1,3 @@
 export { cleanUpAtTheStartOfDocument, insertBlockQuoteWithAnalytics, setBlockType, setBlockTypeWithAnalytics, setHeadingWithAnalytics, setNormalText, setNormalTextWithAnalytics } from './block-type';
 export { deleteAndMoveCursor } from './delete-and-move-cursor';
-export { deleteBlockContent } from './delete-block-content';
-/**
- * @private
- * @deprecated use import from @atlaskit/editor-common/commands
- */
-export { setHeading } from '@atlaskit/editor-common/commands';
+export { deleteBlockContent } from './delete-block-content';

package/dist/esm/plugin/index.js

@@ -116,17 +116,16 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
       return [{
         name: 'blockType',
         plugin: function plugin(_ref4) {
-          var _api$analytics;
           var dispatch = _ref4.dispatch;
-          return createPlugin(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, dispatch, options && options.lastNodeMustBeParagraph);
+          return createPlugin(api, dispatch, options && options.lastNodeMustBeParagraph);
         }
       }, {
         name: 'blockTypeInputRule',
         plugin: function plugin(_ref5) {
-          var _api$analytics2;
+          var _api$analytics;
           var schema = _ref5.schema,
             featureFlags = _ref5.featureFlags;
-          return inputRulePlugin(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, schema, featureFlags);
+          return inputRulePlugin(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, schema, featureFlags);
         }
       },
       // Needs to be lower priority than editor-tables.tableEditing
@@ -134,21 +133,23 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
       {
         name: 'blockTypeKeyMap',
         plugin: function plugin(_ref6) {
-          var _api$analytics3;
+          var _api$analytics2;
           var schema = _ref6.schema,
             featureFlags = _ref6.featureFlags;
-          return keymapPlugin(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, schema, featureFlags);
+          return keymapPlugin(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, schema, featureFlags);
         }
       }];
     },
     actions: {
       insertBlockQuote: function insertBlockQuote(inputMethod) {
+        var _api$analytics3;
+        return insertBlockQuoteWithAnalytics(inputMethod, api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
+      }
+    },
+    commands: {
+      setTextLevel: function setTextLevel(level, inputMethod) {
         var _api$analytics4;
-        return insertBlockQuoteWithAnalytics(inputMethod, api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
-      },
-      setBlockType: function setBlockType(name, inputMethod) {
-        var _api$analytics5;
-        return setBlockTypeWithAnalytics(name, inputMethod, api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
+        return setBlockTypeWithAnalytics(level, inputMethod, api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions);
       }
     },
     getSharedState: function getSharedState(editorState) {
@@ -168,8 +169,8 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
         eventDispatcher = _ref7.eventDispatcher;
       var isSmall = options && options.isUndoRedoButtonsEnabled ? toolbarSize < ToolbarSize.XXL : toolbarSize < ToolbarSize.XL;
       var boundSetBlockType = function boundSetBlockType(name) {
-        var _api$analytics6;
-        return setBlockTypeWithAnalytics(name, INPUT_METHOD.TOOLBAR, api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions)(editorView.state, editorView.dispatch);
+        var _api$analytics5;
+        api === null || api === void 0 || api.core.actions.execute(setBlockTypeWithAnalytics(name, INPUT_METHOD.TOOLBAR, api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions));
       };
       return /*#__PURE__*/React.createElement(WithPluginState, {
         editorView: editorView,
@@ -183,7 +184,7 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
             isSmall: isSmall,
             isDisabled: disabled,
             isReducedSpacing: isToolbarReducedSpacing,
-            setBlockType: boundSetBlockType,
+            setTextLevel: boundSetBlockType,
             pluginState: pluginState,
             popupsMountPoint: popupsMountPoint,
             popupsBoundariesElement: popupsBoundariesElement,
@@ -194,9 +195,9 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
     },
     pluginsOptions: {
       quickInsert: function quickInsert(intl) {
-        var _api$analytics7, _api$analytics8;
+        var _api$analytics6, _api$analytics7;
         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 || (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions)), _toConsumableArray(headingPluginOptions(intl, exclude.indexOf('heading') === -1, api === null || api === void 0 || (_api$analytics8 = api.analytics) === null || _api$analytics8 === void 0 ? void 0 : _api$analytics8.actions)));
+        return [].concat(_toConsumableArray(blockquotePluginOptions(intl, exclude.indexOf('blockquote') === -1, api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions)), _toConsumableArray(headingPluginOptions(intl, exclude.indexOf('heading') === -1, api === null || api === void 0 || (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions)));
       }
     }
   };

package/dist/esm/plugin/pm-plugins/main.js

@@ -63,16 +63,16 @@ var detectBlockType = function detectBlockType(availableBlockTypes, state) {
   });
   return blockType || OTHER;
 };
-var autoformatHeading = function autoformatHeading(headingLevel, view, editorAnalyticsApi) {
+var autoformatHeading = function autoformatHeading(headingLevel, editorAnalyticsApi) {
   if (headingLevel === 0) {
-    setNormalTextWithAnalytics(INPUT_METHOD.FORMATTING, editorAnalyticsApi)(view.state, view.dispatch);
-  } else {
-    setHeadingWithAnalytics(headingLevel, INPUT_METHOD.FORMATTING, editorAnalyticsApi)(view.state, view.dispatch);
+    return setNormalTextWithAnalytics(INPUT_METHOD.FORMATTING, editorAnalyticsApi);
   }
-  return true;
+  return setHeadingWithAnalytics(headingLevel, INPUT_METHOD.FORMATTING, editorAnalyticsApi);
 };
 export var pluginKey = new PluginKey('blockTypePlugin');
-export var createPlugin = function createPlugin(editorAnalyticsApi, dispatch, lastNodeMustBeParagraph) {
+export var createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMustBeParagraph) {
+  var _editorAPI$analytics;
+  var editorAnalyticsApi = editorAPI === null || editorAPI === void 0 || (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions;
   var altKeyLocation = 0;
   return new SafePlugin({
     appendTransaction: function appendTransaction(_transactions, _oldState, newState) {
@@ -123,9 +123,11 @@ export var createPlugin = function createPlugin(editorAnalyticsApi, dispatch, la
         var headingLevel = HEADING_KEYS.indexOf(event.keyCode);
         if (headingLevel > -1 && event.altKey) {
           if (browser.mac && event.metaKey) {
-            return autoformatHeading(headingLevel, view, editorAnalyticsApi);
+            var _editorAPI$core$actio;
+            return (_editorAPI$core$actio = editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.core.actions.execute(autoformatHeading(headingLevel, editorAnalyticsApi))) !== null && _editorAPI$core$actio !== void 0 ? _editorAPI$core$actio : false;
           } else if (!browser.mac && event.ctrlKey && altKeyLocation !== event.DOM_KEY_LOCATION_RIGHT) {
-            return autoformatHeading(headingLevel, view, editorAnalyticsApi);
+            var _editorAPI$core$actio2;
+            return (_editorAPI$core$actio2 = editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.core.actions.execute(autoformatHeading(headingLevel, editorAnalyticsApi))) !== null && _editorAPI$core$actio2 !== void 0 ? _editorAPI$core$actio2 : false;
           }
         } else if (event.key === 'Alt') {
           // event.location is for the current key only; when a user hits Ctrl-Alt-1 the

package/dist/esm/plugin/ui/ToolbarBlockType/index.js

@@ -94,7 +94,7 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
         _ref$shouldCloseMenu = _ref.shouldCloseMenu,
         shouldCloseMenu = _ref$shouldCloseMenu === void 0 ? true : _ref$shouldCloseMenu;
       var blockType = item.value;
-      _this.props.setBlockType(blockType.name);
+      _this.props.setTextLevel(blockType.name);
       if (shouldCloseMenu) {
         _this.setState(_objectSpread(_objectSpread({}, _this.state), {}, {
           active: false

package/dist/types/index.d.ts

@@ -4,3 +4,4 @@ export type { BlockTypePluginOptions, BlockType } from './plugin/types';
 export type { BlockTypeState } from './plugin/pm-plugins/main';
 export type { InputMethod } from './plugin/commands';
 export type { DropdownItem } from './plugin/ui/ToolbarBlockType';
+export type { TextBlockTypes } from './plugin/block-types';

package/dist/types/plugin/block-types.d.ts

@@ -11,6 +11,7 @@ export declare const CODE_BLOCK: BlockType;
 export declare const PANEL: BlockType;
 export declare const OTHER: BlockType;
 export declare const TEXT_BLOCK_TYPES: BlockType[];
+export type TextBlockTypes = 'normal' | 'heading1' | 'heading2' | 'heading3' | 'heading4' | 'heading5' | 'heading6';
 export declare const WRAPPER_BLOCK_TYPES: BlockType[];
 export declare const ALL_BLOCK_TYPES: BlockType[];
 export declare const HEADINGS_BY_LEVEL: Record<number, BlockType>;

package/dist/types/plugin/commands/block-type.d.ts

@@ -1,11 +1,13 @@
 import type { EditorAnalyticsAPI, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import type { Command, HeadingLevelsAndNormalText } from '@atlaskit/editor-common/types';
+import type { Command, EditorCommand, HeadingLevelsAndNormalText } from '@atlaskit/editor-common/types';
+import type { TextBlockTypes } from '../block-types';
 export type InputMethod = INPUT_METHOD.TOOLBAR | INPUT_METHOD.INSERT_MENU | INPUT_METHOD.SHORTCUT | INPUT_METHOD.FORMATTING | INPUT_METHOD.KEYBOARD;
-export declare function setBlockType(name: string): Command;
-export declare function setBlockTypeWithAnalytics(name: string, inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined): Command;
-export declare function setNormalText(): Command;
-export declare function setNormalTextWithAnalytics(inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined): Command;
-export declare const setHeadingWithAnalytics: (newHeadingLevel: HeadingLevelsAndNormalText, inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
+export declare function setBlockType(name: TextBlockTypes): EditorCommand;
+export declare function setHeading(level: HeadingLevelsAndNormalText): EditorCommand;
+export declare function setBlockTypeWithAnalytics(name: TextBlockTypes, inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined): EditorCommand;
+export declare function setNormalText(): EditorCommand;
+export declare function setNormalTextWithAnalytics(inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined): EditorCommand;
+export declare const setHeadingWithAnalytics: (newHeadingLevel: HeadingLevelsAndNormalText, inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined) => EditorCommand;
 /**
  *
  * @param name - block type name

package/dist/types/plugin/commands/index.d.ts

@@ -2,8 +2,3 @@ export { cleanUpAtTheStartOfDocument, insertBlockQuoteWithAnalytics, setBlockTyp
 export type { InputMethod } from './block-type';
 export { deleteAndMoveCursor } from './delete-and-move-cursor';
 export { deleteBlockContent } from './delete-block-content';
-/**
- * @private
- * @deprecated use import from @atlaskit/editor-common/commands
- */
-export { setHeading } from '@atlaskit/editor-common/commands';

package/dist/types/plugin/index.d.ts

@@ -1,5 +1,6 @@
-import type { Command, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { Command, EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { TextBlockTypes } from './block-types';
 import type { InputMethod } from './commands/block-type';
 import type { BlockTypeState } from './pm-plugins/main';
 import type { BlockTypePluginOptions } from './types';
@@ -9,7 +10,9 @@ export type BlockTypePlugin = NextEditorPlugin<'blockType', {
     sharedState: BlockTypeState | undefined;
     actions: {
         insertBlockQuote: (inputMethod: InputMethod) => Command;
-        setBlockType: (name: string, inputMethod: InputMethod) => Command;
+    };
+    commands: {
+        setTextLevel: (level: TextBlockTypes, inputMethod: InputMethod) => EditorCommand;
     };
 }>;
 declare const blockTypePlugin: BlockTypePlugin;

package/dist/types/plugin/pm-plugins/main.d.ts

@@ -1,6 +1,7 @@
-import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import type { BlockTypePlugin } from '../index';
 import type { BlockType } from '../types';
 export type BlockTypeState = {
     currentBlockType: BlockType;
@@ -9,7 +10,7 @@ export type BlockTypeState = {
     availableWrapperBlockTypes: BlockType[];
 };
 export declare const pluginKey: PluginKey<BlockTypeState>;
-export declare const createPlugin: (editorAnalyticsApi: EditorAnalyticsAPI | undefined, dispatch: (eventName: string | PluginKey, data: any) => void, lastNodeMustBeParagraph?: boolean) => SafePlugin<{
+export declare const createPlugin: (editorAPI: ExtractInjectionAPI<BlockTypePlugin> | undefined, dispatch: (eventName: string | PluginKey, data: any) => void, lastNodeMustBeParagraph?: boolean) => SafePlugin<{
     currentBlockType: BlockType;
     blockTypesDisabled: boolean;
     availableBlockTypes: BlockType[];

package/dist/types/plugin/ui/ToolbarBlockType/index.d.ts

@@ -3,6 +3,7 @@ import React from 'react';
 import type { WrappedComponentProps } from 'react-intl-next';
 import type { MenuItem } from '@atlaskit/editor-common/ui-menu';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { TextBlockTypes } from '../../block-types';
 import type { BlockTypeState } from '../../pm-plugins/main';
 import type { BlockType } from '../../types';
 export type DropdownItem = MenuItem & {
@@ -17,7 +18,7 @@ export interface Props {
     popupsBoundariesElement?: HTMLElement;
     popupsScrollableElement?: HTMLElement;
     editorView?: EditorView;
-    setBlockType: (type: string) => void;
+    setTextLevel: (type: TextBlockTypes) => void;
 }
 export interface State {
     active: boolean;

package/dist/types-ts4.5/index.d.ts

@@ -4,3 +4,4 @@ export type { BlockTypePluginOptions, BlockType } from './plugin/types';
 export type { BlockTypeState } from './plugin/pm-plugins/main';
 export type { InputMethod } from './plugin/commands';
 export type { DropdownItem } from './plugin/ui/ToolbarBlockType';
+export type { TextBlockTypes } from './plugin/block-types';

package/dist/types-ts4.5/plugin/block-types.d.ts

@@ -11,6 +11,7 @@ export declare const CODE_BLOCK: BlockType;
 export declare const PANEL: BlockType;
 export declare const OTHER: BlockType;
 export declare const TEXT_BLOCK_TYPES: BlockType[];
+export type TextBlockTypes = 'normal' | 'heading1' | 'heading2' | 'heading3' | 'heading4' | 'heading5' | 'heading6';
 export declare const WRAPPER_BLOCK_TYPES: BlockType[];
 export declare const ALL_BLOCK_TYPES: BlockType[];
 export declare const HEADINGS_BY_LEVEL: Record<number, BlockType>;