@atlaskit/editor-core 153.1.5 → 157.0.0

package/dist/cjs/plugins/collab-edit/actions.js

@@ -91,6 +91,16 @@ var applyRemoteSteps = function applyRemoteSteps(json, userIds, view, options) {
 
     var _json = (0, _slicedToArray2.default)(json, 1),
         firstStep = _json[0];
+    /*
+     * Persist marks across transactions. Fixes an issue where
+     * marks are lost if remote transactions are dispatched
+     * between a user creating the mark and typing.
+     */
+
+
+    if (state.tr.storedMarks) {
+      tr.setStoredMarks(state.tr.storedMarks);
+    }
     /**
      * If the cursor is a the same position as the first step in
      * the remote data, we need to manually set it back again

package/dist/cjs/plugins/collab-edit/events/initialize.js

@@ -16,10 +16,21 @@ var _handlers = require("./handlers");
 var _pluginKey = require("../plugin-key");
 
 var initCollab = function initCollab(collabEditProvider, view) {
-  collabEditProvider.initialize(function () {
-    return view.state;
-  }, function (json) {
-    return _prosemirrorTransform.Step.fromJSON(view.state.schema, json);
+  if (collabEditProvider.initialize) {
+    collabEditProvider.initialize(function () {
+      return view.state;
+    }, function (json) {
+      return _prosemirrorTransform.Step.fromJSON(view.state.schema, json);
+    });
+  }
+};
+
+var initNewCollab = function initNewCollab(collabEditProvider, view, onSyncUpError) {
+  collabEditProvider.setup({
+    getState: function getState() {
+      return view.state;
+    },
+    onSyncUpError: onSyncUpError
   });
 };
 
@@ -43,7 +54,7 @@ var initialize = function initialize(_ref) {
     if (options.useNativePlugin) {
       // ED-13912 For NCS we don't want to use memoizeOne because it causes
       // infinite text while changing page-width
-      initCollab(provider, view);
+      initNewCollab(provider, view, options.onSyncUpError);
     } else {
       /**
        * We only want to initialise once, if we reload/reconfigure this plugin

package/dist/cjs/plugins/collab-edit/index.js

@@ -5,12 +5,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "CollabProvider", {
-  enumerable: true,
-  get: function get() {
-    return _provider.CollabProvider;
-  }
-});
 exports.default = void 0;
 Object.defineProperty(exports, "pluginKey", {
   enumerable: true,
@@ -29,12 +23,12 @@ var _prosemirrorCollab = require("prosemirror-collab");
 
 var _plugin = require("./plugin");
 
-var _provider = require("./provider");
-
 var _sendTransaction = require("./events/send-transaction");
 
 var _analytics = require("./analytics");
 
+var _nativeCollabProviderPlugin = require("./native-collab-provider-plugin");
+
 var providerBuilder = function providerBuilder(collabEditProviderPromise) {
   return /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(codeToExecute, onError) {
@@ -109,6 +103,13 @@ var collabEditPlugin = function collabEditPlugin(options) {
             clientID: userId
           });
         }
+      }, {
+        name: 'nativeCollabProviderPlugin',
+        plugin: function plugin() {
+          return (0, _nativeCollabProviderPlugin.nativeCollabProviderPlugin)({
+            providerPromise: collabEditProviderPromise
+          });
+        }
       }] : []), [{
         name: 'collab',
         plugin: function plugin(_ref3) {

package/dist/cjs/plugins/collab-edit/native-collab-provider-plugin.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.nativeCollabProviderPlugin = exports.getCollabProvider = void 0;
+
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
+var _prosemirrorState = require("prosemirror-state");
+
+var nativeCollabProviderPluginKey = new _prosemirrorState.PluginKey('nativeCollabProviderPlugin');
+
+var nativeCollabProviderPlugin = function nativeCollabProviderPlugin(_ref) {
+  var providerPromise = _ref.providerPromise;
+  return new _safePlugin.SafePlugin({
+    key: nativeCollabProviderPluginKey,
+    state: {
+      init: function init() {
+        return null;
+      },
+      apply: function apply(tr, currentPluginState) {
+        var provider = tr.getMeta(nativeCollabProviderPluginKey);
+        return provider ? provider : currentPluginState;
+      }
+    },
+    view: function view(editorView) {
+      providerPromise.then(function (provider) {
+        var dispatch = editorView.dispatch,
+            state = editorView.state;
+        var tr = state.tr;
+        tr.setMeta(nativeCollabProviderPluginKey, provider);
+        dispatch(tr);
+      });
+      return {};
+    }
+  });
+};
+
+exports.nativeCollabProviderPlugin = nativeCollabProviderPlugin;
+
+var getCollabProvider = function getCollabProvider(editorState) {
+  return nativeCollabProviderPluginKey.getState(editorState);
+};
+
+exports.getCollabProvider = getCollabProvider;

package/dist/cjs/plugins/collab-edit/plugin.js

@@ -17,7 +17,7 @@ Object.defineProperty(exports, "pluginKey", {
   }
 });
 
-var _prosemirrorState = require("prosemirror-state");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 
 var _initialize = require("./events/initialize");
 
@@ -27,8 +27,13 @@ var _pluginKey = require("./plugin-key");
 
 var _analytics = require("./analytics");
 
+var _fireAnalyticsEvent = require("../analytics/fire-analytics-event");
+
+var _analytics2 = require("../analytics");
+
 var createPlugin = function createPlugin(dispatch, providerFactory, collabProviderCallback, options) {
-  return new _prosemirrorState.Plugin({
+  var fireAnalyticsCallback = (0, _fireAnalyticsEvent.fireAnalyticsEvent)(options === null || options === void 0 ? void 0 : options.createAnalyticsEvent);
+  return new _safePlugin.SafePlugin({
     key: _pluginKey.pluginKey,
     state: {
       init: function init(config) {
@@ -63,6 +68,19 @@ var createPlugin = function createPlugin(dispatch, providerFactory, collabProvid
     },
     view: function view(_view) {
       var addErrorAnalytics = (0, _analytics.addSynchronyErrorAnalytics)(_view.state, _view.state.tr);
+
+      var onSyncUpError = function onSyncUpError(attributes) {
+        fireAnalyticsCallback({
+          payload: {
+            action: _analytics2.ACTION.NEW_COLLAB_SYNC_UP_ERROR_NO_STEPS,
+            actionSubject: _analytics2.ACTION_SUBJECT.EDITOR,
+            eventType: _analytics2.EVENT_TYPE.OPERATIONAL,
+            attributes: attributes
+          }
+        });
+      };
+
+      options.onSyncUpError = onSyncUpError;
       var cleanup = collabProviderCallback((0, _initialize.initialize)({
         view: _view,
         options: options,

package/dist/cjs/plugins/collab-edit/provider/index.js

@@ -3,12 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "CollabProvider", {
-  enumerable: true,
-  get: function get() {
-    return _collabProvider.CollabProvider;
-  }
-});
 Object.defineProperty(exports, "PubSubSpecialEventType", {
   enumerable: true,
   get: function get() {
@@ -16,6 +10,4 @@ Object.defineProperty(exports, "PubSubSpecialEventType", {
   }
 });
 
-var _types = require("./types");
-
-var _collabProvider = require("./collab-provider");
+var _types = require("./types");

package/dist/cjs/plugins/context-panel/index.js

@@ -11,6 +11,8 @@ exports.pluginKey = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 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; }
@@ -25,7 +27,7 @@ function getPluginState(state) {
 }
 
 function contextPanelPluginFactory(contextPanels, dispatch) {
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     key: pluginKey,
     state: {
       init: function init(_config, state) {

package/dist/cjs/plugins/custom-autoformat/index.js

@@ -13,7 +13,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _prosemirrorState = require("prosemirror-state");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 
 var _prosemirrorKeymap = require("prosemirror-keymap");
 
@@ -32,7 +32,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 var createPMPlugin = function createPMPlugin(_ref) {
   var providerFactory = _ref.providerFactory;
   var rules = [];
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     state: {
       init: function init() {
         return {

package/dist/cjs/plugins/date/pm-plugins/main.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getPluginState = exports.default = void 0;
 
-var _prosemirrorState = require("prosemirror-state");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 
 var _date = _interopRequireDefault(require("../nodeviews/date"));
 
@@ -39,7 +39,7 @@ var createPlugin = function createPlugin(_ref) {
     focusDateInput: false
   };
   var hasIntlContext = true;
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     state: createPluginState(dispatch, newPluginState),
     key: _pluginKey.pluginKey,
     props: {

package/dist/cjs/plugins/editor-disabled/index.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.createPlugin = createPlugin;
 exports.pluginKey = exports.default = void 0;
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 var _pluginStateFactory = require("../../utils/plugin-state-factory");
@@ -28,7 +30,7 @@ won't re-render when it changes.
 
 
 function createPlugin(dispatch) {
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     key: pluginKey,
     state: createPluginState(dispatch, {
       editorDisabled: false

package/dist/cjs/plugins/emoji/index.js

@@ -16,6 +16,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _react = _interopRequireDefault(require("react"));
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 var _adfSchema = require("@atlaskit/adf-schema");
@@ -321,7 +323,7 @@ function getEmojiPluginState(state) {
 }
 
 function emojiPluginFactory(dispatch, providerFactory, portalProviderAPI, eventDispatcher, options) {
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     key: emojiPluginKey,
     state: {
       init: function init() {

package/dist/cjs/plugins/emoji/nodeviews/emoji-next.js

@@ -22,14 +22,10 @@ var _prosemirrorModel = require("prosemirror-model");
 
 var _utils = require("@atlaskit/editor-common/utils");
 
-var _InlineNodeWrapper = require("../../../ui/InlineNodeWrapper");
-
 var EmojiNodeView = /*#__PURE__*/function () {
   function EmojiNodeView(node, _, context) {
     var _this = this,
-        _this$options,
-        _this$options2,
-        _this$options3;
+        _this$options;
 
     (0, _classCallCheck2.default)(this, EmojiNodeView);
     (0, _defineProperty2.default)(this, "hasProvider", false);
@@ -48,17 +44,10 @@ var EmojiNodeView = /*#__PURE__*/function () {
     this.providers = context.providerFactory;
     this.options = context.options;
     this.dom = EmojiNodeView.toDom(node);
-
-    if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.useInlineWrapper) {
-      var dom = (0, _InlineNodeWrapper.createMobileInlineDomRef)();
-      dom.appendChild(this.dom);
-      this.dom = dom;
-    }
-
-    this.el = (_this$options2 = this.options) !== null && _this$options2 !== void 0 && _this$options2.useInlineWrapper ? this.dom.firstElementChild : this.dom;
+    this.el = this.dom;
     this.providers.subscribe('emojiProvider', this.subscribe);
 
-    if ((_this$options3 = this.options) !== null && _this$options3 !== void 0 && _this$options3.allowZeroWidthSpaceAfter) {
+    if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.allowZeroWidthSpaceAfter) {
       this.el.after(document.createTextNode(_utils.ZERO_WIDTH_SPACE));
     }
 

package/dist/cjs/plugins/emoji/nodeviews/emoji.js

@@ -2,8 +2,6 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -30,12 +28,6 @@ var _Emoji = _interopRequireDefault(require("../ui/Emoji"));
 
 var _nodeviews = require("../../../nodeviews");
 
-var _InlineNodeWrapper = _interopRequireWildcard(require("../../../ui/InlineNodeWrapper"));
-
-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 _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); }; }
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -53,10 +45,6 @@ var EmojiNodeView = /*#__PURE__*/function (_ReactNodeView) {
   (0, _createClass2.default)(EmojiNodeView, [{
     key: "createDomRef",
     value: function createDomRef() {
-      if (this.reactComponentProps.options && this.reactComponentProps.options.useInlineWrapper) {
-        return (0, _InlineNodeWrapper.createMobileInlineDomRef)();
-      }
-
       return (0, _get2.default)((0, _getPrototypeOf2.default)(EmojiNodeView.prototype), "createDomRef", this).call(this);
     }
   }, {
@@ -68,9 +56,7 @@ var EmojiNodeView = /*#__PURE__*/function (_ReactNodeView) {
           shortName = _this$node$attrs.shortName,
           id = _this$node$attrs.id,
           text = _this$node$attrs.text;
-      return /*#__PURE__*/_react.default.createElement(_InlineNodeWrapper.default, {
-        useInlineWrapper: options && options.useInlineWrapper
-      }, /*#__PURE__*/_react.default.createElement(_Emoji.default, {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Emoji.default, {
         providers: providerFactory,
         id: id,
         shortName: shortName,

package/dist/cjs/plugins/expand/index.js

@@ -55,7 +55,7 @@ var expandPlugin = function expandPlugin() {
         plugin: function plugin(_ref) {
           var dispatch = _ref.dispatch,
               getIntl = _ref.getIntl;
-          return (0, _main.createPlugin)(dispatch, getIntl, options.useLongPressSelection);
+          return (0, _main.createPlugin)(dispatch, getIntl, options.appearance, options.useLongPressSelection);
         }
       }, {
         name: 'expandKeymap',

package/dist/cjs/plugins/expand/nodeviews/index.js

@@ -83,11 +83,12 @@ var toDOM = function toDOM(node, intl) {
 };
 
 var ExpandNodeView = /*#__PURE__*/function () {
-  function ExpandNodeView(node, view, getPos, getIntl) {
+  function ExpandNodeView(node, view, getPos, getIntl, isMobile) {
     var _this = this;
 
     (0, _classCallCheck2.default)(this, ExpandNodeView);
     (0, _defineProperty2.default)(this, "allowInteractiveExpand", true);
+    (0, _defineProperty2.default)(this, "isMobile", false);
     (0, _defineProperty2.default)(this, "focusTitle", function () {
       if (_this.input) {
         var _this$view = _this.view,
@@ -368,6 +369,7 @@ var ExpandNodeView = /*#__PURE__*/function () {
     this.node = node;
     this.dom = dom;
     this.contentDOM = contentDOM;
+    this.isMobile = isMobile;
     this.icon = this.dom.querySelector(".".concat(_classNames.expandClassNames.icon));
     this.input = this.dom.querySelector(".".concat(_classNames.expandClassNames.titleInput));
     this.titleContainer = this.dom.querySelector(".".concat(_classNames.expandClassNames.titleContainer));
@@ -423,6 +425,12 @@ var ExpandNodeView = /*#__PURE__*/function () {
   }, {
     key: "ignoreMutation",
     value: function ignoreMutation(mutationRecord) {
+      // ME-1931: Mobile relies on composition which creates dom mutations. If we ignore them, prosemirror
+      // does not recognise the changes and reverts them.
+      if (this.isMobile && (mutationRecord.type === 'characterData' || mutationRecord.type === 'childList')) {
+        return false;
+      }
+
       if (mutationRecord.type === 'selection') {
         return false;
       }
@@ -498,8 +506,10 @@ var ExpandNodeView = /*#__PURE__*/function () {
 
 exports.ExpandNodeView = ExpandNodeView;
 
-function _default(getIntl) {
+function _default(_ref2) {
+  var getIntl = _ref2.getIntl,
+      isMobile = _ref2.isMobile;
   return function (node, view, getPos) {
-    return new ExpandNodeView(node, view, getPos, getIntl);
+    return new ExpandNodeView(node, view, getPos, getIntl, isMobile);
   };
 }

package/dist/cjs/plugins/expand/pm-plugins/keymap.js

@@ -31,8 +31,12 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
+var isExpandNode = function isExpandNode(node) {
+  return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
+};
+
 var isExpandSelected = function isExpandSelected(selection) {
-  return selection instanceof _prosemirrorState.NodeSelection && (selection.node.type.name === 'expand' || selection.node.type.name === 'nestedExpand');
+  return selection instanceof _prosemirrorState.NodeSelection && isExpandNode(selection.node);
 };
 
 function expandKeymap() {
@@ -170,6 +174,7 @@ function expandKeymap() {
   }, list);
   keymaps.bindKeymapWithCommand(keymaps.backspace.common, function (state, dispatch, editorView) {
     var selection = state.selection;
+    var $from = selection.$from;
 
     if (!editorView || !selection.empty) {
       return false;
@@ -193,6 +198,13 @@ function expandKeymap() {
       return false;
     }
 
+    var parentNode = state.doc.nodeAt($from.before(Math.max($from.depth - 1, 1))); // ED-10012 catch cases where the expand has another node nested within it and
+    // the backspace should be applied only to the inner node instead of the expand
+
+    if (parentNode && !isExpandNode(parentNode)) {
+      return false;
+    }
+
     var textSel = _prosemirrorState.Selection.findFrom(state.doc.resolve(expandNode.pos), 1, true);
 
     if (textSel && selection.$from.pos === textSel.$from.pos && (0, _utils2.isEmptyNode)(state.schema)(expandNode.node) && dispatch) {

package/dist/cjs/plugins/expand/pm-plugins/main.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createPlugin = void 0;
 
-var _prosemirrorState = require("prosemirror-state");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 
 var _prosemirrorUtils = require("prosemirror-utils");
 
@@ -28,15 +28,23 @@ function containsClass(element, className) {
 }
 
 var createPlugin = function createPlugin(dispatch, getIntl) {
-  var useLongPressSelection = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var appearance = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'full-page';
+  var useLongPressSelection = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var state = (0, _pluginFactory.createPluginState)(dispatch, {});
-  return new _prosemirrorState.Plugin({
+  var isMobile = appearance === 'mobile';
+  return new _safePlugin.SafePlugin({
     state: state,
     key: _pluginFactory.pluginKey,
     props: {
       nodeViews: {
-        expand: (0, _nodeviews.default)(getIntl),
-        nestedExpand: (0, _nodeviews.default)(getIntl)
+        expand: (0, _nodeviews.default)({
+          getIntl: getIntl,
+          isMobile: isMobile
+        }),
+        nestedExpand: (0, _nodeviews.default)({
+          getIntl: getIntl,
+          isMobile: isMobile
+        })
       },
       handleKeyDown: function handleKeyDown(_view, event) {
         return containsClass(event.target, _classNames.expandClassNames.titleContainer);

package/dist/cjs/plugins/expand/toolbar.js

@@ -44,7 +44,8 @@ var getToolbarConfig = function getToolbarConfig(state, _ref) {
         onMouseLeave: (0, _decoration.hoverDecoration)([nestedExpand, expand], false),
         onFocus: (0, _decoration.hoverDecoration)([nestedExpand, expand], true),
         onBlur: (0, _decoration.hoverDecoration)([nestedExpand, expand], false),
-        title: formatMessage(_messages.default.remove)
+        title: formatMessage(_messages.default.remove),
+        tabIndex: null
       }]
     };
   }

package/dist/cjs/plugins/extension/pm-plugins/main.js

@@ -32,7 +32,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _prosemirrorState = require("prosemirror-state");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 
 var _extensions = require("@atlaskit/editor-common/extensions");
 
@@ -302,7 +302,7 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
   var extensionNodeViewOptions = {
     appearance: options.appearance
   };
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     state: state,
     view: function view(editorView) {
       var domAtPos = editorView.domAtPos.bind(editorView);

package/dist/cjs/plugins/extension/pm-plugins/unique-id.js

@@ -9,6 +9,8 @@ exports.createPlugin = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 var _adfSchema = require("@atlaskit/adf-schema");
@@ -22,7 +24,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 var pluginKey = new _prosemirrorState.PluginKey('extensionUniqueIdPlugin');
 
 var createPlugin = function createPlugin() {
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     // TODO: @see ED-8839
     appendTransaction: function appendTransaction(transactions, _oldState, newState) {
       var tr = newState.tr;

package/dist/cjs/plugins/extension/toolbar.js

@@ -72,19 +72,22 @@ var breakoutOptions = function breakoutOptions(state, formatMessage, extensionSt
       icon: _mediaCenter.default,
       onClick: (0, _commands.updateExtensionLayout)('default'),
       selected: layout === 'default',
-      title: formatMessage(_messages.default.layoutFixedWidth)
+      title: formatMessage(_messages.default.layoutFixedWidth),
+      tabIndex: null
     }, {
       type: 'button',
       icon: _mediaWide.default,
       onClick: (0, _commands.updateExtensionLayout)('wide'),
       selected: layout === 'wide',
-      title: formatMessage(_messages.default.layoutWide)
+      title: formatMessage(_messages.default.layoutWide),
+      tabIndex: null
     }, {
       type: 'button',
       icon: _mediaFullWidth.default,
       onClick: (0, _commands.updateExtensionLayout)('full-width'),
       selected: layout === 'full-width',
-      title: formatMessage(_messages.default.layoutFullWidth)
+      title: formatMessage(_messages.default.layoutFullWidth),
+      tabIndex: null
     }];
   }
 
@@ -111,7 +114,8 @@ var editButton = function editButton(formatMessage, extensionState) {
       (0, _actions.editExtension)(macroState && macroState.macroProvider, updateExtension)(state, dispatch, view);
       return true;
     },
-    title: formatMessage(messages.edit)
+    title: formatMessage(messages.edit),
+    tabIndex: null
   }];
 };
 
@@ -147,7 +151,8 @@ var getToolbarConfig = function getToolbarConfig() {
           onMouseLeave: (0, _decoration.hoverDecoration)(nodeType, false),
           onFocus: (0, _decoration.hoverDecoration)(nodeType, true),
           onBlur: (0, _decoration.hoverDecoration)(nodeType, false),
-          title: formatMessage(_messages.default.remove)
+          title: formatMessage(_messages.default.remove),
+          tabIndex: null
         }])
       };
     }

package/dist/cjs/plugins/fake-text-cursor/index.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.stateKey = exports.default = exports.createPlugin = void 0;
 
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+
 var _prosemirrorState = require("prosemirror-state");
 
 var _cursor = require("./cursor");
@@ -13,7 +15,7 @@ var stateKey = new _prosemirrorState.PluginKey('fakeTextCursorPlugin');
 exports.stateKey = stateKey;
 
 var createPlugin = function createPlugin() {
-  return new _prosemirrorState.Plugin({
+  return new _safePlugin.SafePlugin({
     key: stateKey,
     props: {
       decorations: _cursor.drawFakeTextCursor