@atlaskit/editor-plugin-text-formatting 0.1.1 → 0.2.0

package/dist/es2019/commands.js

@@ -0,0 +1,251 @@
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { toggleMark } from '@atlaskit/editor-common/mark';
+export const toggleEm = ({
+  tr
+}) => {
+  const {
+    em
+  } = tr.doc.type.schema.marks;
+  if (!em) {
+    // No transaction to apply
+    return null;
+  }
+  return toggleMark(em)({
+    tr
+  });
+};
+export const toggleEmWithAnalytics = editorAnalyticsApi => inputMethod => ({
+  tr
+}) => {
+  const newTr = toggleEm({
+    tr
+  });
+  if (!newTr) {
+    // No transaction to apply
+    return null;
+  }
+  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_ITALIC,
+    attributes: {
+      inputMethod
+    }
+  })(newTr);
+  return newTr;
+};
+export const toggleStrike = ({
+  tr
+}) => {
+  const {
+    strike
+  } = tr.doc.type.schema.marks;
+  if (!strike) {
+    // No transaction to apply
+    return null;
+  }
+  return toggleMark(strike)({
+    tr
+  });
+};
+export const toggleStrikeWithAnalytics = editorAnalyticsApi => inputMethod => ({
+  tr
+}) => {
+  const newTr = toggleStrike({
+    tr
+  });
+  if (!newTr) {
+    // No transaction to apply
+    return null;
+  }
+  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_STRIKE,
+    attributes: {
+      inputMethod
+    }
+  })(newTr);
+  return newTr;
+};
+export const toggleStrong = ({
+  tr
+}) => {
+  const {
+    strong
+  } = tr.doc.type.schema.marks;
+  if (!strong) {
+    // No transaction to apply
+    return null;
+  }
+  return toggleMark(strong)({
+    tr
+  });
+};
+export const toggleStrongWithAnalytics = editorAnalyticsApi => inputMethod => ({
+  tr
+}) => {
+  const newTr = toggleStrong({
+    tr
+  });
+  if (!newTr) {
+    // No transaction to apply
+    return null;
+  }
+  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_STRONG,
+    attributes: {
+      inputMethod
+    }
+  })(newTr);
+  return newTr;
+};
+export const toggleUnderline = ({
+  tr
+}) => {
+  const {
+    underline
+  } = tr.doc.type.schema.marks;
+  if (!underline) {
+    // No transaction to apply
+    return null;
+  }
+  return toggleMark(underline)({
+    tr
+  });
+};
+export const toggleUnderlineWithAnalytics = editorAnalyticsApi => inputMethod => ({
+  tr
+}) => {
+  const newTr = toggleUnderline({
+    tr
+  });
+  if (!newTr) {
+    // No transaction to apply
+    return null;
+  }
+  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_UNDERLINE,
+    attributes: {
+      inputMethod
+    }
+  })(newTr);
+  return newTr;
+};
+export const toggleSuperscript = ({
+  tr
+}) => {
+  const {
+    subsup
+  } = tr.doc.type.schema.marks;
+  if (!subsup) {
+    // No transaction to apply
+    return null;
+  }
+  return toggleMark(subsup, {
+    type: 'sup'
+  })({
+    tr
+  });
+};
+export const toggleSuperscriptWithAnalytics = editorAnalyticsApi => inputMethod => ({
+  tr
+}) => {
+  const newTr = toggleSuperscript({
+    tr
+  });
+  if (!newTr) {
+    // No transaction to apply
+    return null;
+  }
+  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_SUPER,
+    attributes: {
+      inputMethod
+    }
+  })(newTr);
+  return newTr;
+};
+export const toggleSubscript = ({
+  tr
+}) => {
+  const {
+    subsup
+  } = tr.doc.type.schema.marks;
+  if (!subsup) {
+    // No transaction to apply
+    return null;
+  }
+  return toggleMark(subsup, {
+    type: 'sub'
+  })({
+    tr
+  });
+};
+export const toggleSubscriptWithAnalytics = editorAnalyticsApi => inputMethod => ({
+  tr
+}) => {
+  const newTr = toggleSubscript({
+    tr
+  });
+  if (!newTr) {
+    // No transaction to apply
+    return null;
+  }
+  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_SUB,
+    attributes: {
+      inputMethod
+    }
+  })(newTr);
+  return newTr;
+};
+export const toggleCode = ({
+  tr
+}) => {
+  const {
+    code
+  } = tr.doc.type.schema.marks;
+  if (!code) {
+    // No transaction to apply
+    return null;
+  }
+  return toggleMark(code)({
+    tr
+  });
+};
+export const toggleCodeWithAnalytics = editorAnalyticsApi => inputMethod => ({
+  tr
+}) => {
+  const newTr = toggleCode({
+    tr
+  });
+  if (!newTr) {
+    // No transaction to apply
+    return null;
+  }
+  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_CODE,
+    attributes: {
+      inputMethod
+    }
+  })(newTr);
+  return newTr;
+};

