@atlaskit/editor-core 187.10.8 → 187.11.0

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';

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

@@ -1,4 +1,4 @@
-import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { anyMarkActive } from '@atlaskit/editor-common/mark';
 import { FORMATTING_MARK_TYPES, FORMATTING_NODE_TYPES } from './commands/clear-formatting';
 export var hasCode = function hasCode(state, pos) {
   var code = state.schema.marks.code;
@@ -30,37 +30,10 @@ export var markActive = function markActive(state, mark) {
   });
   return found;
 };
-
-/**
- * Determine if a mark of a specific type exists anywhere in the selection.
- */
-export var anyMarkActive = function anyMarkActive(state, markType) {
+var blockStylingIsPresent = function blockStylingIsPresent(state) {
   var _state$selection2 = state.selection,
-    $from = _state$selection2.$from,
     from = _state$selection2.from,
-    to = _state$selection2.to,
-    empty = _state$selection2.empty;
-  if (empty) {
-    return !!markType.isInSet(state.storedMarks || $from.marks());
-  }
-  var rangeHasMark = false;
-  if (state.selection instanceof CellSelection) {
-    state.selection.forEachCell(function (cell, cellPos) {
-      var from = cellPos;
-      var to = cellPos + cell.nodeSize;
-      if (!rangeHasMark) {
-        rangeHasMark = state.doc.rangeHasMark(from, to, markType);
-      }
-    });
-  } else {
-    rangeHasMark = state.doc.rangeHasMark(from, to, markType);
-  }
-  return rangeHasMark;
-};
-var blockStylingIsPresent = function blockStylingIsPresent(state) {
-  var _state$selection3 = state.selection,
-    from = _state$selection3.from,
-    to = _state$selection3.to;
+    to = _state$selection2.to;
   var isBlockStyling = false;
   state.doc.nodesBetween(from, to, function (node) {
     if (FORMATTING_NODE_TYPES.indexOf(node.type.name) !== -1) {
@@ -74,9 +47,9 @@ var blockStylingIsPresent = function blockStylingIsPresent(state) {
 var marksArePresent = function marksArePresent(state) {
   var activeMarkTypes = FORMATTING_MARK_TYPES.filter(function (mark) {
     if (!!state.schema.marks[mark]) {
-      var _state$selection4 = state.selection,
-        $from = _state$selection4.$from,
-        empty = _state$selection4.empty;
+      var _state$selection3 = state.selection,
+        $from = _state$selection3.$from,
+        empty = _state$selection3.empty;
       var marks = state.schema.marks;
       if (empty) {
         return !!marks[mark].isInSet(state.storedMarks || $from.marks());

package/dist/esm/ui/ContentStyles/index.js

@@ -20,7 +20,6 @@ import { panelStyles } from '../../plugins/panel/styles';
 import { fakeCursorStyles } from '../../plugins/fake-text-cursor/styles';
 import { mentionsStyles } from '../../plugins/mentions/styles';
 import { emojiStyles } from '../../plugins/emoji/styles';
-import { textFormattingStyles } from '../../plugins/text-formatting/styles';
 import { placeholderTextStyles } from '../../plugins/placeholder-text/styles';
 import { extensionStyles } from '../../plugins/extension/ui/styles';
 import { expandStyles } from '../../plugins/expand/ui/styles';
@@ -30,12 +29,12 @@ import { taskDecisionStyles } from '../../plugins/tasks-and-decisions/styles';
 import { statusStyles } from '../../plugins/status/styles';
 import { dateStyles } from '../../plugins/date/styles';
 import { InlineNodeViewSharedStyles } from '../../nodeviews/getInlineNodeViewProducer.styles';
-import { linkSharedStyle } from '@atlaskit/editor-common/styles';
+import { linkSharedStyle, codeMarkSharedStyles } from '@atlaskit/editor-common/styles';
 export var linkStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ProseMirror {\n    ", "\n  }\n"])), linkSharedStyle);
 var contentStyles = function contentStyles(props) {
   return css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  .ProseMirror {\n    outline: none;\n    font-size: ", "px;\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n    ", ";\n  }\n\n  .ProseMirror[contenteditable='false'] .taskItemView-content-wrap {\n    pointer-events: none;\n    opacity: 0.7;\n  }\n\n  .ProseMirror-hideselection *::selection {\n    background: transparent;\n  }\n\n  .ProseMirror-hideselection *::-moz-selection {\n    background: transparent;\n  }\n\n  .ProseMirror-selectednode {\n    outline: none;\n  }\n\n  .ProseMirror-selectednode:empty {\n    outline: 2px solid ", ";\n  }\n\n  ", "\n  ", "\n  ", "\n\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", ";\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n  ", "\n\n  .panelView-content-wrap {\n    box-sizing: border-box;\n  }\n\n  .mediaGroupView-content-wrap ul {\n    padding: 0;\n  }\n\n  /** Needed to override any cleared floats, e.g. image wrapping */\n\n  div.fabric-editor-block-mark[class^='fabric-editor-align'] {\n    clear: none !important;\n  }\n\n  .fabric-editor-align-end {\n    text-align: right;\n  }\n\n  .fabric-editor-align-start {\n    text-align: left;\n  }\n\n  .fabric-editor-align-center {\n    text-align: center;\n  }\n\n  .pm-table-header-content-wrap :not(.fabric-editor-alignment),\n  .pm-table-header-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark,\n  .pm-table-cell-content-wrap\n    :not(p, .fabric-editor-block-mark)\n    + div.fabric-editor-block-mark {\n    p:first-of-type {\n      margin-top: 0;\n    }\n  }\n\n  .hyperlink-floating-toolbar,\n  .", " {\n    padding: 0;\n  }\n\n  /* Link icon in the Atlaskit package\n     is bigger than the others\n  */\n  .hyperlink-open-link {\n    svg {\n      max-width: 18px;\n    }\n    &[href] {\n      padding: 0 4px;\n    }\n  }\n"])), editorFontSize({
     theme: props.theme
-  }), whitespaceSharedStyles, paragraphSharedStyles, listsSharedStyles, indentationSharedStyles, shadowSharedStyle, InlineNodeViewSharedStyles, "var(--ds-border-focused, #8cf)", placeholderTextStyles, placeholderStyles, codeBlockStyles(props), blocktypeStyles(props), textFormattingStyles(props), textColorStyles, listsStyles, ruleStyles(props), mediaStyles, layoutStyles(props), telepointerStyle, gapCursorStyles, tableStyles(props), panelStyles(props), fakeCursorStyles, mentionsStyles, emojiStyles, tasksAndDecisionsStyles, gridStyles, linkStyles, blockMarksSharedStyles, dateSharedStyle, extensionStyles, expandStyles(props), findReplaceStyles, taskDecisionStyles, statusStyles, annotationSharedStyles(props), smartCardStyles, smartCardSharedStyles, dateStyles, embedCardStyles, unsupportedStyles, resizerStyles, ClassNames.FLOATING_TOOLBAR_COMPONENT);
+  }), whitespaceSharedStyles, paragraphSharedStyles, listsSharedStyles, indentationSharedStyles, shadowSharedStyle, InlineNodeViewSharedStyles, "var(--ds-border-focused, #8cf)", placeholderTextStyles, placeholderStyles, codeBlockStyles(props), blocktypeStyles(props), codeMarkSharedStyles(props), textColorStyles, listsStyles, ruleStyles(props), mediaStyles, layoutStyles(props), telepointerStyle, gapCursorStyles, tableStyles(props), panelStyles(props), fakeCursorStyles, mentionsStyles, emojiStyles, tasksAndDecisionsStyles, gridStyles, linkStyles, blockMarksSharedStyles, dateSharedStyle, extensionStyles, expandStyles(props), findReplaceStyles, taskDecisionStyles, statusStyles, annotationSharedStyles(props), smartCardStyles, smartCardSharedStyles, dateStyles, embedCardStyles, unsupportedStyles, resizerStyles, ClassNames.FLOATING_TOOLBAR_COMPONENT);
 };
 export var createEditorContentStyle = function createEditorContentStyle(styles) {
   return /*#__PURE__*/React.forwardRef(function (props, ref) {

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "187.10.8";
+export var version = "187.11.0";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "187.10.8",
+	"version": "187.11.0",
 	"sideEffects": false
 }