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

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @atlaskit/editor-plugin-block-type
 
+## 3.0.0
+
+### Major Changes
+
+- [#42090](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42090) [`dfea93d39c9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/dfea93d39c9) - Replacing setBlockType action on `editor-plugin-block-type` with setTextLevel
+  command.
+
+  WHAT/WHY?: setBlockType is only for headings/text so the naming is not clear,
+  it is also an action which makes it difficult to use by external consumers.
+
+  This replacement can be easily used by external consumers (ie. for custom toolbars)
+  and also has more type safety (for setBlockType the name parameter is any string but
+  setTextLevel only accepts valid values including "normal", "heading1",
+  "heading2" etc.)
+
+  HOW?: This API at this stage should be unused by consumers to the best of our
+  knowledge. However if you are using it you should change as so:
+
+  Before:
+
+  ```ts
+  api?.blockType.actions.setBlockType(blockType, inputMethod)(state, dispatch);
+  ```
+
+  ```ts
+  api?.core.actions.execute(
+    api?.blockType.commands.setTextLevel(blockType, inputMethod),
+  );
+  ```
+
 ## 2.0.0
 
 ### Major Changes

package/dist/cjs/i18n/nl.js

@@ -22,17 +22,17 @@ var _default = exports.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/cjs/plugin/commands/block-type.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.insertBlockQuoteWithAnalytics = exports.cleanUpAtTheStartOfDocument = void 0;
 exports.setBlockType = setBlockType;
 exports.setBlockTypeWithAnalytics = setBlockTypeWithAnalytics;
+exports.setHeading = setHeading;
 exports.setHeadingWithAnalytics = void 0;
 exports.setNormalText = setNormalText;
 exports.setNormalTextWithAnalytics = setNormalTextWithAnalytics;
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _commands = require("@atlaskit/editor-common/commands");
 var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var _utils = require("@atlaskit/editor-common/utils");
 var _editorTables = require("@atlaskit/editor-tables");
@@ -19,55 +19,79 @@ 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; }
 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 === _blockTypes.NORMAL_TEXT.name && nodes.paragraph) {
-      return setNormalText()(state, dispatch);
+      return setNormalText()({
+        tr: tr
+      });
     }
     var headingBlockType = _blockTypes.HEADINGS_BY_NAME[name];
     if (headingBlockType && nodes.heading && headingBlockType.level) {
-      return (0, _commands.setHeading)(headingBlockType.level)(state, dispatch);
+      return setHeading(headingBlockType.level)({
+        tr: tr
+      });
     }
