@atlaskit/editor-core 187.10.6 → 187.11.0

package/dist/esm/plugins/media/utils/media-single.js

@@ -5,18 +5,16 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { safeInsert as pmSafeInsert, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { checkNodeDown } from '../../../utils';
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
-import { MEDIA_SINGLE_MIN_PIXEL_WIDTH } from '@atlaskit/editor-common/media-single';
+import { getMediaSingleInitialWidth } from '@atlaskit/editor-common/media-single';
 import { copyOptionalAttrsFromMediaState } from '../utils/media-common';
 import { mapSlice } from '../../../utils/slice';
 import { addAnalytics } from '../../analytics';
-import { akEditorDefaultLayoutWidth } from '@atlaskit/editor-shared-styles';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { safeInsert, shouldSplitSelectedNodeOnNodeInsertion } from '@atlaskit/editor-common/insert';
 import { isImage } from './is-image';
 import { atTheBeginningOfBlock } from '../../../utils/prosemirror/position';
 import { getRandomHex } from '@atlaskit/media-common';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
-import { DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/ui';
 var getInsertMediaAnalytics = function getInsertMediaAnalytics(inputMethod, fileExtension) {
   return {
     action: ACTION.INSERTED,
@@ -94,7 +92,9 @@ export var insertMediaSingleNode = function insertMediaSingleNode(view, mediaSta
   // add undefined as fallback as we don't want media single width to have upper limit as 0
   // if widthPluginState.width is 0, default 760 will be used
   var contentWidth = (widthPluginState === null || widthPluginState === void 0 ? void 0 : widthPluginState.lineLength) || (widthPluginState === null || widthPluginState === void 0 ? void 0 : widthPluginState.width) || undefined;
-  var node = createMediaSingleNode(state.schema, collection, contentWidth, undefined, alignLeftOnInsert)(mediaState);
+  var node = createMediaSingleNode(state.schema, collection, contentWidth,
+  // pass undefined to use default min width
+  undefined, alignLeftOnInsert)(mediaState);
   var fileExtension;
   if (mediaState.fileName) {
     var extensionIdx = mediaState.fileName.lastIndexOf('.');
@@ -127,10 +127,7 @@ export var insertMediaSingleNode = function insertMediaSingleNode(view, mediaSta
   }
   return true;
 };
-export var createMediaSingleNode = function createMediaSingleNode(schema, collection) {
-  var maxWidth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : akEditorDefaultLayoutWidth;
-  var minWidth = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : MEDIA_SINGLE_MIN_PIXEL_WIDTH;
-  var alignLeftOnInsert = arguments.length > 4 ? arguments[4] : undefined;
+export var createMediaSingleNode = function createMediaSingleNode(schema, collection, maxWidth, minWidth, alignLeftOnInsert) {
   return function (mediaState) {
     var id = mediaState.id,
       dimensions = mediaState.dimensions,
@@ -159,8 +156,7 @@ export var createMediaSingleNode = function createMediaSingleNode(schema, collec
       layout: 'align-start'
     } : {};
     var extendedMediaSingleAttrs = getBooleanFF('platform.editor.media.extended-resize-experience') ? _objectSpread(_objectSpread({}, mediaSingleAttrs), {}, {
-      // constrain initial width between max width (editor content width) and min width (default to 24)
-      width: Math.max(Math.min(scaledWidth || DEFAULT_IMAGE_WIDTH, maxWidth), minWidth),
+      width: getMediaSingleInitialWidth(scaledWidth, maxWidth, minWidth),
       // TODO: change to use enum
       widthType: 'pixel'
     }) : mediaSingleAttrs;

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

@@ -16,16 +16,16 @@ import { compose, insideTable, isParagraph, isText, isLinkMark, insideTableCell,
 import { mapSlice } from '../../utils/slice';
 import { INPUT_METHOD } from '../analytics';
 import { GapCursorSelection, Side } from '../selection/gap-cursor-selection';
-import { linkifyContent } from '@atlaskit/editor-common/utils';
 import { runMacroAutoConvert } from '../macro';
 import { insertMediaAsMediaSingle } from '../media/utils/media-single';
-import { pluginKey as textFormattingPluginKey } from '../text-formatting/pm-plugins/main';
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType } from './util';
-import { isListItemNode, isListNode, canLinkBeCreatedInRange } from '@atlaskit/editor-common/utils';
+import { linkifyContent, isListItemNode, isListNode, canLinkBeCreatedInRange } from '@atlaskit/editor-common/utils';
 import { insertSliceForLists } from './edge-cases';
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
 import { doesSelectionWhichStartsOrEndsInListContainEntireList } from '../../utils/lists';
+import { anyMarkActive } from '@atlaskit/editor-common/mark';
+
 // remove text attribute from mention for copy/paste (GDPR)
 export function handleMention(slice, schema) {
   return mapSlice(slice, function (node) {
@@ -86,8 +86,7 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
     }
     var filters = [linkifyContent(schema)];
     var selectionMarks = selection.$head.marks();
-    var textFormattingState = textFormattingPluginKey.getState(state);
-    if (selection instanceof TextSelection && Array.isArray(selectionMarks) && selectionMarks.length > 0 && 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 TextSelection && Array.isArray(selectionMarks) && selectionMarks.length > 0 && hasOnlyNodesOfType(paragraph, text, emoji, mention, hardBreak)(slice) && (!codeMark.isInSet(selectionMarks) || anyMarkActive(state, codeMark)) // check if there is a code mark anywhere in the selection
     ) {
       filters.push(applyTextMarksToSlice(schema, selection.$head.marks()));
     }
@@ -362,11 +361,10 @@ export function handlePastePreservingMarks(slice, queueCardsFromChangedTr) {
     if (selectionMarks.length === 0) {
       return false;
     }
-    var textFormattingState = textFormattingPluginKey.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) && !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/esm/plugins/text-formatting/actions.js

@@ -0,0 +1,168 @@
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
+import { toggleMark } from '@atlaskit/editor-common/mark';
+export var toggleEm = function toggleEm() {
+  return function (state, dispatch) {
+    var em = state.schema.marks.em;
+    if (em) {
+      return toggleMark(em)(state, dispatch);
+    }
+    return false;
+  };
+};
+export var toggleEmWithAnalytics = function toggleEmWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref) {
+    var inputMethod = _ref.inputMethod;
+    return withAnalytics(editorAnalyticsAPI, {
+      action: ACTION.FORMATTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      eventType: EVENT_TYPE.TRACK,
+      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_ITALIC,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleEm());
+  };
+};
+export var toggleStrike = function toggleStrike() {
+  return function (state, dispatch) {
+    var strike = state.schema.marks.strike;
+    if (strike) {
+      return toggleMark(strike)(state, dispatch);
+    }
+    return false;
+  };
+};
+export var toggleStrikeWithAnalytics = function toggleStrikeWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref2) {
+    var inputMethod = _ref2.inputMethod;
+    return withAnalytics(editorAnalyticsAPI, {
+      action: ACTION.FORMATTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      eventType: EVENT_TYPE.TRACK,
+      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_STRIKE,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleStrike());
+  };
+};
+export var toggleStrong = function toggleStrong() {
+  return function (state, dispatch) {
+    var strong = state.schema.marks.strong;
+    if (strong) {
+      return toggleMark(strong)(state, dispatch);
+    }
+    return false;
+  };
+};
+export var toggleStrongWithAnalytics = function toggleStrongWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref3) {
+    var inputMethod = _ref3.inputMethod;
+    return withAnalytics(editorAnalyticsAPI, {
+      action: ACTION.FORMATTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      eventType: EVENT_TYPE.TRACK,
+      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_STRONG,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleStrong());
+  };
+};
+export var toggleUnderline = function toggleUnderline() {
+  return function (state, dispatch) {
+    var underline = state.schema.marks.underline;
+    if (underline) {
+      return toggleMark(underline)(state, dispatch);
+    }
+    return false;
+  };
+};
+export var toggleUnderlineWithAnalytics = function toggleUnderlineWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref4) {
+    var inputMethod = _ref4.inputMethod;
+    return withAnalytics(editorAnalyticsAPI, {
+      action: ACTION.FORMATTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      eventType: EVENT_TYPE.TRACK,
+      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_UNDERLINE,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleUnderline());
+  };
+};
+export var toggleSuperscript = function toggleSuperscript() {
+  return function (state, dispatch) {
+    var subsup = state.schema.marks.subsup;
+    if (subsup) {
+      return toggleMark(subsup, {
+        type: 'sup'
+      })(state, dispatch);
+    }
+    return false;
+  };
+};
+export var toggleSuperscriptWithAnalytics = function toggleSuperscriptWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref5) {
+    var inputMethod = _ref5.inputMethod;
+    return withAnalytics(editorAnalyticsAPI, {
+      action: ACTION.FORMATTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      eventType: EVENT_TYPE.TRACK,
+      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_SUPER,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleSuperscript());
+  };
+};
+export var toggleSubscript = function toggleSubscript() {
+  return function (state, dispatch) {
+    var subsup = state.schema.marks.subsup;
+    if (subsup) {
+      return toggleMark(subsup, {
+        type: 'sub'
+      })(state, dispatch);
+    }
+    return false;
+  };
+};
+export var toggleSubscriptWithAnalytics = function toggleSubscriptWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref6) {
+    var inputMethod = _ref6.inputMethod;
+    return withAnalytics(editorAnalyticsAPI, {
+      action: ACTION.FORMATTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      eventType: EVENT_TYPE.TRACK,
+      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_SUB,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleSubscript());
+  };
+};
+export var toggleCode = function toggleCode() {
+  return function (state, dispatch) {
+    var code = state.schema.marks.code;
+    if (code) {
+      return toggleMark(code)(state, dispatch);
+    }
+    return false;
+  };
+};
+export var toggleCodeWithAnalytics = function toggleCodeWithAnalytics(editorAnalyticsAPI) {
+  return function (_ref7) {
+    var inputMethod = _ref7.inputMethod;
+    return withAnalytics(editorAnalyticsAPI, {
+      action: ACTION.FORMATTED,
+      actionSubject: ACTION_SUBJECT.TEXT,
+      eventType: EVENT_TYPE.TRACK,
+      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_CODE,
+      attributes: {
+        inputMethod: inputMethod
+      }
+    })(toggleCode());
+  };
+};

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

@@ -1,5 +1,5 @@
 import { Selection } from '@atlaskit/editor-prosemirror/state';
-import { applyMarkOnRange, toggleMark } from '@atlaskit/editor-common/mark';
+import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { hasCode, markActive } from '../utils';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
@@ -97,171 +97,6 @@ export var moveLeft = function moveLeft() {
     return false;
   };
 };
-export var toggleEm = function toggleEm() {
-  return function (state, dispatch) {
-    var em = state.schema.marks.em;
-    if (em) {
-      return toggleMark(em)(state, dispatch);
-    }
-    return false;
-  };
-};
-export var toggleEmWithAnalytics = function toggleEmWithAnalytics(editorAnalyticsAPI) {
-  return function (_ref3) {
-    var inputMethod = _ref3.inputMethod;
-    return withAnalytics(editorAnalyticsAPI, {
-      action: ACTION.FORMATTED,
-      actionSubject: ACTION_SUBJECT.TEXT,
-      eventType: EVENT_TYPE.TRACK,
-      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_ITALIC,
-      attributes: {
-        inputMethod: inputMethod
-      }
-    })(toggleEm());
-  };
-};
-export var toggleStrike = function toggleStrike() {
-  return function (state, dispatch) {
-    var strike = state.schema.marks.strike;
-    if (strike) {
-      return toggleMark(strike)(state, dispatch);
-    }
-    return false;
-  };
-};
-export var toggleStrikeWithAnalytics = function toggleStrikeWithAnalytics(editorAnalyticsAPI) {
-  return function (_ref4) {
-    var inputMethod = _ref4.inputMethod;
-    return withAnalytics(editorAnalyticsAPI, {
-      action: ACTION.FORMATTED,
-      actionSubject: ACTION_SUBJECT.TEXT,
-      eventType: EVENT_TYPE.TRACK,
-      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_STRIKE,
-      attributes: {
-        inputMethod: inputMethod
-      }
-    })(toggleStrike());
-  };
-};
-export var toggleStrong = function toggleStrong() {
-  return function (state, dispatch) {
-    var strong = state.schema.marks.strong;
-    if (strong) {
-      return toggleMark(strong)(state, dispatch);
-    }
-    return false;
-  };
-};
-export var toggleStrongWithAnalytics = function toggleStrongWithAnalytics(editorAnalyticsAPI) {
-  return function (_ref5) {
-    var inputMethod = _ref5.inputMethod;
-    return withAnalytics(editorAnalyticsAPI, {
-      action: ACTION.FORMATTED,
-      actionSubject: ACTION_SUBJECT.TEXT,
-      eventType: EVENT_TYPE.TRACK,
-      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_STRONG,
-      attributes: {
-        inputMethod: inputMethod
-      }
-    })(toggleStrong());
-  };
-};
-export var toggleUnderline = function toggleUnderline() {
-  return function (state, dispatch) {
-    var underline = state.schema.marks.underline;
-    if (underline) {
-      return toggleMark(underline)(state, dispatch);
-    }
-    return false;
-  };
-};
-export var toggleUnderlineWithAnalytics = function toggleUnderlineWithAnalytics(editorAnalyticsAPI) {
-  return function (_ref6) {
-    var inputMethod = _ref6.inputMethod;
-    return withAnalytics(editorAnalyticsAPI, {
-      action: ACTION.FORMATTED,
-      actionSubject: ACTION_SUBJECT.TEXT,
-      eventType: EVENT_TYPE.TRACK,
-      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_UNDERLINE,
-      attributes: {
-        inputMethod: inputMethod
-      }
-    })(toggleUnderline());
-  };
-};
-export var toggleSuperscript = function toggleSuperscript() {
-  return function (state, dispatch) {
-    var subsup = state.schema.marks.subsup;
-    if (subsup) {
-      return toggleMark(subsup, {
-        type: 'sup'
-      })(state, dispatch);
-    }
-    return false;
-  };
-};
-export var toggleSuperscriptWithAnalytics = function toggleSuperscriptWithAnalytics(editorAnalyticsAPI) {
-  return function (_ref7) {
-    var inputMethod = _ref7.inputMethod;
-    return withAnalytics(editorAnalyticsAPI, {
-      action: ACTION.FORMATTED,
-      actionSubject: ACTION_SUBJECT.TEXT,
-      eventType: EVENT_TYPE.TRACK,
-      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_SUPER,
-      attributes: {
-        inputMethod: inputMethod
-      }
-    })(toggleSuperscript());
-  };
-};
-export var toggleSubscript = function toggleSubscript() {
-  return function (state, dispatch) {
-    var subsup = state.schema.marks.subsup;
-    if (subsup) {
-      return toggleMark(subsup, {
-        type: 'sub'
-      })(state, dispatch);
-    }
-    return false;
-  };
-};
-export var toggleSubscriptWithAnalytics = function toggleSubscriptWithAnalytics(editorAnalyticsAPI) {
-  return function (_ref8) {
-    var inputMethod = _ref8.inputMethod;
-    return withAnalytics(editorAnalyticsAPI, {
-      action: ACTION.FORMATTED,
-      actionSubject: ACTION_SUBJECT.TEXT,
-      eventType: EVENT_TYPE.TRACK,
-      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_SUB,
-      attributes: {
-        inputMethod: inputMethod
-      }
-    })(toggleSubscript());
-  };
-};
-export var toggleCode = function toggleCode() {
-  return function (state, dispatch) {
-    var code = state.schema.marks.code;
-    if (code) {
-      return toggleMark(code)(state, dispatch);
-    }
-    return false;
-  };
-};
-export var toggleCodeWithAnalytics = function toggleCodeWithAnalytics(editorAnalyticsAPI) {
-  return function (_ref9) {
-    var inputMethod = _ref9.inputMethod;
-    return withAnalytics(editorAnalyticsAPI, {
-      action: ACTION.FORMATTED,
-      actionSubject: ACTION_SUBJECT.TEXT,
-      eventType: EVENT_TYPE.TRACK,
-      actionSubjectId: ACTION_SUBJECT_ID.FORMAT_CODE,
-      attributes: {
-        inputMethod: inputMethod
-      }
-    })(toggleCode());
-  };
-};
 var createInlineCodeFromTextInput = function createInlineCodeFromTextInput(from, to, text) {
   return function (state, dispatch) {
     if (state.selection.empty) {

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

@@ -9,6 +9,7 @@ import textFormattingInputRulePlugin from './pm-plugins/input-rule';
 import keymapPlugin from './pm-plugins/keymap';
 import textFormattingSmartInputRulePlugin from './pm-plugins/smart-input-rule';
 import Toolbar from './ui/Toolbar';
+import { toggleSuperscript, toggleSuperscriptWithAnalytics, toggleSubscript, toggleSubscriptWithAnalytics, toggleStrike, toggleStrikeWithAnalytics, toggleCode, toggleCodeWithAnalytics, toggleUnderline, toggleUnderlineWithAnalytics, toggleEm, toggleEmWithAnalytics, toggleStrong, toggleStrongWithAnalytics } from './actions';
 var textFormatting = function textFormatting() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var api = arguments.length > 1 ? arguments[1] : undefined;
@@ -111,6 +112,22 @@ var textFormatting = function textFormatting() {
           });
         }
       });
+    },
+    actions: {
+      toggleSuperscript: toggleSuperscript,
+      toggleSuperscriptWithAnalytics: toggleSuperscriptWithAnalytics,
+      toggleSubscript: toggleSubscript,
+      toggleSubscriptWithAnalytics: toggleSubscriptWithAnalytics,
+      toggleStrike: toggleStrike,
+      toggleStrikeWithAnalytics: toggleStrikeWithAnalytics,
+      toggleCode: toggleCode,
+      toggleCodeWithAnalytics: toggleCodeWithAnalytics,
+      toggleUnderline: toggleUnderline,
+      toggleUnderlineWithAnalytics: toggleUnderlineWithAnalytics,
+      toggleEm: toggleEm,
+      toggleEmWithAnalytics: toggleEmWithAnalytics,
+      toggleStrong: toggleStrong,
+      toggleStrongWithAnalytics: toggleStrongWithAnalytics
     }
   };
 };

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

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

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

