@atlaskit/editor-core 187.10.8 → 187.12.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-core
 
+## 187.12.0
+
+### Minor Changes
+
+- [`94eaf42403b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/94eaf42403b) - ED-16575 - clean up EditorNext Props
+- [`c2279d7aeb1`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c2279d7aeb1) - [ED-19205] Update text formatting plugin API to abstract away the analytics implementation
+
+## 187.11.0
+
+### Minor Changes
+
+- [`c6c3b7e43d3`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c6c3b7e43d3) - [ED-19202] Remove direct dependency of editor-core code on text-formatting plugin
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 187.10.8
 
 ### Patch Changes

package/dist/cjs/create-editor/ReactEditorViewInternal.js

@@ -158,9 +158,6 @@ var ReactEditorView = /*#__PURE__*/function (_React$Component) {
       }
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleAnalyticsEvent", function (payload) {
-      if (!_this.props.allowAnalyticsGASV3) {
-        return;
-      }
       (0, _analytics.fireAnalyticsEvent)(_this.props.createAnalyticsEvent)(payload);
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "editorPlugins", []);
@@ -507,7 +504,7 @@ var ReactEditorView = /*#__PURE__*/function (_React$Component) {
       }
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "dispatchAnalyticsEvent", function (payload) {
-      if (_this.props.allowAnalyticsGASV3 && _this.eventDispatcher) {
+      if (_this.eventDispatcher) {
         var dispatch = (0, _eventDispatcher.createDispatch)(_this.eventDispatcher);
         dispatch(_utils.analyticsEventKey, {
           payload: payload

package/dist/cjs/editor-next/editor-internal.js

@@ -99,7 +99,6 @@ function EditorInternalWithoutHooks(_ref) {
         providerFactory: providerFactory,
         onEditorCreated: onEditorCreated,
         onEditorDestroyed: onEditorDestroyed,
-        allowAnalyticsGASV3: props.allowAnalyticsGASV3,
         disabled: props.disabled,
         preset: preset,
         render: function render(_ref2) {
@@ -133,7 +132,6 @@ function EditorInternalWithoutHooks(_ref) {
             primaryToolbarComponents: config.primaryToolbarComponents,
             primaryToolbarIconBefore: props.primaryToolbarIconBefore,
             secondaryToolbarComponents: config.secondaryToolbarComponents,
-            insertMenuItems: props.insertMenuItems,
             customContentComponents: props.contentComponents,
             customPrimaryToolbarComponents: props.primaryToolbarComponents,
             customSecondaryToolbarComponents: props.secondaryToolbarComponents,

package/dist/cjs/editor-next/hooks/useProviderFactory.js

@@ -37,8 +37,6 @@ function useProviderFactory(props, editorActions, createAnalyticsEvent) {
   var extensionProviders = props.extensionProviders,
     quickInsert = props.quickInsert,
     linking = props.linking,
-    smartLinks = props.smartLinks,
-    UNSAFE_cards = props.UNSAFE_cards,
     autoformattingProvider = props.autoformattingProvider,
     media = props.media,
     emojiProvider = props.emojiProvider,
@@ -52,6 +50,8 @@ function useProviderFactory(props, editorActions, createAnalyticsEvent) {
     collabEdit = props.collabEdit,
     collabEditProvider = props.collabEditProvider,
     presenceProvider = props.presenceProvider;
+  var UNSAFE_cards = props.UNSAFE_cards;
+  var smartLinks = props.smartLinks;
   var providerFactory = (0, _react.useRef)(new _providerFactory.ProviderFactory());
   var _useState = (0, _react.useState)(createNewState(editorActions, quickInsert, extensionProviders, createAnalyticsEvent)),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),

package/dist/cjs/editor-next/index.js

@@ -23,7 +23,6 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _EditorContext = require("../ui/EditorContext");
 var _measureEnum = _interopRequireDefault(require("../utils/performance/measure-enum"));
 var _editorInternal = _interopRequireDefault(require("./editor-internal"));
-var _deprecationWarnings = _interopRequireDefault(require("./utils/deprecationWarnings"));
 var _sendDurationAnalytics = _interopRequireDefault(require("./utils/sendDurationAnalytics"));
 var _trackEditorActions = _interopRequireDefault(require("./utils/trackEditorActions"));
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -46,7 +45,6 @@ function Editor(passedProps) {
     return (0, _analytics.fireAnalyticsEvent)(createAnalyticsEvent)(data);
   };
   (0, _hooks.useConstructor)(function () {
-    (0, _deprecationWarnings.default)(props);
     (0, _trackEditorActions.default)(editorActions.current, props.performanceTracking, function (value) {
       return handleAnalyticsEvent(value);
     });

package/dist/cjs/editor.js

@@ -14,6 +14,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
+var _editorDeprecationWarnings = _interopRequireDefault(require("./utils/editorDeprecationWarnings"));
 var _editorNext = _interopRequireDefault(require("./editor-next"));
 var _useUniversalPreset = _interopRequireDefault(require("./labs/next/presets/useUniversalPreset"));
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -30,9 +31,12 @@ var EditorNextWrapper = function EditorNextWrapper(_ref) {
 var Editor = /*#__PURE__*/function (_React$Component) {
   (0, _inherits2.default)(Editor, _React$Component);
   var _super = _createSuper(Editor);
-  function Editor() {
+  function Editor(props) {
+    var _this;
     (0, _classCallCheck2.default)(this, Editor);
-    return _super.apply(this, arguments);
+    _this = _super.call(this, props);
+    (0, _editorDeprecationWarnings.default)(props);
+    return _this;
   }
   (0, _createClass2.default)(Editor, [{
     key: "render",

package/dist/cjs/index.js

@@ -344,7 +344,7 @@ Object.defineProperty(exports, "lightModeStatusColorPalette", {
 Object.defineProperty(exports, "listStateKey", {
   enumerable: true,
   get: function get() {
-    return _main3.pluginKey;
+    return _main2.pluginKey;
   }
 });
 Object.defineProperty(exports, "measurements", {
@@ -485,96 +485,6 @@ Object.defineProperty(exports, "textColorPluginKey", {
     return _textColor.textColorPluginKey;
   }
 });
-Object.defineProperty(exports, "textFormattingStateKey", {
-  enumerable: true,
-  get: function get() {
-    return _main2.pluginKey;
-  }
-});
-Object.defineProperty(exports, "toggleCode", {
-  enumerable: true,
-  get: function get() {
-    return _textFormatting.toggleCode;
-  }
-});
-Object.defineProperty(exports, "toggleCodeWithAnalytics", {
-  enumerable: true,
-  get: function get() {
-    return _textFormatting.toggleCodeWithAnalytics;
-  }
-});
-Object.defineProperty(exports, "toggleEm", {
-  enumerable: true,
-  get: function get() {
-    return _textFormatting.toggleEm;
-  }
-});
-Object.defineProperty(exports, "toggleEmWithAnalytics", {
-  enumerable: true,
-  get: function get() {
-    return _textFormatting.toggleEmWithAnalytics;
-  }
-});
-Object.defineProperty(exports, "toggleStrike", {
-  enumerable: true,
-  get: function get() {
-    return _textFormatting.toggleStrike;
-  }
-});
-Object.defineProperty(exports, "toggleStrikeWithAnalytics", {
-  enumerable: true,
-  get: function get() {
-    return _textFormatting.toggleStrikeWithAnalytics;
-  }
-});
-Object.defineProperty(exports, "toggleStrong", {
-  enumerable: true,
-  get: function get() {
-    return _textFormatting.toggleStrong;
-  }
-});
-Object.defineProperty(exports, "toggleStrongWithAnalytics", {
-  enumerable: true,
-  get: function get() {
-    return _textFormatting.toggleStrongWithAnalytics;
-  }
-});
-Object.defineProperty(exports, "toggleSubscript", {
-  enumerable: true,
-  get: function get() {
-    return _textFormatting.toggleSubscript;
-  }
-});
-Object.defineProperty(exports, "toggleSubscriptWithAnalytics", {
-  enumerable: true,
-  get: function get() {
-    return _textFormatting.toggleSubscriptWithAnalytics;
-  }
-});
-Object.defineProperty(exports, "toggleSuperscript", {
-  enumerable: true,
-  get: function get() {
-    return _textFormatting.toggleSuperscript;
-  }
-});
-Object.defineProperty(exports, "toggleSuperscriptWithAnalytics", {
-  enumerable: true,
-  get: function get() {
-    return _textFormatting.toggleSuperscriptWithAnalytics;
-  }
-});
-Object.defineProperty(exports, "toggleUnderline", {
-  enumerable: true,
-  get: function get() {
-    return _textFormatting.toggleUnderline;
-  }
-});
-Object.defineProperty(exports, "toggleUnderlineWithAnalytics", {
-  enumerable: true,
-  get: function get() {
-    return _textFormatting.toggleUnderlineWithAnalytics;
-  }
-});
 Object.defineProperty(exports, "typeAheadPluginKey", {
   enumerable: true,
   get: function get() {
@@ -616,13 +526,11 @@ var _teamResource = require("@atlaskit/mention/team-resource");
 var _annotation = require("./plugins/annotation");
 var _main = require("./plugins/media/pm-plugins/main");
 var _mentions = require("./plugins/mentions");
-var _main2 = require("./plugins/text-formatting/pm-plugins/main");
 var _textColor = require("./plugins/text-color");
 var _changeColor = require("./plugins/text-color/commands/change-color");
 var _commands2 = require("./plugins/rule/commands");
 var _plugins = require("./plugins");
-var _main3 = require("./plugins/list/pm-plugins/main");
-var _textFormatting = require("./plugins/text-formatting/commands/text-formatting");
+var _main2 = require("./plugins/list/pm-plugins/main");
 var _toolbarAndPickerUpdates = require("./plugins/view-update-subscription/subscribe/toolbarAndPickerUpdates");
 var _typeAheadUpdates = require("./plugins/view-update-subscription/subscribe/type-ahead-updates");
 var _commands3 = require("./plugins/block-type/commands");

package/dist/cjs/plugins/help-dialog/ui/index.js

@@ -24,12 +24,12 @@ var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
 var _styles = require("./styles");
 var keymaps = _interopRequireWildcard(require("../../../keymaps"));
 var _ToolbarButton = _interopRequireDefault(require("../../../ui/ToolbarButton"));
-var _toolbarMessages = require("../../text-formatting/ui/Toolbar/toolbar-messages");
-var _messages = require("../../list/messages");
-var _messages2 = require("../../insert-block/ui/ToolbarInsertBlock/messages");
-var _messages3 = require("../../block-type/messages");
-var _messages4 = require("../../undo-redo/messages");
-var _messages5 = require("../../../ui/Alignment/messages");
+var _messages = require("@atlaskit/editor-common/messages");
+var _messages2 = require("../../list/messages");
+var _messages3 = require("../../insert-block/ui/ToolbarInsertBlock/messages");
+var _messages4 = require("../../block-type/messages");
+var _messages5 = require("../../undo-redo/messages");
+var _messages6 = require("../../../ui/Alignment/messages");
 var _commands = require("../commands");
 var _toolbar = require("../../annotation/toolbar");
 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); }
@@ -82,13 +82,13 @@ var messages = (0, _reactIntlNext.defineMessages)({
 var navigationKeymaps = function navigationKeymaps(_ref) {
   var formatMessage = _ref.formatMessage;
   return [{
-    name: formatMessage(_toolbarMessages.toolbarMessages.navigateToEditorToolbar),
+    name: formatMessage(_messages.toolbarMessages.navigateToEditorToolbar),
     type: 'navigation',
     keymap: function keymap() {
       return keymaps.navToEditorToolbar;
     }
   }, {
-    name: formatMessage(_toolbarMessages.toolbarMessages.navigateToFloatingToolbar),
+    name: formatMessage(_messages.toolbarMessages.navigateToFloatingToolbar),
     type: 'navigation',
     keymap: function keymap() {
       return keymaps.navToFloatingToolbar;
@@ -98,7 +98,7 @@ var navigationKeymaps = function navigationKeymaps(_ref) {
 var formatting = function formatting(_ref2) {
   var formatMessage = _ref2.formatMessage;
   return [{
-    name: formatMessage(_toolbarMessages.toolbarMessages.bold),
+    name: formatMessage(_messages.toolbarMessages.bold),
     type: 'strong',
     keymap: function keymap() {
       return keymaps.toggleBold;
@@ -106,10 +106,10 @@ var formatting = function formatting(_ref2) {
     autoFormatting: function autoFormatting() {
       return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
         css: _styles.codeLg
-      }, "**", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _toolbarMessages.toolbarMessages.bold), "**"));
+      }, "**", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.toolbarMessages.bold), "**"));
     }
   }, {
-    name: formatMessage(_toolbarMessages.toolbarMessages.italic),
+    name: formatMessage(_messages.toolbarMessages.italic),
     type: 'em',
     keymap: function keymap() {
       return keymaps.toggleItalic;
@@ -117,16 +117,16 @@ var formatting = function formatting(_ref2) {
     autoFormatting: function autoFormatting() {
       return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
         css: _styles.codeLg
-      }, "*", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _toolbarMessages.toolbarMessages.italic), "*"));
+      }, "*", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.toolbarMessages.italic), "*"));
     }
   }, {
-    name: formatMessage(_toolbarMessages.toolbarMessages.underline),
+    name: formatMessage(_messages.toolbarMessages.underline),
     type: 'underline',
     keymap: function keymap() {
       return keymaps.toggleUnderline;
     }
   }, {
-    name: formatMessage(_toolbarMessages.toolbarMessages.strike),
+    name: formatMessage(_messages.toolbarMessages.strike),
     type: 'strike',
     keymap: function keymap() {
       return keymaps.toggleStrikethrough;
@@ -134,22 +134,22 @@ var formatting = function formatting(_ref2) {
     autoFormatting: function autoFormatting() {
       return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
         css: _styles.codeLg
-      }, "~~", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _toolbarMessages.toolbarMessages.strike), "~~"));
+      }, "~~", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.toolbarMessages.strike), "~~"));
     }
   }, {
-    name: formatMessage(_toolbarMessages.toolbarMessages.subscript),
+    name: formatMessage(_messages.toolbarMessages.subscript),
     type: 'subsup',
     keymap: function keymap() {
       return keymaps.toggleSubscript;
     }
   }, {
-    name: formatMessage(_toolbarMessages.toolbarMessages.superscript),
+    name: formatMessage(_messages.toolbarMessages.superscript),
     type: 'subsup',
     keymap: function keymap() {
       return keymaps.toggleSuperscript;
     }
   }, {
-    name: formatMessage(_messages3.messages.heading1),
+    name: formatMessage(_messages4.messages.heading1),
     type: 'heading',
     keymap: function keymap() {
       return keymaps.toggleHeading1;
@@ -162,7 +162,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages3.messages.heading2),
+    name: formatMessage(_messages4.messages.heading2),
     type: 'heading',
     keymap: function keymap() {
       return keymaps.toggleHeading2;
@@ -175,7 +175,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages3.messages.heading3),
+    name: formatMessage(_messages4.messages.heading3),
     type: 'heading',
     keymap: function keymap() {
       return keymaps.toggleHeading3;
@@ -188,7 +188,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages3.messages.heading4),
+    name: formatMessage(_messages4.messages.heading4),
     type: 'heading',
     keymap: function keymap() {
       return keymaps.toggleHeading4;
@@ -201,7 +201,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages3.messages.heading5),
+    name: formatMessage(_messages4.messages.heading5),
     type: 'heading',
     keymap: function keymap() {
       return keymaps.toggleHeading5;
@@ -214,7 +214,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages3.messages.heading6),
+    name: formatMessage(_messages4.messages.heading6),
     type: 'heading',
     keymap: function keymap() {
       return keymaps.toggleHeading6;
@@ -227,13 +227,13 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages3.messages.normal),
+    name: formatMessage(_messages4.messages.normal),
     type: 'paragraph',
     keymap: function keymap() {
       return keymaps.setNormalText;
     }
   }, {
-    name: formatMessage(_messages.messages.orderedList),
+    name: formatMessage(_messages2.messages.orderedList),
     type: 'orderedList',
     keymap: function keymap() {
       return keymaps.toggleOrderedList;
@@ -246,7 +246,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages.messages.unorderedList),
+    name: formatMessage(_messages2.messages.unorderedList),
     type: 'bulletList',
     keymap: function keymap() {
       return keymaps.toggleBulletList;
@@ -259,7 +259,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages3.messages.blockquote),
+    name: formatMessage(_messages4.messages.blockquote),
     type: 'blockquote',
     keymap: function keymap() {
       return keymaps.toggleBlockQuote;
@@ -272,7 +272,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages3.messages.codeblock),
+    name: formatMessage(_messages4.messages.codeblock),
     type: 'codeBlock',
     autoFormatting: function autoFormatting() {
       return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
@@ -280,7 +280,7 @@ var formatting = function formatting(_ref2) {
       }, "```"));
     }
   }, {
-    name: formatMessage(_messages2.messages.horizontalRule),
+    name: formatMessage(_messages3.messages.horizontalRule),
     type: 'rule',
     keymap: function keymap() {
       return keymaps.insertRule;
@@ -291,7 +291,7 @@ var formatting = function formatting(_ref2) {
       }, "---"));
     }
   }, {
-    name: formatMessage(_messages2.messages.link),
+    name: formatMessage(_messages3.messages.link),
     type: 'link',
     keymap: function keymap() {
       return keymaps.addLink;
@@ -299,10 +299,10 @@ var formatting = function formatting(_ref2) {
     autoFormatting: function autoFormatting() {
       return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
         css: _styles.codeLg
-      }, "[", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages2.messages.link), "](http://a.com)"));
+      }, "[", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages3.messages.link), "](http://a.com)"));
     }
   }, {
-    name: formatMessage(_toolbarMessages.toolbarMessages.code),
+    name: formatMessage(_messages.toolbarMessages.code),
     type: 'code',
     keymap: function keymap() {
       return keymaps.toggleCode;
@@ -310,10 +310,10 @@ var formatting = function formatting(_ref2) {
     autoFormatting: function autoFormatting() {
       return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
         css: _styles.codeLg
-      }, "`", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _toolbarMessages.toolbarMessages.code), "`"));
+      }, "`", (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.toolbarMessages.code), "`"));
     }
   }, {
-    name: formatMessage(_messages2.messages.action),
+    name: formatMessage(_messages3.messages.action),
     type: 'taskItem',
     autoFormatting: function autoFormatting() {
       return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
@@ -323,7 +323,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages2.messages.decision),
+    name: formatMessage(_messages3.messages.decision),
     type: 'decisionItem',
     autoFormatting: function autoFormatting() {
       return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
@@ -333,7 +333,7 @@ var formatting = function formatting(_ref2) {
       }, "Space"));
     }
   }, {
-    name: formatMessage(_messages2.messages.emoji),
+    name: formatMessage(_messages3.messages.emoji),
     type: 'emoji',
     autoFormatting: function autoFormatting() {
       return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
@@ -341,7 +341,7 @@ var formatting = function formatting(_ref2) {
       }, ":"));
     }
   }, {
-    name: formatMessage(_messages2.messages.mention),
+    name: formatMessage(_messages3.messages.mention),
     type: 'mention',
     autoFormatting: function autoFormatting() {
       return (0, _react2.jsx)("span", null, (0, _react2.jsx)("span", {
@@ -349,13 +349,13 @@ var formatting = function formatting(_ref2) {
       }, "@"));
     }
   }, {
-    name: formatMessage(_messages5.alignmentMessages.alignLeft),
+    name: formatMessage(_messages6.alignmentMessages.alignLeft),
     type: 'alignment',
     keymap: function keymap() {
       return keymaps.alignLeft;
     }
   }, {
-    name: formatMessage(_messages5.alignmentMessages.alignRight),
+    name: formatMessage(_messages6.alignmentMessages.alignRight),
     type: 'alignment'
   }];
 };
@@ -364,19 +364,19 @@ var shortcutNamesWithoutKeymap = ['emoji', 'mention', 'quickInsert'];
 var otherFormatting = function otherFormatting(_ref3) {
   var formatMessage = _ref3.formatMessage;
   return [{
-    name: formatMessage(_toolbarMessages.toolbarMessages.clearFormatting),
+    name: formatMessage(_messages.toolbarMessages.clearFormatting),
     type: 'clearFormatting',
     keymap: function keymap() {
       return keymaps.clearFormatting;
     }
   }, {
-    name: formatMessage(_messages4.messages.undo),
+    name: formatMessage(_messages5.messages.undo),
     type: 'undo',
     keymap: function keymap() {
       return keymaps.undo;
     }
   }, {
-    name: formatMessage(_messages4.messages.redo),
+    name: formatMessage(_messages5.messages.redo),
     type: 'redo',
     keymap: function keymap() {
       return keymaps.redo;

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;