-    return false;
+    return null;
+  };
+}
+function setHeading(level) {
+  return function (_ref2) {
+    var tr = _ref2.tr;
+    var selection = tr.selection,
+      schema = tr.doc.type.schema;
+    var ranges = selection instanceof _editorTables.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;
   };
 }
 function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi) {
-  return function (state, dispatch) {
-    var nodes = state.schema.nodes;
-    if (name === _blockTypes.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 = _blockTypes.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;
   };
 }
 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 _editorTables.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 = (0, _utils.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 = (0, _utils.filterChildrenBetween)(tr.doc, tr.selection.from, tr.selection.to, function (node) {
       return node.type === heading || node.type === paragraph;
     });
 
@@ -92,37 +116,51 @@ function withCurrentHeadingLevel(fn) {
     } finally {
       _iterator.f();
     }
-    return fn(level)(state, dispatch, view);
+    return fn(level)({
+      tr: tr
+    });
   };
 }
 function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, {
-      action: _analytics.ACTION.FORMATTED,
-      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-      eventType: _analytics.EVENT_TYPE.TRACK,
-      actionSubjectId: _analytics.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: _analytics.ACTION.FORMATTED,
+        actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+        eventType: _analytics.EVENT_TYPE.TRACK,
+        actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_HEADING,
+        attributes: {
+          inputMethod: inputMethod,
+          newHeadingLevel: 0,
+          previousHeadingLevel: previousHeadingLevel
+        }
+      })(tr);
+      return setNormalText()({
+        tr: tr
+      });
+    };
   });
 }
 var setHeadingWithAnalytics = exports.setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod, editorAnalyticsApi) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return (0, _editorAnalytics.withAnalytics)(editorAnalyticsApi, {
-      action: _analytics.ACTION.FORMATTED,
-      actionSubject: _analytics.ACTION_SUBJECT.TEXT,
-      eventType: _analytics.EVENT_TYPE.TRACK,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_HEADING,
-      attributes: {
-        inputMethod: inputMethod,
-        newHeadingLevel: newHeadingLevel,
-        previousHeadingLevel: previousHeadingLevel
-      }
-    })((0, _commands.setHeading)(newHeadingLevel));
+    return function (_ref9) {
+      var tr = _ref9.tr;
+      editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
+        action: _analytics.ACTION.FORMATTED,
+        actionSubject: _analytics.ACTION_SUBJECT.TEXT,
+        eventType: _analytics.EVENT_TYPE.TRACK,
+        actionSubjectId: _analytics.ACTION_SUBJECT_ID.FORMAT_HEADING,
+        attributes: {
+          inputMethod: inputMethod,
+          newHeadingLevel: newHeadingLevel,
+          previousHeadingLevel: previousHeadingLevel
+        }
+      })(tr);
+      return setHeading(newHeadingLevel)({
+        tr: tr
+      });
+    };
   });
 };
 function insertBlockQuote() {
@@ -155,8 +193,8 @@ var insertBlockQuoteWithAnalytics = exports.insertBlockQuoteWithAnalytics = func
   })(insertBlockQuote());
 };
 var cleanUpAtTheStartOfDocument = exports.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/cjs/plugin/commands/index.js

@@ -39,12 +39,6 @@ Object.defineProperty(exports, "setBlockTypeWithAnalytics", {
     return _blockType.setBlockTypeWithAnalytics;
   }
 });
