@atlaskit/editor-core 153.1.4 → 156.0.0

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

@@ -1,3 +1,9 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+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; }
+
+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 React from 'react';
 import { codeBlock } from '@atlaskit/adf-schema';
 import { createPlugin } from './pm-plugins/main';
@@ -23,11 +29,10 @@ var codeBlockPlugin = function codeBlockPlugin(options) {
         name: 'codeBlock',
         plugin: function plugin(_ref) {
           var getIntl = _ref.getIntl;
-          return createPlugin({
-            useLongPressSelection: options.useLongPressSelection,
+          return createPlugin(_objectSpread(_objectSpread({}, options), {}, {
             getIntl: getIntl,
             appearance: options.appearance
-          });
+          }));
         }
       }, {
         name: 'codeBlockIDEKeyBindings',

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';
@@ -18,10 +19,27 @@ export var createPlugin = function createPlugin(_ref) {
   var _ref$useLongPressSele = _ref.useLongPressSelection,
       useLongPressSelection = _ref$useLongPressSele === void 0 ? false : _ref$useLongPressSele,
       getIntl = _ref.getIntl,
-      appearance = _ref.appearance;
+      appearance = _ref.appearance,
+      _ref$allowComposition = _ref.allowCompositionInputOverride,
+      allowCompositionInputOverride = _ref$allowComposition === void 0 ? false : _ref$allowComposition;
   var intl = getIntl();
   var codeBidiWarningLabel = intl.formatMessage(codeBidiWarningMessages.label);
-  return new Plugin({
+  var handleDOMEvents = {}; // ME-1599: Composition on mobile was causing the DOM observer to mutate the code block
+  // incorrecly and lose content when pressing enter in the middle of a code block line.
+
+  if (allowCompositionInputOverride) {
+    handleDOMEvents.beforeinput = function (view, event) {
+      if (event.composed && // insertParagraph will be the input type when the enter key is pressed.
+      event.inputType === 'insertParagraph' && findCodeBlock(view.state, view.state.selection)) {
+        event.preventDefault();
+        return true;
+      }
+
+      return false;
+    };
+  }
+
+  return new SafePlugin({
     state: {
       init: function init(_, state) {
         var node = findCodeBlock(state, state.selection);
@@ -77,7 +95,8 @@ export var createPlugin = function createPlugin(_ref) {
         return !!(target.closest(".".concat(codeBlockClassNames.gutter)) || target.classList.contains(codeBlockClassNames.content));
       }, {
         useLongPressSelection: useLongPressSelection
-      })
+      }),
+      handleDOMEvents: handleDOMEvents
     }
   });
 };

package/dist/esm/plugins/code-block/refresh-browser-selection.js

@@ -1,4 +1,4 @@
-import { browser } from '@atlaskit/editor-common';
+import { browser } from '@atlaskit/editor-common/utils';
 import { pluginKey } from './plugin-key'; // Workaround for a firefox issue where dom selection is off sync
 // https://product-fabric.atlassian.net/browse/ED-12442
 

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/analytics.js

@@ -1,7 +1,7 @@
 import { addAnalytics, ACTION, EVENT_TYPE, ACTION_SUBJECT } from '../analytics';
 import { getFeatureFlags } from '../feature-flags-context';
 import { getDocStructure } from '../../utils/document-logger';
-import { sniffUserBrowserExtensions } from '@atlaskit/editor-common';
+import { sniffUserBrowserExtensions } from '@atlaskit/editor-common/utils';
 export var addSynchronyErrorAnalytics = function addSynchronyErrorAnalytics(state, tr) {
   return function (error) {
     var browserExtensions = sniffUserBrowserExtensions({

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
   });
 };
 
@@ -26,12 +37,18 @@ export var initialize = function initialize(_ref) {
 
     cleanup = subscribe(view, provider, options, providerFactory); // Initialize provider
 
-    /**
-     * We only want to initialise once, if we reload/reconfigure this plugin
-     * We dont want to re-init collab, it would break existing sessions
-     */
+    if (options.useNativePlugin) {
+      // ED-13912 For NCS we don't want to use memoizeOne because it causes
+      // infinite text while changing page-width
+      initNewCollab(provider, view, options.onSyncUpError);
+    } else {
+      /**
+       * We only want to initialise once, if we reload/reconfigure this plugin
+       * We dont want to re-init collab, it would break existing sessions
+       */
+      initCollabMemo(provider, view);
+    }
 
-    initCollabMemo(provider, view);
     return cleanup;
   };
 };

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) {

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

@@ -0,0 +1,31 @@
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from 'prosemirror-state';
+var nativeCollabProviderPluginKey = new PluginKey('nativeCollabProviderPlugin');
+export var nativeCollabProviderPlugin = function nativeCollabProviderPlugin(_ref) {
+  var providerPromise = _ref.providerPromise;
+  return new 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 {};
+    }
+  });
+};
+export var getCollabProvider = function getCollabProvider(editorState) {
+  return nativeCollabProviderPluginKey.getState(editorState);
+};

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

