@atlaskit/editor-core 187.18.1 → 187.19.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-core
 
+## 187.19.0
+
+### Minor Changes
+
+- [`7cb6ec49e68`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7cb6ec49e68) - Decouple `composition` plugin from `base` plugin
+
+## 187.18.2
+
+### Patch Changes
+
+- [`079e7748c62`](https://bitbucket.org/atlassian/atlassian-frontend/commits/079e7748c62) - Extracted `editor-plugin-image-upload` from `editor-core`.
+- Updated dependencies
+
 ## 187.18.1
 
 ### Patch Changes

package/dist/cjs/labs/next/presets/default.js

@@ -26,6 +26,7 @@ var _plugins = require("../../../plugins");
 var _editorPluginAnalytics = require("@atlaskit/editor-plugin-analytics");
 var _placeholder = _interopRequireDefault(require("../../../plugins/placeholder"));
 var _annotation = _interopRequireDefault(require("../../../plugins/annotation"));
+var _composition = _interopRequireDefault(require("../../../plugins/composition"));
 var _quickInsert = _interopRequireDefault(require("../../../plugins/quick-insert"));
 var _selection = _interopRequireDefault(require("../../../plugins/selection"));
 var _codeBlock = _interopRequireDefault(require("../../../plugins/code-block"));
@@ -61,7 +62,7 @@ function createDefaultPreset(options) {
       }]);
     }
     return builder;