package/dist/es2019/plugin.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { code, em, strike, strong, subsup, underline } from '@atlaskit/adf-schema';
 import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
-import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from './actions';
+import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from './commands';
 import { plugin as clearFormattingPlugin, pluginKey as clearFormattingPluginKey } from './pm-plugins/clear-formatting';
 import clearFormattingKeymapPlugin from './pm-plugins/clear-formatting-keymap';
 import textFormattingCursorPlugin from './pm-plugins/cursor';
@@ -111,7 +111,7 @@ export const textFormattingPlugin = (options = {}, api) => {
         }
       });
     },
-    actions: {
+    commands: {
       toggleSuperscript: toggleSuperscriptWithAnalytics(api === null || api === void 0 ? void 0 : (_api$dependencies$ana7 = api.dependencies.analytics) === null || _api$dependencies$ana7 === void 0 ? void 0 : _api$dependencies$ana7.actions),
       toggleSubscript: toggleSubscriptWithAnalytics(api === null || api === void 0 ? void 0 : (_api$dependencies$ana8 = api.dependencies.analytics) === null || _api$dependencies$ana8 === void 0 ? void 0 : _api$dependencies$ana8.actions),
       toggleStrike: toggleStrikeWithAnalytics(api === null || api === void 0 ? void 0 : (_api$dependencies$ana9 = api.dependencies.analytics) === null || _api$dependencies$ana9 === void 0 ? void 0 : _api$dependencies$ana9.actions),

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

@@ -1,43 +1,29 @@
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import * as keymaps from '@atlaskit/editor-common/keymaps';
+import { bindKeymapWithPluginCommand, toggleBold, toggleCode, toggleItalic, toggleStrikethrough, toggleSubscript, toggleSuperscript, toggleUnderline } from '@atlaskit/editor-common/keymaps';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from '../actions';
+import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from '../commands';
 export default function keymapPlugin(schema, editorAnalyticsAPI) {
   const list = {};
   if (schema.marks.strong) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleBold.common, toggleStrongWithAnalytics(editorAnalyticsAPI)({
-      inputMethod: INPUT_METHOD.SHORTCUT
-    }), list);
+    bindKeymapWithPluginCommand(toggleBold.common, toggleStrongWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
   }
   if (schema.marks.em) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleItalic.common, toggleEmWithAnalytics(editorAnalyticsAPI)({
-      inputMethod: INPUT_METHOD.SHORTCUT
-    }), list);
+    bindKeymapWithPluginCommand(toggleItalic.common, toggleEmWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
   }
   if (schema.marks.code) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleCode.common, toggleCodeWithAnalytics(editorAnalyticsAPI)({
-      inputMethod: INPUT_METHOD.SHORTCUT
-    }), list);
+    bindKeymapWithPluginCommand(toggleCode.common, toggleCodeWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
   }
   if (schema.marks.strike) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleStrikethrough.common, toggleStrikeWithAnalytics(editorAnalyticsAPI)({
-      inputMethod: INPUT_METHOD.SHORTCUT
-    }), list);
+    bindKeymapWithPluginCommand(toggleStrikethrough.common, toggleStrikeWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
   }
   if (schema.marks.subsup) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleSubscript.common, toggleSubscriptWithAnalytics(editorAnalyticsAPI)({
-      inputMethod: INPUT_METHOD.SHORTCUT
-    }), list);
+    bindKeymapWithPluginCommand(toggleSubscript.common, toggleSubscriptWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
   }
   if (schema.marks.subsup) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleSuperscript.common, toggleSuperscriptWithAnalytics(editorAnalyticsAPI)({
-      inputMethod: INPUT_METHOD.SHORTCUT
-    }), list);
+    bindKeymapWithPluginCommand(toggleSuperscript.common, toggleSuperscriptWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
   }
   if (schema.marks.underline) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleUnderline.common, toggleUnderlineWithAnalytics(editorAnalyticsAPI)({
-      inputMethod: INPUT_METHOD.SHORTCUT
-    }), list);
+    bindKeymapWithPluginCommand(toggleUnderline.common, toggleUnderlineWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
   }
   return keymap(list);
 }

