@atlaskit/editor-core 154.0.0 → 155.0.0

package/dist/esm/plugins/card/nodeviews/inlineCard.js

@@ -18,10 +18,8 @@ import { UnsupportedInline } from '@atlaskit/editor-common/ui';
 import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 import rafSchedule from 'raf-schd';
-import { Card } from './genericCard';
-import ReactNodeView from '../../../nodeviews/ReactNodeView';
+import { Card, GenericCard } from './genericCard';
 import { registerCard } from '../pm-plugins/actions';
-import InlineNodeWrapper, { createMobileInlineDomRef } from '../../../ui/InlineNodeWrapper';
 export var InlineCardComponent = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(InlineCardComponent, _React$PureComponent);
 
@@ -110,8 +108,8 @@ _defineProperty(InlineCardComponent, "contextTypes", {
 });
 
 var WrappedInlineCard = Card(InlineCardComponent, UnsupportedInline);
-export var InlineCard = /*#__PURE__*/function (_ReactNodeView) {
-  _inherits(InlineCard, _ReactNodeView);
+export var InlineCard = /*#__PURE__*/function (_GenericCard) {
+  _inherits(InlineCard, _GenericCard);
 
   var _super2 = _createSuper(InlineCard);
 
@@ -124,10 +122,6 @@ export var InlineCard = /*#__PURE__*/function (_ReactNodeView) {
   _createClass(InlineCard, [{
     key: "createDomRef",
     value: function createDomRef() {
-      if (this.reactComponentProps.useInlineWrapper) {
-        return createMobileInlineDomRef();
-      }
-
       return _get(_getPrototypeOf(InlineCard.prototype), "createDomRef", this).call(this, {
         displayInlineBlockForInlineNodes: false
       });
@@ -135,12 +129,8 @@ export var InlineCard = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "render",
     value: function render() {
-      var _this$reactComponentP = this.reactComponentProps,
-          useInlineWrapper = _this$reactComponentP.useInlineWrapper,
-          useAlternativePreloader = _this$reactComponentP.useAlternativePreloader;
-      return /*#__PURE__*/React.createElement(InlineNodeWrapper, {
-        useInlineWrapper: useInlineWrapper
-      }, /*#__PURE__*/React.createElement(WrappedInlineCard, {
+      var useAlternativePreloader = this.reactComponentProps.useAlternativePreloader;
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(WrappedInlineCard, {
         node: this.node,
         view: this.view,
         getPos: this.getPos,
@@ -150,4 +140,4 @@ export var InlineCard = /*#__PURE__*/function (_ReactNodeView) {
   }]);
 
   return InlineCard;
-}(ReactNodeView);
+}(GenericCard);

package/dist/esm/plugins/card/pm-plugins/doc.js

@@ -19,6 +19,7 @@ import { shouldReplaceLink } from './shouldReplaceLink';
 import { SMART_LINK_TYPE } from '../../../plugins/analytics/types/node-events';
 import { getLinkCreationAnalyticsEvent } from '../../../plugins/hyperlink/analytics';
 import { unlinkPayload } from '../../../utils/linking-utils';
+import { getFeatureFlags } from '../../feature-flags-context';
 export function insertCard(tr, cardAdf, schema) {
   var inlineCard = schema.nodes.inlineCard; // ED-5638: add an extra space after inline cards to avoid re-rendering them
 
@@ -213,6 +214,44 @@ export var convertHyperlinkToSmartCard = function convertHyperlinkToSmartCard(st
   return queueCards(requests)(state.tr);
 };
 export var changeSelectedCardToLink = function changeSelectedCardToLink(text, href, sendAnalytics, node, pos) {
+  return function (state, dispatch) {
+    var tr;
+
+    if (node && pos) {
+      tr = cardNodeToLinkWithTransaction(state, text, href, node, pos);
+    } else {
+      tr = cardToLinkWithTransaction(state, text, href);
+    }
+
+    var selectedNode = state.selection instanceof NodeSelection && state.selection.node;
+
+    if (sendAnalytics) {
+      if (selectedNode) {
+        var _getFeatureFlags = getFeatureFlags(state),
+            viewChangingExperimentToolbarStyle = _getFeatureFlags.viewChangingExperimentToolbarStyle;
+
+        addAnalytics(state, tr, {
+          action: ACTION.CHANGED_TYPE,
+          actionSubject: ACTION_SUBJECT.SMART_LINK,
+          eventType: EVENT_TYPE.TRACK,
+          attributes: {
+            newType: SMART_LINK_TYPE.URL,
+            previousType: appearanceForNodeType(selectedNode.type),
+            localId: selectedNode.attrs.localId,
+            featureFlag: viewChangingExperimentToolbarStyle || 'noChange'
+          }
+        });
+      }
+    }
+
+    if (dispatch) {
+      dispatch(tr.scrollIntoView());
+    }
+
+    return true;
+  };
+};
+export var changeSelectedCardToLinkFallback = function changeSelectedCardToLinkFallback(text, href, sendAnalytics, node, pos) {
   return function (state, dispatch) {
     var tr;
 
@@ -224,11 +263,11 @@ export var changeSelectedCardToLink = function changeSelectedCardToLink(text, hr
 
     if (sendAnalytics) {
       addAnalytics(state, tr, {
-        action: ACTION.CHANGED_TYPE,
+        action: ACTION.ERRORED,
         actionSubject: ACTION_SUBJECT.SMART_LINK,
-        eventType: EVENT_TYPE.TRACK,
+        eventType: EVENT_TYPE.OPERATIONAL,
         attributes: {
-          newType: SMART_LINK_TYPE.URL
+          error: 'Smart card falling back to link.'
         }
       });
     }
@@ -326,13 +365,19 @@ export var setSelectedCardAppearance = function setSelectedCardAppearance(appear
     var from = state.selection.from;
     var nodeType = getLinkNodeType(appearance, state.schema.nodes);
     var tr = state.tr.setNodeMarkup(from, nodeType, attrs, selectedNode.marks);
+
+    var _getFeatureFlags2 = getFeatureFlags(state),
+        viewChangingExperimentToolbarStyle = _getFeatureFlags2.viewChangingExperimentToolbarStyle;
+
     addAnalytics(state, tr, {
       action: ACTION.CHANGED_TYPE,
       actionSubject: ACTION_SUBJECT.SMART_LINK,
       eventType: EVENT_TYPE.TRACK,
       attributes: {
         newType: appearance,
-        previousType: appearanceForNodeType(selectedNode.type)
+        previousType: appearanceForNodeType(selectedNode.type),
+        localId: selectedNode.attrs.localId,
+        featureFlag: viewChangingExperimentToolbarStyle || 'noChange'
       }
     });
 

package/dist/esm/plugins/card/pm-plugins/keymap.js

@@ -0,0 +1,71 @@
+import { keymap } from 'prosemirror-keymap';
+import { NodeSelection } from 'prosemirror-state';
+import * as keymaps from '../../../keymaps';
+import { findChildren, flatten } from 'prosemirror-utils';
+import { browser } from '@atlaskit/editor-common/utils';
+var lookupPixel = 10;
+
+var getClosestInlineCardPos = function getClosestInlineCardPos(state, editorView, direction) {
+  var _editorView$posAtCoor;
+
+  var selection = state.selection;
+  var parent = selection.$from.parent;
+  var inlineCardType = state.schema.nodes.inlineCard;
+
+  if (!flatten(parent, false).some(function (_ref) {
+    var node = _ref.node;
+    return node.type === inlineCardType;
+  })) {
+    return null;
+  }
+
+  var coord = editorView.coordsAtPos(selection.$anchor.pos);
+  var nearPos = (_editorView$posAtCoor = editorView.posAtCoords({
+    left: coord.left,
+    top: direction === 'up' ? coord.top - lookupPixel : coord.bottom + lookupPixel
+  })) === null || _editorView$posAtCoor === void 0 ? void 0 : _editorView$posAtCoor.pos;
+
+  if (nearPos) {
+    var newNode = state.doc.nodeAt(nearPos);
+
+    if (newNode) {
+      if (newNode.type !== inlineCardType || findChildren(parent, function (node) {
+        return node === newNode;
+      }, false).length === 0 || newNode === selection.node) {
+        return null;
+      }
+
+      return nearPos;
+    }
+  }
+
+  return null;
+};
+
+var selectAboveBelowInlineCard = function selectAboveBelowInlineCard(direction) {
+  return function (state, dispatch, editorView) {
+    if (!editorView || !dispatch) {
+      return false;
+    }
+
+    var pos = getClosestInlineCardPos(state, editorView, direction);
+
+    if (pos) {
+      dispatch(state.tr.setSelection(new NodeSelection(state.doc.resolve(pos))));
+      return true;
+    }
+
+    return false;
+  };
+};
+
+export function cardKeymap(featureFlags) {
+  var list = {}; // https://bugs.chromium.org/p/chromium/issues/detail?id=1227468 introduced since Chrome 91
+
+  if (browser.chrome && browser.chrome_version > 90 && featureFlags.chromeCursorHandlerFixedVersion && browser.chrome_version < featureFlags.chromeCursorHandlerFixedVersion) {
+    keymaps.bindKeymapWithCommand(keymaps.moveUp.common, selectAboveBelowInlineCard('up'), list);
+    keymaps.bindKeymapWithCommand(keymaps.moveDown.common, selectAboveBelowInlineCard('down'), list);
+  }
+
+  return keymap(list);
+}

package/dist/esm/plugins/card/pm-plugins/main.js

@@ -1,4 +1,4 @@
-import { Plugin } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import rafSchedule from 'raf-schd';
 import reducer from './reducers';
 import { pluginKey } from './plugin-key';
@@ -19,7 +19,7 @@ export var createPlugin = function createPlugin(options) {
         useAlternativePreloader = options.useAlternativePreloader,
         fullWidthMode = options.fullWidthMode,
         createAnalyticsEvent = options.createAnalyticsEvent;
-    return new Plugin({
+    return new SafePlugin({
       state: {
         init: function init() {
           return {
@@ -100,8 +100,7 @@ export var createPlugin = function createPlugin(options) {
         nodeViews: {
           inlineCard: function inlineCard(node, view, getPos) {
             var reactComponentProps = {
-              useAlternativePreloader: useAlternativePreloader,
-              useInlineWrapper: platform === 'mobile'
+              useAlternativePreloader: useAlternativePreloader
             };
             var hasIntlContext = true;
             return new InlineCard(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, undefined, true, undefined, hasIntlContext).init();

package/dist/esm/plugins/card/ui/LinkToolbarAppearance.js

@@ -18,6 +18,9 @@ import { isSupportedInParent } from '../../../utils/nodes';
 import Dropdown from '../../floating-toolbar/ui/Dropdown';
 import { messages } from '../messages';
 import nodeNames from '../../../messages';
+import { getFeatureFlags } from '../../../plugins/feature-flags-context';
+import LinkToolbarIconDropdown from './LinkToolbarIconDropdown';
+import LinkToolbarButtonGroup from './LinkToolbarButtonGroup';
 export var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
   _inherits(LinkToolbarAppearance, _React$Component);
 
@@ -97,6 +100,21 @@ export var LinkToolbarAppearance = /*#__PURE__*/function (_React$Component) {
         options.push(embedOption);
       }
 
+      var _getFeatureFlags = getFeatureFlags(editorState),
+          viewChangingExperimentToolbarStyle = _getFeatureFlags.viewChangingExperimentToolbarStyle;
+
+      if (viewChangingExperimentToolbarStyle === 'toolbarIcons') {
+        return /*#__PURE__*/React.createElement(LinkToolbarButtonGroup, {
+          key: "link-toolbar-button-group"
+        });
+      }
+
+      if (viewChangingExperimentToolbarStyle === 'newDropdown') {
+        return /*#__PURE__*/React.createElement(LinkToolbarIconDropdown, {
+          key: "link-toolbar-icon-dropdown"
+        });
+      }
+
       return /*#__PURE__*/React.createElement(Dropdown, {
         key: 'link-toolbar',
         buttonTestId: "link-toolbar-appearance-button",

package/dist/esm/plugins/card/ui/LinkToolbarButtonGroup.js

@@ -0,0 +1,10 @@
+import _objectDestructuringEmpty from "@babel/runtime/helpers/objectDestructuringEmpty";
+import React from 'react';
+
+var LinkToolbarButtonGroup = function LinkToolbarButtonGroup(_ref) {
+  _objectDestructuringEmpty(_ref);
+
+  return /*#__PURE__*/React.createElement("span", null);
+};
+
+export default LinkToolbarButtonGroup;

package/dist/esm/plugins/card/ui/LinkToolbarIconDropdown.js

@@ -0,0 +1,10 @@
+import _objectDestructuringEmpty from "@babel/runtime/helpers/objectDestructuringEmpty";
+import React from 'react';
+
+var LinkToolbarIconDropdown = function LinkToolbarIconDropdown(_ref) {
+  _objectDestructuringEmpty(_ref);
+
+  return /*#__PURE__*/React.createElement("span", null);
+};
+
+export default LinkToolbarIconDropdown;

package/dist/esm/plugins/card/ui/ResizableEmbedCard.js

@@ -24,6 +24,7 @@ import { Wrapper } from '../../../ui/Resizer/styled';
 import Resizer from '../../../ui/Resizer';
 import { handleSides, imageAlignmentMap, snapTo } from '../../../ui/Resizer/utils';
 import { calcMediaPxWidth } from '../../../plugins/media/utils/media-single';
+import { EmbedSpacing } from './styled';
 
 var ResizableEmbedCard = /*#__PURE__*/function (_React$Component) {
   _inherits(ResizableEmbedCard, _React$Component);
@@ -375,7 +376,9 @@ var ResizableEmbedCard = /*#__PURE__*/function (_React$Component) {
           enable[side] = false;
         }
       });
-      return /*#__PURE__*/React.createElement(Wrapper, {
+      return /*#__PURE__*/React.createElement(EmbedSpacing, {
+        "data-testid": "resizable-embed-card-spacing"
+      }, /*#__PURE__*/React.createElement(Wrapper, {
         layout: layout,
         isResized: !!pctWidth,
         containerWidth: containerWidth || DEFAULT_EMBED_CARD_WIDTH,
@@ -393,7 +396,7 @@ var ResizableEmbedCard = /*#__PURE__*/function (_React$Component) {
         highlights: this.highlights,
         innerPadding: akEditorMediaResizeHandlerPaddingWide,
         nodeType: "embed"
-      }), children, this.getHeightDefiningComponent()));
+      }), children, this.getHeightDefiningComponent())));
     }
   }]);
 

package/dist/esm/plugins/card/ui/assets/card.js

@@ -0,0 +1,24 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import Icon from '@atlaskit/icon';
+
+var IconCardGlyph = function IconCardGlyph(props) {
+  return /*#__PURE__*/React.createElement("svg", _extends({
+    width: "32",
+    height: "32",
+    viewBox: "0 0 32 32",
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg"
+  }, props), /*#__PURE__*/React.createElement("path", {
+    fillRule: "evenodd",
+    clipRule: "evenodd",
+    d: "M8 9c-1.10457 0-2 .89543-2 2v10c0 1.1046.89543 2 2 2h16c1.1046 0 2-.8954 2-2V11c0-1.10457-.8954-2-2-2H8Zm0 3c0-.5523.44772-1 1-1h2c.5523 0 1 .4477 1 1v2c0 .5523-.4477 1-1 1H9c-.55228 0-1-.4477-1-1v-2Zm5 1c0-.2761.2239-.5.5-.5h10c.2761 0 .5.2239.5.5s-.2239.5-.5.5h-10c-.2761 0-.5-.2239-.5-.5Zm-4 3c-.55228 0-1 .4477-1 1s.44772 1 1 1h14c.5523 0 1-.4477 1-1s-.4477-1-1-1H9Zm-1 4c0-.5523.44772-1 1-1h6c.5523 0 1 .4477 1 1s-.4477 1-1 1H9c-.55228 0-1-.4477-1-1Z",
+    fill: "#42526E"
+  }));
+};
+
+export var IconCard = function IconCard(props) {
+  return /*#__PURE__*/React.createElement(Icon, _extends({
+    glyph: IconCardGlyph
+  }, props));
+};

package/dist/esm/plugins/card/ui/assets/embed.js

@@ -0,0 +1,24 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import Icon from '@atlaskit/icon';
+
+var IconEmbedGlyph = function IconEmbedGlyph(props) {
+  return /*#__PURE__*/React.createElement("svg", _extends({
+    width: "32",
+    height: "32",
+    viewBox: "0 0 32 32",
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg"
+  }, props), /*#__PURE__*/React.createElement("path", {
+    fillRule: "evenodd",
+    clipRule: "evenodd",
+    d: "M8 6c-1.10457 0-2 .89543-2 2v16c0 1.1046.89543 2 2 2h16c1.1046 0 2-.8954 2-2V8c0-1.10457-.8954-2-2-2H8Zm1 2c-.55228 0-1 .44772-1 1v2c0 .5523.44772 1 1 1h2c.5523 0 1-.4477 1-1V9c0-.55228-.4477-1-1-1H9Zm4.5 1.5c-.2761 0-.5.22386-.5.5 0 .2761.2239.5.5.5h10c.2761 0 .5-.2239.5-.5 0-.27614-.2239-.5-.5-.5h-10ZM9 14c-.55228 0-1 .4477-1 1v8c0 .5523.44772 1 1 1h14c.5523 0 1-.4477 1-1v-8c0-.5523-.4477-1-1-1H9Zm6 2.5c0 .8284-.6716 1.5-1.5 1.5s-1.5-.6716-1.5-1.5.6716-1.5 1.5-1.5 1.5.6716 1.5 1.5Zm0 5.5-1-1-2 2h8v-1.8L18 19l-3 3Z",
+    fill: "#42526E"
+  }));
+};
+
+export var IconEmbed = function IconEmbed(props) {
+  return /*#__PURE__*/React.createElement(Icon, _extends({
+    glyph: IconEmbedGlyph
+  }, props));
+};

package/dist/esm/plugins/card/ui/assets/inline.js

@@ -0,0 +1,24 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import Icon from '@atlaskit/icon';
+
+var IconInlineGlyph = function IconInlineGlyph(props) {
+  return /*#__PURE__*/React.createElement("svg", _extends({
+    width: "32",
+    height: "32",
+    viewBox: "0 0 32 32",
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg"
+  }, props), /*#__PURE__*/React.createElement("path", {
+    fillRule: "evenodd",
+    clipRule: "evenodd",
+    d: "M8 12c-1.10457 0-2 .8954-2 2v4c0 1.1046.89543 2 2 2h16c1.1046 0 2-.8954 2-2v-4c0-1.1046-.8954-2-2-2H8Zm0 3c0-.5523.44772-1 1-1h2c.5523 0 1 .4477 1 1v2c0 .5523-.4477 1-1 1H9c-.55228 0-1-.4477-1-1v-2Zm5 1c0-.2761.2239-.5.5-.5h10c.2761 0 .5.2239.5.5s-.2239.5-.5.5h-10c-.2761 0-.5-.2239-.5-.5Z",
+    fill: "#42526E"
+  }));
+};
+
+export var IconInline = function IconInline(props) {
+  return /*#__PURE__*/React.createElement(Icon, _extends({
+    glyph: IconInlineGlyph
+  }, props));
+};

package/dist/esm/plugins/card/ui/assets/url.js

@@ -0,0 +1,26 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import Icon from '@atlaskit/icon';
+
+var IconUrlGlyph = function IconUrlGlyph(props) {
+  return /*#__PURE__*/React.createElement("svg", _extends({
+    width: "32",
+    height: "32",
+    viewBox: "0 0 32 32",
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg"
+  }, props), /*#__PURE__*/React.createElement("rect", {
+    x: "6",
+    y: "15",
+    width: "20",
+    height: "2",
+    rx: "1",
+    fill: "#42526E"
+  }));
+};
+
+export var IconUrl = function IconUrl(props) {
+  return /*#__PURE__*/React.createElement(Icon, _extends({
+    glyph: IconUrlGlyph
+  }, props));
+};

package/dist/esm/plugins/card/ui/styled.js

@@ -1,6 +1,7 @@
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 
-var _templateObject;
+var _templateObject, _templateObject2;
 
-import { css } from 'styled-components';
-export var embedCardStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ProseMirror {\n    .embedCardView-content-wrap[layout^='wrap-'] {\n      max-width: 100%;\n    }\n\n    .embedCardView-content-wrap[layout='wrap-left'] {\n      float: left;\n    }\n\n    .embedCardView-content-wrap[layout='wrap-right'] {\n      float: right;\n    }\n\n    .embedCardView-content-wrap[layout='wrap-right']\n      + .embedCardView-content-wrap[layout='wrap-left'] {\n      clear: both;\n    }\n  }\n"])));
+import styled, { css } from 'styled-components';
+export var embedCardStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ProseMirror {\n    .embedCardView-content-wrap[layout^='wrap-'] {\n      max-width: 100%;\n    }\n\n    .embedCardView-content-wrap[layout='wrap-left'] {\n      float: left;\n    }\n\n    .embedCardView-content-wrap[layout='wrap-right'] {\n      float: right;\n    }\n\n    .embedCardView-content-wrap[layout='wrap-right']\n      + .embedCardView-content-wrap[layout='wrap-left'] {\n      clear: both;\n    }\n  }\n"])));
+export var EmbedSpacing = styled.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  margin: 0 10px;\n"])));

package/dist/esm/plugins/clear-marks-on-change-to-empty-document/index.js

@@ -1,8 +1,9 @@
-import { Plugin, PluginKey } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from 'prosemirror-state';
 import { isEmptyDocument } from '../../utils';
 export var pluginKey = new PluginKey('clearMarksOnChangeToEmptyDocumentPlugin');
 export function createPlugin() {
-  return new Plugin({
+  return new SafePlugin({
     key: pluginKey,
     appendTransaction: function appendTransaction(_transactions, oldState, newState) {
       // ED-2973: When a user clears the editor's content, remove the current active marks

package/dist/esm/plugins/clipboard/pm-plugins/main.js

@@ -1,11 +1,12 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import { Plugin, TextSelection } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { TextSelection } from 'prosemirror-state';
 import { clipboardPluginKey } from '../plugin-key';
 import { getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload } from '../../selection/utils';
 import { EVENT_TYPE, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID } from '../../analytics/types/enums';
 export var createPlugin = function createPlugin(_ref) {
   var dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
-  return new Plugin({
+  return new SafePlugin({
     key: clipboardPluginKey,
     props: {
       handleDOMEvents: {

package/dist/esm/plugins/code-bidi-warning/pm-plugins/main.js

@@ -1,4 +1,4 @@
-import { Plugin } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { codeBidiWarningMessages } from '@atlaskit/editor-common/messages';
 import { codeBidiWarningPluginKey } from '../plugin-key';
 import { createBidiWarningsDecorationSetFromDoc, createPluginState, getPluginState } from './plugin-factory';
@@ -8,7 +8,7 @@ export var createPlugin = function createPlugin(_ref, _ref2) {
   var appearance = _ref2.appearance;
   var intl = getIntl();
   var codeBidiWarningLabel = intl.formatMessage(codeBidiWarningMessages.label);
-  return new Plugin({
+  return new SafePlugin({
     key: codeBidiWarningPluginKey,
     state: createPluginState(dispatch, function (state) {
       // The appearance being mobile indicates we are in an editor being

package/dist/esm/plugins/code-block/pm-plugins/ide-ux.js

@@ -1,4 +1,5 @@
-import { Plugin, TextSelection } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { TextSelection } from 'prosemirror-state';
 import { keydownHandler } from 'prosemirror-keymap';
 import { setTextSelection } from 'prosemirror-utils';
 import { getCursor } from '../../../utils';
@@ -8,7 +9,7 @@ import { getAutoClosingBracketInfo, shouldAutoCloseBracket } from '../ide-ux/bra
 import { getAutoClosingQuoteInfo, shouldAutoCloseQuote } from '../ide-ux/quote-handling';
 import { getEndOfCurrentLine, getStartOfCurrentLine, isCursorInsideCodeBlock, isSelectionEntirelyInsideCodeBlock, getLineInfo } from '../ide-ux/line-handling';
 import { insertIndent, outdent, indent, insertNewlineWithIndent } from '../ide-ux/commands';
-export default new Plugin({
+export default new SafePlugin({
   props: {
     handleTextInput: function handleTextInput(view, from, to, text) {
       var state = view.state,

package/dist/esm/plugins/code-block/pm-plugins/keymaps.js

@@ -5,7 +5,7 @@ import { getCursor, isEmptyNode, pipe } from '../../../utils';
 
 var deleteCurrentItem = function deleteCurrentItem($from) {
   return function (tr) {
-    return tr.delete($from.before($from.depth) - 1, $from.end($from.depth) + 1);
+    return tr.delete($from.before($from.depth), $from.after($from.depth));
   };
 };
 

package/dist/esm/plugins/code-block/pm-plugins/main.js

@@ -4,7 +4,8 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import { Plugin, NodeSelection } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { NodeSelection } from 'prosemirror-state';
 import { codeBidiWarningMessages } from '@atlaskit/editor-common/messages';
 import { codeBlockNodeView } from '../nodeviews/code-block';
 import { highlightingCodeBlockNodeView } from '../nodeviews/highlighting-code-block';
@@ -38,7 +39,7 @@ export var createPlugin = function createPlugin(_ref) {
     };
   }
 
-  return new Plugin({
+  return new SafePlugin({
     state: {
       init: function init(_, state) {
         var node = findCodeBlock(state, state.selection);

package/dist/esm/plugins/code-block/toolbar.js

@@ -73,7 +73,8 @@ export var getToolbarConfig = function getToolbarConfig() {
       title: formatMessage(codeBlockState.contentCopied ? commonMessages.copiedToClipboard : commonMessages.copyToClipboard),
       onMouseLeave: resetCopiedState,
       hideTooltipOnClick: false,
-      disabled: codeBlockState.isNodeSelected
+      disabled: codeBlockState.isNodeSelected,
+      tabIndex: null
     }, separator];
     var deleteButton = {
       id: 'editor.codeBlock.delete',
@@ -85,7 +86,8 @@ export var getToolbarConfig = function getToolbarConfig() {
       onFocus: hoverDecoration(nodeType, true),
       onBlur: hoverDecoration(nodeType, false),
       onClick: removeCodeBlock,
-      title: formatMessage(commonMessages.remove)
+      title: formatMessage(commonMessages.remove),
+      tabIndex: null
     };
     return {
       title: 'CodeBlock floating controls',

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

@@ -65,6 +65,16 @@ export var applyRemoteSteps = function applyRemoteSteps(json, userIds, view, opt
 
     var _json = _slicedToArray(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/esm/plugins/collab-edit/events/initialize.js

@@ -4,10 +4,21 @@ import { subscribe } from './handlers';
 import { pluginKey } from '../plugin-key';
 
 var initCollab = function initCollab(collabEditProvider, view) {
-  collabEditProvider.initialize(function () {
-    return view.state;
-  }, function (json) {
-    return Step.fromJSON(view.state.schema, json);
+  if (collabEditProvider.initialize) {
+    collabEditProvider.initialize(function () {
+      return view.state;
+    }, function (json) {
+      return Step.fromJSON(view.state.schema, json);
+    });
+  }
+};
+
+var initNewCollab = function initNewCollab(collabEditProvider, view, onSyncUpError) {
+  collabEditProvider.setup({
+    getState: function getState() {
+      return view.state;
+    },
+    onSyncUpError: onSyncUpError
   });
 };
 
@@ -29,7 +40,7 @@ export 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/esm/plugins/collab-edit/index.js

@@ -3,9 +3,9 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import { collab } from 'prosemirror-collab';
 import { createPlugin, pluginKey } from './plugin';
-export { CollabProvider } from './provider';
 import { sendTransaction } from './events/send-transaction';
 import { addSynchronyErrorAnalytics } from './analytics';
+import { nativeCollabProviderPlugin } from './native-collab-provider-plugin';
 export { pluginKey };
 
 var providerBuilder = function providerBuilder(collabEditProviderPromise) {
@@ -82,6 +82,13 @@ var collabEditPlugin = function collabEditPlugin(options) {
             clientID: userId
           });
         }
+      }, {
+        name: 'nativeCollabProviderPlugin',
+        plugin: function plugin() {
+          return nativeCollabProviderPlugin({
+            providerPromise: collabEditProviderPromise
+          });
+        }
       }] : []), [{
         name: 'collab',
         plugin: function plugin(_ref3) {