@@ -1,11 +1,14 @@
-import { Plugin } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { initialize } from './events/initialize';
 import { PluginState } from './plugin-state';
 import { pluginKey } from './plugin-key';
 import { addSynchronyErrorAnalytics } from './analytics';
+import { fireAnalyticsEvent } from '../analytics/fire-analytics-event';
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../analytics';
 export { PluginState, pluginKey };
 export var createPlugin = function createPlugin(dispatch, providerFactory, collabProviderCallback, options) {
-  return new Plugin({
+  var fireAnalyticsCallback = fireAnalyticsEvent(options === null || options === void 0 ? void 0 : options.createAnalyticsEvent);
+  return new SafePlugin({
     key: pluginKey,
     state: {
       init: function init(config) {
@@ -39,6 +42,19 @@ export var createPlugin = function createPlugin(dispatch, providerFactory, colla
     },
     view: function view(_view) {
       var addErrorAnalytics = addSynchronyErrorAnalytics(_view.state, _view.state.tr);
+
+      var onSyncUpError = function onSyncUpError(attributes) {
+        fireAnalyticsCallback({
+          payload: {
+            action: ACTION.NEW_COLLAB_SYNC_UP_ERROR_NO_STEPS,
+            actionSubject: ACTION_SUBJECT.EDITOR,
+            eventType: EVENT_TYPE.OPERATIONAL,
+            attributes: attributes
+          }
+        });
+      };
+
+      options.onSyncUpError = onSyncUpError;
       var cleanup = collabProviderCallback(initialize({
         view: _view,
         options: options,

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

@@ -1,2 +1 @@
-export { PubSubSpecialEventType } from './types';
-export { CollabProvider } from './collab-provider';
+export { PubSubSpecialEventType } from './types';

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

@@ -3,7 +3,7 @@ import { Selection, TextSelection } from 'prosemirror-state';
 import { Decoration } from 'prosemirror-view';
 import * as themeColors from '@atlaskit/theme/colors';
 import { hexToRgba } from '@atlaskit/adf-schema';
-import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common';
+import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
 import { addAnalytics } from '../analytics/utils';
 import { EVENT_TYPE, ACTION, ACTION_SUBJECT } from '../analytics/types';
 export var colors = [themeColors.R100, themeColors.R300, themeColors.R500, themeColors.Y100, themeColors.Y300, themeColors.Y500, themeColors.G100, themeColors.G300, themeColors.G500, themeColors.T100, themeColors.T300, themeColors.T500, themeColors.B100, themeColors.B300, themeColors.B500, themeColors.P100, themeColors.P300, themeColors.P500, themeColors.N70, themeColors.N200, themeColors.N800].map(function (solid) {

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

@@ -4,14 +4,15 @@ 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, PluginKey } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from 'prosemirror-state';
 export var pluginKey = new PluginKey('contextPanelPluginKey');
 export function getPluginState(state) {
   return pluginKey.getState(state);
 }
 
 function contextPanelPluginFactory(contextPanels, dispatch) {
-  return new Plugin({
+  return new SafePlugin({
     key: pluginKey,
     state: {
       init: function init(_config, state) {

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

@@ -6,7 +6,7 @@ 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 as PMPlugin } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { keydownHandler } from 'prosemirror-keymap';
 import reducers from './reducers';
 import { triggerInputRule } from './input-rules';
@@ -15,7 +15,7 @@ import { getPluginState, pluginKey } from './utils';
 export var createPMPlugin = function createPMPlugin(_ref) {
   var providerFactory = _ref.providerFactory;
   var rules = [];
-  return new PMPlugin({
+  return new SafePlugin({
     state: {
       init: function init() {
         return {

package/dist/esm/plugins/date/actions.js

@@ -1,6 +1,6 @@
 import { NodeSelection, Selection } from 'prosemirror-state';
 import { Fragment } from 'prosemirror-model';
-import { todayTimestampInUTC } from '@atlaskit/editor-common';
+import { todayTimestampInUTC } from '@atlaskit/editor-common/utils';
 import { pluginKey } from './pm-plugins/plugin-key';
 import { withAnalytics, addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '../analytics';
 import { isToday } from './utils/internal';

package/dist/esm/plugins/date/nodeviews/date.js

@@ -11,8 +11,9 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import React from 'react';
+import { DateSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { injectIntl } from 'react-intl-next';
-import { timestampToString, timestampToTaskContext, isPastDate, DateSharedCssClassName } from '@atlaskit/editor-common';
+import { timestampToString, timestampToTaskContext, isPastDate } from '@atlaskit/editor-common/utils';
 import { Date } from '@atlaskit/date';
 import { setDatePickerAt } from '../actions';
 

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

@@ -1,4 +1,4 @@
-import { Plugin } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import DateNodeView from '../nodeviews/date';
 import { ReactNodeView } from '../../../nodeviews';
 import { pluginFactory } from '../../../utils/plugin-state-factory';
@@ -23,7 +23,7 @@ var createPlugin = function createPlugin(_ref) {
     focusDateInput: false
   };
   var hasIntlContext = true;
-  return new Plugin({
+  return new SafePlugin({
     state: createPluginState(dispatch, newPluginState),
     key: pluginKey,
     props: {

package/dist/esm/plugins/date/styles.js

@@ -3,6 +3,6 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject;
 
 import { css } from 'styled-components';
-import { DateSharedCssClassName } from '@atlaskit/editor-common';
+import { DateSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { SelectionStyle, getSelectionStyles, akEditorSelectedBorderSize, akEditorDeleteBorder, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 export var dateStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .", " {\n    .", " {\n      line-height: initial;\n      cursor: pointer;\n    }\n\n    &.", " {\n      .", " > span {\n        ", "\n      }\n    }\n  }\n\n  .danger {\n    .", ".", "\n      .", "\n      > span {\n      box-shadow: 0 0 0 ", "px ", ";\n    }\n  }\n"])), DateSharedCssClassName.DATE_CONTAINER, DateSharedCssClassName.DATE_WRAPPER, akEditorSelectedNodeClassName, DateSharedCssClassName.DATE_WRAPPER, getSelectionStyles([SelectionStyle.BoxShadow]), DateSharedCssClassName.DATE_CONTAINER, akEditorSelectedNodeClassName, DateSharedCssClassName.DATE_WRAPPER, akEditorSelectedBorderSize, akEditorDeleteBorder);

package/dist/esm/plugins/date/ui/DatePicker/index.js

@@ -15,7 +15,8 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Popup, timestampToUTCDate, timestampToIsoFormat } from '@atlaskit/editor-common';
+import { Popup } from '@atlaskit/editor-common/ui';
+import { timestampToUTCDate, timestampToIsoFormat } from '@atlaskit/editor-common/utils';
 import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
 import Calendar from '@atlaskit/calendar';
 import { borderRadius } from '@atlaskit/theme/constants';

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

@@ -1,4 +1,5 @@
-import { Plugin, PluginKey } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from 'prosemirror-state';
 import { pluginFactory } from '../../utils/plugin-state-factory';
 export var pluginKey = new PluginKey('editorDisabledPlugin');
 
@@ -17,7 +18,7 @@ won't re-render when it changes.
 
 
 export function createPlugin(dispatch) {
-  return new Plugin({
+  return new SafePlugin({
     key: pluginKey,
     state: createPluginState(dispatch, {
       editorDisabled: false

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

@@ -5,7 +5,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 React from 'react';
-import { Plugin, PluginKey } from 'prosemirror-state';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { PluginKey } from 'prosemirror-state';
 import { emoji } from '@atlaskit/adf-schema';
 import { Fragment } from 'prosemirror-model';
 import { TypeAheadAvailableNodes } from '@atlaskit/editor-common/type-ahead';
@@ -280,7 +281,7 @@ export function getEmojiPluginState(state) {
   return emojiPluginKey.getState(state) || {};
 }
 export function emojiPluginFactory(dispatch, providerFactory, portalProviderAPI, eventDispatcher, options) {
-  return new Plugin({
+  return new SafePlugin({
     key: emojiPluginKey,
     state: {
       init: function init() {

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

@@ -4,14 +4,11 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { DOMSerializer } from 'prosemirror-model';
-import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common';
-import { createMobileInlineDomRef } from '../../../ui/InlineNodeWrapper';
+import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
 export var EmojiNodeView = /*#__PURE__*/function () {
   function EmojiNodeView(node, _, context) {
     var _this = this,
-        _this$options,
-        _this$options2,
-        _this$options3;
+        _this$options;
 
     _classCallCheck(this, EmojiNodeView);
 
@@ -33,17 +30,10 @@ export 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 = 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(ZERO_WIDTH_SPACE));
     }
 

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

@@ -10,10 +10,9 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import React from 'react';
-import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common';
+import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
 import Emoji from '../ui/Emoji';
 import { ReactNodeView } from '../../../nodeviews';
-import InlineNodeWrapper, { createMobileInlineDomRef } from '../../../ui/InlineNodeWrapper';
 export var EmojiNodeView = /*#__PURE__*/function (_ReactNodeView) {
   _inherits(EmojiNodeView, _ReactNodeView);
 
@@ -28,10 +27,6 @@ export var EmojiNodeView = /*#__PURE__*/function (_ReactNodeView) {
   _createClass(EmojiNodeView, [{
     key: "createDomRef",
     value: function createDomRef() {
-      if (this.reactComponentProps.options && this.reactComponentProps.options.useInlineWrapper) {
-        return createMobileInlineDomRef();
-      }
-
       return _get(_getPrototypeOf(EmojiNodeView.prototype), "createDomRef", this).call(this);
     }
   }, {
@@ -43,9 +38,7 @@ export var EmojiNodeView = /*#__PURE__*/function (_ReactNodeView) {
           shortName = _this$node$attrs.shortName,
           id = _this$node$attrs.id,
           text = _this$node$attrs.text;
-      return /*#__PURE__*/React.createElement(InlineNodeWrapper, {
-        useInlineWrapper: options && options.useInlineWrapper
-      }, /*#__PURE__*/React.createElement(Emoji, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Emoji, {
         providers: providerFactory,
         id: id,
         shortName: shortName,

package/dist/esm/plugins/emoji/styles.js

@@ -5,9 +5,9 @@ var _templateObject, _templateObject2;
 import { css } from 'styled-components';
 import { N0, N20, N900 } from '@atlaskit/theme/colors';
 import { borderRadius, fontSizeSmall, gridSize } from '@atlaskit/theme/constants';
-import { EmojiSharedCssClassName } from '@atlaskit/editor-common';
+import { EmojiSharedCssClassName } from '@atlaskit/editor-common/emoji';
 import { SelectionStyle, getSelectionStyles, akEditorSelectedNodeClassName, relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
-export var emojiStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .", " {\n    display: inline-block;\n\n    .", " {\n      cursor: pointer;\n\n      &.", " > span {\n        /** needed for selection style to cover custom emoji image properly */\n        display: flex;\n      }\n    }\n\n    &.", " {\n      .", ",\n        .", "\n        > span {\n        border-radius: 2px;\n        ", "\n      }\n    }\n  }\n"])), EmojiSharedCssClassName.EMOJI_CONTAINER, EmojiSharedCssClassName.EMOJI_NODE, EmojiSharedCssClassName.EMOJI_IMAGE, akEditorSelectedNodeClassName, EmojiSharedCssClassName.EMOJI_SPRITE, EmojiSharedCssClassName.EMOJI_IMAGE, getSelectionStyles([SelectionStyle.Blanket, SelectionStyle.BoxShadow]));
+export var emojiStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .", " {\n    display: inline-block;\n\n    .", " {\n      cursor: pointer;\n\n      &.", " > span {\n        /** needed for selection style to cover custom emoji image properly */\n        display: flex;\n      }\n    }\n\n    &.", " {\n      .", ",\n        .", " {\n        border-radius: 2px;\n        ", "\n      }\n    }\n  }\n"])), EmojiSharedCssClassName.EMOJI_CONTAINER, EmojiSharedCssClassName.EMOJI_NODE, EmojiSharedCssClassName.EMOJI_IMAGE, akEditorSelectedNodeClassName, EmojiSharedCssClassName.EMOJI_SPRITE, EmojiSharedCssClassName.EMOJI_IMAGE, getSelectionStyles([SelectionStyle.Blanket, SelectionStyle.BoxShadow]));
 var grid = gridSize() / 2;
 var fontSize = fontSizeSmall();
 var lineHeight = 4 * grid / fontSize;

package/dist/esm/plugins/emoji/ui/Emoji/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ClickSelectWrapper } from '../../../../ui/styles';
-import { Emoji } from '@atlaskit/editor-common';
+import { Emoji } from '@atlaskit/editor-common/emoji';
 export default function EmojiNode(props) {
   return /*#__PURE__*/React.createElement(ClickSelectWrapper, null, /*#__PURE__*/React.createElement(Emoji, props));
 }

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

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

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

@@ -7,7 +7,7 @@ import { Selection, NodeSelection } from 'prosemirror-state';
 import { ExpandIconButton } from '../ui/ExpandIconButton';
 import { keyName } from 'w3c-keyname';
 import { DOMSerializer } from 'prosemirror-model';
-import { expandMessages } from '@atlaskit/editor-common';
+import { expandMessages } from '@atlaskit/editor-common/ui';
 import { isEmptyNode } from '../../../utils';
 import { updateExpandTitle, toggleExpandExpanded, deleteExpandAtPos, setSelectionInsideExpand } from '../commands';
 import { expandClassNames } from '../ui/class-names';
@@ -55,13 +55,15 @@ var toDOM = function toDOM(node, intl) {
 };
 
 export var ExpandNodeView = /*#__PURE__*/function () {
-  function ExpandNodeView(node, view, getPos, getIntl) {
+  function ExpandNodeView(node, view, getPos, getIntl, isMobile) {
     var _this = this;
 
     _classCallCheck(this, ExpandNodeView);
 
     _defineProperty(this, "allowInteractiveExpand", true);
 
+    _defineProperty(this, "isMobile", false);
+
     _defineProperty(this, "focusTitle", function () {
       if (_this.input) {
         var _this$view = _this.view,
@@ -357,6 +359,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
     this.node = node;
     this.dom = dom;
     this.contentDOM = contentDOM;
+    this.isMobile = isMobile;
     this.icon = this.dom.querySelector(".".concat(expandClassNames.icon));
     this.input = this.dom.querySelector(".".concat(expandClassNames.titleInput));
     this.titleContainer = this.dom.querySelector(".".concat(expandClassNames.titleContainer));
@@ -412,6 +415,12 @@ export 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;
       }
@@ -484,8 +493,10 @@ export var ExpandNodeView = /*#__PURE__*/function () {
 
   return ExpandNodeView;
 }();
-export default function (getIntl) {
+export default function (_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);
   };
 }