package/dist/es2019/ui/Toolbar/hooks/formatting-icons.js

@@ -4,15 +4,14 @@ import { jsx } from '@emotion/react';
 import { INPUT_METHOD, TOOLBAR_ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { getAriaKeyshortcuts, toggleBold, toggleCode, toggleItalic, toggleStrikethrough, toggleSubscript, toggleSuperscript, toggleUnderline, tooltip, ToolTipContent } from '@atlaskit/editor-common/keymaps';
 import { toolbarMessages } from '@atlaskit/editor-common/messages';
+import { pluginCommandToPMCommand } from '@atlaskit/editor-common/preset';
 import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 import BoldIcon from '@atlaskit/icon/glyph/editor/bold';
 import ItalicIcon from '@atlaskit/icon/glyph/editor/italic';
-import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from '../../../actions';
+import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from '../../../commands';
 import { pluginKey as textFormattingPluginKey } from '../../../pm-plugins/plugin-key';
 import { IconTypes } from '../types';
-const withToolbarInputMethod = func => func({
-  inputMethod: INPUT_METHOD.TOOLBAR
-});
+const withToolbarInputMethod = func => pluginCommandToPMCommand(func(INPUT_METHOD.TOOLBAR));
 const IconButtons = editorAnalyticsAPI => ({
   strong: {
     buttonId: TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_STRONG,

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-plugin-text-formatting",
-	"version": "0.1.1",
+	"version": "0.2.0",
 	"sideEffects": false
 }

package/dist/esm/commands.js

@@ -0,0 +1,251 @@
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { toggleMark } from '@atlaskit/editor-common/mark';
+export var toggleEm = function toggleEm(_ref) {
+  var tr = _ref.tr;
+  var em = tr.doc.type.schema.marks.em;
+  if (!em) {
+    // No transaction to apply
+    return null;
+  }
+  return toggleMark(em)({
+    tr: tr
+  });
+};
+export var toggleEmWithAnalytics = function toggleEmWithAnalytics(editorAnalyticsApi) {
+  return function (inputMethod) {
+    return function (_ref2) {
+      var tr = _ref2.tr;
+      var newTr = toggleEm({
+        tr: tr
+      });
+      if (!newTr) {
+        // No transaction to apply
+        return null;
+      }
+      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_ITALIC,
+        attributes: {
+          inputMethod: inputMethod
+        }
+      })(newTr);
+      return newTr;
+    };
+  };
+};
+export var toggleStrike = function toggleStrike(_ref3) {
+  var tr = _ref3.tr;
+  var strike = tr.doc.type.schema.marks.strike;
+  if (!strike) {
+    // No transaction to apply
+    return null;
+  }
+  return toggleMark(strike)({
+    tr: tr
+  });
+};
+export var toggleStrikeWithAnalytics = function toggleStrikeWithAnalytics(editorAnalyticsApi) {
+  return function (inputMethod) {
+    return function (_ref4) {
+      var tr = _ref4.tr;
+      var newTr = toggleStrike({
+        tr: tr
+      });
+      if (!newTr) {
+        // No transaction to apply
+        return null;
+      }
+      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_STRIKE,
+        attributes: {
+          inputMethod: inputMethod
+        }
+      })(newTr);
+      return newTr;
+    };
+  };
+};
+export var toggleStrong = function toggleStrong(_ref5) {
+  var tr = _ref5.tr;
+  var strong = tr.doc.type.schema.marks.strong;
+  if (!strong) {
+    // No transaction to apply
+    return null;
+  }
+  return toggleMark(strong)({
+    tr: tr
+  });
+};
+export var toggleStrongWithAnalytics = function toggleStrongWithAnalytics(editorAnalyticsApi) {
+  return function (inputMethod) {
+    return function (_ref6) {
+      var tr = _ref6.tr;
+      var newTr = toggleStrong({
+        tr: tr
+      });
+      if (!newTr) {
+        // No transaction to apply
+        return null;
+      }
+      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_STRONG,
+        attributes: {
+          inputMethod: inputMethod
+        }
+      })(newTr);
+      return newTr;
+    };
+  };
+};
+export var toggleUnderline = function toggleUnderline(_ref7) {
+  var tr = _ref7.tr;
+  var underline = tr.doc.type.schema.marks.underline;
+  if (!underline) {
+    // No transaction to apply
+    return null;
+  }
+  return toggleMark(underline)({
+    tr: tr
+  });
+};
+export var toggleUnderlineWithAnalytics = function toggleUnderlineWithAnalytics(editorAnalyticsApi) {
+  return function (inputMethod) {
+    return function (_ref8) {
+      var tr = _ref8.tr;
+      var newTr = toggleUnderline({
+        tr: tr
+      });
+      if (!newTr) {
+        // No transaction to apply
+        return null;
+      }
+      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_UNDERLINE,
+        attributes: {
+          inputMethod: inputMethod
+        }
+      })(newTr);
+      return newTr;
+    };
+  };
+};
+export var toggleSuperscript = function toggleSuperscript(_ref9) {
+  var tr = _ref9.tr;
+  var subsup = tr.doc.type.schema.marks.subsup;
+  if (!subsup) {
+    // No transaction to apply
+    return null;
+  }
+  return toggleMark(subsup, {
+    type: 'sup'
+  })({
+    tr: tr
+  });
+};
+export var toggleSuperscriptWithAnalytics = function toggleSuperscriptWithAnalytics(editorAnalyticsApi) {
+  return function (inputMethod) {
+    return function (_ref10) {
+      var tr = _ref10.tr;
+      var newTr = toggleSuperscript({
+        tr: tr
+      });
+      if (!newTr) {
+        // No transaction to apply
+        return null;
+      }
+      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_SUPER,
+        attributes: {
+          inputMethod: inputMethod
+        }
+      })(newTr);
+      return newTr;
+    };
+  };
+};
+export var toggleSubscript = function toggleSubscript(_ref11) {
+  var tr = _ref11.tr;
+  var subsup = tr.doc.type.schema.marks.subsup;
+  if (!subsup) {
+    // No transaction to apply
+    return null;
+  }
+  return toggleMark(subsup, {
+    type: 'sub'
+  })({
+    tr: tr
+  });
+};
+export var toggleSubscriptWithAnalytics = function toggleSubscriptWithAnalytics(editorAnalyticsApi) {
+  return function (inputMethod) {
+    return function (_ref12) {
+      var tr = _ref12.tr;
+      var newTr = toggleSubscript({
+        tr: tr
+      });
+      if (!newTr) {
+        // No transaction to apply
+        return null;
+      }
+      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_SUB,
+        attributes: {
+          inputMethod: inputMethod
+        }
+      })(newTr);
+      return newTr;
+    };
+  };
+};
+export var toggleCode = function toggleCode(_ref13) {
+  var tr = _ref13.tr;
+  var code = tr.doc.type.schema.marks.code;
+  if (!code) {
+    // No transaction to apply
+    return null;
+  }
+  return toggleMark(code)({
+    tr: tr
+  });
+};
+export var toggleCodeWithAnalytics = function toggleCodeWithAnalytics(editorAnalyticsApi) {
+  return function (inputMethod) {
+    return function (_ref14) {
+      var tr = _ref14.tr;
+      var newTr = toggleCode({
+        tr: tr
+      });
+      if (!newTr) {
+        // No transaction to apply
+        return null;
+      }
+      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_CODE,
+        attributes: {
+          inputMethod: inputMethod
+        }
+      })(newTr);
+      return newTr;
+    };
+  };
+};

