@atlaskit/editor-core 187.18.1 → 187.19.0

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

@@ -33,7 +33,7 @@ const codeBlockPlugin = (options, api) => ({
       })
     }, {
       name: 'codeBlockIDEKeyBindings',
-      plugin: () => ideUX
+      plugin: () => ideUX(api)
     }, {
       name: 'codeBlockKeyMap',
       plugin: ({

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

@@ -9,121 +9,124 @@ 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';
-import { isComposing } from '../../base/pm-plugins/composition';
-export default new SafePlugin({
-  props: {
-    handleTextInput(view, from, to, text) {
-      const {
-        state,
-        dispatch
-      } = view;
-      if (isCursorInsideCodeBlock(state) && !isComposing(state)) {
-        const beforeText = getStartOfCurrentLine(state).text;
-        const afterText = getEndOfCurrentLine(state).text;
-
-        // If text is a closing bracket/quote and we've already inserted it, move the selection after
-        if (isCursorBeforeClosingCharacter(afterText) && isClosingCharacter(text) && afterText.startsWith(text)) {
-          dispatch(setTextSelection(to + text.length)(state.tr));
-          return true;
-        }
-
-        // Automatically add right-hand side bracket when user types the left bracket
-        if (shouldAutoCloseBracket(beforeText, afterText)) {
-          const {
-            left,
-            right
-          } = getAutoClosingBracketInfo(beforeText + text, afterText);
-          if (left && right) {
-            const bracketPair = state.schema.text(text + right);
-            let tr = state.tr.replaceWith(from, to, bracketPair);
-            dispatch(setTextSelection(from + text.length)(tr));
-            return true;
-          }
-        }
-
-        // Automatically add closing quote when user types a starting quote
-        if (shouldAutoCloseQuote(beforeText, afterText)) {
-          const {
-            left: leftQuote,
-            right: rightQuote
-          } = getAutoClosingQuoteInfo(beforeText + text, afterText);
-          if (leftQuote && rightQuote) {
-            const quotePair = state.schema.text(text + rightQuote);
-            let tr = state.tr.replaceWith(from, to, quotePair);
-            dispatch(setTextSelection(from + text.length)(tr));
-            return true;
-          }
-        }
-      }
-      return false;
-    },
-    handleKeyDown: keydownHandler({
-      Backspace: (state, dispatch) => {
-        if (isCursorInsideCodeBlock(state)) {
-          const $cursor = getCursor(state.selection);
+const ideUX = pluginInjectionApi => {
+  return new SafePlugin({
+    props: {
+      handleTextInput(view, from, to, text) {
+        const {
+          state,
+          dispatch
+        } = view;
+        const compositionPluginState = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.composition.sharedState.currentState();
+        if (isCursorInsideCodeBlock(state) && !(compositionPluginState !== null && compositionPluginState !== void 0 && compositionPluginState.isComposing)) {
           const beforeText = getStartOfCurrentLine(state).text;
           const afterText = getEndOfCurrentLine(state).text;
-          const {
-            left: leftBracket,
-            right: rightBracket,
-            hasTrailingMatchingBracket
-          } = getAutoClosingBracketInfo(beforeText, afterText);
-          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 (isCursorBeforeClosingCharacter(afterText) && isClosingCharacter(text) && afterText.startsWith(text)) {
+            dispatch(setTextSelection(to + text.length)(state.tr));
             return true;
           }
-          const {
-            left: leftQuote,
-            right: rightQuote,
-            hasTrailingMatchingQuote
-          } = getAutoClosingQuoteInfo(beforeText, afterText);
-          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 (shouldAutoCloseBracket(beforeText, afterText)) {
+            const {
+              left,
+              right
+            } = getAutoClosingBracketInfo(beforeText + text, afterText);
+            if (left && right) {
+              const bracketPair = state.schema.text(text + right);
+              let tr = state.tr.replaceWith(from, to, bracketPair);
+              dispatch(setTextSelection(from + text.length)(tr));
+              return true;
+            }
           }
-          const {
-            indentToken: {
-              size,
-              token
-            },
-            indentText
-          } = getLineInfo(beforeText);
-          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 (shouldAutoCloseQuote(beforeText, afterText)) {
+            const {
+              left: leftQuote,
+              right: rightQuote
+            } = getAutoClosingQuoteInfo(beforeText + text, afterText);
+            if (leftQuote && rightQuote) {
+              const quotePair = state.schema.text(text + rightQuote);
+              let tr = state.tr.replaceWith(from, to, quotePair);
+              dispatch(setTextSelection(from + text.length)(tr));
               return true;
             }
           }
         }
         return false;
       },
-      Enter: filter(isSelectionEntirelyInsideCodeBlock, insertNewlineWithIndent),
-      'Mod-]': filter(isSelectionEntirelyInsideCodeBlock, indent),
-      'Mod-[': filter(isSelectionEntirelyInsideCodeBlock, outdent),
-      Tab: filter(isSelectionEntirelyInsideCodeBlock, (state, dispatch) => {
-        if (!dispatch) {
+      handleKeyDown: keydownHandler({
+        Backspace: (state, dispatch) => {
+          if (isCursorInsideCodeBlock(state)) {
+            const $cursor = getCursor(state.selection);
+            const beforeText = getStartOfCurrentLine(state).text;
+            const afterText = getEndOfCurrentLine(state).text;
+            const {
+              left: leftBracket,
+              right: rightBracket,
+              hasTrailingMatchingBracket
+            } = getAutoClosingBracketInfo(beforeText, afterText);
+            if (leftBracket && rightBracket && hasTrailingMatchingBracket && dispatch) {
+              dispatch(state.tr.delete($cursor.pos - leftBracket.length, $cursor.pos + rightBracket.length));
+              return true;
+            }
+            const {
+              left: leftQuote,
+              right: rightQuote,
+              hasTrailingMatchingQuote
+            } = getAutoClosingQuoteInfo(beforeText, afterText);
+            if (leftQuote && rightQuote && hasTrailingMatchingQuote && dispatch) {
+              dispatch(state.tr.delete($cursor.pos - leftQuote.length, $cursor.pos + rightQuote.length));
+              return true;
+            }
+            const {
+              indentToken: {
+                size,
+                token
+              },
+              indentText
+            } = getLineInfo(beforeText);
+            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 (isCursorInsideCodeBlock(state)) {
-          return insertIndent(state, dispatch);
-        }
-        return indent(state, dispatch);
-      }),
-      'Shift-Tab': filter(isSelectionEntirelyInsideCodeBlock, outdent),
-      'Mod-a': (state, dispatch) => {
-        if (isSelectionEntirelyInsideCodeBlock(state)) {
-          const {
-            $from,
-            $to
-          } = state.selection;
-          const isFullCodeBlockSelection = $from.parentOffset === 0 && $to.parentOffset === $to.parent.nodeSize - 2;
-          if (!isFullCodeBlockSelection && dispatch) {
-            dispatch(state.tr.setSelection(TextSelection.create(state.doc, $from.start(), $to.end())));
-            return true;
+        },
+        Enter: filter(isSelectionEntirelyInsideCodeBlock, insertNewlineWithIndent),
+        'Mod-]': filter(isSelectionEntirelyInsideCodeBlock, indent),
+        'Mod-[': filter(isSelectionEntirelyInsideCodeBlock, outdent),
+        Tab: filter(isSelectionEntirelyInsideCodeBlock, (state, dispatch) => {
+          if (!dispatch) {
+            return false;
+          }
+          if (isCursorInsideCodeBlock(state)) {
+            return insertIndent(state, dispatch);
           }
+          return indent(state, dispatch);
+        }),
+        'Shift-Tab': filter(isSelectionEntirelyInsideCodeBlock, outdent),
+        'Mod-a': (state, dispatch) => {
+          if (isSelectionEntirelyInsideCodeBlock(state)) {
+            const {
+              $from,
+              $to
+            } = state.selection;
+            const isFullCodeBlockSelection = $from.parentOffset === 0 && $to.parentOffset === $to.parent.nodeSize - 2;
+            if (!isFullCodeBlockSelection && dispatch) {
+              dispatch(state.tr.setSelection(TextSelection.create(state.doc, $from.start(), $to.end())));
+              return true;
+            }
+          }
+          return false;
         }
-        return false;
-      }
-    })
-  }
-});
+      })
+    }
+  });
+};
+export default ideUX;

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

@@ -0,0 +1,23 @@
+import createPlugin from './pm-plugins/main';
+import { pluginKey } from './pm-plugins/plugin-key';
+const composition = () => {
+  return {
+    name: 'composition',
+    getSharedState(editorState) {
+      var _pluginKey$getState;
+      if (!editorState) {
+        return undefined;
+      }
+      return {
+        isComposing: !!((_pluginKey$getState = pluginKey.getState(editorState)) !== null && _pluginKey$getState !== void 0 && _pluginKey$getState.isComposing)
+      };
+    },
+    pmPlugins() {
+      return [{
+        name: 'composition',
+        plugin: () => createPlugin()
+      }];
+    }
+  };
+};
+export default composition;

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

@@ -1,21 +1,16 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
-const compositionPluginKey = new PluginKey('compositionPlugin');
-export const isComposing = state => {
-  var _compositionPluginKey;
-  return !!((_compositionPluginKey = compositionPluginKey.getState(state)) !== null && _compositionPluginKey !== void 0 && _compositionPluginKey.isComposing);
-};
+import { pluginKey } from './plugin-key';
 const isLinux = () => navigator.userAgent.indexOf('Linux') >= 0;
 export default (() => new SafePlugin({
-  key: compositionPluginKey,
+  key: pluginKey,
   state: {
     init: () => ({
       isComposing: false,
       zeroWidthSpacePos: undefined
     }),
     apply: (tr, value) => {
-      const isComposing = tr.getMeta(compositionPluginKey);
+      const isComposing = tr.getMeta(pluginKey);
       const zeroWidthSpacePos = tr.getMeta('zeroWidthSpacePos');
       if (typeof isComposing === 'undefined') {
         return value;
@@ -32,7 +27,7 @@ export default (() => new SafePlugin({
         const {
           tr
         } = view.state;
-        tr.setMeta(compositionPluginKey, true);
+        tr.setMeta(pluginKey, true);
 
         // only apply for linux and cursor is at start of line
         if (isLinux() && view.state.selection.$from.parentOffset === 0) {
@@ -48,10 +43,10 @@ export default (() => new SafePlugin({
         const {
           tr
         } = view.state;
-        tr.setMeta(compositionPluginKey, false);
+        tr.setMeta(pluginKey, false);
         if (isLinux()) {
-          var _compositionPluginKey2;
-          const zeroWidthSpacePos = (_compositionPluginKey2 = compositionPluginKey.getState(view.state)) === null || _compositionPluginKey2 === void 0 ? void 0 : _compositionPluginKey2.zeroWidthSpacePos;
+          var _pluginKey$getState;
+          const zeroWidthSpacePos = (_pluginKey$getState = 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/es2019/plugins/{image-upload → composition}/pm-plugins/plugin-key.js

@@ -1,2 +1,2 @@
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-export const stateKey = new PluginKey('imageUploadPlugin');
+export const pluginKey = new PluginKey('compositionPlugin');

package/dist/es2019/plugins/index.js

@@ -10,7 +10,6 @@ export { default as emojiPlugin } from './emoji';
 export { default as extensionPlugin } from './extension';
 export { default as fakeTextCursorPlugin } from './fake-text-cursor';
 export { default as helpDialogPlugin } from './help-dialog';
-export { default as imageUploadPlugin } from './image-upload';
 export { default as insertBlockPlugin } from './insert-block';
 export { default as jiraIssuePlugin } from './jira-issue';
 export { default as layoutPlugin } from './layout';

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

@@ -5,7 +5,7 @@ import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { mapChildren } from '../../../utils/slice';
 import { getExtensionAutoConvertersFromProvider } from '@atlaskit/editor-common/extensions';
-import * as clipboard from '../../../utils/clipboard';
+import { isPastedFile as isPastedFileFromEvent } from '@atlaskit/editor-common/paste';
 import { transformSliceForMedia } from '../../media/utils/media-single';
 import { escapeLinks, htmlContainsSingleFile, isPastedFromWord, isPastedFromExcel, htmlHasInvalidLinkTags, removeDuplicateInvalidLinks, transformUnsupportedBlockCardToInline } from '../util';
 import { linkifyContent } from '@atlaskit/editor-common/utils';
@@ -95,7 +95,7 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         if ((_text = text) !== null && _text !== void 0 && _text.includes('\r')) {
           text = text.replace(/\r/g, '');
         }
-        const isPastedFile = clipboard.isPastedFile(event);
+        const isPastedFile = isPastedFileFromEvent(event);
         const isPlainText = text && !html;
         const isRichText = !!html;
 

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

@@ -4,7 +4,6 @@ import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
 export const pluginKey = new PluginKey('placeholderPlugin');
 import { isTypeAheadOpen } from '../type-ahead/utils';
-import { isComposing } from '../base/pm-plugins/composition';
 function getPlaceholderState(editorState) {
   return pluginKey.getState(editorState);
 }
@@ -100,7 +99,8 @@ export function createPlugin(defaultPlaceholderText, bracketPlaceholderText, api
           placeholderText,
           pos
         } = getPlaceholderState(editorState);
-        if (hasPlaceholder && placeholderText && pos !== undefined && !isComposing(editorState)) {
+        const 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/es2019/utils/clipboard.js

@@ -1,20 +1,4 @@
 import * as clipboard from 'clipboard-polyfill';
-export function checkClipboardTypes(type, item) {
-  const isDOMStringList = t => !t.indexOf && !!t.contains;
-  return isDOMStringList(type) ? type.contains(item) : type.indexOf(item) > -1;
-}
-
-// Typeguard Function
-export const isClipboardEvent = event => 'clipboardData' in event;
-export function isPastedFile(rawEvent) {
-  const {
-    clipboardData
-  } = rawEvent;
-  if (!clipboardData) {
-    return false;
-  }
-  return checkClipboardTypes(clipboardData.types, 'Files');
-}
 const isClipboardApiSupported = () => !!navigator.clipboard && typeof navigator.clipboard.writeText === 'function';
 const isIEClipboardApiSupported = () => window.clipboardData && typeof window.clipboardData.setData === 'function';
 export const copyToClipboard = async textToCopy => {

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.18.1";
+export const version = "187.19.0";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

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

package/dist/esm/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';
@@ -53,7 +54,7 @@ export function createDefaultPreset(options) {
       }]);
     }
     return builder;
-  }).add([pastePlugin, options.paste]).add(clipboardPlugin).add(focusPlugin).add([basePlugin, options.base]).add(decorationsPlugin).maybeAdd(undoRedoPlugin, function (p, builder) {
+  }).add([pastePlugin, options.paste]).add(clipboardPlugin).add(focusPlugin).add(compositionPlugin).add([basePlugin, options.base]).add(decorationsPlugin).maybeAdd(undoRedoPlugin, 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/esm/labs/next/presets/universal.js

@@ -3,7 +3,8 @@ 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 { 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/esm/plugins/base/index.js

@@ -14,7 +14,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 var isChromeWithSelectionBug = browser.chrome && browser.chrome_version >= 88;
 var basePlugin = function basePlugin(options, api) {
@@ -104,12 +103,6 @@ var basePlugin = function basePlugin(options, api) {
           return disableSpellcheckingPlugin(featureFlags);
         }
       });
-      plugins.push({
-        name: 'compositionPlugin',
-        plugin: function plugin() {
-          return compositionPlugin();
-        }
-      });
       return plugins;
     },
     nodes: function nodes() {

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

@@ -38,7 +38,7 @@ var codeBlockPlugin = function codeBlockPlugin(options, api) {
       }, {
         name: 'codeBlockIDEKeyBindings',
         plugin: function plugin() {
-          return ideUX;
+          return ideUX(api);
         }
       }, {
         name: 'codeBlockKeyMap',