@atlaskit/editor-core 187.10.6 → 187.11.0

package/dist/cjs/plugins/paste/handlers.js

@@ -34,15 +34,15 @@ var _utils3 = require("../../utils");
 var _slice = require("../../utils/slice");
 var _analytics = require("../analytics");
 var _gapCursorSelection = require("../selection/gap-cursor-selection");
-var _utils4 = require("@atlaskit/editor-common/utils");
 var _macro = require("../macro");
 var _mediaSingle = require("../media/utils/media-single");
-var _main = require("../text-formatting/pm-plugins/main");
 var _util = require("./util");
+var _utils4 = require("@atlaskit/editor-common/utils");
 var _edgeCases = require("./edge-cases");
 var _commands = require("./commands");
 var _pluginFactory = require("./pm-plugins/plugin-factory");
 var _lists = require("../../utils/lists");
+var _mark = require("@atlaskit/editor-common/mark");
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 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; }
@@ -108,8 +108,7 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
     }
     var filters = [(0, _utils4.linkifyContent)(schema)];
     var selectionMarks = selection.$head.marks();
-    var textFormattingState = _main.pluginKey.getState(state);
-    if (selection instanceof _state.TextSelection && Array.isArray(selectionMarks) && selectionMarks.length > 0 && (0, _util.hasOnlyNodesOfType)(paragraph, text, emoji, mention, hardBreak)(slice) && (!codeMark.isInSet(selectionMarks) || textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.codeActive) // for codeMarks let's make sure mark is active
+    if (selection instanceof _state.TextSelection && Array.isArray(selectionMarks) && selectionMarks.length > 0 && (0, _util.hasOnlyNodesOfType)(paragraph, text, emoji, mention, hardBreak)(slice) && (!codeMark.isInSet(selectionMarks) || (0, _mark.anyMarkActive)(state, codeMark)) // check if there is a code mark anywhere in the selection
     ) {
       filters.push((0, _util.applyTextMarksToSlice)(schema, selection.$head.marks()));
     }
@@ -384,11 +383,10 @@ function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
     if (selectionMarks.length === 0) {
       return false;
     }
-    var textFormattingState = _main.pluginKey.getState(state);
 
     // special case for codeMark: will preserve mark only if codeMark is currently active
     // won't preserve mark if cursor is on the edge on the mark (namely inactive)
-    if (codeMark.isInSet(selectionMarks) && !(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.codeActive)) {
+    if (codeMark.isInSet(selectionMarks) && !(0, _mark.anyMarkActive)(state, codeMark)) {
       return false;
     }
     var isPlainTextSlice = slice.content.childCount === 1 && slice.content.firstChild.type === paragraph && slice.content.firstChild.content.childCount === 1 && slice.content.firstChild.firstChild.type === text;

package/dist/cjs/plugins/text-formatting/actions.js

@@ -0,0 +1,188 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.toggleUnderlineWithAnalytics = exports.toggleUnderline = exports.toggleSuperscriptWithAnalytics = exports.toggleSuperscript = exports.toggleSubscriptWithAnalytics = exports.toggleSubscript = exports.toggleStrongWithAnalytics = exports.toggleStrong = exports.toggleStrikeWithAnalytics = exports.toggleStrike = exports.toggleEmWithAnalytics = exports.toggleEm = exports.toggleCodeWithAnalytics = exports.toggleCode = void 0;
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
+var _mark = require("@atlaskit/editor-common/mark");
+var toggleEm = function toggleEm() {
+  return function (state, dispatch) {
+    var em = state.schema.marks.em;
+    if (em) {
+      return (0, _mark.toggleMark)(em)(state, dispatch);
+    }
+    return false;
+  };
+};
+exports.toggleEm = toggleEm;
+var toggleEmWithAnalytics = function toggleEmWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref) {
+    var inputMethod = _ref.inputMethod;
+    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_ITALIC,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleEm());
+  };
+};
+exports.toggleEmWithAnalytics = toggleEmWithAnalytics;
+var toggleStrike = function toggleStrike() {
+  return function (state, dispatch) {
+    var strike = state.schema.marks.strike;
+    if (strike) {
+      return (0, _mark.toggleMark)(strike)(state, dispatch);
+    }
+    return false;
+  };
+};
+exports.toggleStrike = toggleStrike;
+var toggleStrikeWithAnalytics = function toggleStrikeWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref2) {
+    var inputMethod = _ref2.inputMethod;
+    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_STRIKE,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleStrike());
+  };
+};
+exports.toggleStrikeWithAnalytics = toggleStrikeWithAnalytics;
+var toggleStrong = function toggleStrong() {
+  return function (state, dispatch) {
+    var strong = state.schema.marks.strong;
+    if (strong) {
+      return (0, _mark.toggleMark)(strong)(state, dispatch);
+    }
+    return false;
+  };
+};
+exports.toggleStrong = toggleStrong;
+var toggleStrongWithAnalytics = function toggleStrongWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref3) {
+    var inputMethod = _ref3.inputMethod;
+    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_STRONG,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleStrong());
+  };
+};
+exports.toggleStrongWithAnalytics = toggleStrongWithAnalytics;
+var toggleUnderline = function toggleUnderline() {
+  return function (state, dispatch) {
+    var underline = state.schema.marks.underline;
+    if (underline) {
+      return (0, _mark.toggleMark)(underline)(state, dispatch);
+    }
+    return false;
+  };
+};
+exports.toggleUnderline = toggleUnderline;
+var toggleUnderlineWithAnalytics = function toggleUnderlineWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref4) {
+    var inputMethod = _ref4.inputMethod;
+    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_UNDERLINE,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleUnderline());
+  };
+};
+exports.toggleUnderlineWithAnalytics = toggleUnderlineWithAnalytics;
+var toggleSuperscript = function toggleSuperscript() {
+  return function (state, dispatch) {
+    var subsup = state.schema.marks.subsup;
+    if (subsup) {
+      return (0, _mark.toggleMark)(subsup, {
+        type: 'sup'
+      })(state, dispatch);
+    }
+    return false;
+  };
+};
+exports.toggleSuperscript = toggleSuperscript;
+var toggleSuperscriptWithAnalytics = function toggleSuperscriptWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref5) {
+    var inputMethod = _ref5.inputMethod;
+    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_SUPER,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleSuperscript());
+  };
+};
+exports.toggleSuperscriptWithAnalytics = toggleSuperscriptWithAnalytics;
+var toggleSubscript = function toggleSubscript() {
+  return function (state, dispatch) {
+    var subsup = state.schema.marks.subsup;
+    if (subsup) {
+      return (0, _mark.toggleMark)(subsup, {
+        type: 'sub'
+      })(state, dispatch);
+    }
+    return false;
+  };
+};
+exports.toggleSubscript = toggleSubscript;
+var toggleSubscriptWithAnalytics = function toggleSubscriptWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref6) {
+    var inputMethod = _ref6.inputMethod;
+    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_SUB,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleSubscript());
+  };
+};
+exports.toggleSubscriptWithAnalytics = toggleSubscriptWithAnalytics;
+var toggleCode = function toggleCode() {
+  return function (state, dispatch) {
+    var code = state.schema.marks.code;
+    if (code) {
+      return (0, _mark.toggleMark)(code)(state, dispatch);
+    }
+    return false;
+  };
+};
+exports.toggleCode = toggleCode;
+var toggleCodeWithAnalytics = function toggleCodeWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref7) {
+    var inputMethod = _ref7.inputMethod;
+    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_CODE,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleCode());
+  };
+};
+exports.toggleCodeWithAnalytics = toggleCodeWithAnalytics;

