@atlaskit/editor-plugin-local-id 8.1.2 → 8.3.0

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @atlaskit/editor-plugin-local-id
 
+## 8.3.0
+
+### Minor Changes
+
+- [`1c5e23accfe24`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1c5e23accfe24) -
+  Cleanup feature gate platform_editor_localid_improvements. Updates are now always batched into a
+  single BatchAttrsStep. Removes the unused addLocalIdToNode export.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 8.2.0
+
+### Minor Changes
+
+- [`b284d7fc05568`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b284d7fc05568) -
+  Fix tableCell/tableHeader nodes in middle rows of newly-inserted tables missing localId. The
+  localId plugin's appendTransaction was keyed by PMNode identity, which incorrectly overwrote
+  positions when the same node reference legitimately occupied multiple document positions (as
+  createTable from prosemirror-utils does by reusing cell node objects across non-header rows). The
+  plugin now tracks all positions per node identity and assigns a unique localId per position. Gated
+  behind the `platform_editor_ai_tablecell_localids` experiment.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 8.1.2
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -35,6 +35,9 @@
 		{
 			"path": "../../../platform/feature-flags/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../tmp-editor-statsig/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../editor-common/afm-cc/tsconfig.json"
 		}

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

@@ -4,14 +4,16 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.localIdPluginKey = exports.createPlugin = exports.batchAddLocalIdToNodes = exports.addLocalIdToNode = void 0;
+exports.localIdPluginKey = exports.createPlugin = exports.batchAddLocalIdToNodes = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
 var _steps = require("@atlaskit/adf-schema/steps");
 var _collab = require("@atlaskit/editor-common/collab");
 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");
 var _generateShortUUID = require("./generateShortUUID");
 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; } }