-Object.defineProperty(exports, "setHeading", {
-  enumerable: true,
-  get: function get() {
-    return _commands.setHeading;
-  }
-});
 Object.defineProperty(exports, "setHeadingWithAnalytics", {
   enumerable: true,
   get: function get() {
@@ -65,5 +59,4 @@ Object.defineProperty(exports, "setNormalTextWithAnalytics", {
 });
 var _blockType = require("./block-type");
 var _deleteAndMoveCursor = require("./delete-and-move-cursor");
-var _deleteBlockContent = require("./delete-block-content");
-var _commands = require("@atlaskit/editor-common/commands");
+var _deleteBlockContent = require("./delete-block-content");

package/dist/cjs/plugin/index.js

@@ -129,17 +129,16 @@ var blockTypePlugin = exports.blockTypePlugin = function blockTypePlugin(_ref3)
       return [{
         name: 'blockType',
         plugin: function plugin(_ref4) {
-          var _api$analytics;
           var dispatch = _ref4.dispatch;
-          return (0, _main.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 (0, _main.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 (0, _inputRule.default)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions, schema, featureFlags);
+          return (0, _inputRule.default)(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
@@ -147,21 +146,23 @@ var blockTypePlugin = exports.blockTypePlugin = function blockTypePlugin(_ref3)
       {
         name: 'blockTypeKeyMap',
         plugin: function plugin(_ref6) {
-          var _api$analytics3;
+          var _api$analytics2;
           var schema = _ref6.schema,
             featureFlags = _ref6.featureFlags;
-          return (0, _keymap.default)(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, schema, featureFlags);
+          return (0, _keymap.default)(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 (0, _blockType.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 (0, _blockType.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 (0, _commands.setBlockTypeWithAnalytics)(name, inputMethod, api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
+        return (0, _commands.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) {
@@ -181,8 +182,8 @@ var blockTypePlugin = exports.blockTypePlugin = function blockTypePlugin(_ref3)
         eventDispatcher = _ref7.eventDispatcher;
       var isSmall = options && options.isUndoRedoButtonsEnabled ? toolbarSize < _types.ToolbarSize.XXL : toolbarSize < _types.ToolbarSize.XL;
       var boundSetBlockType = function boundSetBlockType(name) {
-        var _api$analytics6;
-        return (0, _commands.setBlockTypeWithAnalytics)(name, _analytics.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((0, _commands.setBlockTypeWithAnalytics)(name, _analytics.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.default.createElement(_withPluginState.WithPluginState, {
         editorView: editorView,
@@ -196,7 +197,7 @@ var blockTypePlugin = exports.blockTypePlugin = function blockTypePlugin(_ref3)
             isSmall: isSmall,
             isDisabled: disabled,
             isReducedSpacing: isToolbarReducedSpacing,
-            setBlockType: boundSetBlockType,
+            setTextLevel: boundSetBlockType,
             pluginState: pluginState,
             popupsMountPoint: popupsMountPoint,
             popupsBoundariesElement: popupsBoundariesElement,
@@ -207,9 +208,9 @@ var blockTypePlugin = exports.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((0, _toConsumableArray2.default)(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)), (0, _toConsumableArray2.default)(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((0, _toConsumableArray2.default)(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)), (0, _toConsumableArray2.default)(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/cjs/plugin/pm-plugins/main.js

@@ -70,16 +70,16 @@ var detectBlockType = function detectBlockType(availableBlockTypes, state) {
   });
   return blockType || _blockTypes.OTHER;
 };
-var autoformatHeading = function autoformatHeading(headingLevel, view, editorAnalyticsApi) {
+var autoformatHeading = function autoformatHeading(headingLevel, editorAnalyticsApi) {
   if (headingLevel === 0) {
-    (0, _commands.setNormalTextWithAnalytics)(_analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi)(view.state, view.dispatch);
-  } else {
-    (0, _commands.setHeadingWithAnalytics)(headingLevel, _analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi)(view.state, view.dispatch);
+    return (0, _commands.setNormalTextWithAnalytics)(_analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi);
   }
-  return true;
+  return (0, _commands.setHeadingWithAnalytics)(headingLevel, _analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi);
 };
 var pluginKey = exports.pluginKey = new _state.PluginKey('blockTypePlugin');
-var createPlugin = exports.createPlugin = function createPlugin(editorAnalyticsApi, dispatch, lastNodeMustBeParagraph) {
+var createPlugin = exports.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.SafePlugin({
     appendTransaction: function appendTransaction(_transactions, _oldState, newState) {
@@ -130,9 +130,11 @@ var createPlugin = exports.createPlugin = function createPlugin(editorAnalyticsA
         var headingLevel = _consts.HEADING_KEYS.indexOf(event.keyCode);
         if (headingLevel > -1 && event.altKey) {
           if (_utils.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 (!_utils.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/cjs/plugin/ui/ToolbarBlockType/index.js

@@ -100,7 +100,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/es2019/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/es2019/plugin/commands/block-type.js

@@ -1,46 +1,86 @@
 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 (state, dispatch) => {
+  return ({
+    tr
+  }) => {
     const {
       nodes
-    } = state.schema;
+    } = tr.doc.type.schema;
     if (name === NORMAL_TEXT.name && nodes.paragraph) {
-      return setNormalText()(state, dispatch);
+      return setNormalText()({
+        tr
+      });
     }
     const headingBlockType = HEADINGS_BY_NAME[name];
     if (headingBlockType && nodes.heading && headingBlockType.level) {
-      return setHeading(headingBlockType.level)(state, dispatch);
+      return setHeading(headingBlockType.level)({
+        tr
+      });
     }
-    return false;
+    return null;
+  };
+}
+export function setHeading(level) {
+  return function ({
+    tr
+  }) {
+    const {
+      selection,
+      doc: {
+        type: {
+          schema
+        }
+      }
+    } = tr;
+    const ranges = selection instanceof CellSelection ? selection.ranges : [selection];
+    ranges.forEach(({
+      $from,
+      $to
+    }) => {
+      tr.setBlockType($from.pos, $to.pos, schema.nodes.heading, {
+        level
+      });
+    });
+    return tr;
   };
 }
 export function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi) {
-  return (state, dispatch) => {
+  return ({
+    tr
+  }) => {
     const {
       nodes
-    } = state.schema;
-    if (name === NORMAL_TEXT.name && nodes.paragraph) {
-      return setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi)(state, dispatch);
+    } = tr.doc.type.schema;
+    if (name === 'normal' && nodes.paragraph) {
+      return setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi)({
+        tr
+      });
     }
     const 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
+      });
     }
-    return false;
+    return null;
   };
 }
 export function setNormalText() {
-  return function (state, dispatch) {
+  return function ({
+    tr
+  }) {
     const {
       selection,
-      schema,
-      tr
-    } = state;
+      doc: {
+        type: {
+          schema
+        }
+      }
+    } = tr;
     const ranges = selection instanceof CellSelection ? selection.ranges : [selection];
     ranges.forEach(({
       $from,
@@ -48,20 +88,19 @@ export function setNormalText() {
     }) => {
       tr.setBlockType($from.pos, $to.pos, schema.nodes.paragraph);
     });
-    if (dispatch) {
-      dispatch(tr);
-    }
-    return true;
+    return tr;
   };
 }
 function withCurrentHeadingLevel(fn) {
-  return (state, dispatch, view) => {
+  return ({
+    tr
+  }) => {
     // Find all headings and paragraphs of text
     const {
       heading,
       paragraph
-    } = state.schema.nodes;
-    const nodes = filterChildrenBetween(state.doc, state.selection.from, state.selection.to, node => {
+    } = tr.doc.type.schema.nodes;
+    const nodes = filterChildrenBetween(tr.doc, tr.selection.from, tr.selection.to, node => {
       return node.type === heading || node.type === paragraph;
     });
 
@@ -77,34 +116,50 @@ function withCurrentHeadingLevel(fn) {
         break;
       }
     }
-    return fn(level)(state, dispatch, view);
+    return fn(level)({
+      tr
+    });
   };
 }
 export function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi) {
-  return withCurrentHeadingLevel(previousHeadingLevel => withAnalytics(editorAnalyticsApi, {
-    action: ACTION.FORMATTED,
-    actionSubject: ACTION_SUBJECT.TEXT,
-    eventType: EVENT_TYPE.TRACK,
-    actionSubjectId: ACTION_SUBJECT_ID.FORMAT_HEADING,
-    attributes: {
-      inputMethod,
-      newHeadingLevel: 0,
-      previousHeadingLevel
-    }
-  })(setNormalText()));
+  return withCurrentHeadingLevel(previousHeadingLevel => ({
+    tr
+  }) => {
+    editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
+      action: ACTION.FORMATTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      eventType: EVENT_TYPE.TRACK,
+      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_HEADING,
+      attributes: {
+        inputMethod,
+        newHeadingLevel: 0,
+        previousHeadingLevel
+      }
+    })(tr);
+    return setNormalText()({
+      tr
+    });
+  });
 }
 export const setHeadingWithAnalytics = (newHeadingLevel, inputMethod, editorAnalyticsApi) => {
-  return withCurrentHeadingLevel(previousHeadingLevel => withAnalytics(editorAnalyticsApi, {
-    action: ACTION.FORMATTED,
-    actionSubject: ACTION_SUBJECT.TEXT,
-    eventType: EVENT_TYPE.TRACK,
-    actionSubjectId: ACTION_SUBJECT_ID.FORMAT_HEADING,
-    attributes: {
-      inputMethod,
-      newHeadingLevel,
-      previousHeadingLevel
-    }
-  })(setHeading(newHeadingLevel)));
+  return withCurrentHeadingLevel(previousHeadingLevel => ({
+    tr
+  }) => {
+    editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
+      action: ACTION.FORMATTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      eventType: EVENT_TYPE.TRACK,
+      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_HEADING,
+      attributes: {
+        inputMethod,
+        newHeadingLevel,
+        previousHeadingLevel
+      }
+    })(tr);
+    return setHeading(newHeadingLevel)({
+      tr
+    });
+  });
 };
 function insertBlockQuote() {
   return function (state, dispatch) {