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

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 10.1.0
+
+### Minor Changes
+
+- [`ecafba7c81b7d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ecafba7c81b7d) -
+  Enrich synced block deletion analytics so source-block deletions can be explained rather than just
+  counted. The source `syncedBlockDelete` operational event now carries `deletionReason` and a
+  `mechanism` dimension (undo/redo/deleteButton/keyboardDelete/selectionReplaced/other), and
+  repeated emissions for the same removal are de-duplicated. A real operational `syncedBlockCreate`
+  success event is now emitted, and the source bare-uuid join key is added to the copy event so
+  create/copy/delete can be correlated. All new attributes and events are gated behind
+  `platform_editor_blocks_patch_4`; gate-off behaviour is unchanged.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 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/editor-commands/index.js

@@ -158,6 +158,10 @@ var copySyncedBlockReferenceToClipboardInternal = function copySyncedBlockRefere
   }
   var domNode = (0, _copyButton.toDOM)(referenceSyncBlockNode, schema);
   (0, _copyButton.copyDomNode)(domNode, referenceSyncBlockNode.type, selection);
+
+  // Bare-uuid join key shared with the create/delete events: for a source
+  // bodiedSyncBlock its `localId` is the source uuid (copy was page-form only).
+  var sourceJoinKey = isBodiedSyncBlock ? syncBlockFindResult.node.attrs.localId : undefined;
   (0, _utils2.deferDispatch)(function () {
     api === null || api === void 0 || api.core.actions.execute(function (_ref3) {
       var _api$analytics4;
@@ -167,10 +171,12 @@ var copySyncedBlockReferenceToClipboardInternal = function copySyncedBlockRefere
         action: _analytics.ACTION.COPIED,
         actionSubject: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,
         actionSubjectId: _analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_COPY,
-        attributes: {
+        attributes: _objectSpread({
           resourceId: referenceSyncBlockNode.attrs.resourceId,
           inputMethod: inputMethod
-        }
+        }, sourceJoinKey && (0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_4') && {
+          blockInstanceId: sourceJoinKey
+        })
       });
       return tr.setMeta(_main.syncedBlockPluginKey, {
         activeFlag: {
@@ -246,6 +252,13 @@ var removeSyncedBlock = exports.removeSyncedBlock = function removeSyncedBlock(a
     if (!removeTr) {
       return false;
     }
+
+    // Tag the transaction so analytics can report this as `deleteButton` rather
+    // than a keyboard delete (both produce a plain ReplaceStep). Gated so the
+    // gate-off transaction is unchanged.
+    if ((0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_4')) {
+      removeTr.setMeta(_main.deleteMechanismMetaKey, 'deleteButton');
+    }
     dispatch(removeTr);
     api === null || api === void 0 || api.core.actions.focus();
     return true;

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

@@ -4,10 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.syncedBlockPluginKey = exports.createPlugin = void 0;
+exports.syncedBlockPluginKey = exports.getDeleteMechanism = exports.deleteMechanismMetaKey = exports.createPlugin = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _collab = require("@atlaskit/editor-common/collab");
@@ -41,6 +42,17 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 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; }
 var syncedBlockPluginKey = exports.syncedBlockPluginKey = new _state.PluginKey('syncedBlockPlugin');
+
+/**
+ * Dedicated transaction-meta {@link PluginKey} the synced-block removal command
+ * sets so {@link getDeleteMechanism} can report a toolbar Delete as
+ * `deleteButton` (otherwise indistinguishable from a keyboard delete — both are
+ * plain ReplaceSteps). A separate key (rather than `syncedBlockPluginKey`, which
+ * carries plugin-state transitions read in `apply()`, or a bare string) keeps
+ * this transient signal uniquely namespaced and isolated. Only read behind
+ * `platform_editor_blocks_patch_4`.
+ */
+var deleteMechanismMetaKey = exports.deleteMechanismMetaKey = new _state.PluginKey('syncedBlockDeleteMechanism');
 var mapRetryCreationPosMap = function mapRetryCreationPosMap(oldMap, newRetryCreationPos, mapPos, isPerfExperimentOn) {
   var resourceId = newRetryCreationPos === null || newRetryCreationPos === void 0 ? void 0 : newRetryCreationPos.resourceId;
 
@@ -121,6 +133,55 @@ var getDeleteReason = function getDeleteReason(tr) {
   }
   return reason;
 };
+
+/** Narrows the history plugin meta, matching the editor-plugin-card pattern. */
+var isHistoryMeta = function isHistoryMeta(meta) {
+  return (0, _typeof2.default)(meta) === 'object' && meta !== null && 'redo' in meta;
+};
+
+/**
+ * Derive how a source bodiedSyncBlock removal was performed, for the `mechanism`
+ * analytics dimension. Each value names the user action; most-specific wins:
+ *  - `undo` / `redo` — history transaction.
+ *  - `deleteButton` — the explicit "Delete" control in the synced-block toolbar
+ *    (the removal command tags its transaction with {@link deleteMechanismMetaKey}).
+ *  - `selectionReplaced` — ReplaceStep on a node-selected block (the
+ *    accidental-overwrite path: block selected, then typed/pasted over).
+ *  - `keyboardDelete` — ReplaceStep removal at a caret/range selection
+ *    (Backspace/Delete key).
+ *  - `other` — anything else (unsync, conversion, code-dispatched, or a
+ *    structural `ReplaceAroundStep` such as wrap/lift/unwrap).
+ *
+ * Only a plain `ReplaceStep` counts as a direct user deletion. `ReplaceAroundStep`
+ * is used for wrapping/lifting/unwrapping content, not direct removal, so a
+ * removal carried by one is classified as `other` rather than misreported as a
+ * keyboard delete.
+ *
+ * `state` is the pre-transaction state, so its selection reflects what was
+ * selected when the edit was made.
+ */
+var getDeleteMechanism = exports.getDeleteMechanism = function getDeleteMechanism(tr, state) {
+  var _selection$node;
+  var historyMeta = tr.getMeta(_utils.pmHistoryPluginKey);
+  if (historyMeta) {
+    return isHistoryMeta(historyMeta) && historyMeta.redo ? 'redo' : 'undo';
+  }
+
+  // The toolbar Delete control tags its transaction so we can report it
+  // distinctly from a keyboard delete (both produce a plain ReplaceStep).
+  if (tr.getMeta(deleteMechanismMetaKey) === 'deleteButton') {
+    return 'deleteButton';
+  }
+  var hasReplaceStep = tr.steps.some(function (step) {
+    return step instanceof _transform.ReplaceStep;
+  });
+  if (!hasReplaceStep) {
+    return 'other';
+  }
+  var selection = state.selection;
+  var isNodeSelected = selection instanceof _state.NodeSelection && ((_selection$node = selection.node) === null || _selection$node === void 0 ? void 0 : _selection$node.type.name) === 'bodiedSyncBlock';
+  return isNodeSelected ? 'selectionReplaced' : 'keyboardDelete';
+};
 var filterTransactionOnline = function filterTransactionOnline(_ref3) {
   var _tr$getMeta;
   var tr = _ref3.tr,
@@ -171,9 +232,18 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
     });
   });
   if (bodiedSyncBlockRemoved.length > 0) {
-    // eslint-disable-next-line no-param-reassign
-    confirmationTransactionRef.current = tr;
-    return (0, _handleBodiedSyncBlockRemoval.handleBodiedSyncBlockRemoval)(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(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;
+    }
+    // Only derive the mechanism behind the gate — discarded gate-off.
+    var mechanism = (0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_4') ? getDeleteMechanism(tr, state) : undefined;
+    return (0, _handleBodiedSyncBlockRemoval.handleBodiedSyncBlockRemoval)(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(tr), mechanism);
   }
   if (bodiedSyncBlockAdded.length > 0) {
     if (tr.getMeta(_utils.pmHistoryPluginKey)) {
@@ -887,13 +957,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) {
@@ -32,7 +34,7 @@ var onDismissed = function onDismissed(syncBlockStore) {
     });
   };
 };
-var handleBodiedSyncBlockRemoval = exports.handleBodiedSyncBlockRemoval = function handleBodiedSyncBlockRemoval(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, deletionReason) {
+var handleBodiedSyncBlockRemoval = exports.handleBodiedSyncBlockRemoval = function handleBodiedSyncBlockRemoval(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, deletionReason, mechanism) {
   // Clear potential old pending deletion to retreat the deletion as first attempt
   syncBlockStore.sourceManager.clearPendingDeletion();
 
@@ -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 = {
@@ -86,6 +121,6 @@ var handleBodiedSyncBlockRemoval = exports.handleBodiedSyncBlockRemoval = functi
     });
   }, function () {
     confirmationTransactionRef.current = undefined;
-  });
+  }, mechanism);
   return false;
 };

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/editor-commands/index.js

@@ -5,7 +5,7 @@ import { DOMSerializer, Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findSelectedNodeOfType, removeParentNodeOfType, removeSelectedNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { syncedBlockPluginKey } from '../pm-plugins/main';
+import { deleteMechanismMetaKey, syncedBlockPluginKey } from '../pm-plugins/main';
 import { canBeConvertedToSyncBlock, deferDispatch, findSyncBlock, findSyncBlockOrBodiedSyncBlock, isBodiedSyncBlockNode } from '../pm-plugins/utils/utils';
 import { FLAG_ID } from '../types';
 import { findBodiedSyncBlockByLocalId, pasteSyncBlockHTMLContent } from './utils';
@@ -153,6 +153,10 @@ const copySyncedBlockReferenceToClipboardInternal = (schema, selection, syncBloc
   }
   const domNode = toDOM(referenceSyncBlockNode, schema);
   copyDomNode(domNode, referenceSyncBlockNode.type, selection);
+
+  // Bare-uuid join key shared with the create/delete events: for a source
+  // bodiedSyncBlock its `localId` is the source uuid (copy was page-form only).
+  const sourceJoinKey = isBodiedSyncBlock ? syncBlockFindResult.node.attrs.localId : undefined;
   deferDispatch(() => {
     api === null || api === void 0 ? void 0 : api.core.actions.execute(({
       tr
@@ -165,7 +169,10 @@ const copySyncedBlockReferenceToClipboardInternal = (schema, selection, syncBloc
         actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_COPY,
         attributes: {
           resourceId: referenceSyncBlockNode.attrs.resourceId,
-          inputMethod
+          inputMethod,
+          ...(sourceJoinKey && fg('platform_editor_blocks_patch_4') && {
+            blockInstanceId: sourceJoinKey
+          })
         }
       });
       return tr.setMeta(syncedBlockPluginKey, {
@@ -246,6 +253,13 @@ export const removeSyncedBlock = api => (state, dispatch, _view) => {
   if (!removeTr) {
     return false;
   }
+
+  // Tag the transaction so analytics can report this as `deleteButton` rather
+  // than a keyboard delete (both produce a plain ReplaceStep). Gated so the
+  // gate-off transaction is unchanged.
+  if (fg('platform_editor_blocks_patch_4')) {
+    removeTr.setMeta(deleteMechanismMetaKey, 'deleteButton');
+  }
   dispatch(removeTr);
   api === null || api === void 0 ? void 0 : api.core.actions.focus();
   return true;

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

@@ -6,7 +6,7 @@ import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import { BodiedSyncBlockSharedCssClassName, SyncBlockStateCssClassName } from '@atlaskit/editor-common/sync-block';
 import { mapSlice, pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
-import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { NodeSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
 import { convertPMNodesToSyncBlockNodes, rebaseTransaction } from '@atlaskit/editor-synced-block-provider';
@@ -26,6 +26,17 @@ import { hasEditInSyncBlock, trackSyncBlocks } from './utils/track-sync-blocks';
 import { transactionInsertsSyncedBlock } from './utils/transaction-inserts-synced-block';
 import { deferDispatch, wasExtensionInsertedInBodiedSyncBlock, sliceFullyContainsNode } from './utils/utils';
 export const syncedBlockPluginKey = new PluginKey('syncedBlockPlugin');
+
+/**
+ * Dedicated transaction-meta {@link PluginKey} the synced-block removal command
+ * sets so {@link getDeleteMechanism} can report a toolbar Delete as
+ * `deleteButton` (otherwise indistinguishable from a keyboard delete — both are
+ * plain ReplaceSteps). A separate key (rather than `syncedBlockPluginKey`, which
+ * carries plugin-state transitions read in `apply()`, or a bare string) keeps
+ * this transient signal uniquely namespaced and isolated. Only read behind
+ * `platform_editor_blocks_patch_4`.
+ */
+export const deleteMechanismMetaKey = new PluginKey('syncedBlockDeleteMechanism');
 const mapRetryCreationPosMap = (oldMap, newRetryCreationPos, mapPos, isPerfExperimentOn) => {
   const resourceId = newRetryCreationPos === null || newRetryCreationPos === void 0 ? void 0 : newRetryCreationPos.resourceId;
 
@@ -95,6 +106,53 @@ const getDeleteReason = tr => {
   }
   return reason;
 };
+
+/** Narrows the history plugin meta, matching the editor-plugin-card pattern. */
+const isHistoryMeta = meta => typeof meta === 'object' && meta !== null && 'redo' in meta;
+
+/**
+ * Derive how a source bodiedSyncBlock removal was performed, for the `mechanism`
+ * analytics dimension. Each value names the user action; most-specific wins:
+ *  - `undo` / `redo` — history transaction.
+ *  - `deleteButton` — the explicit "Delete" control in the synced-block toolbar
+ *    (the removal command tags its transaction with {@link deleteMechanismMetaKey}).
+ *  - `selectionReplaced` — ReplaceStep on a node-selected block (the
+ *    accidental-overwrite path: block selected, then typed/pasted over).
+ *  - `keyboardDelete` — ReplaceStep removal at a caret/range selection
+ *    (Backspace/Delete key).
+ *  - `other` — anything else (unsync, conversion, code-dispatched, or a
+ *    structural `ReplaceAroundStep` such as wrap/lift/unwrap).
+ *
+ * Only a plain `ReplaceStep` counts as a direct user deletion. `ReplaceAroundStep`
+ * is used for wrapping/lifting/unwrapping content, not direct removal, so a
+ * removal carried by one is classified as `other` rather than misreported as a
+ * keyboard delete.
+ *
+ * `state` is the pre-transaction state, so its selection reflects what was
+ * selected when the edit was made.
+ */
+export const getDeleteMechanism = (tr, state) => {
+  var _selection$node;
+  const historyMeta = tr.getMeta(pmHistoryPluginKey);
+  if (historyMeta) {
+    return isHistoryMeta(historyMeta) && historyMeta.redo ? 'redo' : 'undo';
+  }
+
+  // The toolbar Delete control tags its transaction so we can report it
+  // distinctly from a keyboard delete (both produce a plain ReplaceStep).
+  if (tr.getMeta(deleteMechanismMetaKey) === 'deleteButton') {
+    return 'deleteButton';
+  }
+  const hasReplaceStep = tr.steps.some(step => step instanceof ReplaceStep);
+  if (!hasReplaceStep) {
+    return 'other';
+  }
+  const {
+    selection
+  } = state;
+  const isNodeSelected = selection instanceof NodeSelection && ((_selection$node = selection.node) === null || _selection$node === void 0 ? void 0 : _selection$node.type.name) === 'bodiedSyncBlock';
+  return isNodeSelected ? 'selectionReplaced' : 'keyboardDelete';
+};
 const filterTransactionOnline = ({
   tr,
   state,
@@ -147,9 +205,18 @@ const filterTransactionOnline = ({
     });
   });
   if (bodiedSyncBlockRemoved.length > 0) {
-    // eslint-disable-next-line no-param-reassign
-    confirmationTransactionRef.current = tr;
-    return handleBodiedSyncBlockRemoval(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(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;
+    }
+    // Only derive the mechanism behind the gate — discarded gate-off.
+    const mechanism = fg('platform_editor_blocks_patch_4') ? getDeleteMechanism(tr, state) : undefined;
+    return handleBodiedSyncBlockRemoval(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(tr), mechanism);
   }
   if (bodiedSyncBlockAdded.length > 0) {
     if (tr.getMeta(pmHistoryPluginKey)) {
@@ -844,11 +911,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(({
@@ -19,7 +21,7 @@ const onDismissed = syncBlockStore => tr => {
     bodiedSyncBlockDeletionStatus: 'none'
   });
 };
-export const handleBodiedSyncBlockRemoval = (bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, deletionReason) => {
+export const handleBodiedSyncBlockRemoval = (bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, deletionReason, mechanism) => {
   // Clear potential old pending deletion to retreat the deletion as first attempt
   syncBlockStore.sourceManager.clearPendingDeletion();
 
@@ -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;
@@ -73,6 +107,6 @@ export const handleBodiedSyncBlockRemoval = (bodiedSyncBlockRemoved, syncBlockSt
     });
   }, () => {
     confirmationTransactionRef.current = undefined;
-  });
+  }, mechanism);
   return false;
 };

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/editor-commands/index.js

@@ -8,7 +8,7 @@ import { DOMSerializer, Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findSelectedNodeOfType, removeParentNodeOfType, removeSelectedNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { syncedBlockPluginKey } from '../pm-plugins/main';
+import { deleteMechanismMetaKey, syncedBlockPluginKey } from '../pm-plugins/main';
 import { canBeConvertedToSyncBlock, deferDispatch, findSyncBlock, findSyncBlockOrBodiedSyncBlock, isBodiedSyncBlockNode } from '../pm-plugins/utils/utils';
 import { FLAG_ID } from '../types';
 import { findBodiedSyncBlockByLocalId, pasteSyncBlockHTMLContent } from './utils';
@@ -151,6 +151,10 @@ var copySyncedBlockReferenceToClipboardInternal = function copySyncedBlockRefere
   }
   var domNode = toDOM(referenceSyncBlockNode, schema);
   copyDomNode(domNode, referenceSyncBlockNode.type, selection);
+
+  // Bare-uuid join key shared with the create/delete events: for a source
+  // bodiedSyncBlock its `localId` is the source uuid (copy was page-form only).
+  var sourceJoinKey = isBodiedSyncBlock ? syncBlockFindResult.node.attrs.localId : undefined;
   deferDispatch(function () {
     api === null || api === void 0 || api.core.actions.execute(function (_ref3) {
       var _api$analytics4;
@@ -160,10 +164,12 @@ var copySyncedBlockReferenceToClipboardInternal = function copySyncedBlockRefere
         action: ACTION.COPIED,
         actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
         actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK_COPY,
-        attributes: {
+        attributes: _objectSpread({
           resourceId: referenceSyncBlockNode.attrs.resourceId,
           inputMethod: inputMethod
-        }
+        }, sourceJoinKey && fg('platform_editor_blocks_patch_4') && {
+          blockInstanceId: sourceJoinKey
+        })
       });
       return tr.setMeta(syncedBlockPluginKey, {
         activeFlag: {
@@ -239,6 +245,13 @@ export var removeSyncedBlock = function removeSyncedBlock(api) {
     if (!removeTr) {
       return false;
     }
+
+    // Tag the transaction so analytics can report this as `deleteButton` rather
+    // than a keyboard delete (both produce a plain ReplaceStep). Gated so the
+    // gate-off transaction is unchanged.
+    if (fg('platform_editor_blocks_patch_4')) {
+      removeTr.setMeta(deleteMechanismMetaKey, 'deleteButton');
+    }
     dispatch(removeTr);
     api === null || api === void 0 || api.core.actions.focus();
     return true;

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

@@ -1,6 +1,7 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _typeof from "@babel/runtime/helpers/typeof";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 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; }
@@ -14,7 +15,7 @@ import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import { BodiedSyncBlockSharedCssClassName, SyncBlockStateCssClassName } from '@atlaskit/editor-common/sync-block';
 import { mapSlice, pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
-import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { NodeSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
 import { convertPMNodesToSyncBlockNodes, rebaseTransaction } from '@atlaskit/editor-synced-block-provider';
@@ -34,6 +35,17 @@ import { hasEditInSyncBlock, trackSyncBlocks } from './utils/track-sync-blocks';
 import { transactionInsertsSyncedBlock } from './utils/transaction-inserts-synced-block';
 import { deferDispatch, wasExtensionInsertedInBodiedSyncBlock, sliceFullyContainsNode } from './utils/utils';
 export var syncedBlockPluginKey = new PluginKey('syncedBlockPlugin');
+
+/**
+ * Dedicated transaction-meta {@link PluginKey} the synced-block removal command
+ * sets so {@link getDeleteMechanism} can report a toolbar Delete as
+ * `deleteButton` (otherwise indistinguishable from a keyboard delete — both are
+ * plain ReplaceSteps). A separate key (rather than `syncedBlockPluginKey`, which
+ * carries plugin-state transitions read in `apply()`, or a bare string) keeps
+ * this transient signal uniquely namespaced and isolated. Only read behind
+ * `platform_editor_blocks_patch_4`.
+ */
+export var deleteMechanismMetaKey = new PluginKey('syncedBlockDeleteMechanism');
 var mapRetryCreationPosMap = function mapRetryCreationPosMap(oldMap, newRetryCreationPos, mapPos, isPerfExperimentOn) {
   var resourceId = newRetryCreationPos === null || newRetryCreationPos === void 0 ? void 0 : newRetryCreationPos.resourceId;
 
@@ -114,6 +126,55 @@ var getDeleteReason = function getDeleteReason(tr) {
   }
   return reason;
 };
+
+/** Narrows the history plugin meta, matching the editor-plugin-card pattern. */
+var isHistoryMeta = function isHistoryMeta(meta) {
+  return _typeof(meta) === 'object' && meta !== null && 'redo' in meta;
+};
+
+/**
+ * Derive how a source bodiedSyncBlock removal was performed, for the `mechanism`
+ * analytics dimension. Each value names the user action; most-specific wins:
+ *  - `undo` / `redo` — history transaction.
+ *  - `deleteButton` — the explicit "Delete" control in the synced-block toolbar
+ *    (the removal command tags its transaction with {@link deleteMechanismMetaKey}).
+ *  - `selectionReplaced` — ReplaceStep on a node-selected block (the
+ *    accidental-overwrite path: block selected, then typed/pasted over).
+ *  - `keyboardDelete` — ReplaceStep removal at a caret/range selection
+ *    (Backspace/Delete key).
+ *  - `other` — anything else (unsync, conversion, code-dispatched, or a
+ *    structural `ReplaceAroundStep` such as wrap/lift/unwrap).
+ *
+ * Only a plain `ReplaceStep` counts as a direct user deletion. `ReplaceAroundStep`
+ * is used for wrapping/lifting/unwrapping content, not direct removal, so a
+ * removal carried by one is classified as `other` rather than misreported as a
+ * keyboard delete.
+ *
+ * `state` is the pre-transaction state, so its selection reflects what was
+ * selected when the edit was made.
+ */
+export var getDeleteMechanism = function getDeleteMechanism(tr, state) {
+  var _selection$node;
+  var historyMeta = tr.getMeta(pmHistoryPluginKey);
+  if (historyMeta) {
+    return isHistoryMeta(historyMeta) && historyMeta.redo ? 'redo' : 'undo';
+  }
+
+  // The toolbar Delete control tags its transaction so we can report it
+  // distinctly from a keyboard delete (both produce a plain ReplaceStep).
+  if (tr.getMeta(deleteMechanismMetaKey) === 'deleteButton') {
+    return 'deleteButton';
+  }
+  var hasReplaceStep = tr.steps.some(function (step) {
+    return step instanceof ReplaceStep;
+  });
+  if (!hasReplaceStep) {
+    return 'other';
+  }
+  var selection = state.selection;
+  var isNodeSelected = selection instanceof NodeSelection && ((_selection$node = selection.node) === null || _selection$node === void 0 ? void 0 : _selection$node.type.name) === 'bodiedSyncBlock';
+  return isNodeSelected ? 'selectionReplaced' : 'keyboardDelete';
+};
 var filterTransactionOnline = function filterTransactionOnline(_ref3) {
   var _tr$getMeta;
   var tr = _ref3.tr,
@@ -164,9 +225,18 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
     });
   });
   if (bodiedSyncBlockRemoved.length > 0) {
-    // eslint-disable-next-line no-param-reassign
-    confirmationTransactionRef.current = tr;
-    return handleBodiedSyncBlockRemoval(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(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;
+    }
+    // Only derive the mechanism behind the gate — discarded gate-off.
+    var mechanism = fg('platform_editor_blocks_patch_4') ? getDeleteMechanism(tr, state) : undefined;
+    return handleBodiedSyncBlockRemoval(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(tr), mechanism);
   }
   if (bodiedSyncBlockAdded.length > 0) {
     if (tr.getMeta(pmHistoryPluginKey)) {
@@ -880,13 +950,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;
@@ -25,7 +27,7 @@ var onDismissed = function onDismissed(syncBlockStore) {
     });
   };
 };
-export var handleBodiedSyncBlockRemoval = function handleBodiedSyncBlockRemoval(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, deletionReason) {
+export var handleBodiedSyncBlockRemoval = function handleBodiedSyncBlockRemoval(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, deletionReason, mechanism) {
   // Clear potential old pending deletion to retreat the deletion as first attempt
   syncBlockStore.sourceManager.clearPendingDeletion();
 
@@ -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 = {
@@ -79,6 +114,6 @@ export var handleBodiedSyncBlockRemoval = function handleBodiedSyncBlockRemoval(
     });
   }, function () {
     confirmationTransactionRef.current = undefined;
-  });
+  }, mechanism);
   return false;
 };

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/main.d.ts

@@ -1,11 +1,23 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
+import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import type { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
+import type { DeletionMechanism } from '@atlaskit/editor-synced-block-provider/common/types';
 import type { SyncedBlockPlugin, SyncedBlockPluginOptions } from '../syncedBlockPluginType';
 import type { ActiveFlag, BodiedSyncBlockDeletionStatus, RetryCreationPosMap } from '../types';
 export declare const syncedBlockPluginKey: PluginKey;
+/**
+ * Dedicated transaction-meta {@link PluginKey} the synced-block removal command
+ * sets so {@link getDeleteMechanism} can report a toolbar Delete as
+ * `deleteButton` (otherwise indistinguishable from a keyboard delete — both are
+ * plain ReplaceSteps). A separate key (rather than `syncedBlockPluginKey`, which
+ * carries plugin-state transitions read in `apply()`, or a bare string) keeps
+ * this transient signal uniquely namespaced and isolated. Only read behind
+ * `platform_editor_blocks_patch_4`.
+ */
+export declare const deleteMechanismMetaKey: PluginKey<DeletionMechanism>;
 type SyncedBlockPluginState = {
     activeFlag: ActiveFlag;
     bodiedSyncBlockDeletionStatus?: BodiedSyncBlockDeletionStatus;
@@ -42,5 +54,27 @@ type SyncedBlockPluginState = {
     statusDecorationSet: DecorationSet;
     syncBlockStore: SyncBlockStoreManager;
 };
+/**
+ * Derive how a source bodiedSyncBlock removal was performed, for the `mechanism`
+ * analytics dimension. Each value names the user action; most-specific wins:
+ *  - `undo` / `redo` — history transaction.
+ *  - `deleteButton` — the explicit "Delete" control in the synced-block toolbar
+ *    (the removal command tags its transaction with {@link deleteMechanismMetaKey}).
+ *  - `selectionReplaced` — ReplaceStep on a node-selected block (the
+ *    accidental-overwrite path: block selected, then typed/pasted over).
+ *  - `keyboardDelete` — ReplaceStep removal at a caret/range selection
+ *    (Backspace/Delete key).
+ *  - `other` — anything else (unsync, conversion, code-dispatched, or a
+ *    structural `ReplaceAroundStep` such as wrap/lift/unwrap).
+ *
+ * Only a plain `ReplaceStep` counts as a direct user deletion. `ReplaceAroundStep`
+ * is used for wrapping/lifting/unwrapping content, not direct removal, so a
+ * removal carried by one is classified as `other` rather than misreported as a
+ * keyboard delete.
+ *
+ * `state` is the pre-transaction state, so its selection reflects what was
+ * selected when the edit was made.
+ */
+export declare const getDeleteMechanism: (tr: Transaction, state: EditorState) => DeletionMechanism;
 export declare const createPlugin: (options: SyncedBlockPluginOptions | undefined, pmPluginFactoryParams: PMPluginFactoryParams, syncBlockStore: SyncBlockStoreManager, api?: ExtractInjectionAPI<SyncedBlockPlugin>) => SafePlugin<SyncedBlockPluginState>;
 export {};

package/dist/types/pm-plugins/utils/handle-bodied-sync-block-removal.d.ts

@@ -1,9 +1,10 @@
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
-import type { DeletionReason, SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
+import type { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
+import type { DeletionMechanism, DeletionReason } from '@atlaskit/editor-synced-block-provider/common/types';
 import type { SyncedBlockPlugin } from '../../syncedBlockPluginType';
 import type { SyncBlockInfo } from '../../types';
 export type TransactionRef = {
     current: Transaction | undefined;
 };
-export declare const handleBodiedSyncBlockRemoval: (bodiedSyncBlockRemoved: SyncBlockInfo[], syncBlockStore: SyncBlockStoreManager, api: ExtractInjectionAPI<SyncedBlockPlugin> | undefined, confirmationTransactionRef: TransactionRef, deletionReason: DeletionReason) => boolean;
+export declare const handleBodiedSyncBlockRemoval: (bodiedSyncBlockRemoved: SyncBlockInfo[], syncBlockStore: SyncBlockStoreManager, api: ExtractInjectionAPI<SyncedBlockPlugin> | undefined, confirmationTransactionRef: TransactionRef, deletionReason: DeletionReason, mechanism?: DeletionMechanism) => boolean;

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.1.0",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,7 +35,7 @@
 		"@atlaskit/editor-plugin-user-intent": "^10.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-shared-styles": "^4.0.0",
-		"@atlaskit/editor-synced-block-provider": "^8.4.0",
+		"@atlaskit/editor-synced-block-provider": "^8.5.0",
 		"@atlaskit/editor-toolbar": "^2.1.0",
 		"@atlaskit/flag": "^18.1.0",
 		"@atlaskit/icon": "36.1.0",
@@ -56,7 +56,7 @@
 		"date-fns": "^2.17.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.18.0",
+		"@atlaskit/editor-common": "^116.19.0",
 		"react": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.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"
 		},