@atlaskit/editor-core 187.18.2 → 187.19.0

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

@@ -1,17 +1,12 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
-var compositionPluginKey = new PluginKey('compositionPlugin');
-export var isComposing = function isComposing(state) {
-  var _compositionPluginKey;
-  return !!((_compositionPluginKey = compositionPluginKey.getState(state)) !== null && _compositionPluginKey !== void 0 && _compositionPluginKey.isComposing);
-};
+import { pluginKey } from './plugin-key';
 var isLinux = function isLinux() {
   return navigator.userAgent.indexOf('Linux') >= 0;
 };
 export default (function () {
   return new SafePlugin({
-    key: compositionPluginKey,
+    key: pluginKey,
     state: {
       init: function init() {
         return {
@@ -20,7 +15,7 @@ export default (function () {
         };
       },
       apply: function apply(tr, value) {
-        var isComposing = tr.getMeta(compositionPluginKey);
+        var isComposing = tr.getMeta(pluginKey);
         var zeroWidthSpacePos = tr.getMeta('zeroWidthSpacePos');
         if (typeof isComposing === 'undefined') {
           return value;
@@ -35,7 +30,7 @@ export default (function () {
       handleDOMEvents: {
         compositionstart: function compositionstart(view, event) {
           var tr = view.state.tr;
-          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) {
@@ -49,10 +44,10 @@ export default (function () {
         },
         compositionend: function compositionend(view, event) {
           var tr = view.state.tr;
-          tr.setMeta(compositionPluginKey, false);
+          tr.setMeta(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.getState(view.state)) === null || _pluginKey$getState === void 0 ? void 0 : _pluginKey$getState.zeroWidthSpacePos;
             if (typeof zeroWidthSpacePos !== 'undefined') {
               tr.deleteRange(zeroWidthSpacePos, zeroWidthSpacePos + 1);
             }

package/dist/esm/plugins/composition/pm-plugins/plugin-key.js

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

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

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

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

package/dist/esm/version.json

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

package/dist/types/labs/next/presets/default.d.ts

@@ -49,6 +49,10 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
             hoverDecoration: (nodeType: import("prosemirror-model").NodeType | import("prosemirror-model").NodeType[], add: boolean, className?: string | undefined) => import("@atlaskit/editor-common/types").Command;
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
+    }>, (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"composition", {
+        sharedState: import("../../../plugins/composition").CompositionState | undefined;
+    }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"composition", {
+        sharedState: import("../../../plugins/composition").CompositionState | undefined;
     }>, import("@atlaskit/editor-common/types").OptionalPlugin<(config: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"analytics", {
         pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
         sharedState: {
@@ -92,6 +96,10 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
             hoverDecoration: (nodeType: import("prosemirror-model").NodeType | import("prosemirror-model").NodeType[], add: boolean, className?: string | undefined) => import("@atlaskit/editor-common/types").Command;
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
+    }>, (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"composition", {
+        sharedState: import("../../../plugins/composition").CompositionState | undefined;
+    }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"composition", {
+        sharedState: import("../../../plugins/composition").CompositionState | undefined;
     }>, import("@atlaskit/editor-common/types").OptionalPlugin<(config: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"analytics", {
         pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
         sharedState: {
@@ -412,6 +420,10 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
             hoverDecoration: (nodeType: import("prosemirror-model").NodeType | import("prosemirror-model").NodeType[], add: boolean, className?: string | undefined) => import("@atlaskit/editor-common/types").Command;
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
+    }>, (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"composition", {
+        sharedState: import("../../../plugins/composition").CompositionState | undefined;
+    }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"composition", {
+        sharedState: import("../../../plugins/composition").CompositionState | undefined;
     }>, import("@atlaskit/editor-common/types").OptionalPlugin<(config: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"analytics", {
         pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
         sharedState: {
@@ -455,6 +467,10 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
             hoverDecoration: (nodeType: import("prosemirror-model").NodeType | import("prosemirror-model").NodeType[], add: boolean, className?: string | undefined) => import("@atlaskit/editor-common/types").Command;
             removeDecoration: import("@atlaskit/editor-common/types").Command;
         };
+    }>, (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"composition", {
+        sharedState: import("../../../plugins/composition").CompositionState | undefined;
+    }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"composition", {
+        sharedState: import("../../../plugins/composition").CompositionState | undefined;
     }>, import("@atlaskit/editor-common/types").OptionalPlugin<(config: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"analytics", {
         pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
         sharedState: {

package/dist/types/plugins/code-block/index.d.ts

@@ -1,11 +1,13 @@
-import { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
-import { CodeBlockOptions } from './types';
-import { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
-import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { CodeBlockOptions } from './types';
+import type { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
+import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type compositionPlugin from '../composition';
 declare const codeBlockPlugin: NextEditorPlugin<'codeBlock', {
     pluginConfiguration: CodeBlockOptions;
     dependencies: [
         typeof decorationsPlugin,
+        typeof compositionPlugin,
         OptionalPlugin<typeof analyticsPlugin>
     ];
 }>;

package/dist/types/plugins/code-block/pm-plugins/ide-ux.d.ts

@@ -1,3 +1,5 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-declare const _default: SafePlugin<any>;
-export default _default;
+import type codeBlockPlugin from '../';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+declare const ideUX: (pluginInjectionApi: ExtractInjectionAPI<typeof codeBlockPlugin> | undefined) => SafePlugin<any>;
+export default ideUX;

package/dist/types/plugins/composition/index.d.ts

@@ -0,0 +1,8 @@
+import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
+export type CompositionState = {
+    isComposing: boolean;
+};
+declare const composition: NextEditorPlugin<'composition', {
+    sharedState: CompositionState | undefined;
+}>;
+export default composition;

package/dist/types/plugins/composition/pm-plugins/main.d.ts

@@ -0,0 +1,4 @@
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { CompositionPluginState } from './plugin-key';
+declare const _default: () => SafePlugin<CompositionPluginState>;
+export default _default;

package/dist/types/plugins/composition/pm-plugins/plugin-key.d.ts

@@ -0,0 +1,6 @@
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+export interface CompositionPluginState {
+    isComposing: boolean;
+    zeroWidthSpacePos?: number;
+}
+export declare const pluginKey: PluginKey<CompositionPluginState>;

package/dist/types/plugins/placeholder/index.d.ts

@@ -5,6 +5,7 @@ import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import type { NextEditorPlugin, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { focusPlugin } from '@atlaskit/editor-plugin-focus';
 export declare const pluginKey: PluginKey<any>;
+import type compositionPlugin from '../composition';
 export declare const placeholderTestId = "placeholder-test-id";
 export declare function createPlaceholderDecoration(editorState: EditorState, placeholderText: string, pos?: number): DecorationSet;
 export declare function createPlugin(defaultPlaceholderText?: string, bracketPlaceholderText?: string, api?: ExtractInjectionAPI<typeof placeholderPlugin>): SafePlugin | undefined;
@@ -14,6 +15,6 @@ export interface PlaceholderPluginOptions {
 }
 declare const placeholderPlugin: NextEditorPlugin<'placeholder', {
     pluginConfiguration: PlaceholderPluginOptions | undefined;
-    dependencies: [typeof focusPlugin];
+    dependencies: [typeof focusPlugin, typeof compositionPlugin];
 }>;
 export default placeholderPlugin;

package/dist/types-ts4.5/labs/next/presets/default.d.ts

@@ -66,6 +66,11 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
                     removeDecoration: import("@atlaskit/editor-common/types").Command;
                 };
             }>,
+            (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"composition", {
+                sharedState: import("../../../plugins/composition").CompositionState | undefined;
+            }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"composition", {
+                sharedState: import("../../../plugins/composition").CompositionState | undefined;
+            }>,
             import("@atlaskit/editor-common/types").OptionalPlugin<(config: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"analytics", {
                 pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
                 sharedState: {
@@ -116,6 +121,11 @@ export declare function createDefaultPreset(options: EditorPresetProps & Default
                     removeDecoration: import("@atlaskit/editor-common/types").Command;
                 };
             }>,
+            (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"composition", {
+                sharedState: import("../../../plugins/composition").CompositionState | undefined;
+            }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"composition", {
+                sharedState: import("../../../plugins/composition").CompositionState | undefined;
+            }>,
             import("@atlaskit/editor-common/types").OptionalPlugin<(config: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"analytics", {
                 pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
                 sharedState: {
@@ -507,6 +517,11 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
                     removeDecoration: import("@atlaskit/editor-common/types").Command;
                 };
             }>,
+            (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"composition", {
+                sharedState: import("../../../plugins/composition").CompositionState | undefined;
+            }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"composition", {
+                sharedState: import("../../../plugins/composition").CompositionState | undefined;
+            }>,
             import("@atlaskit/editor-common/types").OptionalPlugin<(config: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"analytics", {
                 pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
                 sharedState: {
@@ -557,6 +572,11 @@ export declare function useDefaultPreset(props: EditorPresetProps & DefaultPrese
                     removeDecoration: import("@atlaskit/editor-common/types").Command;
                 };
             }>,
+            (config?: undefined, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"composition", {
+                sharedState: import("../../../plugins/composition").CompositionState | undefined;
+            }> | undefined) => import("@atlaskit/editor-common/types").DefaultEditorPlugin<"composition", {
+                sharedState: import("../../../plugins/composition").CompositionState | undefined;
+            }>,
             import("@atlaskit/editor-common/types").OptionalPlugin<(config: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions, api?: import("@atlaskit/editor-common/types").PluginInjectionAPI<"analytics", {
                 pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
                 sharedState: {

package/dist/types-ts4.5/plugins/code-block/index.d.ts

@@ -1,11 +1,13 @@
-import { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
-import { CodeBlockOptions } from './types';
-import { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
-import { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { CodeBlockOptions } from './types';
+import type { decorationsPlugin } from '@atlaskit/editor-plugin-decorations';
+import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type compositionPlugin from '../composition';
 declare const codeBlockPlugin: NextEditorPlugin<'codeBlock', {
     pluginConfiguration: CodeBlockOptions;
     dependencies: [
         typeof decorationsPlugin,
+        typeof compositionPlugin,
         OptionalPlugin<typeof analyticsPlugin>
     ];
 }>;

package/dist/types-ts4.5/plugins/code-block/pm-plugins/ide-ux.d.ts

@@ -1,3 +1,5 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-declare const _default: SafePlugin<any>;
-export default _default;
+import type codeBlockPlugin from '../';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+declare const ideUX: (pluginInjectionApi: ExtractInjectionAPI<typeof codeBlockPlugin> | undefined) => SafePlugin<any>;
+export default ideUX;

package/dist/types-ts4.5/plugins/composition/index.d.ts

@@ -0,0 +1,8 @@
+import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
+export type CompositionState = {
+    isComposing: boolean;
+};
+declare const composition: NextEditorPlugin<'composition', {
+    sharedState: CompositionState | undefined;
+}>;
+export default composition;

package/dist/types-ts4.5/plugins/composition/pm-plugins/main.d.ts

@@ -0,0 +1,4 @@
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { CompositionPluginState } from './plugin-key';
+declare const _default: () => SafePlugin<CompositionPluginState>;
+export default _default;

package/dist/types-ts4.5/plugins/composition/pm-plugins/plugin-key.d.ts

@@ -0,0 +1,6 @@
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+export interface CompositionPluginState {
+    isComposing: boolean;
+    zeroWidthSpacePos?: number;
+}
+export declare const pluginKey: PluginKey<CompositionPluginState>;

package/dist/types-ts4.5/plugins/placeholder/index.d.ts

@@ -5,6 +5,7 @@ import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import type { NextEditorPlugin, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { focusPlugin } from '@atlaskit/editor-plugin-focus';
 export declare const pluginKey: PluginKey<any>;
+import type compositionPlugin from '../composition';
 export declare const placeholderTestId = "placeholder-test-id";
 export declare function createPlaceholderDecoration(editorState: EditorState, placeholderText: string, pos?: number): DecorationSet;
 export declare function createPlugin(defaultPlaceholderText?: string, bracketPlaceholderText?: string, api?: ExtractInjectionAPI<typeof placeholderPlugin>): SafePlugin | undefined;
@@ -15,7 +16,8 @@ export interface PlaceholderPluginOptions {
 declare const placeholderPlugin: NextEditorPlugin<'placeholder', {
     pluginConfiguration: PlaceholderPluginOptions | undefined;
     dependencies: [
-        typeof focusPlugin
+        typeof focusPlugin,
+        typeof compositionPlugin
     ];
 }>;
 export default placeholderPlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "187.18.2",
+  "version": "187.19.0",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/dist/types/plugins/base/pm-plugins/composition.d.ts

@@ -1,9 +0,0 @@
-import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-interface CompositionPluginState {
-    isComposing: boolean;
-    zeroWidthSpacePos?: number;
-}
-export declare const isComposing: (state: EditorState) => boolean;
-declare const _default: () => SafePlugin<CompositionPluginState>;
-export default _default;

package/dist/types-ts4.5/plugins/base/pm-plugins/composition.d.ts

@@ -1,9 +0,0 @@
-import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-interface CompositionPluginState {
-    isComposing: boolean;
-    zeroWidthSpacePos?: number;
-}
-export declare const isComposing: (state: EditorState) => boolean;
-declare const _default: () => SafePlugin<CompositionPluginState>;
-export default _default;