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

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/block-types.js

@@ -1,4 +1,4 @@
-import { messages } from './messages';
+import { blockTypeMessages as messages } from '@atlaskit/editor-common/messages';
 export const NORMAL_TEXT = {
   name: 'normal',
   title: messages.normal,

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) {

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

@@ -2,12 +2,12 @@ import React from 'react';
 import { blockquote, hardBreak, heading } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { keymap, toggleBlockQuote, tooltip } from '@atlaskit/editor-common/keymaps';
+import { blockTypeMessages as messages } from '@atlaskit/editor-common/messages';
 import { IconHeading, IconQuote } from '@atlaskit/editor-common/quick-insert';
 import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
 import { setBlockTypeWithAnalytics } from './commands';
 import { insertBlockQuoteWithAnalytics } from './commands/block-type';
-import { messages } from './messages';
 import inputRulePlugin from './pm-plugins/input-rule';
 import keymapPlugin from './pm-plugins/keymap';
 import { createPlugin, pluginKey } from './pm-plugins/main';
@@ -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/blocktype-button.js

@@ -1,22 +1,16 @@
 /** @jsx jsx */
 import React from 'react';
 import { jsx } from '@emotion/react';
-import { defineMessages, FormattedMessage } from 'react-intl-next';
+import { FormattedMessage } from 'react-intl-next';
+import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { wrapperStyle } from '@atlaskit/editor-common/styles';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import TextStyleIcon from '@atlaskit/icon/glyph/editor/text-style';
 import { NORMAL_TEXT } from '../../block-types';
 import { buttonContentReducedSpacingStyle, buttonContentStyle, expandIconWrapperStyle, wrapperSmallStyle } from './styled';
-export const messages = defineMessages({
-  textStyles: {
-    id: 'fabric.editor.textStyles',
-    defaultMessage: 'Text styles',
-    description: 'Menu provides access to various heading styles or normal text'
-  }
-});
 export const BlockTypeButton = props => {
-  const labelTextStyles = props.formatMessage(messages.textStyles);
+  const labelTextStyles = props.formatMessage(toolbarMessages.textStyles);
   return jsx(ToolbarButton, {
     spacing: props.isReducedSpacing ? 'none' : 'default',
     selected: props.selected,

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/block-types.js

@@ -1,4 +1,4 @@
-import { messages } from './messages';
+import { blockTypeMessages as messages } from '@atlaskit/editor-common/messages';
 export var NORMAL_TEXT = {
   name: 'normal',
   title: messages.normal,

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;