@@ -48,7 +50,6 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
       }
       requestIdleCallbackWithFallback(function () {
         var tr = editorView.state.tr;
-        var localIdWasAdded = false;
         var nodesToUpdate = new Map(); // position -> localId
 
         var _editorView$state$sch = editorView.state.schema.nodes,
@@ -61,23 +62,12 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
         editorView.state.doc.descendants(function (node, pos) {
           var _node$type$spec$attrs;
           if (!ignoredNodeTypes.includes(node.type.name) && !node.attrs.localId && !!((_node$type$spec$attrs = node.type.spec.attrs) !== null && _node$type$spec$attrs !== void 0 && _node$type$spec$attrs.localId)) {
-            if ((0, _platformFeatureFlags.fg)('platform_editor_localid_improvements')) {
-              nodesToUpdate.set(pos, generateUUID());
-            } else {
-              localIdWasAdded = true;
-              addLocalIdToNode(pos, tr);
-            }
+            nodesToUpdate.set(pos, generateUUID());
           }
           return true; // Continue traversing
         });
-        if ((0, _platformFeatureFlags.fg)('platform_editor_localid_improvements')) {
-          if (nodesToUpdate.size > 0) {
-            batchAddLocalIdToNodes(nodesToUpdate, tr);
-            (0, _collab.tintDirtyTransaction)(tr);
-            editorView.dispatch(tr);
-          }
-        } else if (localIdWasAdded) {
-          tr.setMeta('addToHistory', false);
+        if (nodesToUpdate.size > 0) {
+          batchAddLocalIdToNodes(nodesToUpdate, tr);
           (0, _collab.tintDirtyTransaction)(tr);
           editorView.dispatch(tr);
         }
@@ -105,6 +95,11 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
       // https://bitbucket.org/atlassian/adf-schema/src/fb2236147a0c2bc9c8efbdb75fd8f8c411df44ba/packages/adf-schema/src/next-schema/nodes/mediaGroup.ts#lines-12
       var ignoredNodeTypes = [text === null || text === void 0 ? void 0 : text.name, hardBreak === null || hardBreak === void 0 ? void 0 : hardBreak.name, mediaGroup === null || mediaGroup === void 0 ? void 0 : mediaGroup.name];
       var addedNodes = new Set();
+      // A single PMNode reference can appear at multiple positions in the doc (e.g.
+      // `createTable` from `prosemirror-utils` reuses cell node objects across
+      // non-header rows), so the new code path tracks every position per node identity.
+      // The legacy path retains the single-position-per-node map for compatibility.
+      var positionsByNode = new Map();
       var addedNodePos = new Map();
       var localIds = new Set();
       var nodesToUpdate = new Map(); // position -> localId
@@ -141,15 +136,17 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
               if ((0, _platformFeatureFlags.fg)('platform_editor_use_localid_dedupe')) {
                 // Always add to addedNodes for duplicate prevention
                 addedNodes.add(node);
-                addedNodePos.set(node, pos);
+                if ((0, _expValEquals.expValEquals)('platform_editor_ai_tablecell_localids', 'isEnabled', true)) {
+                  var _positionsByNode$get;
+                  var positions = (_positionsByNode$get = positionsByNode.get(node)) !== null && _positionsByNode$get !== void 0 ? _positionsByNode$get : new Set();
+                  positions.add(pos);
+                  positionsByNode.set(node, positions);
+                } else {
+                  addedNodePos.set(node, pos);
+                }
               } else {
                 if (!(node !== null && node !== void 0 && node.attrs.localId)) {
-                  if ((0, _platformFeatureFlags.fg)('platform_editor_localid_improvements')) {
-                    nodesToUpdate.set(pos, generateUUID());
-                  } else {
-                    // Legacy behavior - individual steps
-                    addLocalIdToNode(pos, tr);
-                  }
+                  nodesToUpdate.set(pos, generateUUID());
                 }
               }
               return true;
@@ -173,57 +170,103 @@ var createPlugin = exports.createPlugin = function createPlugin(api) {
         hasInitializedExistingUUIDs = true;
         // Also ensure the added have no duplicates
         var seenIds = new Set();
-        var _iterator = _createForOfIteratorHelper(addedNodes),
-          _step;
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var node = _step.value;
-            if (!node.attrs.localId || localIds.has(node.attrs.localId) || seenIds.has(node.attrs.localId)) {
-              var pos = addedNodePos.get(node);
-              if (pos !== undefined) {
-                if ((0, _platformFeatureFlags.fg)('platform_editor_localid_improvements')) {
-                  var newId = generateUUID();
-                  nodesToUpdate.set(pos, newId);
-                  seenIds.add(newId);
-                } else {
-                  addLocalIdToNode(pos, tr);
+        if ((0, _expValEquals.expValEquals)('platform_editor_ai_tablecell_localids', 'isEnabled', true)) {
+          var _iterator = _createForOfIteratorHelper(addedNodes),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var node = _step.value;
+              var positions = positionsByNode.get(node);
+              if (!positions || positions.size === 0) {
+                continue;
+              }
+              var existingId = node.attrs.localId;
+              var needsNewIds = !existingId || localIds.has(existingId) || seenIds.has(existingId);
+              if (needsNewIds) {
+                // No usable localId: assign a fresh unique one to every position.
+                var _iterator2 = _createForOfIteratorHelper(positions),
+                  _step2;
+                try {
+                  for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                    var pos = _step2.value;
+                    var newId = generateUUID();
+                    nodesToUpdate.set(pos, newId);
+                    seenIds.add(newId);
+                    modified = true;
+                  }
+                } catch (err) {
+                  _iterator2.e(err);
+                } finally {
+                  _iterator2.f();
+                }
+              } else if (positions.size > 1) {
+                // Shared node reference: keep the existing id at the first position,
+                // assign fresh ones to the rest so they don't share the same localId.
+                seenIds.add(existingId);
+                var _Array$from = Array.from(positions),
+                  _Array$from2 = (0, _toArray2.default)(_Array$from),
+                  _first = _Array$from2[0],
+                  rest = _Array$from2.slice(1);
+                var _iterator3 = _createForOfIteratorHelper(rest),
+                  _step3;
+                try {
+                  for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                    var _pos = _step3.value;
+                    var _newId = generateUUID();
+                    nodesToUpdate.set(_pos, _newId);
+                    seenIds.add(_newId);
+                    modified = true;
+                  }
+                } catch (err) {
+                  _iterator3.e(err);
+                } finally {
+                  _iterator3.f();
                 }
-                modified = true;
+              } else if (existingId) {
+                seenIds.add(existingId);
               }
             }
-            if (node.attrs.localId) {
-              seenIds.add(node.attrs.localId);
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+        } else {
+          var _iterator4 = _createForOfIteratorHelper(addedNodes),
+            _step4;
+          try {
+            for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+              var _node = _step4.value;
+              if (!_node.attrs.localId || localIds.has(_node.attrs.localId) || seenIds.has(_node.attrs.localId)) {
+                var _pos2 = addedNodePos.get(_node);
+                if (_pos2 !== undefined) {
+                  var _newId2 = generateUUID();
+                  nodesToUpdate.set(_pos2, _newId2);
+                  seenIds.add(_newId2);
+                  modified = true;
+                }
+              }
+              if (_node.attrs.localId) {
+                seenIds.add(_node.attrs.localId);
+              }
             }
+          } catch (err) {
+            _iterator4.e(err);
+          } finally {
+            _iterator4.f();
           }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _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
-      if (modified && nodesToUpdate.size > 0 && (0, _platformFeatureFlags.fg)('platform_editor_localid_improvements')) {
+      if (modified && nodesToUpdate.size > 0) {
         batchAddLocalIdToNodes(nodesToUpdate, tr);
       }
       return modified ? tr : undefined;
     }
   });
 };
-/**
- * Adds a local ID to a ProseMirror node
- *
- * This utility function updates a node's attributes to include a unique local ID.
- *
- * @param pos - The position of the node in the document
- * @param tr - The transaction to apply the change to
- */
-var addLocalIdToNode = exports.addLocalIdToNode = function addLocalIdToNode(pos, tr) {
-  tr.setNodeAttribute(pos, 'localId', generateUUID());
-  tr.setMeta('addToHistory', false);
-};
-
 /**
  * Batch adds local IDs to nodes using a BatchAttrsStep
  * @param nodesToUpdate Map of position -> localId for nodes that need updates

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

@@ -4,6 +4,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';
 import { generateShortUUID, generatedShortUUIDs } from './generateShortUUID';
 export const localIdPluginKey = new PluginKey('localIdPlugin');
 const generateUUID = () => {
@@ -37,7 +38,6 @@ export const createPlugin = api => {
       }
       requestIdleCallbackWithFallback(() => {
         const tr = editorView.state.tr;
-        let localIdWasAdded = false;
         const nodesToUpdate = new Map(); // position -> localId
 
         const {
@@ -51,23 +51,12 @@ export const createPlugin = api => {
         editorView.state.doc.descendants((node, pos) => {
           var _node$type$spec$attrs;
           if (!ignoredNodeTypes.includes(node.type.name) && !node.attrs.localId && !!((_node$type$spec$attrs = node.type.spec.attrs) !== null && _node$type$spec$attrs !== void 0 && _node$type$spec$attrs.localId)) {
-            if (fg('platform_editor_localid_improvements')) {
-              nodesToUpdate.set(pos, generateUUID());
-            } else {
-              localIdWasAdded = true;
-              addLocalIdToNode(pos, tr);
-            }
+            nodesToUpdate.set(pos, generateUUID());
           }
           return true; // Continue traversing
         });
-        if (fg('platform_editor_localid_improvements')) {
-          if (nodesToUpdate.size > 0) {
-            batchAddLocalIdToNodes(nodesToUpdate, tr);
-            tintDirtyTransaction(tr);
-            editorView.dispatch(tr);
-          }
-        } else if (localIdWasAdded) {
-          tr.setMeta('addToHistory', false);
+        if (nodesToUpdate.size > 0) {
+          batchAddLocalIdToNodes(nodesToUpdate, tr);
           tintDirtyTransaction(tr);
           editorView.dispatch(tr);
         }
@@ -96,6 +85,11 @@ export const createPlugin = api => {
       // https://bitbucket.org/atlassian/adf-schema/src/fb2236147a0c2bc9c8efbdb75fd8f8c411df44ba/packages/adf-schema/src/next-schema/nodes/mediaGroup.ts#lines-12
       const ignoredNodeTypes = [text === null || text === void 0 ? void 0 : text.name, hardBreak === null || hardBreak === void 0 ? void 0 : hardBreak.name, mediaGroup === null || mediaGroup === void 0 ? void 0 : mediaGroup.name];
       const addedNodes = new Set();
+      // A single PMNode reference can appear at multiple positions in the doc (e.g.
+      // `createTable` from `prosemirror-utils` reuses cell node objects across
+      // non-header rows), so the new code path tracks every position per node identity.
+      // The legacy path retains the single-position-per-node map for compatibility.
+      const positionsByNode = new Map();
       const addedNodePos = new Map();
       const localIds = new Set();
       const nodesToUpdate = new Map(); // position -> localId
@@ -132,15 +126,17 @@ export const createPlugin = api => {
               if (fg('platform_editor_use_localid_dedupe')) {
                 // Always add to addedNodes for duplicate prevention
                 addedNodes.add(node);
-                addedNodePos.set(node, pos);
+                if (expValEquals('platform_editor_ai_tablecell_localids', 'isEnabled', true)) {
+                  var _positionsByNode$get;
+                  const positions = (_positionsByNode$get = positionsByNode.get(node)) !== null && _positionsByNode$get !== void 0 ? _positionsByNode$get : new Set();
+                  positions.add(pos);
+                  positionsByNode.set(node, positions);
+                } else {
+                  addedNodePos.set(node, pos);
+                }
               } else {
                 if (!(node !== null && node !== void 0 && node.attrs.localId)) {
-                  if (fg('platform_editor_localid_improvements')) {
-                    nodesToUpdate.set(pos, generateUUID());
-                  } else {
-                    // Legacy behavior - individual steps
-                    addLocalIdToNode(pos, tr);
-                  }
+                  nodesToUpdate.set(pos, generateUUID());
                 }
               }
               return true;
@@ -164,48 +160,64 @@ export const createPlugin = api => {
         hasInitializedExistingUUIDs = true;
         // Also ensure the added have no duplicates
         const seenIds = new Set();
-        for (const node of addedNodes) {
-          if (!node.attrs.localId || localIds.has(node.attrs.localId) || seenIds.has(node.attrs.localId)) {
-            const pos = addedNodePos.get(node);
-            if (pos !== undefined) {
-              if (fg('platform_editor_localid_improvements')) {
+        if (expValEquals('platform_editor_ai_tablecell_localids', 'isEnabled', true)) {
+          for (const node of addedNodes) {
+            const positions = positionsByNode.get(node);
+            if (!positions || positions.size === 0) {
+              continue;
+            }
+            const existingId = node.attrs.localId;
+            const needsNewIds = !existingId || localIds.has(existingId) || seenIds.has(existingId);
+            if (needsNewIds) {
+              // No usable localId: assign a fresh unique one to every position.
+              for (const pos of positions) {
                 const newId = generateUUID();
                 nodesToUpdate.set(pos, newId);
                 seenIds.add(newId);
-              } else {
-                addLocalIdToNode(pos, tr);
+                modified = true;
               }
-              modified = true;
+            } else if (positions.size > 1) {
+              // Shared node reference: keep the existing id at the first position,
+              // assign fresh ones to the rest so they don't share the same localId.
+              seenIds.add(existingId);
+              const [_first, ...rest] = Array.from(positions);
+              for (const pos of rest) {
+                const newId = generateUUID();
+                nodesToUpdate.set(pos, newId);
+                seenIds.add(newId);
+                modified = true;
+              }
+            } else if (existingId) {
+              seenIds.add(existingId);
             }
           }
-          if (node.attrs.localId) {
-            seenIds.add(node.attrs.localId);
+        } else {
+          for (const node of addedNodes) {
+            if (!node.attrs.localId || localIds.has(node.attrs.localId) || seenIds.has(node.attrs.localId)) {
+              const pos = addedNodePos.get(node);
+              if (pos !== undefined) {
+                const newId = generateUUID();
+                nodesToUpdate.set(pos, newId);
+                seenIds.add(newId);
+                modified = true;
+              }
+            }
+            if (node.attrs.localId) {
+              seenIds.add(node.attrs.localId);
+            }
           }
         }
       }
       // 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
-      if (modified && nodesToUpdate.size > 0 && fg('platform_editor_localid_improvements')) {
+      if (modified && nodesToUpdate.size > 0) {
         batchAddLocalIdToNodes(nodesToUpdate, tr);
       }
       return modified ? tr : undefined;
     }
   });
 };
-/**
- * Adds a local ID to a ProseMirror node
- *
- * This utility function updates a node's attributes to include a unique local ID.
- *
- * @param pos - The position of the node in the document
- * @param tr - The transaction to apply the change to
- */
-export const addLocalIdToNode = (pos, tr) => {
-  tr.setNodeAttribute(pos, 'localId', generateUUID());
-  tr.setMeta('addToHistory', false);
-};
-
 /**
  * Batch adds local IDs to nodes using a BatchAttrsStep
  * @param nodesToUpdate Map of position -> localId for nodes that need updates

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

@@ -1,4 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _toArray from "@babel/runtime/helpers/toArray";
 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; }
@@ -8,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';
 import { generateShortUUID, generatedShortUUIDs } from './generateShortUUID';
 export var localIdPluginKey = new PluginKey('localIdPlugin');
 var generateUUID = function generateUUID() {
@@ -41,7 +43,6 @@ export var createPlugin = function createPlugin(api) {
       }
       requestIdleCallbackWithFallback(function () {
         var tr = editorView.state.tr;
-        var localIdWasAdded = false;
         var nodesToUpdate = new Map(); // position -> localId
 
         var _editorView$state$sch = editorView.state.schema.nodes,
@@ -54,23 +55,12 @@ export var createPlugin = function createPlugin(api) {
         editorView.state.doc.descendants(function (node, pos) {
           var _node$type$spec$attrs;
           if (!ignoredNodeTypes.includes(node.type.name) && !node.attrs.localId && !!((_node$type$spec$attrs = node.type.spec.attrs) !== null && _node$type$spec$attrs !== void 0 && _node$type$spec$attrs.localId)) {
-            if (fg('platform_editor_localid_improvements')) {
-              nodesToUpdate.set(pos, generateUUID());
-            } else {
-              localIdWasAdded = true;
-              addLocalIdToNode(pos, tr);
-            }
+            nodesToUpdate.set(pos, generateUUID());
           }
           return true; // Continue traversing
         });
-        if (fg('platform_editor_localid_improvements')) {
-          if (nodesToUpdate.size > 0) {
-            batchAddLocalIdToNodes(nodesToUpdate, tr);
-            tintDirtyTransaction(tr);
-            editorView.dispatch(tr);
-          }
-        } else if (localIdWasAdded) {
-          tr.setMeta('addToHistory', false);
+        if (nodesToUpdate.size > 0) {
+          batchAddLocalIdToNodes(nodesToUpdate, tr);
           tintDirtyTransaction(tr);
           editorView.dispatch(tr);
         }
@@ -98,6 +88,11 @@ export var createPlugin = function createPlugin(api) {
       // https://bitbucket.org/atlassian/adf-schema/src/fb2236147a0c2bc9c8efbdb75fd8f8c411df44ba/packages/adf-schema/src/next-schema/nodes/mediaGroup.ts#lines-12
       var ignoredNodeTypes = [text === null || text === void 0 ? void 0 : text.name, hardBreak === null || hardBreak === void 0 ? void 0 : hardBreak.name, mediaGroup === null || mediaGroup === void 0 ? void 0 : mediaGroup.name];
       var addedNodes = new Set();
+      // A single PMNode reference can appear at multiple positions in the doc (e.g.
+      // `createTable` from `prosemirror-utils` reuses cell node objects across
+      // non-header rows), so the new code path tracks every position per node identity.
+      // The legacy path retains the single-position-per-node map for compatibility.
+      var positionsByNode = new Map();
       var addedNodePos = new Map();
       var localIds = new Set();
       var nodesToUpdate = new Map(); // position -> localId
@@ -134,15 +129,17 @@ export var createPlugin = function createPlugin(api) {
               if (fg('platform_editor_use_localid_dedupe')) {
                 // Always add to addedNodes for duplicate prevention
                 addedNodes.add(node);
-                addedNodePos.set(node, pos);
+                if (expValEquals('platform_editor_ai_tablecell_localids', 'isEnabled', true)) {
+                  var _positionsByNode$get;
+                  var positions = (_positionsByNode$get = positionsByNode.get(node)) !== null && _positionsByNode$get !== void 0 ? _positionsByNode$get : new Set();
+                  positions.add(pos);
+                  positionsByNode.set(node, positions);
+                } else {
+                  addedNodePos.set(node, pos);
+                }
               } else {
                 if (!(node !== null && node !== void 0 && node.attrs.localId)) {
-                  if (fg('platform_editor_localid_improvements')) {
-                    nodesToUpdate.set(pos, generateUUID());
-                  } else {
-                    // Legacy behavior - individual steps
-                    addLocalIdToNode(pos, tr);
-                  }
+                  nodesToUpdate.set(pos, generateUUID());
                 }
               }
               return true;
@@ -166,57 +163,103 @@ export var createPlugin = function createPlugin(api) {
         hasInitializedExistingUUIDs = true;
         // Also ensure the added have no duplicates
         var seenIds = new Set();
-        var _iterator = _createForOfIteratorHelper(addedNodes),
-          _step;
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var node = _step.value;
-            if (!node.attrs.localId || localIds.has(node.attrs.localId) || seenIds.has(node.attrs.localId)) {
-              var pos = addedNodePos.get(node);
-              if (pos !== undefined) {
-                if (fg('platform_editor_localid_improvements')) {
-                  var newId = generateUUID();
-                  nodesToUpdate.set(pos, newId);
-                  seenIds.add(newId);
-                } else {
-                  addLocalIdToNode(pos, tr);
+        if (expValEquals('platform_editor_ai_tablecell_localids', 'isEnabled', true)) {
+          var _iterator = _createForOfIteratorHelper(addedNodes),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var node = _step.value;
+              var positions = positionsByNode.get(node);
+              if (!positions || positions.size === 0) {
+                continue;
+              }
+              var existingId = node.attrs.localId;
+              var needsNewIds = !existingId || localIds.has(existingId) || seenIds.has(existingId);
+              if (needsNewIds) {
+                // No usable localId: assign a fresh unique one to every position.
+                var _iterator2 = _createForOfIteratorHelper(positions),
+                  _step2;
+                try {
+                  for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                    var pos = _step2.value;
+                    var newId = generateUUID();
+                    nodesToUpdate.set(pos, newId);
+                    seenIds.add(newId);
+                    modified = true;
+                  }
+                } catch (err) {
+                  _iterator2.e(err);
+                } finally {
+                  _iterator2.f();
+                }
+              } else if (positions.size > 1) {
+                // Shared node reference: keep the existing id at the first position,
+                // assign fresh ones to the rest so they don't share the same localId.
+                seenIds.add(existingId);
+                var _Array$from = Array.from(positions),
+                  _Array$from2 = _toArray(_Array$from),
+                  _first = _Array$from2[0],
+                  rest = _Array$from2.slice(1);
+                var _iterator3 = _createForOfIteratorHelper(rest),
+                  _step3;
+                try {
+                  for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                    var _pos = _step3.value;
+                    var _newId = generateUUID();
+                    nodesToUpdate.set(_pos, _newId);
+                    seenIds.add(_newId);
+                    modified = true;
+                  }
+                } catch (err) {
+                  _iterator3.e(err);
+                } finally {
+                  _iterator3.f();
                 }
-                modified = true;
+              } else if (existingId) {
+                seenIds.add(existingId);
               }
             }
-            if (node.attrs.localId) {
-              seenIds.add(node.attrs.localId);
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+        } else {
+          var _iterator4 = _createForOfIteratorHelper(addedNodes),
+            _step4;
+          try {
+            for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+              var _node = _step4.value;
+              if (!_node.attrs.localId || localIds.has(_node.attrs.localId) || seenIds.has(_node.attrs.localId)) {
+                var _pos2 = addedNodePos.get(_node);
+                if (_pos2 !== undefined) {
+                  var _newId2 = generateUUID();
+                  nodesToUpdate.set(_pos2, _newId2);
+                  seenIds.add(_newId2);
+                  modified = true;
+                }
+              }
+              if (_node.attrs.localId) {
+                seenIds.add(_node.attrs.localId);
+              }
             }
+          } catch (err) {
+            _iterator4.e(err);
+          } finally {
+            _iterator4.f();
           }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _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
-      if (modified && nodesToUpdate.size > 0 && fg('platform_editor_localid_improvements')) {
+      if (modified && nodesToUpdate.size > 0) {
         batchAddLocalIdToNodes(nodesToUpdate, tr);
       }
       return modified ? tr : undefined;
     }
   });
 };
-/**
- * Adds a local ID to a ProseMirror node
- *
- * This utility function updates a node's attributes to include a unique local ID.
- *
- * @param pos - The position of the node in the document
- * @param tr - The transaction to apply the change to
- */
-export var addLocalIdToNode = function addLocalIdToNode(pos, tr) {
-  tr.setNodeAttribute(pos, 'localId', generateUUID());
-  tr.setMeta('addToHistory', false);
-};
-
 /**
  * Batch adds local IDs to nodes using a BatchAttrsStep
  * @param nodesToUpdate Map of position -> localId for nodes that need updates

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

@@ -4,15 +4,6 @@ import { PluginKey, type Transaction } from '@atlaskit/editor-prosemirror/state'
 import type { LocalIdPlugin } from '../localIdPluginType';
 export declare const localIdPluginKey: PluginKey;
 export declare const createPlugin: (api: ExtractInjectionAPI<LocalIdPlugin> | undefined) => SafePlugin;
-/**
- * Adds a local ID to a ProseMirror node
- *
- * This utility function updates a node's attributes to include a unique local ID.
- *
- * @param pos - The position of the node in the document
- * @param tr - The transaction to apply the change to
- */
-export declare const addLocalIdToNode: (pos: number, tr: Transaction) => void;
 /**
  * Batch adds local IDs to nodes using a BatchAttrsStep
  * @param nodesToUpdate Map of position -> localId for nodes that need updates

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

@@ -4,15 +4,6 @@ import { PluginKey, type Transaction } from '@atlaskit/editor-prosemirror/state'
 import type { LocalIdPlugin } from '../localIdPluginType';
 export declare const localIdPluginKey: PluginKey;
 export declare const createPlugin: (api: ExtractInjectionAPI<LocalIdPlugin> | undefined) => SafePlugin;
-/**
- * Adds a local ID to a ProseMirror node
- *
- * This utility function updates a node's attributes to include a unique local ID.
- *
- * @param pos - The position of the node in the document
- * @param tr - The transaction to apply the change to
- */
-export declare const addLocalIdToNode: (pos: number, tr: Transaction) => void;
 /**
  * Batch adds local IDs to nodes using a BatchAttrsStep
  * @param nodesToUpdate Map of position -> localId for nodes that need updates

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-local-id",
-	"version": "8.1.2",
+	"version": "8.3.0",
 	"description": "LocalId plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,14 +34,16 @@
 		"@atlaskit/editor-plugin-limited-mode": "^7.2.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
+		"@atlaskit/tmp-editor-statsig": "^82.3.0",
 		"@babel/runtime": "^7.0.0",
 		"raf-schd": "^4.0.3"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.36.0",
+		"@atlaskit/editor-common": "^114.41.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
+		"react": "^18.2.0",
 		"typescript": "5.9.2"
 	},
 	"techstack": {
@@ -84,9 +86,6 @@
 		"platform_editor_use_localid_dedupe": {
 			"type": "boolean"
 		},
-		"platform_editor_localid_improvements": {
-			"type": "boolean"
-		},
 		"platform_editor_ai_aifc_localid_error_reporting": {
 			"type": "boolean"
 		}