@atlaskit/editor-plugin-local-id 4.3.0 → 4.3.2

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-local-id
 
+## 4.3.2
+
+### Patch Changes
+
+- [`45270b9a8ed63`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/45270b9a8ed63) -
+  CONFCLOUD-83370: Fix broken IME composition
+- Updated dependencies
+
+## 4.3.1
+
+### Patch Changes
+
+- [`65e23b9169d24`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/65e23b9169d24) -
+  Do not pre-load local ids with collab
+- Updated dependencies
+
 ## 4.3.0
 
 ### Minor Changes

package/afm-cc/tsconfig.json

@@ -18,9 +18,18 @@
 		"../src/**/examples.*"
 	],
 	"references": [
+		{
+			"path": "../../adf-schema/afm-cc/tsconfig.json"
+		},
+		{
+			"path": "../../editor-prosemirror/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../../platform/feature-flags/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../tmp-editor-statsig/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../editor-common/afm-cc/tsconfig.json"
 		}

package/afm-jira/tsconfig.json

@@ -18,6 +18,12 @@
 		"../src/**/examples.*"
 	],
 	"references": [
+		{
+			"path": "../../adf-schema/afm-jira/tsconfig.json"
+		},
+		{
+			"path": "../../editor-prosemirror/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../../platform/feature-flags/afm-jira/tsconfig.json"
 		},

package/afm-products/tsconfig.json

@@ -18,6 +18,12 @@
 		"../src/**/examples.*"
 	],
 	"references": [
+		{
+			"path": "../../adf-schema/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../editor-prosemirror/afm-products/tsconfig.json"
+		},
 		{
 			"path": "../../../platform/feature-flags/afm-products/tsconfig.json"
 		},

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

@@ -13,6 +13,7 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -45,6 +46,13 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
        * to nodes that don't have them. It's designed to run only once per
        * editor instance to avoid performance issues.
        */
+      // @ts-expect-error - This is an experiment to see if we can improve performance - if successful
+      // we will add the plugin as a dependency
+      if (api !== null && api !== void 0 && api.collabEdit && (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_avoid_initial_localId')) {
+        return {
+          update: function update() {}
+        };
+      }
       requestIdleCallbackWithFallback(function () {
         var tr = editorView.state.tr;
         var localIdWasAdded = false;
@@ -90,6 +98,10 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
      * This ensures uniqueness of localIds on nodes being created or edited
      */
     appendTransaction: function appendTransaction(transactions, _oldState, newState) {
+      var _api$composition$shar;
+      if (api !== null && api !== void 0 && (_api$composition$shar = api.composition.sharedState.currentState()) !== null && _api$composition$shar !== void 0 && _api$composition$shar.isComposing && (0, _expValEquals.expValEquals)('platform_editor_localid_ime_composition_fix', 'isEnabled', true)) {
+        return undefined;
+      }
       var modified = false;
       var tr = newState.tr;
       var _newState$schema$node = newState.schema.nodes,
@@ -153,7 +165,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
         });
       });
       if (addedNodes.size > 0 && (0, _platformFeatureFlags.fg)('platform_editor_use_localid_dedupe')) {
-        newState.doc.descendants(function (node, pos) {
+        newState.doc.descendants(function (node) {
           if (addedNodes.has(node)) {
             return true;
           }
@@ -190,7 +202,6 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
           _iterator.f();
         }
       }
-
       // Apply local ID updates based on the improvements feature flag:
       // - When enabled: Batch all updates into a single BatchAttrsStep
       // - When disabled: Individual steps were already applied above during node processing

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

@@ -5,6 +5,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { stepHasSlice } from '@atlaskit/editor-common/utils';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export const localIdPluginKey = new PluginKey('localIdPlugin');
 const generateUUID = (api, node, pos) => {
   if (fg('platform_editor_ai_local_id_short')) {
@@ -34,6 +35,13 @@ export const createPlugin = api => {
        * to nodes that don't have them. It's designed to run only once per
        * editor instance to avoid performance issues.
        */
+      // @ts-expect-error - This is an experiment to see if we can improve performance - if successful
+      // we will add the plugin as a dependency
+      if (api !== null && api !== void 0 && api.collabEdit && fg('platform_editor_ai_aifc_avoid_initial_localId')) {
+        return {
+          update: () => {}
+        };
+      }
       requestIdleCallbackWithFallback(() => {
         const tr = editorView.state.tr;
         let localIdWasAdded = false;
@@ -80,6 +88,10 @@ export const createPlugin = api => {
      * This ensures uniqueness of localIds on nodes being created or edited
      */
     appendTransaction: (transactions, _oldState, newState) => {
+      var _api$composition$shar;
+      if (api !== null && api !== void 0 && (_api$composition$shar = api.composition.sharedState.currentState()) !== null && _api$composition$shar !== void 0 && _api$composition$shar.isComposing && expValEquals('platform_editor_localid_ime_composition_fix', 'isEnabled', true)) {
+        return undefined;
+      }
       let modified = false;
       const tr = newState.tr;
       const {
@@ -144,7 +156,7 @@ export const createPlugin = api => {
         });
       });
       if (addedNodes.size > 0 && fg('platform_editor_use_localid_dedupe')) {
-        newState.doc.descendants((node, pos) => {
+        newState.doc.descendants(node => {
           if (addedNodes.has(node)) {
             return true;
           }
@@ -172,7 +184,6 @@ export const createPlugin = api => {
           }
         }
       }
-
       // Apply local ID updates based on the improvements feature flag:
       // - When enabled: Batch all updates into a single BatchAttrsStep
       // - When disabled: Individual steps were already applied above during node processing

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

@@ -9,6 +9,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { stepHasSlice } from '@atlaskit/editor-common/utils';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export var localIdPluginKey = new PluginKey('localIdPlugin');
 var generateUUID = function generateUUID(api, node, pos) {
   if (fg('platform_editor_ai_local_id_short')) {
@@ -38,6 +39,13 @@ export var createPlugin = function createPlugin(api) {
        * to nodes that don't have them. It's designed to run only once per
        * editor instance to avoid performance issues.
        */
+      // @ts-expect-error - This is an experiment to see if we can improve performance - if successful
+      // we will add the plugin as a dependency
+      if (api !== null && api !== void 0 && api.collabEdit && fg('platform_editor_ai_aifc_avoid_initial_localId')) {
+        return {
+          update: function update() {}
+        };
+      }
       requestIdleCallbackWithFallback(function () {
         var tr = editorView.state.tr;
         var localIdWasAdded = false;
@@ -83,6 +91,10 @@ export var createPlugin = function createPlugin(api) {
      * This ensures uniqueness of localIds on nodes being created or edited
      */
     appendTransaction: function appendTransaction(transactions, _oldState, newState) {
+      var _api$composition$shar;
+      if (api !== null && api !== void 0 && (_api$composition$shar = api.composition.sharedState.currentState()) !== null && _api$composition$shar !== void 0 && _api$composition$shar.isComposing && expValEquals('platform_editor_localid_ime_composition_fix', 'isEnabled', true)) {
+        return undefined;
+      }
       var modified = false;
       var tr = newState.tr;
       var _newState$schema$node = newState.schema.nodes,
@@ -146,7 +158,7 @@ export var createPlugin = function createPlugin(api) {
         });
       });
       if (addedNodes.size > 0 && fg('platform_editor_use_localid_dedupe')) {
-        newState.doc.descendants(function (node, pos) {
+        newState.doc.descendants(function (node) {
           if (addedNodes.has(node)) {
             return true;
           }
@@ -183,7 +195,6 @@ export var createPlugin = function createPlugin(api) {
           _iterator.f();
         }
       }
-
       // Apply local ID updates based on the improvements feature flag:
       // - When enabled: Batch all updates into a single BatchAttrsStep
       // - When disabled: Individual steps were already applied above during node processing

package/dist/types/localIdPluginType.d.ts

@@ -1,4 +1,5 @@
 import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { CompositionPlugin } from '@atlaskit/editor-plugin-composition';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { NodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 export type ActionProps = {
@@ -24,4 +25,5 @@ export type LocalIdPlugin = NextEditorPlugin<'localId', {
             value: Node;
         }) => boolean;
     };
+    dependencies: [CompositionPlugin];
 }>;

package/dist/types-ts4.5/localIdPluginType.d.ts

@@ -1,4 +1,5 @@
 import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { CompositionPlugin } from '@atlaskit/editor-plugin-composition';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { NodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 export type ActionProps = {
@@ -24,4 +25,7 @@ export type LocalIdPlugin = NextEditorPlugin<'localId', {
             value: Node;
         }) => boolean;
     };
+    dependencies: [
+        CompositionPlugin
+    ];
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-local-id",
-	"version": "4.3.0",
+	"version": "4.3.2",
 	"description": "LocalId plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,14 +28,15 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^51.5.1",
-		"@atlaskit/editor-prosemirror": "7.0.0",
+		"@atlaskit/adf-schema": "^51.5.0",
+		"@atlaskit/editor-prosemirror": "^7.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
+		"@atlaskit/tmp-editor-statsig": "^16.3.0",
 		"@babel/runtime": "^7.0.0",
 		"raf-schd": "^4.0.3"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.41.0",
+		"@atlaskit/editor-common": "^110.49.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -84,6 +85,9 @@
 		"platform_editor_ai_local_id_short": {
 			"type": "boolean"
 		},
+		"platform_editor_ai_aifc_avoid_initial_localId": {
+			"type": "boolean"
+		},
 		"platform_editor_localid_improvements": {
 			"type": "boolean"
 		}