package/dist/esm/plugin.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { code, em, strike, strong, subsup, underline } from '@atlaskit/adf-schema';
 import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
-import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from './actions';
+import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from './commands';
 import { plugin as clearFormattingPlugin, pluginKey as clearFormattingPluginKey } from './pm-plugins/clear-formatting';
 import clearFormattingKeymapPlugin from './pm-plugins/clear-formatting-keymap';
 import textFormattingCursorPlugin from './pm-plugins/cursor';
@@ -112,7 +112,7 @@ export var textFormattingPlugin = function textFormattingPlugin() {
         }
       });
     },
-    actions: {
+    commands: {
       toggleSuperscript: toggleSuperscriptWithAnalytics(api === null || api === void 0 ? void 0 : (_api$dependencies$ana7 = api.dependencies.analytics) === null || _api$dependencies$ana7 === void 0 ? void 0 : _api$dependencies$ana7.actions),
       toggleSubscript: toggleSubscriptWithAnalytics(api === null || api === void 0 ? void 0 : (_api$dependencies$ana8 = api.dependencies.analytics) === null || _api$dependencies$ana8 === void 0 ? void 0 : _api$dependencies$ana8.actions),
       toggleStrike: toggleStrikeWithAnalytics(api === null || api === void 0 ? void 0 : (_api$dependencies$ana9 = api.dependencies.analytics) === null || _api$dependencies$ana9 === void 0 ? void 0 : _api$dependencies$ana9.actions),

package/dist/esm/pm-plugins/keymap.js

@@ -1,43 +1,29 @@
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import * as keymaps from '@atlaskit/editor-common/keymaps';
+import { bindKeymapWithPluginCommand, toggleBold, toggleCode, toggleItalic, toggleStrikethrough, toggleSubscript, toggleSuperscript, toggleUnderline } from '@atlaskit/editor-common/keymaps';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from '../actions';
+import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from '../commands';
 export default function keymapPlugin(schema, editorAnalyticsAPI) {
   var list = {};
   if (schema.marks.strong) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleBold.common, toggleStrongWithAnalytics(editorAnalyticsAPI)({
-      inputMethod: INPUT_METHOD.SHORTCUT
-    }), list);
+    bindKeymapWithPluginCommand(toggleBold.common, toggleStrongWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
   }
   if (schema.marks.em) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleItalic.common, toggleEmWithAnalytics(editorAnalyticsAPI)({
-      inputMethod: INPUT_METHOD.SHORTCUT
-    }), list);
+    bindKeymapWithPluginCommand(toggleItalic.common, toggleEmWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
   }
   if (schema.marks.code) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleCode.common, toggleCodeWithAnalytics(editorAnalyticsAPI)({
-      inputMethod: INPUT_METHOD.SHORTCUT
-    }), list);
+    bindKeymapWithPluginCommand(toggleCode.common, toggleCodeWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
   }
   if (schema.marks.strike) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleStrikethrough.common, toggleStrikeWithAnalytics(editorAnalyticsAPI)({
-      inputMethod: INPUT_METHOD.SHORTCUT
-    }), list);
+    bindKeymapWithPluginCommand(toggleStrikethrough.common, toggleStrikeWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
   }
   if (schema.marks.subsup) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleSubscript.common, toggleSubscriptWithAnalytics(editorAnalyticsAPI)({
-      inputMethod: INPUT_METHOD.SHORTCUT
-    }), list);
+    bindKeymapWithPluginCommand(toggleSubscript.common, toggleSubscriptWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
   }
   if (schema.marks.subsup) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleSuperscript.common, toggleSuperscriptWithAnalytics(editorAnalyticsAPI)({
-      inputMethod: INPUT_METHOD.SHORTCUT
-    }), list);
+    bindKeymapWithPluginCommand(toggleSuperscript.common, toggleSuperscriptWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
   }
   if (schema.marks.underline) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleUnderline.common, toggleUnderlineWithAnalytics(editorAnalyticsAPI)({
-      inputMethod: INPUT_METHOD.SHORTCUT
-    }), list);
+    bindKeymapWithPluginCommand(toggleUnderline.common, toggleUnderlineWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
   }
   return keymap(list);
 }