@atlaskit/editor-plugin-synced-block 10.0.20 → 10.0.21

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 10.0.21
+
+### Patch Changes
+
+- [`845de90a5f39e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/845de90a5f39e) -
+  [ux] Fix source synced block deletion intermittently failing when the document changes (from your
+  own edits or a collaborator's) while the delete confirmation dialog is open. The delete is now
+  recomputed from the current document on confirm, instead of replaying a stale transaction captured
+  when the dialog opened. Gated behind `platform_editor_blocks_patch_4`.
+
 ## 10.0.20
 
 ### Patch Changes

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

@@ -171,8 +171,15 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
     });
   });
   if (bodiedSyncBlockRemoved.length > 0) {
-    // eslint-disable-next-line no-param-reassign
-    confirmationTransactionRef.current = tr;
+    if (!(0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_4')) {
+      // Legacy stash-and-rebase path: store the original delete transaction so it
+      // can be rebased against intervening edits and replayed on confirm. When
+      // platform_editor_blocks_patch_4 is on we instead recompute the delete fresh
+      // from the live document on confirm (see handleBodiedSyncBlockRemoval), so
+      // there is no need to stash the transaction here. See EDITOR-7889.
+      // eslint-disable-next-line no-param-reassign
+      confirmationTransactionRef.current = tr;
+    }
     return (0, _handleBodiedSyncBlockRemoval.handleBodiedSyncBlockRemoval)(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(tr));
   }
   if (bodiedSyncBlockAdded.length > 0) {
@@ -887,13 +894,19 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           }
         });
       }
-      trs.filter(function (tr) {
-        return tr.docChanged;
-      }).forEach(function (tr) {
-        if (confirmationTransactionRef.current) {
-          confirmationTransactionRef.current = (0, _editorSyncedBlockProvider.rebaseTransaction)(confirmationTransactionRef.current, tr, newState);
-        }
-      });
+
+      // Legacy stash-and-rebase path. When platform_editor_blocks_patch_4 is on the
+      // delete is recomputed fresh from the live document on confirm, so there is
+      // no stashed transaction to rebase here. See EDITOR-7889.
+      if (!(0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_4')) {
+        trs.filter(function (tr) {
+          return tr.docChanged;
+        }).forEach(function (tr) {
+          if (confirmationTransactionRef.current) {
+            confirmationTransactionRef.current = (0, _editorSyncedBlockProvider.rebaseTransaction)(confirmationTransactionRef.current, tr, newState);
+          }
+        });
+      }
       var _iterator2 = _createForOfIteratorHelper(trs),
         _step2;
       try {

package/dist/cjs/pm-plugins/utils/handle-bodied-sync-block-removal.js

@@ -7,8 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.handleBodiedSyncBlockRemoval = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _utils = require("@atlaskit/editor-common/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("../../types");
 var _main = require("../main");
+var _recomputeDeleteTransaction = require("./recompute-delete-transaction");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var onRetry = function onRetry(api, syncBlockStore) {
@@ -43,12 +45,45 @@ var handleBodiedSyncBlockRemoval = exports.handleBodiedSyncBlockRemoval = functi
   syncBlockStore.sourceManager.deleteSyncBlocksWithConfirmation(bodiedSyncBlockRemoved.map(function (node) {
     return node.attrs;
   }), deletionReason, function () {
-    var _api$core2;
+    var _api$core3;
+    if ((0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_4')) {
+      var _api$core2;
+      // Recompute the delete fresh from the live document instead of
+      // replaying a stashed-and-rebased transaction. The stash/rebase
+      // approach produced stale, schema-invalid transactions when the
+      // document changed shape (local edits or remote collab) while the
+      // confirmation modal was open — the dominant signature being
+      // "Invalid content for node bodiedSyncBlock: <>". See EDITOR-7889.
+      api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref2) {
+        var tr = _ref2.tr;
+        var recomputedTr = (0, _recomputeDeleteTransaction.recomputeDeleteTransaction)(tr, syncBlockStore.sourceManager.isSourceBlock, bodiedSyncBlockRemoved.map(function (node) {
+          return node.attrs;
+        }));
+
+        // The target node(s) no longer exist in the live document (e.g.
+        // a remote collaborator already removed them). There is nothing
+        // to delete locally, so return `null` to skip the dispatch
+        // entirely — dispatching the untouched transaction would be a
+        // no-op that still runs the plugin's filter/append hooks. The
+        // backend deletion has already been issued by the store manager.
+        if (!recomputedTr) {
+          return null;
+        }
+        recomputedTr.setMeta('isConfirmedSyncBlockDeletion', true);
+        if (!recomputedTr.getMeta(_utils.pmHistoryPluginKey)) {
+          // bodiedSyncBlock deletion is expected to be permanent (cannot undo)
+          // For a normal deletion (not triggered by undo), remove it from history so that it cannot be undone
+          recomputedTr.setMeta('addToHistory', false);
+        }
+        return recomputedTr;
+      });
+      return;
+    }
     var confirmationTransaction = confirmationTransactionRef.current;
     if (!confirmationTransaction) {
       return;
     }
-    api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function () {
+    api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function () {
       var trToDispatch = confirmationTransaction.setMeta('isConfirmedSyncBlockDeletion', true);
       if (!trToDispatch.getMeta(_utils.pmHistoryPluginKey)) {
         // bodiedSyncBlock deletion is expected to be permanent (cannot undo)
@@ -58,9 +93,9 @@ var handleBodiedSyncBlockRemoval = exports.handleBodiedSyncBlockRemoval = functi
       return trToDispatch;
     });
   }, function (success) {
-    var _api$core3;
-    api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref2) {
-      var tr = _ref2.tr;
+    var _api$core4;
+    api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.execute(function (_ref3) {
+      var tr = _ref3.tr;
       var newState;
       if (!success) {
         newState = {

package/dist/cjs/pm-plugins/utils/recompute-delete-transaction.js

@@ -0,0 +1,98 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.recomputeDeleteTransaction = void 0;
+/**
+ * Whether `node` is the source block requested by `wanted`.
+ *
+ * Matching is done *per requested block* (rather than against global pools of
+ * every requested localId/resourceId) so a node cannot be matched by combining
+ * one block's `localId` with a different block's `resourceId`. We match on the
+ * requested block's `localId` first and only fall back to its `resourceId` when
+ * the `localId` has been regenerated (so it no longer matches the live node).
+ */
+var matchesRequestedBlock = function matchesRequestedBlock(node, wanted) {
+  var _ref = node.attrs,
+    localId = _ref.localId,
+    resourceId = _ref.resourceId;
+  if (wanted.localId && localId && wanted.localId === localId) {
+    return true;
+  }
+  return Boolean(wanted.resourceId && resourceId && wanted.resourceId === resourceId);
+};
+
+/**
+ * Locate the live positions of the source `bodiedSyncBlock` nodes identified by
+ * `syncBlockIds`, matching first on `localId` and falling back to `resourceId`.
+ *
+ * This walks the *current* document (`tr.doc`) rather than relying on positions
+ * captured when the delete was first triggered, so it is robust to intervening
+ * local edits and remote collab changes that occur while the confirmation modal
+ * is open.
+ */
+var findSourceBlocks = function findSourceBlocks(tr, isSourceBlock, syncBlockIds) {
+  var matches = [];
+  tr.doc.descendants(function (node, pos) {
+    if (!isSourceBlock(node)) {
+      // bodiedSyncBlock is always a top-level node, so there is no need to
+      // descend into other branches looking for one.
+      return false;
+    }
+    if (syncBlockIds.some(function (wanted) {
+      return matchesRequestedBlock(node, wanted);
+    })) {
+      matches.push({
+        node: node,
+        pos: pos
+      });
+    }
+
+    // Never recurse into a source block's body.
+    return false;
+  });
+  return matches;
+};
+
+/**
+ * Recompute a source `bodiedSyncBlock` delete from the live document.
+ *
+ * Instead of replaying a transaction that was stashed when the delete was first
+ * triggered (and then manually rebased against every intervening edit — the
+ * fragile pattern that produced "Invalid content for node bodiedSyncBlock: <>"
+ * and assorted position/open-depth errors), this finds the target node(s) by
+ * `localId`/`resourceId` in the current state and issues a fresh
+ * `tr.delete(pos, pos + nodeSize)` for each.
+ *
+ * Deletes are applied in reverse document order so earlier deletes do not
+ * invalidate the positions of later ones.
+ *
+ * Partial matches are handled gracefully: when only some of the requested
+ * blocks are still present (e.g. a remote collaborator removed the rest while
+ * the confirmation modal was open), the found ones are deleted and the missing
+ * ones are skipped. This is intentional — the backend deletion for every
+ * requested block has already been issued by the store manager, so the local
+ * transaction only needs to remove whatever is still in the live document.
+ *
+ * @returns the mutated transaction when at least one target node was found and
+ * deleted (this may be a partial delete if some targets were already gone),
+ * otherwise `undefined` when none of the targets exist any more — e.g. a remote
+ * collaborator already removed them all — so there is nothing to delete.
+ */
+var recomputeDeleteTransaction = exports.recomputeDeleteTransaction = function recomputeDeleteTransaction(tr, isSourceBlock, syncBlockIds) {
+  var matches = findSourceBlocks(tr, isSourceBlock, syncBlockIds);
+  if (matches.length === 0) {
+    return undefined;
+  }
+
+  // Delete in reverse document order so positions remain valid across deletes.
+  matches.sort(function (a, b) {
+    return b.pos - a.pos;
+  }).forEach(function (_ref2) {
+    var node = _ref2.node,
+      pos = _ref2.pos;
+    tr.delete(pos, pos + node.nodeSize);
+  });
+  return tr;
+};

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

@@ -147,8 +147,15 @@ const filterTransactionOnline = ({
     });
   });
   if (bodiedSyncBlockRemoved.length > 0) {
-    // eslint-disable-next-line no-param-reassign
-    confirmationTransactionRef.current = tr;
+    if (!fg('platform_editor_blocks_patch_4')) {
+      // Legacy stash-and-rebase path: store the original delete transaction so it
+      // can be rebased against intervening edits and replayed on confirm. When
+      // platform_editor_blocks_patch_4 is on we instead recompute the delete fresh
+      // from the live document on confirm (see handleBodiedSyncBlockRemoval), so
+      // there is no need to stash the transaction here. See EDITOR-7889.
+      // eslint-disable-next-line no-param-reassign
+      confirmationTransactionRef.current = tr;
+    }
     return handleBodiedSyncBlockRemoval(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(tr));
   }
   if (bodiedSyncBlockAdded.length > 0) {
@@ -844,11 +851,17 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           }
         });
       }
-      trs.filter(tr => tr.docChanged).forEach(tr => {
-        if (confirmationTransactionRef.current) {
-          confirmationTransactionRef.current = rebaseTransaction(confirmationTransactionRef.current, tr, newState);
-        }
-      });
+
+      // Legacy stash-and-rebase path. When platform_editor_blocks_patch_4 is on the
+      // delete is recomputed fresh from the live document on confirm, so there is
+      // no stashed transaction to rebase here. See EDITOR-7889.
+      if (!fg('platform_editor_blocks_patch_4')) {
+        trs.filter(tr => tr.docChanged).forEach(tr => {
+          if (confirmationTransactionRef.current) {
+            confirmationTransactionRef.current = rebaseTransaction(confirmationTransactionRef.current, tr, newState);
+          }
+        });
+      }
       for (const tr of trs) {
         if (tr.getMeta(pmHistoryPluginKey)) {
           const {

package/dist/es2019/pm-plugins/utils/handle-bodied-sync-block-removal.js

@@ -1,6 +1,8 @@
 import { pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { FLAG_ID } from '../../types';
 import { syncedBlockPluginKey } from '../main';
+import { recomputeDeleteTransaction } from './recompute-delete-transaction';
 const onRetry = (api, syncBlockStore) => () => {
   var _api$core;
   api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(({
@@ -28,12 +30,44 @@ export const handleBodiedSyncBlockRemoval = (bodiedSyncBlockRemoved, syncBlockSt
   // See editor-common/src/sync-block/sync-block-store-manager.ts for how we handle user confirmation and
   // proceed with deletion.
   syncBlockStore.sourceManager.deleteSyncBlocksWithConfirmation(bodiedSyncBlockRemoved.map(node => node.attrs), deletionReason, () => {
-    var _api$core2;
+    var _api$core3;
+    if (fg('platform_editor_blocks_patch_4')) {
+      var _api$core2;
+      // Recompute the delete fresh from the live document instead of
+      // replaying a stashed-and-rebased transaction. The stash/rebase
+      // approach produced stale, schema-invalid transactions when the
+      // document changed shape (local edits or remote collab) while the
+      // confirmation modal was open — the dominant signature being
+      // "Invalid content for node bodiedSyncBlock: <>". See EDITOR-7889.
+      api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(({
+        tr
+      }) => {
+        const recomputedTr = recomputeDeleteTransaction(tr, syncBlockStore.sourceManager.isSourceBlock, bodiedSyncBlockRemoved.map(node => node.attrs));
+
+        // The target node(s) no longer exist in the live document (e.g.
+        // a remote collaborator already removed them). There is nothing
+        // to delete locally, so return `null` to skip the dispatch
+        // entirely — dispatching the untouched transaction would be a
+        // no-op that still runs the plugin's filter/append hooks. The
+        // backend deletion has already been issued by the store manager.
+        if (!recomputedTr) {
+          return null;
+        }
+        recomputedTr.setMeta('isConfirmedSyncBlockDeletion', true);
+        if (!recomputedTr.getMeta(pmHistoryPluginKey)) {
+          // bodiedSyncBlock deletion is expected to be permanent (cannot undo)
+          // For a normal deletion (not triggered by undo), remove it from history so that it cannot be undone
+          recomputedTr.setMeta('addToHistory', false);
+        }
+        return recomputedTr;
+      });
+      return;
+    }
     const confirmationTransaction = confirmationTransactionRef.current;
     if (!confirmationTransaction) {
       return;
     }
-    api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(() => {
+    api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(() => {
       const trToDispatch = confirmationTransaction.setMeta('isConfirmedSyncBlockDeletion', true);
       if (!trToDispatch.getMeta(pmHistoryPluginKey)) {
         // bodiedSyncBlock deletion is expected to be permanent (cannot undo)
@@ -43,8 +77,8 @@ export const handleBodiedSyncBlockRemoval = (bodiedSyncBlockRemoved, syncBlockSt
       return trToDispatch;
     });
   }, success => {
-    var _api$core3;
-    api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(({
+    var _api$core4;
+    api === null || api === void 0 ? void 0 : (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions.execute(({
       tr
     }) => {
       let newState;

package/dist/es2019/pm-plugins/utils/recompute-delete-transaction.js

@@ -0,0 +1,90 @@
+/**
+ * Whether `node` is the source block requested by `wanted`.
+ *
+ * Matching is done *per requested block* (rather than against global pools of
+ * every requested localId/resourceId) so a node cannot be matched by combining
+ * one block's `localId` with a different block's `resourceId`. We match on the
+ * requested block's `localId` first and only fall back to its `resourceId` when
+ * the `localId` has been regenerated (so it no longer matches the live node).
+ */
+const matchesRequestedBlock = (node, wanted) => {
+  const {
+    localId,
+    resourceId
+  } = node.attrs;
+  if (wanted.localId && localId && wanted.localId === localId) {
+    return true;
+  }
+  return Boolean(wanted.resourceId && resourceId && wanted.resourceId === resourceId);
+};
+
+/**
+ * Locate the live positions of the source `bodiedSyncBlock` nodes identified by
+ * `syncBlockIds`, matching first on `localId` and falling back to `resourceId`.
+ *
+ * This walks the *current* document (`tr.doc`) rather than relying on positions
+ * captured when the delete was first triggered, so it is robust to intervening
+ * local edits and remote collab changes that occur while the confirmation modal
+ * is open.
+ */
+const findSourceBlocks = (tr, isSourceBlock, syncBlockIds) => {
+  const matches = [];
+  tr.doc.descendants((node, pos) => {
+    if (!isSourceBlock(node)) {
+      // bodiedSyncBlock is always a top-level node, so there is no need to
+      // descend into other branches looking for one.
+      return false;
+    }
+    if (syncBlockIds.some(wanted => matchesRequestedBlock(node, wanted))) {
+      matches.push({
+        node,
+        pos
+      });
+    }
+
+    // Never recurse into a source block's body.
+    return false;
+  });
+  return matches;
+};
+
+/**
+ * Recompute a source `bodiedSyncBlock` delete from the live document.
+ *
+ * Instead of replaying a transaction that was stashed when the delete was first
+ * triggered (and then manually rebased against every intervening edit — the
+ * fragile pattern that produced "Invalid content for node bodiedSyncBlock: <>"
+ * and assorted position/open-depth errors), this finds the target node(s) by
+ * `localId`/`resourceId` in the current state and issues a fresh
+ * `tr.delete(pos, pos + nodeSize)` for each.
+ *
+ * Deletes are applied in reverse document order so earlier deletes do not
+ * invalidate the positions of later ones.
+ *
+ * Partial matches are handled gracefully: when only some of the requested
+ * blocks are still present (e.g. a remote collaborator removed the rest while
+ * the confirmation modal was open), the found ones are deleted and the missing
+ * ones are skipped. This is intentional — the backend deletion for every
+ * requested block has already been issued by the store manager, so the local
+ * transaction only needs to remove whatever is still in the live document.
+ *
+ * @returns the mutated transaction when at least one target node was found and
+ * deleted (this may be a partial delete if some targets were already gone),
+ * otherwise `undefined` when none of the targets exist any more — e.g. a remote
+ * collaborator already removed them all — so there is nothing to delete.
+ */
+export const recomputeDeleteTransaction = (tr, isSourceBlock, syncBlockIds) => {
+  const matches = findSourceBlocks(tr, isSourceBlock, syncBlockIds);
+  if (matches.length === 0) {
+    return undefined;
+  }
+
+  // Delete in reverse document order so positions remain valid across deletes.
+  matches.sort((a, b) => b.pos - a.pos).forEach(({
+    node,
+    pos
+  }) => {
+    tr.delete(pos, pos + node.nodeSize);
+  });
+  return tr;
+};

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

@@ -164,8 +164,15 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
     });
   });
   if (bodiedSyncBlockRemoved.length > 0) {
-    // eslint-disable-next-line no-param-reassign
-    confirmationTransactionRef.current = tr;
+    if (!fg('platform_editor_blocks_patch_4')) {
+      // Legacy stash-and-rebase path: store the original delete transaction so it
+      // can be rebased against intervening edits and replayed on confirm. When
+      // platform_editor_blocks_patch_4 is on we instead recompute the delete fresh
+      // from the live document on confirm (see handleBodiedSyncBlockRemoval), so
+      // there is no need to stash the transaction here. See EDITOR-7889.
+      // eslint-disable-next-line no-param-reassign
+      confirmationTransactionRef.current = tr;
+    }
     return handleBodiedSyncBlockRemoval(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(tr));
   }
   if (bodiedSyncBlockAdded.length > 0) {
@@ -880,13 +887,19 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
           }
         });
       }
-      trs.filter(function (tr) {
-        return tr.docChanged;
-      }).forEach(function (tr) {
-        if (confirmationTransactionRef.current) {
-          confirmationTransactionRef.current = rebaseTransaction(confirmationTransactionRef.current, tr, newState);
-        }
-      });
+
+      // Legacy stash-and-rebase path. When platform_editor_blocks_patch_4 is on the
+      // delete is recomputed fresh from the live document on confirm, so there is
+      // no stashed transaction to rebase here. See EDITOR-7889.
+      if (!fg('platform_editor_blocks_patch_4')) {
+        trs.filter(function (tr) {
+          return tr.docChanged;
+        }).forEach(function (tr) {
+          if (confirmationTransactionRef.current) {
+            confirmationTransactionRef.current = rebaseTransaction(confirmationTransactionRef.current, tr, newState);
+          }
+        });
+      }
       var _iterator2 = _createForOfIteratorHelper(trs),
         _step2;
       try {

package/dist/esm/pm-plugins/utils/handle-bodied-sync-block-removal.js

@@ -2,8 +2,10 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { FLAG_ID } from '../../types';
 import { syncedBlockPluginKey } from '../main';
+import { recomputeDeleteTransaction } from './recompute-delete-transaction';
 var onRetry = function onRetry(api, syncBlockStore) {
   return function () {
     var _api$core;
@@ -36,12 +38,45 @@ export var handleBodiedSyncBlockRemoval = function handleBodiedSyncBlockRemoval(
   syncBlockStore.sourceManager.deleteSyncBlocksWithConfirmation(bodiedSyncBlockRemoved.map(function (node) {
     return node.attrs;
   }), deletionReason, function () {
-    var _api$core2;
+    var _api$core3;
+    if (fg('platform_editor_blocks_patch_4')) {
+      var _api$core2;
+      // Recompute the delete fresh from the live document instead of
+      // replaying a stashed-and-rebased transaction. The stash/rebase
+      // approach produced stale, schema-invalid transactions when the
+      // document changed shape (local edits or remote collab) while the
+      // confirmation modal was open — the dominant signature being
+      // "Invalid content for node bodiedSyncBlock: <>". See EDITOR-7889.
+      api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref2) {
+        var tr = _ref2.tr;
+        var recomputedTr = recomputeDeleteTransaction(tr, syncBlockStore.sourceManager.isSourceBlock, bodiedSyncBlockRemoved.map(function (node) {
+          return node.attrs;
+        }));
+
+        // The target node(s) no longer exist in the live document (e.g.
+        // a remote collaborator already removed them). There is nothing
+        // to delete locally, so return `null` to skip the dispatch
+        // entirely — dispatching the untouched transaction would be a
+        // no-op that still runs the plugin's filter/append hooks. The
+        // backend deletion has already been issued by the store manager.
+        if (!recomputedTr) {
+          return null;
+        }
+        recomputedTr.setMeta('isConfirmedSyncBlockDeletion', true);
+        if (!recomputedTr.getMeta(pmHistoryPluginKey)) {
+          // bodiedSyncBlock deletion is expected to be permanent (cannot undo)
+          // For a normal deletion (not triggered by undo), remove it from history so that it cannot be undone
+          recomputedTr.setMeta('addToHistory', false);
+        }
+        return recomputedTr;
+      });
+      return;
+    }
     var confirmationTransaction = confirmationTransactionRef.current;
     if (!confirmationTransaction) {
       return;
     }
-    api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function () {
+    api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function () {
       var trToDispatch = confirmationTransaction.setMeta('isConfirmedSyncBlockDeletion', true);
       if (!trToDispatch.getMeta(pmHistoryPluginKey)) {
         // bodiedSyncBlock deletion is expected to be permanent (cannot undo)
@@ -51,9 +86,9 @@ export var handleBodiedSyncBlockRemoval = function handleBodiedSyncBlockRemoval(
       return trToDispatch;
     });
   }, function (success) {
-    var _api$core3;
-    api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref2) {
-      var tr = _ref2.tr;
+    var _api$core4;
+    api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.execute(function (_ref3) {
+      var tr = _ref3.tr;
       var newState;
       if (!success) {
         newState = {

package/dist/esm/pm-plugins/utils/recompute-delete-transaction.js

@@ -0,0 +1,92 @@
+/**
+ * Whether `node` is the source block requested by `wanted`.
+ *
+ * Matching is done *per requested block* (rather than against global pools of
+ * every requested localId/resourceId) so a node cannot be matched by combining
+ * one block's `localId` with a different block's `resourceId`. We match on the
+ * requested block's `localId` first and only fall back to its `resourceId` when
+ * the `localId` has been regenerated (so it no longer matches the live node).
+ */
+var matchesRequestedBlock = function matchesRequestedBlock(node, wanted) {
+  var _ref = node.attrs,
+    localId = _ref.localId,
+    resourceId = _ref.resourceId;
+  if (wanted.localId && localId && wanted.localId === localId) {
+    return true;
+  }
+  return Boolean(wanted.resourceId && resourceId && wanted.resourceId === resourceId);
+};
+
+/**
+ * Locate the live positions of the source `bodiedSyncBlock` nodes identified by
+ * `syncBlockIds`, matching first on `localId` and falling back to `resourceId`.
+ *
+ * This walks the *current* document (`tr.doc`) rather than relying on positions
+ * captured when the delete was first triggered, so it is robust to intervening
+ * local edits and remote collab changes that occur while the confirmation modal
+ * is open.
+ */
+var findSourceBlocks = function findSourceBlocks(tr, isSourceBlock, syncBlockIds) {
+  var matches = [];
+  tr.doc.descendants(function (node, pos) {
+    if (!isSourceBlock(node)) {
+      // bodiedSyncBlock is always a top-level node, so there is no need to
+      // descend into other branches looking for one.
+      return false;
+    }
+    if (syncBlockIds.some(function (wanted) {
+      return matchesRequestedBlock(node, wanted);
+    })) {
+      matches.push({
+        node: node,
+        pos: pos
+      });
+    }
+
+    // Never recurse into a source block's body.
+    return false;
+  });
+  return matches;
+};
+
+/**
+ * Recompute a source `bodiedSyncBlock` delete from the live document.
+ *
+ * Instead of replaying a transaction that was stashed when the delete was first
+ * triggered (and then manually rebased against every intervening edit — the
+ * fragile pattern that produced "Invalid content for node bodiedSyncBlock: <>"
+ * and assorted position/open-depth errors), this finds the target node(s) by
+ * `localId`/`resourceId` in the current state and issues a fresh
+ * `tr.delete(pos, pos + nodeSize)` for each.
+ *
+ * Deletes are applied in reverse document order so earlier deletes do not
+ * invalidate the positions of later ones.
+ *
+ * Partial matches are handled gracefully: when only some of the requested
+ * blocks are still present (e.g. a remote collaborator removed the rest while
+ * the confirmation modal was open), the found ones are deleted and the missing
+ * ones are skipped. This is intentional — the backend deletion for every
+ * requested block has already been issued by the store manager, so the local
+ * transaction only needs to remove whatever is still in the live document.
+ *
+ * @returns the mutated transaction when at least one target node was found and
+ * deleted (this may be a partial delete if some targets were already gone),
+ * otherwise `undefined` when none of the targets exist any more — e.g. a remote
+ * collaborator already removed them all — so there is nothing to delete.
+ */
+export var recomputeDeleteTransaction = function recomputeDeleteTransaction(tr, isSourceBlock, syncBlockIds) {
+  var matches = findSourceBlocks(tr, isSourceBlock, syncBlockIds);
+  if (matches.length === 0) {
+    return undefined;
+  }
+
+  // Delete in reverse document order so positions remain valid across deletes.
+  matches.sort(function (a, b) {
+    return b.pos - a.pos;
+  }).forEach(function (_ref2) {
+    var node = _ref2.node,
+      pos = _ref2.pos;
+    tr.delete(pos, pos + node.nodeSize);
+  });
+  return tr;
+};

package/dist/types/pm-plugins/utils/recompute-delete-transaction.d.ts

@@ -0,0 +1,29 @@
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { SyncBlockAttrs } from '../../types';
+/**
+ * Recompute a source `bodiedSyncBlock` delete from the live document.
+ *
+ * Instead of replaying a transaction that was stashed when the delete was first
+ * triggered (and then manually rebased against every intervening edit — the
+ * fragile pattern that produced "Invalid content for node bodiedSyncBlock: <>"
+ * and assorted position/open-depth errors), this finds the target node(s) by
+ * `localId`/`resourceId` in the current state and issues a fresh
+ * `tr.delete(pos, pos + nodeSize)` for each.
+ *
+ * Deletes are applied in reverse document order so earlier deletes do not
+ * invalidate the positions of later ones.
+ *
+ * Partial matches are handled gracefully: when only some of the requested
+ * blocks are still present (e.g. a remote collaborator removed the rest while
+ * the confirmation modal was open), the found ones are deleted and the missing
+ * ones are skipped. This is intentional — the backend deletion for every
+ * requested block has already been issued by the store manager, so the local
+ * transaction only needs to remove whatever is still in the live document.
+ *
+ * @returns the mutated transaction when at least one target node was found and
+ * deleted (this may be a partial delete if some targets were already gone),
+ * otherwise `undefined` when none of the targets exist any more — e.g. a remote
+ * collaborator already removed them all — so there is nothing to delete.
+ */
+export declare const recomputeDeleteTransaction: (tr: Transaction, isSourceBlock: (node: PMNode) => boolean, syncBlockIds: SyncBlockAttrs[]) => Transaction | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "10.0.20",
+	"version": "10.0.21",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -108,6 +108,9 @@
 		"platform_editor_blocks_patch_2": {
 			"type": "boolean"
 		},
+		"platform_editor_blocks_patch_4": {
+			"type": "boolean"
+		},
 		"platform_synced_block_patch_13": {
 			"type": "boolean"
 		},