-  }).add([_paste.default, options.paste]).add(_clipboard.default).add(_editorPluginFocus.focusPlugin).add([_base.default, options.base]).add(_editorPluginDecorations.decorationsPlugin).maybeAdd(_undoRedo.default, function (p, builder) {
+  }).add([_paste.default, options.paste]).add(_clipboard.default).add(_editorPluginFocus.focusPlugin).add(_composition.default).add([_base.default, options.base]).add(_editorPluginDecorations.decorationsPlugin).maybeAdd(_undoRedo.default, function (p, builder) {
     var _options$featureFlags;
     // The undo redo plugin needs to be add before the blockTypePlugin
     if ((_options$featureFlags = options.featureFlags) !== null && _options$featureFlags !== void 0 && _options$featureFlags.undoRedoButtons) {

package/dist/cjs/labs/next/presets/universal.js

@@ -9,6 +9,7 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _api = require("../../../selection-api/api");
 var _plugins = require("../../../plugins");
+var _editorPluginImageUpload = require("@atlaskit/editor-plugin-image-upload");
 var _editorPluginGuideline = require("@atlaskit/editor-plugin-guideline");
 var _editorPluginContextPanel = require("@atlaskit/editor-plugin-context-panel");
 var _editorPluginGrid = require("@atlaskit/editor-plugin-grid");
@@ -183,7 +184,7 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
       return builder.add([plugin, props.onSave]);
     }
     return builder;
-  }).maybeAdd(_plugins.imageUploadPlugin, function (plugin, builder) {
+  }).maybeAdd(_editorPluginImageUpload.imageUploadPlugin, function (plugin, builder) {
     if (props.legacyImageUploadProvider) {
       return builder.add(plugin);
     }

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

@@ -19,7 +19,6 @@ var _inlineCursorTarget = _interopRequireDefault(require("./pm-plugins/inline-cu
 var _scrollGutter = _interopRequireDefault(require("./pm-plugins/scroll-gutter"));
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _frozenEditor = _interopRequireDefault(require("./pm-plugins/frozen-editor"));
-var _composition = _interopRequireDefault(require("./pm-plugins/composition"));
 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) { (0, _defineProperty2.default)(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; }
 // Chrome >= 88
@@ -112,12 +111,6 @@ var basePlugin = function basePlugin(options, api) {
           return (0, _disableSpellChecking.default)(featureFlags);
         }
       });
-      plugins.push({
-        name: 'compositionPlugin',
-        plugin: function plugin() {
-          return (0, _composition.default)();
-        }
-      });
       return plugins;
     },
     nodes: function nodes() {

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

@@ -44,7 +44,7 @@ var codeBlockPlugin = function codeBlockPlugin(options, api) {
       }, {
         name: 'codeBlockIDEKeyBindings',
         plugin: function plugin() {
-          return _ideUx.default;
+          return (0, _ideUx.default)(api);
         }
       }, {
         name: 'codeBlockKeyMap',

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

@@ -15,113 +15,116 @@ var _bracketHandling = require("../ide-ux/bracket-handling");
 var _quoteHandling = require("../ide-ux/quote-handling");
 var _lineHandling = require("../ide-ux/line-handling");
 var _commands = require("../ide-ux/commands");
-var _composition = require("../../base/pm-plugins/composition");
-var _default = new _safePlugin.SafePlugin({
-  props: {
-    handleTextInput: function handleTextInput(view, from, to, text) {
-      var state = view.state,
-        dispatch = view.dispatch;
-      if ((0, _lineHandling.isCursorInsideCodeBlock)(state) && !(0, _composition.isComposing)(state)) {
-        var beforeText = (0, _lineHandling.getStartOfCurrentLine)(state).text;
-        var afterText = (0, _lineHandling.getEndOfCurrentLine)(state).text;
-
-        // If text is a closing bracket/quote and we've already inserted it, move the selection after
-        if ((0, _pairedCharacterHandling.isCursorBeforeClosingCharacter)(afterText) && (0, _pairedCharacterHandling.isClosingCharacter)(text) && afterText.startsWith(text)) {
-          dispatch((0, _utils.setTextSelection)(to + text.length)(state.tr));
-          return true;
-        }
-
-        // Automatically add right-hand side bracket when user types the left bracket
-        if ((0, _bracketHandling.shouldAutoCloseBracket)(beforeText, afterText)) {
-          var _getAutoClosingBracke = (0, _bracketHandling.getAutoClosingBracketInfo)(beforeText + text, afterText),
-            left = _getAutoClosingBracke.left,
-            right = _getAutoClosingBracke.right;
-          if (left && right) {
-            var bracketPair = state.schema.text(text + right);
-            var tr = state.tr.replaceWith(from, to, bracketPair);
-            dispatch((0, _utils.setTextSelection)(from + text.length)(tr));
-            return true;
-          }
-        }
-
-        // Automatically add closing quote when user types a starting quote
-        if ((0, _quoteHandling.shouldAutoCloseQuote)(beforeText, afterText)) {
-          var _getAutoClosingQuoteI = (0, _quoteHandling.getAutoClosingQuoteInfo)(beforeText + text, afterText),
-            leftQuote = _getAutoClosingQuoteI.left,
-            rightQuote = _getAutoClosingQuoteI.right;
-          if (leftQuote && rightQuote) {
-            var quotePair = state.schema.text(text + rightQuote);
-            var _tr = state.tr.replaceWith(from, to, quotePair);
-            dispatch((0, _utils.setTextSelection)(from + text.length)(_tr));
-            return true;
-          }
-        }
-      }
-      return false;
-    },
-    handleKeyDown: (0, _keymap.keydownHandler)({
-      Backspace: function Backspace(state, dispatch) {
-        if ((0, _lineHandling.isCursorInsideCodeBlock)(state)) {
-          var $cursor = (0, _utils2.getCursor)(state.selection);
+var ideUX = function ideUX(pluginInjectionApi) {
+  return new _safePlugin.SafePlugin({
+    props: {
+      handleTextInput: function handleTextInput(view, from, to, text) {
+        var state = view.state,
+          dispatch = view.dispatch;
+        var compositionPluginState = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.composition.sharedState.currentState();
+        if ((0, _lineHandling.isCursorInsideCodeBlock)(state) && !(compositionPluginState !== null && compositionPluginState !== void 0 && compositionPluginState.isComposing)) {
           var beforeText = (0, _lineHandling.getStartOfCurrentLine)(state).text;
           var afterText = (0, _lineHandling.getEndOfCurrentLine)(state).text;
-          var _getAutoClosingBracke2 = (0, _bracketHandling.getAutoClosingBracketInfo)(beforeText, afterText),
-            leftBracket = _getAutoClosingBracke2.left,
-            rightBracket = _getAutoClosingBracke2.right,
-            hasTrailingMatchingBracket = _getAutoClosingBracke2.hasTrailingMatchingBracket;
-          if (leftBracket && rightBracket && hasTrailingMatchingBracket && dispatch) {
-            dispatch(state.tr.delete($cursor.pos - leftBracket.length, $cursor.pos + rightBracket.length));
+
+          // If text is a closing bracket/quote and we've already inserted it, move the selection after
+          if ((0, _pairedCharacterHandling.isCursorBeforeClosingCharacter)(afterText) && (0, _pairedCharacterHandling.isClosingCharacter)(text) && afterText.startsWith(text)) {
+            dispatch((0, _utils.setTextSelection)(to + text.length)(state.tr));
             return true;
           }
-          var _getAutoClosingQuoteI2 = (0, _quoteHandling.getAutoClosingQuoteInfo)(beforeText, afterText),
-            leftQuote = _getAutoClosingQuoteI2.left,
-            rightQuote = _getAutoClosingQuoteI2.right,
-            hasTrailingMatchingQuote = _getAutoClosingQuoteI2.hasTrailingMatchingQuote;
-          if (leftQuote && rightQuote && hasTrailingMatchingQuote && dispatch) {
-            dispatch(state.tr.delete($cursor.pos - leftQuote.length, $cursor.pos + rightQuote.length));
-            return true;
+
+          // Automatically add right-hand side bracket when user types the left bracket
+          if ((0, _bracketHandling.shouldAutoCloseBracket)(beforeText, afterText)) {
+            var _getAutoClosingBracke = (0, _bracketHandling.getAutoClosingBracketInfo)(beforeText + text, afterText),
+              left = _getAutoClosingBracke.left,
+              right = _getAutoClosingBracke.right;
+            if (left && right) {
+              var bracketPair = state.schema.text(text + right);
+              var tr = state.tr.replaceWith(from, to, bracketPair);
+              dispatch((0, _utils.setTextSelection)(from + text.length)(tr));
+              return true;
+            }
           }
-          var _getLineInfo = (0, _lineHandling.getLineInfo)(beforeText),
-            _getLineInfo$indentTo = _getLineInfo.indentToken,
-            size = _getLineInfo$indentTo.size,
-            token = _getLineInfo$indentTo.token,
-            indentText = _getLineInfo.indentText;
-          if (beforeText === indentText) {
-            if (indentText.endsWith(token.repeat(size)) && dispatch) {
-              dispatch(state.tr.delete($cursor.pos - (size - indentText.length % size || size), $cursor.pos));
+
+          // Automatically add closing quote when user types a starting quote
+          if ((0, _quoteHandling.shouldAutoCloseQuote)(beforeText, afterText)) {
+            var _getAutoClosingQuoteI = (0, _quoteHandling.getAutoClosingQuoteInfo)(beforeText + text, afterText),
+              leftQuote = _getAutoClosingQuoteI.left,
+              rightQuote = _getAutoClosingQuoteI.right;
+            if (leftQuote && rightQuote) {
+              var quotePair = state.schema.text(text + rightQuote);
+              var _tr = state.tr.replaceWith(from, to, quotePair);
+              dispatch((0, _utils.setTextSelection)(from + text.length)(_tr));
               return true;
             }
           }
         }
         return false;
       },
-      Enter: (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.insertNewlineWithIndent),
-      'Mod-]': (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.indent),
-      'Mod-[': (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.outdent),
-      Tab: (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, function (state, dispatch) {
-        if (!dispatch) {
+      handleKeyDown: (0, _keymap.keydownHandler)({
+        Backspace: function Backspace(state, dispatch) {
+          if ((0, _lineHandling.isCursorInsideCodeBlock)(state)) {
+            var $cursor = (0, _utils2.getCursor)(state.selection);
+            var beforeText = (0, _lineHandling.getStartOfCurrentLine)(state).text;
+            var afterText = (0, _lineHandling.getEndOfCurrentLine)(state).text;
+            var _getAutoClosingBracke2 = (0, _bracketHandling.getAutoClosingBracketInfo)(beforeText, afterText),
+              leftBracket = _getAutoClosingBracke2.left,
+              rightBracket = _getAutoClosingBracke2.right,
+              hasTrailingMatchingBracket = _getAutoClosingBracke2.hasTrailingMatchingBracket;
+            if (leftBracket && rightBracket && hasTrailingMatchingBracket && dispatch) {
+              dispatch(state.tr.delete($cursor.pos - leftBracket.length, $cursor.pos + rightBracket.length));
+              return true;
+            }
+            var _getAutoClosingQuoteI2 = (0, _quoteHandling.getAutoClosingQuoteInfo)(beforeText, afterText),
+              leftQuote = _getAutoClosingQuoteI2.left,
+              rightQuote = _getAutoClosingQuoteI2.right,
+              hasTrailingMatchingQuote = _getAutoClosingQuoteI2.hasTrailingMatchingQuote;
+            if (leftQuote && rightQuote && hasTrailingMatchingQuote && dispatch) {
+              dispatch(state.tr.delete($cursor.pos - leftQuote.length, $cursor.pos + rightQuote.length));
+              return true;
+            }
+            var _getLineInfo = (0, _lineHandling.getLineInfo)(beforeText),
+              _getLineInfo$indentTo = _getLineInfo.indentToken,
+              size = _getLineInfo$indentTo.size,
+              token = _getLineInfo$indentTo.token,
+              indentText = _getLineInfo.indentText;
+            if (beforeText === indentText) {
+              if (indentText.endsWith(token.repeat(size)) && dispatch) {
+                dispatch(state.tr.delete($cursor.pos - (size - indentText.length % size || size), $cursor.pos));
+                return true;
+              }
+            }
+          }
           return false;
-        }
-        if ((0, _lineHandling.isCursorInsideCodeBlock)(state)) {
-          return (0, _commands.insertIndent)(state, dispatch);
-        }
-        return (0, _commands.indent)(state, dispatch);
-      }),
-      'Shift-Tab': (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.outdent),
-      'Mod-a': function ModA(state, dispatch) {
-        if ((0, _lineHandling.isSelectionEntirelyInsideCodeBlock)(state)) {
-          var _state$selection = state.selection,
-            $from = _state$selection.$from,
-            $to = _state$selection.$to;
-          var isFullCodeBlockSelection = $from.parentOffset === 0 && $to.parentOffset === $to.parent.nodeSize - 2;
-          if (!isFullCodeBlockSelection && dispatch) {
-            dispatch(state.tr.setSelection(_state.TextSelection.create(state.doc, $from.start(), $to.end())));
-            return true;
+        },
+        Enter: (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.insertNewlineWithIndent),
+        'Mod-]': (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.indent),
+        'Mod-[': (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.outdent),
+        Tab: (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, function (state, dispatch) {
+          if (!dispatch) {
+            return false;
+          }
+          if ((0, _lineHandling.isCursorInsideCodeBlock)(state)) {
+            return (0, _commands.insertIndent)(state, dispatch);
+          }
+          return (0, _commands.indent)(state, dispatch);
+        }),
+        'Shift-Tab': (0, _utils3.filterCommand)(_lineHandling.isSelectionEntirelyInsideCodeBlock, _commands.outdent),
+        'Mod-a': function ModA(state, dispatch) {
+          if ((0, _lineHandling.isSelectionEntirelyInsideCodeBlock)(state)) {
+            var _state$selection = state.selection,
+              $from = _state$selection.$from,
+              $to = _state$selection.$to;
+            var isFullCodeBlockSelection = $from.parentOffset === 0 && $to.parentOffset === $to.parent.nodeSize - 2;
+            if (!isFullCodeBlockSelection && dispatch) {
+              dispatch(state.tr.setSelection(_state.TextSelection.create(state.doc, $from.start(), $to.end())));
+              return true;
+            }
           }
+          return false;
         }
-        return false;
-      }
-    })
-  }
-});
+      })
+    }
+  });
+};
+var _default = ideUX;
 exports.default = _default;

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

@@ -0,0 +1,33 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _main = _interopRequireDefault(require("./pm-plugins/main"));
+var _pluginKey = require("./pm-plugins/plugin-key");
+var composition = function composition() {
+  return {
+    name: 'composition',
+    getSharedState: function getSharedState(editorState) {
+      var _pluginKey$getState;
+      if (!editorState) {
+        return undefined;
+      }
+      return {
+        isComposing: !!((_pluginKey$getState = _pluginKey.pluginKey.getState(editorState)) !== null && _pluginKey$getState !== void 0 && _pluginKey$getState.isComposing)
+      };
+    },
+    pmPlugins: function pmPlugins() {
+      return [{
+        name: 'composition',
+        plugin: function plugin() {
+          return (0, _main.default)();
+        }
+      }];
+    }
+  };
+};
+var _default = composition;
+exports.default = _default;

package/dist/cjs/plugins/{base/pm-plugins/composition.js → composition/pm-plugins/main.js}

@@ -3,22 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isComposing = exports.default = void 0;
+exports.default = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-common/utils");
-var compositionPluginKey = new _state.PluginKey('compositionPlugin');
-var isComposing = function isComposing(state) {
-  var _compositionPluginKey;
-  return !!((_compositionPluginKey = compositionPluginKey.getState(state)) !== null && _compositionPluginKey !== void 0 && _compositionPluginKey.isComposing);
-};
-exports.isComposing = isComposing;
+var _pluginKey = require("./plugin-key");
 var isLinux = function isLinux() {
   return navigator.userAgent.indexOf('Linux') >= 0;
 };
 var _default = function _default() {
   return new _safePlugin.SafePlugin({
-    key: compositionPluginKey,
+    key: _pluginKey.pluginKey,
     state: {
       init: function init() {
         return {
@@ -27,7 +21,7 @@ var _default = function _default() {
         };
       },
       apply: function apply(tr, value) {
-        var isComposing = tr.getMeta(compositionPluginKey);
+        var isComposing = tr.getMeta(_pluginKey.pluginKey);
         var zeroWidthSpacePos = tr.getMeta('zeroWidthSpacePos');
         if (typeof isComposing === 'undefined') {
           return value;
@@ -42,7 +36,7 @@ var _default = function _default() {
       handleDOMEvents: {
         compositionstart: function compositionstart(view, event) {
           var tr = view.state.tr;
-          tr.setMeta(compositionPluginKey, true);
+          tr.setMeta(_pluginKey.pluginKey, true);
 
           // only apply for linux and cursor is at start of line
           if (isLinux() && view.state.selection.$from.parentOffset === 0) {
@@ -56,10 +50,10 @@ var _default = function _default() {
         },
         compositionend: function compositionend(view, event) {
           var tr = view.state.tr;
-          tr.setMeta(compositionPluginKey, false);
+          tr.setMeta(_pluginKey.pluginKey, false);
           if (isLinux()) {
-            var _compositionPluginKey2;
-            var zeroWidthSpacePos = (_compositionPluginKey2 = compositionPluginKey.getState(view.state)) === null || _compositionPluginKey2 === void 0 ? void 0 : _compositionPluginKey2.zeroWidthSpacePos;
+            var _pluginKey$getState;
+            var zeroWidthSpacePos = (_pluginKey$getState = _pluginKey.pluginKey.getState(view.state)) === null || _pluginKey$getState === void 0 ? void 0 : _pluginKey$getState.zeroWidthSpacePos;
             if (typeof zeroWidthSpacePos !== 'undefined') {
               tr.deleteRange(zeroWidthSpacePos, zeroWidthSpacePos + 1);
             }

package/dist/cjs/plugins/{image-upload → composition}/pm-plugins/plugin-key.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.stateKey = void 0;
+exports.pluginKey = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
-var stateKey = new _state.PluginKey('imageUploadPlugin');
-exports.stateKey = stateKey;
+var pluginKey = new _state.PluginKey('compositionPlugin');
+exports.pluginKey = pluginKey;

package/dist/cjs/plugins/index.js

@@ -191,12 +191,6 @@ Object.defineProperty(exports, "historyPlugin", {
     return _history.default;
   }
 });
-Object.defineProperty(exports, "imageUploadPlugin", {
-  enumerable: true,
-  get: function get() {
-    return _imageUpload.default;
-  }
-});
 Object.defineProperty(exports, "indentationPlugin", {
   enumerable: true,
   get: function get() {
@@ -388,7 +382,6 @@ var _emoji = _interopRequireDefault(require("./emoji"));
 var _extension = _interopRequireDefault(require("./extension"));
 var _fakeTextCursor = _interopRequireDefault(require("./fake-text-cursor"));
 var _helpDialog = _interopRequireDefault(require("./help-dialog"));
-var _imageUpload = _interopRequireDefault(require("./image-upload"));
 var _insertBlock = _interopRequireDefault(require("./insert-block"));
 var _jiraIssue = _interopRequireDefault(require("./jira-issue"));
 var _layout = _interopRequireDefault(require("./layout"));

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

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -21,7 +20,7 @@ var _editorMarkdownTransformer = require("@atlaskit/editor-markdown-transformer"
 var _card = require("@atlaskit/editor-common/card");
 var _slice = require("../../../utils/slice");
 var _extensions = require("@atlaskit/editor-common/extensions");
-var clipboard = _interopRequireWildcard(require("../../../utils/clipboard"));
+var _paste = require("@atlaskit/editor-common/paste");
 var _mediaSingle = require("../../media/utils/media-single");
 var _util = require("../util");
 var _utils = require("@atlaskit/editor-common/utils");
@@ -33,7 +32,6 @@ var _analytics2 = require("../../analytics");
 var _utils4 = require("../../../utils");
 var _mediaCommon = require("../../media/utils/media-common");
 var _commands = require("../commands");
-var _paste = require("@atlaskit/editor-common/paste");
 var _utils5 = require("../../tasks-and-decisions/utils");
 var _utils6 = require("../../annotation/utils");
 var _clipboardTextSerializer = require("./clipboard-text-serializer");
@@ -42,8 +40,6 @@ var _utils7 = require("@atlaskit/editor-tables/utils");
 var _step = require("../../../utils/step");
 var _pluginFactory = require("./plugin-factory");
 var _utils8 = require("@atlaskit/editor-prosemirror/utils");
-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 createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pluginInjectionApi, cardOptions, sanitizePrivateContent, providerFactory) {
   var atlassianMarkDownParser = new _editorMarkdownTransformer.MarkdownTransformer(schema, _paste.md);
   function getMarkdownSlice(text, openStart, openEnd) {
@@ -134,7 +130,7 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
         if ((_text = text) !== null && _text !== void 0 && _text.includes('\r')) {
           text = text.replace(/\r/g, '');
         }
-        var isPastedFile = clipboard.isPastedFile(event);
+        var isPastedFile = (0, _paste.isPastedFile)(event);
         var isPlainText = text && !html;
         var isRichText = !!html;
 

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

@@ -11,7 +11,6 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _utils2 = require("../type-ahead/utils");
-var _composition = require("../base/pm-plugins/composition");
 var pluginKey = new _state.PluginKey('placeholderPlugin');
 exports.pluginKey = pluginKey;
 function getPlaceholderState(editorState) {
@@ -108,7 +107,8 @@ function createPlugin(defaultPlaceholderText, bracketPlaceholderText, api) {
           hasPlaceholder = _getPlaceholderState.hasPlaceholder,
           placeholderText = _getPlaceholderState.placeholderText,
           pos = _getPlaceholderState.pos;
-        if (hasPlaceholder && placeholderText && pos !== undefined && !(0, _composition.isComposing)(editorState)) {
+        var compositionPluginState = api === null || api === void 0 ? void 0 : api.dependencies.composition.sharedState.currentState();
+        if (hasPlaceholder && placeholderText && pos !== undefined && !(compositionPluginState !== null && compositionPluginState !== void 0 && compositionPluginState.isComposing)) {
           return createPlaceholderDecoration(editorState, placeholderText, pos);
         }
         return;

package/dist/cjs/utils/clipboard.js

@@ -5,35 +5,13 @@ var _typeof3 = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.checkClipboardTypes = checkClipboardTypes;
-exports.isClipboardEvent = exports.copyToClipboard = exports.copyHTMLToClipboardPolyfill = exports.copyHTMLToClipboard = void 0;
-exports.isPastedFile = isPastedFile;
+exports.copyToClipboard = exports.copyHTMLToClipboardPolyfill = exports.copyHTMLToClipboard = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var clipboard = _interopRequireWildcard(require("clipboard-polyfill"));
 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 || _typeof3(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 checkClipboardTypes(type, item) {
-  var isDOMStringList = function isDOMStringList(t) {
-    return !t.indexOf && !!t.contains;
-  };
-  return isDOMStringList(type) ? type.contains(item) : type.indexOf(item) > -1;
-}
-
-// Typeguard Function
-var isClipboardEvent = function isClipboardEvent(event) {
-  return 'clipboardData' in event;
-};
-exports.isClipboardEvent = isClipboardEvent;
-function isPastedFile(rawEvent) {
-  var _ref = rawEvent,
-    clipboardData = _ref.clipboardData;
-  if (!clipboardData) {
-    return false;
-  }
-  return checkClipboardTypes(clipboardData.types, 'Files');
-}
 var isClipboardApiSupported = function isClipboardApiSupported() {
   return !!navigator.clipboard && typeof navigator.clipboard.writeText === 'function';
 };
@@ -41,7 +19,7 @@ var isIEClipboardApiSupported = function isIEClipboardApiSupported() {
   return window.clipboardData && typeof window.clipboardData.setData === 'function';
 };
 var copyToClipboard = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(textToCopy) {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(textToCopy) {
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -89,12 +67,12 @@ var copyToClipboard = /*#__PURE__*/function () {
     }, _callee, null, [[1, 6], [12, 17]]);
   }));
   return function copyToClipboard(_x) {
-    return _ref2.apply(this, arguments);
+    return _ref.apply(this, arguments);
   };
 }();
 exports.copyToClipboard = copyToClipboard;
 var copyHTMLToClipboard = /*#__PURE__*/function () {
-  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(elementToCopy, plainTextToCopy) {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(elementToCopy, plainTextToCopy) {
     var data;
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -137,7 +115,7 @@ var copyHTMLToClipboard = /*#__PURE__*/function () {
     }, _callee2, null, [[1, 7]]);
   }));
   return function copyHTMLToClipboard(_x2, _x3) {
-    return _ref3.apply(this, arguments);
+    return _ref2.apply(this, arguments);
   };
 }();
 

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "187.18.1";
+var version = "187.19.0";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

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

package/dist/es2019/labs/next/presets/default.js

@@ -20,6 +20,7 @@ import { analyticsPlugin as deprecatedAnalyticsPlugin } from '../../../plugins';
 import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import placeholderPlugin from '../../../plugins/placeholder';
 import annotationPlugin from '../../../plugins/annotation';
+import compositionPlugin from '../../../plugins/composition';
 import quickInsertPlugin from '../../../plugins/quick-insert';
 import selectionPlugin from '../../../plugins/selection';
 import codeBlockPlugin from '../../../plugins/code-block';
@@ -57,7 +58,7 @@ export function createDefaultPreset(options) {
       }]);
     }
     return builder;
-  }).add([pastePlugin, options.paste]).add(clipboardPlugin).add(focusPlugin).add([basePlugin, options.base]).add(decorationsPlugin).maybeAdd(undoRedoPlugin, (p, builder) => {
+  }).add([pastePlugin, options.paste]).add(clipboardPlugin).add(focusPlugin).add(compositionPlugin).add([basePlugin, options.base]).add(decorationsPlugin).maybeAdd(undoRedoPlugin, (p, builder) => {
     var _options$featureFlags;
     // The undo redo plugin needs to be add before the blockTypePlugin
     if ((_options$featureFlags = options.featureFlags) !== null && _options$featureFlags !== void 0 && _options$featureFlags.undoRedoButtons) {

package/dist/es2019/labs/next/presets/universal.js

@@ -1,5 +1,6 @@
 import { createEditorSelectionAPI } from '../../../selection-api/api';
-import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, datePlugin, emojiPlugin, extensionPlugin, fragmentMarkPlugin, helpDialogPlugin, imageUploadPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, listPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, mediaPlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, rulePlugin, saveOnEnterPlugin, tasksAndDecisionsPlugin, textColorPlugin, statusPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, scrollIntoViewPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, captionPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin, copyButtonPlugin, borderPlugin } from '../../../plugins';
+import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, datePlugin, emojiPlugin, extensionPlugin, fragmentMarkPlugin, helpDialogPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, listPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, mediaPlugin, mentionsPlugin, panelPlugin, placeholderTextPlugin, rulePlugin, saveOnEnterPlugin, tasksAndDecisionsPlugin, textColorPlugin, statusPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, historyPlugin, expandPlugin, isExpandInsertionEnabled, scrollIntoViewPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, captionPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin, copyButtonPlugin, borderPlugin } from '../../../plugins';
+import { imageUploadPlugin } from '@atlaskit/editor-plugin-image-upload';
 import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import { contextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
 import { gridPlugin } from '@atlaskit/editor-plugin-grid';

package/dist/es2019/plugins/base/index.js

@@ -11,7 +11,6 @@ import inlineCursorTargetPlugin from './pm-plugins/inline-cursor-target';
 import scrollGutter from './pm-plugins/scroll-gutter';
 import { keymap } from '@atlaskit/editor-common/keymaps';
 import frozenEditor from './pm-plugins/frozen-editor';
-import compositionPlugin from './pm-plugins/composition';
 // Chrome >= 88
 export const isChromeWithSelectionBug = browser.chrome && browser.chrome_version >= 88;
 const basePlugin = (options, api) => {
@@ -85,10 +84,6 @@ const basePlugin = (options, api) => {
         name: 'disableSpellcheckingPlugin',
         plugin: () => disableSpellcheckingPlugin(featureFlags)
       });
-      plugins.push({
-        name: 'compositionPlugin',
-        plugin: () => compositionPlugin()
-      });
       return plugins;
     },
     nodes() {