package/dist/cjs/plugins/text-formatting/commands/text-formatting.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toggleUnderlineWithAnalytics = exports.toggleUnderline = exports.toggleSuperscriptWithAnalytics = exports.toggleSuperscript = exports.toggleSubscriptWithAnalytics = exports.toggleSubscript = exports.toggleStrongWithAnalytics = exports.toggleStrong = exports.toggleStrikeWithAnalytics = exports.toggleStrike = exports.toggleEmWithAnalytics = exports.toggleEm = exports.toggleCodeWithAnalytics = exports.toggleCode = exports.moveRight = exports.moveLeft = exports.createInlineCodeFromTextInputWithAnalytics = void 0;
+exports.moveRight = exports.moveLeft = exports.createInlineCodeFromTextInputWithAnalytics = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _mark = require("@atlaskit/editor-common/mark");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -105,185 +105,6 @@ var moveLeft = function moveLeft() {
   };
 };
 exports.moveLeft = moveLeft;
-var toggleEm = function toggleEm() {
-  return function (state, dispatch) {
-    var em = state.schema.marks.em;
-    if (em) {
-      return (0, _mark.toggleMark)(em)(state, dispatch);
-    }
-    return false;
-  };
-};
-exports.toggleEm = toggleEm;
-var toggleEmWithAnalytics = function toggleEmWithAnalytics(editorAnalyticsAPI) {
-  return function (_ref3) {
-    var inputMethod = _ref3.inputMethod;
-    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_ITALIC,
-      attributes: {
-        inputMethod: inputMethod
-      }
-    })(toggleEm());
-  };
-};
-exports.toggleEmWithAnalytics = toggleEmWithAnalytics;
-var toggleStrike = function toggleStrike() {
-  return function (state, dispatch) {
-    var strike = state.schema.marks.strike;
-    if (strike) {
-      return (0, _mark.toggleMark)(strike)(state, dispatch);
-    }
-    return false;
-  };
-};
-exports.toggleStrike = toggleStrike;
-var toggleStrikeWithAnalytics = function toggleStrikeWithAnalytics(editorAnalyticsAPI) {
-  return function (_ref4) {
-    var inputMethod = _ref4.inputMethod;
-    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_STRIKE,
-      attributes: {
-        inputMethod: inputMethod
-      }
-    })(toggleStrike());
-  };
-};
-exports.toggleStrikeWithAnalytics = toggleStrikeWithAnalytics;
-var toggleStrong = function toggleStrong() {
-  return function (state, dispatch) {
-    var strong = state.schema.marks.strong;
-    if (strong) {
-      return (0, _mark.toggleMark)(strong)(state, dispatch);
-    }
-    return false;
-  };
-};
-exports.toggleStrong = toggleStrong;
-var toggleStrongWithAnalytics = function toggleStrongWithAnalytics(editorAnalyticsAPI) {
-  return function (_ref5) {
-    var inputMethod = _ref5.inputMethod;
-    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_STRONG,
-      attributes: {
-        inputMethod: inputMethod
-      }
-    })(toggleStrong());
-  };
-};
-exports.toggleStrongWithAnalytics = toggleStrongWithAnalytics;
-var toggleUnderline = function toggleUnderline() {
-  return function (state, dispatch) {
-    var underline = state.schema.marks.underline;
-    if (underline) {
-      return (0, _mark.toggleMark)(underline)(state, dispatch);
-    }
-    return false;
-  };
-};
-exports.toggleUnderline = toggleUnderline;
-var toggleUnderlineWithAnalytics = function toggleUnderlineWithAnalytics(editorAnalyticsAPI) {
-  return function (_ref6) {
-    var inputMethod = _ref6.inputMethod;
-    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_UNDERLINE,
-      attributes: {
-        inputMethod: inputMethod
-      }
-    })(toggleUnderline());
-  };
-};
-exports.toggleUnderlineWithAnalytics = toggleUnderlineWithAnalytics;
-var toggleSuperscript = function toggleSuperscript() {
-  return function (state, dispatch) {
-    var subsup = state.schema.marks.subsup;
-    if (subsup) {
-      return (0, _mark.toggleMark)(subsup, {
-        type: 'sup'
-      })(state, dispatch);
-    }
-    return false;
-  };
-};
-exports.toggleSuperscript = toggleSuperscript;
-var toggleSuperscriptWithAnalytics = function toggleSuperscriptWithAnalytics(editorAnalyticsAPI) {
-  return function (_ref7) {
-    var inputMethod = _ref7.inputMethod;
-    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_SUPER,
-      attributes: {
-        inputMethod: inputMethod
-      }
-    })(toggleSuperscript());
-  };
-};
-exports.toggleSuperscriptWithAnalytics = toggleSuperscriptWithAnalytics;
-var toggleSubscript = function toggleSubscript() {
-  return function (state, dispatch) {
-    var subsup = state.schema.marks.subsup;
-    if (subsup) {
-      return (0, _mark.toggleMark)(subsup, {
-        type: 'sub'
-      })(state, dispatch);
-    }
-    return false;
-  };
-};
-exports.toggleSubscript = toggleSubscript;
-var toggleSubscriptWithAnalytics = function toggleSubscriptWithAnalytics(editorAnalyticsAPI) {
-  return function (_ref8) {
-    var inputMethod = _ref8.inputMethod;
-    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_SUB,
-      attributes: {
-        inputMethod: inputMethod
-      }
-    })(toggleSubscript());
-  };
-};
-exports.toggleSubscriptWithAnalytics = toggleSubscriptWithAnalytics;
-var toggleCode = function toggleCode() {
-  return function (state, dispatch) {
-    var code = state.schema.marks.code;
-    if (code) {
-      return (0, _mark.toggleMark)(code)(state, dispatch);
-    }
-    return false;
-  };
-};
-exports.toggleCode = toggleCode;
-var toggleCodeWithAnalytics = function toggleCodeWithAnalytics(editorAnalyticsAPI) {
-  return function (_ref9) {
-    var inputMethod = _ref9.inputMethod;
-    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_CODE,
-      attributes: {
-        inputMethod: inputMethod
-      }
-    })(toggleCode());
-  };
-};
-exports.toggleCodeWithAnalytics = toggleCodeWithAnalytics;
 var createInlineCodeFromTextInput = function createInlineCodeFromTextInput(from, to, text) {
   return function (state, dispatch) {
     if (state.selection.empty) {

package/dist/cjs/plugins/text-formatting/index.js

@@ -16,6 +16,7 @@ var _inputRule = _interopRequireDefault(require("./pm-plugins/input-rule"));
 var _keymap = _interopRequireDefault(require("./pm-plugins/keymap"));
 var _smartInputRule = _interopRequireDefault(require("./pm-plugins/smart-input-rule"));
 var _Toolbar = _interopRequireDefault(require("./ui/Toolbar"));
+var _actions = require("./actions");
 var textFormatting = function textFormatting() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var api = arguments.length > 1 ? arguments[1] : undefined;
@@ -118,6 +119,22 @@ var textFormatting = function textFormatting() {
           });
         }
       });