@@ -6,7 +6,7 @@ import * as keymaps from '@atlaskit/editor-common/keymaps';
 import { shallowEqual } from '@atlaskit/editor-common/utils';
 import { createInlineCodeFromTextInputWithAnalytics } from '../commands/text-formatting';
 import * as commands from '../commands/text-formatting';
-import { anyMarkActive } from '../utils';
+import { anyMarkActive } from '@atlaskit/editor-common/mark';
 import { pluginKey } from './plugin-key';
 export { pluginKey };
 var getTextFormattingState = function getTextFormattingState(editorState, editorAnalyticsAPI) {

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

@@ -2,7 +2,7 @@
 import { useCallback, useMemo } from 'react';
 import { jsx } from '@emotion/react';
 import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
-import { toolbarMessages } from '../toolbar-messages';
+import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { clearFormattingWithAnalytics } from '../../../commands/clear-formatting';
 import { pluginKey as clearFormattingPluginKey } from '../../../pm-plugins/clear-formatting';
 import { clearFormatting as clearFormattingKeymap, tooltip } from '@atlaskit/editor-common/keymaps';

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

@@ -6,8 +6,8 @@ import { jsx } from '@emotion/react';
 import BoldIcon from '@atlaskit/icon/glyph/editor/bold';
 import ItalicIcon from '@atlaskit/icon/glyph/editor/italic';
 import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
-import { toolbarMessages } from '../toolbar-messages';
-import * as commands from '../../../commands/text-formatting';
+import { toolbarMessages } from '@atlaskit/editor-common/messages';
+import { toggleStrongWithAnalytics, toggleEmWithAnalytics, toggleCodeWithAnalytics, toggleStrikeWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from '../../../actions';
 import { TOOLBAR_ACTION_SUBJECT_ID, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { pluginKey as textFormattingPluginKey } from '../../../pm-plugins/plugin-key';
 import { toggleCode, toggleStrikethrough, toggleUnderline, tooltip, toggleBold, toggleItalic, toggleSubscript, toggleSuperscript, ToolTipContent, getAriaKeyshortcuts } from '@atlaskit/editor-common/keymaps';
@@ -21,7 +21,7 @@ var IconButtons = function IconButtons(editorAnalyticsAPI) {
   return {
     strong: {
       buttonId: TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_STRONG,
-      command: withToolbarInputMethod(commands.toggleStrongWithAnalytics(editorAnalyticsAPI)),
+      command: withToolbarInputMethod(toggleStrongWithAnalytics(editorAnalyticsAPI)),
       message: toolbarMessages.bold,
       tooltipKeymap: toggleBold,
       component: function component() {
@@ -32,7 +32,7 @@ var IconButtons = function IconButtons(editorAnalyticsAPI) {
     },
     em: {
       buttonId: TOOLBAR_ACTION_SUBJECT_ID.TEXT_FORMATTING_ITALIC,
-      command: withToolbarInputMethod(commands.toggleEmWithAnalytics(editorAnalyticsAPI)),
+      command: withToolbarInputMethod(toggleEmWithAnalytics(editorAnalyticsAPI)),
       message: toolbarMessages.italic,
       tooltipKeymap: toggleItalic,
       component: function component() {
@@ -42,27 +42,27 @@ var IconButtons = function IconButtons(editorAnalyticsAPI) {
       }
     },
     underline: {
-      command: withToolbarInputMethod(commands.toggleUnderlineWithAnalytics(editorAnalyticsAPI)),
+      command: withToolbarInputMethod(toggleUnderlineWithAnalytics(editorAnalyticsAPI)),
       message: toolbarMessages.underline,
       tooltipKeymap: toggleUnderline
     },
     strike: {
-      command: withToolbarInputMethod(commands.toggleStrikeWithAnalytics(editorAnalyticsAPI)),
+      command: withToolbarInputMethod(toggleStrikeWithAnalytics(editorAnalyticsAPI)),
       message: toolbarMessages.strike,
       tooltipKeymap: toggleStrikethrough
     },
     code: {
-      command: withToolbarInputMethod(commands.toggleCodeWithAnalytics(editorAnalyticsAPI)),
+      command: withToolbarInputMethod(toggleCodeWithAnalytics(editorAnalyticsAPI)),
       message: toolbarMessages.code,
       tooltipKeymap: toggleCode
     },
     subscript: {
-      command: withToolbarInputMethod(commands.toggleSubscriptWithAnalytics(editorAnalyticsAPI)),
+      command: withToolbarInputMethod(toggleSubscriptWithAnalytics(editorAnalyticsAPI)),
       message: toolbarMessages.subscript,
       tooltipKeymap: toggleSubscript
     },
     superscript: {
-      command: withToolbarInputMethod(commands.toggleSuperscriptWithAnalytics(editorAnalyticsAPI)),
+      command: withToolbarInputMethod(toggleSuperscriptWithAnalytics(editorAnalyticsAPI)),
       message: toolbarMessages.superscript,
       tooltipKeymap: toggleSuperscript
     }

package/dist/esm/plugins/text-formatting/ui/Toolbar/index.js

@@ -18,7 +18,7 @@ import { useResponsiveToolbarButtons, useResponsiveIconTypeMenu } from './hooks/
 import { SingleToolbarButtons } from './single-toolbar-buttons';
 import { MoreButton } from './more-button';
 import { FormattingTextDropdownMenu } from './dropdown-menu';
-import { toolbarMessages } from './toolbar-messages';
+import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { compareItemsArrays, isArrayContainsContent } from '../../utils';
 import { Announcer } from '@atlaskit/editor-common/ui';
 import { usePreviousState } from '@atlaskit/editor-common/hooks';