+    },
+    actions: {
+      toggleSuperscript: _actions.toggleSuperscript,
+      toggleSuperscriptWithAnalytics: _actions.toggleSuperscriptWithAnalytics,
+      toggleSubscript: _actions.toggleSubscript,
+      toggleSubscriptWithAnalytics: _actions.toggleSubscriptWithAnalytics,
+      toggleStrike: _actions.toggleStrike,
+      toggleStrikeWithAnalytics: _actions.toggleStrikeWithAnalytics,
+      toggleCode: _actions.toggleCode,
+      toggleCodeWithAnalytics: _actions.toggleCodeWithAnalytics,
+      toggleUnderline: _actions.toggleUnderline,
+      toggleUnderlineWithAnalytics: _actions.toggleUnderlineWithAnalytics,
+      toggleEm: _actions.toggleEm,
+      toggleEmWithAnalytics: _actions.toggleEmWithAnalytics,
+      toggleStrong: _actions.toggleStrong,
+      toggleStrongWithAnalytics: _actions.toggleStrongWithAnalytics
     }
   };
 };

package/dist/cjs/plugins/text-formatting/pm-plugins/keymap.js

@@ -8,43 +8,43 @@ exports.default = keymapPlugin;
 var keymaps = _interopRequireWildcard(require("@atlaskit/editor-common/keymaps"));
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var commands = _interopRequireWildcard(require("../commands/text-formatting"));
+var _actions = require("../actions");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function keymapPlugin(schema, editorAnalyticsAPI) {
   var list = {};
   if (schema.marks.strong) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleBold.common, commands.toggleStrongWithAnalytics(editorAnalyticsAPI)({
+    keymaps.bindKeymapWithCommand(keymaps.toggleBold.common, (0, _actions.toggleStrongWithAnalytics)(editorAnalyticsAPI)({
       inputMethod: _analytics.INPUT_METHOD.SHORTCUT
     }), list);
   }
   if (schema.marks.em) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleItalic.common, commands.toggleEmWithAnalytics(editorAnalyticsAPI)({
+    keymaps.bindKeymapWithCommand(keymaps.toggleItalic.common, (0, _actions.toggleEmWithAnalytics)(editorAnalyticsAPI)({
       inputMethod: _analytics.INPUT_METHOD.SHORTCUT
     }), list);
   }
   if (schema.marks.code) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleCode.common, commands.toggleCodeWithAnalytics(editorAnalyticsAPI)({
+    keymaps.bindKeymapWithCommand(keymaps.toggleCode.common, (0, _actions.toggleCodeWithAnalytics)(editorAnalyticsAPI)({
       inputMethod: _analytics.INPUT_METHOD.SHORTCUT
     }), list);
   }
   if (schema.marks.strike) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleStrikethrough.common, commands.toggleStrikeWithAnalytics(editorAnalyticsAPI)({
+    keymaps.bindKeymapWithCommand(keymaps.toggleStrikethrough.common, (0, _actions.toggleStrikeWithAnalytics)(editorAnalyticsAPI)({
       inputMethod: _analytics.INPUT_METHOD.SHORTCUT
     }), list);
   }
   if (schema.marks.subsup) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleSubscript.common, commands.toggleSubscriptWithAnalytics(editorAnalyticsAPI)({
+    keymaps.bindKeymapWithCommand(keymaps.toggleSubscript.common, (0, _actions.toggleSubscriptWithAnalytics)(editorAnalyticsAPI)({
       inputMethod: _analytics.INPUT_METHOD.SHORTCUT
     }), list);
   }
   if (schema.marks.subsup) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleSuperscript.common, commands.toggleSuperscriptWithAnalytics(editorAnalyticsAPI)({
+    keymaps.bindKeymapWithCommand(keymaps.toggleSuperscript.common, (0, _actions.toggleSuperscriptWithAnalytics)(editorAnalyticsAPI)({
       inputMethod: _analytics.INPUT_METHOD.SHORTCUT
     }), list);
   }
   if (schema.marks.underline) {
-    keymaps.bindKeymapWithCommand(keymaps.toggleUnderline.common, commands.toggleUnderlineWithAnalytics(editorAnalyticsAPI)({
+    keymaps.bindKeymapWithCommand(keymaps.toggleUnderline.common, (0, _actions.toggleUnderlineWithAnalytics)(editorAnalyticsAPI)({
       inputMethod: _analytics.INPUT_METHOD.SHORTCUT
     }), list);
   }

package/dist/cjs/plugins/text-formatting/pm-plugins/main.js

@@ -16,7 +16,7 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var keymaps = _interopRequireWildcard(require("@atlaskit/editor-common/keymaps"));
 var _utils = require("@atlaskit/editor-common/utils");
 var commands = _interopRequireWildcard(require("../commands/text-formatting"));
-var _utils2 = require("../utils");
+var _mark = require("@atlaskit/editor-common/mark");
 var _pluginKey = require("./plugin-key");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -33,19 +33,19 @@ var getTextFormattingState = function getTextFormattingState(editorState, editor
     underline = _editorState$schema$m.underline;
   var state = {};
   if (code) {
-    state.codeActive = (0, _utils2.anyMarkActive)(editorState, code.create());
+    state.codeActive = (0, _mark.anyMarkActive)(editorState, code.create());
     state.codeDisabled = !(0, _commands.toggleMark)(code)(editorState);
   }
   if (em) {
-    state.emActive = (0, _utils2.anyMarkActive)(editorState, em);
+    state.emActive = (0, _mark.anyMarkActive)(editorState, em);
     state.emDisabled = state.codeActive ? true : !(0, _commands.toggleMark)(em)(editorState);
   }
   if (strike) {
-    state.strikeActive = (0, _utils2.anyMarkActive)(editorState, strike);
+    state.strikeActive = (0, _mark.anyMarkActive)(editorState, strike);
     state.strikeDisabled = state.codeActive ? true : !(0, _commands.toggleMark)(strike)(editorState);
   }
   if (strong) {
-    state.strongActive = (0, _utils2.anyMarkActive)(editorState, strong);
+    state.strongActive = (0, _mark.anyMarkActive)(editorState, strong);
     state.strongDisabled = state.codeActive ? true : !(0, _commands.toggleMark)(strong)(editorState);
   }
   if (subsup) {
@@ -55,17 +55,17 @@ var getTextFormattingState = function getTextFormattingState(editorState, editor
     var supMark = subsup.create({
       type: 'sup'
     });
-    state.subscriptActive = (0, _utils2.anyMarkActive)(editorState, subMark);
+    state.subscriptActive = (0, _mark.anyMarkActive)(editorState, subMark);
     state.subscriptDisabled = state.codeActive ? true : !(0, _commands.toggleMark)(subsup, {
       type: 'sub'
     })(editorState);
-    state.superscriptActive = (0, _utils2.anyMarkActive)(editorState, supMark);
+    state.superscriptActive = (0, _mark.anyMarkActive)(editorState, supMark);
     state.superscriptDisabled = state.codeActive ? true : !(0, _commands.toggleMark)(subsup, {
       type: 'sup'
     })(editorState);
   }
   if (underline) {
-    state.underlineActive = (0, _utils2.anyMarkActive)(editorState, underline);
+    state.underlineActive = (0, _mark.anyMarkActive)(editorState, underline);
     state.underlineDisabled = state.codeActive ? true : !(0, _commands.toggleMark)(underline)(editorState);
   }
   return state;

package/dist/cjs/plugins/text-formatting/ui/Toolbar/hooks/clear-formatting-icon.js

@@ -7,7 +7,7 @@ exports.useClearIcon = void 0;
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
-var _toolbarMessages = require("../toolbar-messages");
+var _messages = require("@atlaskit/editor-common/messages");
 var _clearFormatting = require("../../../commands/clear-formatting");
 var _clearFormatting2 = require("../../../pm-plugins/clear-formatting");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
@@ -26,7 +26,7 @@ var useClearIcon = function useClearIcon(_ref) {
   var pluginState = useClearFormattingPluginState(editorState);
   var isPluginAvailable = Boolean(pluginState);
   var formattingIsPresent = Boolean(pluginState === null || pluginState === void 0 ? void 0 : pluginState.formattingIsPresent);
-  var clearFormattingLabel = intl.formatMessage(_toolbarMessages.toolbarMessages.clearFormatting);
+  var clearFormattingLabel = intl.formatMessage(_messages.toolbarMessages.clearFormatting);
   var clearFormattingToolbar = (0, _react.useCallback)(function (state, dispatch) {
     return (0, _clearFormatting.clearFormattingWithAnalytics)(_analytics.INPUT_METHOD.TOOLBAR, editorAnalyticsAPI)(state, dispatch);
   }, [editorAnalyticsAPI]);

package/dist/cjs/plugins/text-formatting/ui/Toolbar/hooks/formatting-icons.js

@@ -12,8 +12,8 @@ var _react2 = require("@emotion/react");
 var _bold = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/bold"));
 var _italic = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/italic"));
 var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
-var _toolbarMessages = require("../toolbar-messages");
-var commands = _interopRequireWildcard(require("../../../commands/text-formatting"));
+var _messages = require("@atlaskit/editor-common/messages");
+var _actions = require("../../../actions");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _pluginKey = require("../../../pm-plugins/plugin-key");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
@@ -31,8 +31,8 @@ var IconButtons = function IconButtons(editorAnalyticsAPI) {
   return {
     strong: {
       buttonId: _analytics.TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_STRONG,
-      command: withToolbarInputMethod(commands.toggleStrongWithAnalytics(editorAnalyticsAPI)),
-      message: _toolbarMessages.toolbarMessages.bold,
+      command: withToolbarInputMethod((0, _actions.toggleStrongWithAnalytics)(editorAnalyticsAPI)),
+      message: _messages.toolbarMessages.bold,
       tooltipKeymap: _keymaps.toggleBold,
       component: function component() {
         return (0, _react2.jsx)(_bold.default, {
@@ -42,8 +42,8 @@ var IconButtons = function IconButtons(editorAnalyticsAPI) {
     },
     em: {
       buttonId: _analytics.TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_ITALIC,
-      command: withToolbarInputMethod(commands.toggleEmWithAnalytics(editorAnalyticsAPI)),
-      message: _toolbarMessages.toolbarMessages.italic,
+      command: withToolbarInputMethod((0, _actions.toggleEmWithAnalytics)(editorAnalyticsAPI)),
+      message: _messages.toolbarMessages.italic,
       tooltipKeymap: _keymaps.toggleItalic,
       component: function component() {
         return (0, _react2.jsx)(_italic.default, {
@@ -52,28 +52,28 @@ var IconButtons = function IconButtons(editorAnalyticsAPI) {
       }
     },
     underline: {
-      command: withToolbarInputMethod(commands.toggleUnderlineWithAnalytics(editorAnalyticsAPI)),
-      message: _toolbarMessages.toolbarMessages.underline,
+      command: withToolbarInputMethod((0, _actions.toggleUnderlineWithAnalytics)(editorAnalyticsAPI)),
+      message: _messages.toolbarMessages.underline,
       tooltipKeymap: _keymaps.toggleUnderline
     },
     strike: {
-      command: withToolbarInputMethod(commands.toggleStrikeWithAnalytics(editorAnalyticsAPI)),
-      message: _toolbarMessages.toolbarMessages.strike,
+      command: withToolbarInputMethod((0, _actions.toggleStrikeWithAnalytics)(editorAnalyticsAPI)),
+      message: _messages.toolbarMessages.strike,
       tooltipKeymap: _keymaps.toggleStrikethrough
     },
     code: {
-      command: withToolbarInputMethod(commands.toggleCodeWithAnalytics(editorAnalyticsAPI)),
-      message: _toolbarMessages.toolbarMessages.code,
+      command: withToolbarInputMethod((0, _actions.toggleCodeWithAnalytics)(editorAnalyticsAPI)),
+      message: _messages.toolbarMessages.code,
       tooltipKeymap: _keymaps.toggleCode
     },
     subscript: {
-      command: withToolbarInputMethod(commands.toggleSubscriptWithAnalytics(editorAnalyticsAPI)),
-      message: _toolbarMessages.toolbarMessages.subscript,
+      command: withToolbarInputMethod((0, _actions.toggleSubscriptWithAnalytics)(editorAnalyticsAPI)),
+      message: _messages.toolbarMessages.subscript,
       tooltipKeymap: _keymaps.toggleSubscript
     },
     superscript: {
-      command: withToolbarInputMethod(commands.toggleSuperscriptWithAnalytics(editorAnalyticsAPI)),
-      message: _toolbarMessages.toolbarMessages.superscript,
+      command: withToolbarInputMethod((0, _actions.toggleSuperscriptWithAnalytics)(editorAnalyticsAPI)),
+      message: _messages.toolbarMessages.superscript,
       tooltipKeymap: _keymaps.toggleSuperscript
     }
   };