@atlaskit/editor-plugin-synced-block 15.0.10 → 16.0.0

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

@@ -1,8 +1,8 @@
 import { pmHistoryPluginKey } from '@atlaskit/editor-common/utils';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { FLAG_ID } from '../../types';
 import { syncedBlockPluginKey } from '../main';
-import { recomputeDeleteTransaction, recomputeUnsyncTransaction } from './recompute-delete-transaction';
+import { matchesRequestedBlock, recomputeDeleteTransaction, recomputeUnsyncTransaction } 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(({
@@ -21,7 +21,77 @@ const onDismissed = syncBlockStore => tr => {
     bodiedSyncBlockDeletionStatus: 'none'
   });
 };
-export const handleBodiedSyncBlockRemoval = (bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, deletionReason, mechanism, feedbackCallbacks) => {
+const topLevelSourceBlocks = (doc, isSourceBlock) => {
+  const blocks = [];
+  doc.forEach(node => {
+    if (isSourceBlock(node)) {
+      blocks.push(node);
+    }
+  });
+  return blocks;
+};
+
+/**
+ * Whether `tr` removes every block in `wanted` from the document. Identity follows
+ * `matchesRequestedBlock` (localId, falling back to resourceId) so this agrees with the
+ * recompute helpers.
+ */
+const removesRequestedBlocks = (tr, isSourceBlock, wanted) => {
+  const before = topLevelSourceBlocks(tr.before, isSourceBlock);
+  const after = topLevelSourceBlocks(tr.doc, isSourceBlock);
+  return wanted.every(block => before.some(node => matchesRequestedBlock(node, block)) && !after.some(node => matchesRequestedBlock(node, block)));
+};
+
+/**
+ * Replay the undo that removed `wanted` once the source deletion has been confirmed and
+ * persisted (EDITOR-8863).
+ *
+ * The original undo transaction was rejected by `filterTransaction` so the confirmation could
+ * run, which leaves the history event on top of the undo stack. Building the undo again from
+ * the live state (via the history plugin) restores whatever the block was converted from
+ * (e.g. a table), unlike a recomputed whole-node delete which drops that content.
+ *
+ * Guard: only dispatch if that undo still removes the same source block(s). If the user
+ * edited in the meantime the top of the stack is no longer that event, so return `false` and
+ * let the caller fall back to the recomputed unwrap.
+ */
+const replayConfirmedUndo = (api, isSourceBlock, wanted, onTransaction) => {
+  var _api$history;
+  const undo = api === null || api === void 0 ? void 0 : (_api$history = api.history) === null || _api$history === void 0 ? void 0 : _api$history.commands.undo;
+  if (!undo || !(api !== null && api !== void 0 && api.core)) {
+    return false;
+  }
+  let applied = false;
+  api.core.actions.execute(({
+    tr
+  }) => {
+    const undoTr = undo({
+      tr
+    });
+    if (!undoTr || !removesRequestedBlocks(undoTr, isSourceBlock, wanted)) {
+      return null;
+    }
+    undoTr.setMeta('isConfirmedSyncBlockDeletion', true);
+    onTransaction(undoTr);
+    applied = true;
+    return undoTr;
+  });
+  return applied;
+};
+export const handleBodiedSyncBlockRemoval = ({
+  api,
+  confirmationTransactionRef,
+  deletionReason,
+  feedbackCallbacks,
+  mechanism,
+  removed,
+  syncBlockStore
+}) => {
+  const removedAttrs = removed.map(node => node.attrs);
+  const {
+    isSourceBlock
+  } = syncBlockStore.sourceManager;
+
   // Clear potential old pending deletion to retreat the deletion as first attempt
   syncBlockStore.sourceManager.clearPendingDeletion();
 
@@ -29,8 +99,32 @@ export const handleBodiedSyncBlockRemoval = (bodiedSyncBlockRemoved, syncBlockSt
   // we block the transaction here, and wait for user confirmation to proceed with deletion.
   // 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, () => {
+  syncBlockStore.sourceManager.deleteSyncBlocksWithConfirmation(removedAttrs, deletionReason, () => {
     var _api$core2;
+    const closeBlockMenu = confirmedTr => {
+      if (isExperimentEnabled('platform_editor_blocks_exp_patch_10')) {
+        var _api$blockControls, _api$blockControls$co;
+        // The original transaction's closeMenu meta was rejected along with it above,
+        // so re-apply it here to close the block menu once the change actually lands.
+        api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : (_api$blockControls$co = _api$blockControls.commands) === null || _api$blockControls$co === void 0 ? void 0 : _api$blockControls$co.toggleBlockMenu({
+          closeMenu: true
+        })({
+          tr: confirmedTr
+        });
+      }
+    };
+
+    // Any undo that removes a source block (creation, paste, ...) must restore what was
+    // there before. A recomputed whole-node delete drops the converted content and leaves
+    // the event on the undo stack, so replay the undo instead (EDITOR-8863).
+    const shouldReplayUndo = mechanism === 'undo' && isExperimentEnabled('platform_editor_blocks_exp_patch_10');
+    if (shouldReplayUndo && replayConfirmedUndo(api, isSourceBlock, removedAttrs, undoTr => {
+      closeBlockMenu(undoTr);
+      feedbackCallbacks === null || feedbackCallbacks === void 0 ? void 0 : feedbackCallbacks.onDeleteTransaction(undoTr);
+    })) {
+      return;
+    }
+
     // 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
@@ -45,7 +139,10 @@ export const handleBodiedSyncBlockRemoval = (bodiedSyncBlockRemoved, syncBlockSt
       // the confirm path always recomputed a full delete, so unsyncing a source block
       // silently deleted its content. When the deletion was actually triggered by
       // unsync, recompute an unwrap (replaceWith content) instead of a delete.
-      const recomputedTr = deletionReason === 'source-block-unsynced' ? recomputeUnsyncTransaction(tr, syncBlockStore.sourceManager.isSourceBlock, bodiedSyncBlockRemoved.map(node => node.attrs)) : recomputeDeleteTransaction(tr, syncBlockStore.sourceManager.isSourceBlock, bodiedSyncBlockRemoved.map(node => node.attrs));
+      // The same applies when the undo could not be replayed (the undo stack changed
+      // while the backend delete was in flight): the backend delete has already
+      // succeeded, so drop the wrapper but keep the content (EDITOR-8863).
+      const recomputedTr = deletionReason === 'source-block-unsynced' || shouldReplayUndo ? recomputeUnsyncTransaction(tr, isSourceBlock, removedAttrs) : recomputeDeleteTransaction(tr, isSourceBlock, removedAttrs);
 
       // The target node(s) no longer exist in the live document (e.g.
       // a remote collaborator already removed them). There is nothing
@@ -56,16 +153,7 @@ export const handleBodiedSyncBlockRemoval = (bodiedSyncBlockRemoved, syncBlockSt
       if (!recomputedTr) {
         return null;
       }
-      if (fg('platform_editor_blocks_patch_10')) {
-        var _api$blockControls, _api$blockControls$co;
-        // The original transaction's closeMenu meta was rejected along with it above,
-        // so re-apply it here to close the block menu once the delete actually lands.
-        api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : (_api$blockControls$co = _api$blockControls.commands) === null || _api$blockControls$co === void 0 ? void 0 : _api$blockControls$co.toggleBlockMenu({
-          closeMenu: true
-        })({
-          tr: recomputedTr
-        });
-      }
+      closeBlockMenu(recomputedTr);
       recomputedTr.setMeta('isConfirmedSyncBlockDeletion', true);
       feedbackCallbacks === null || feedbackCallbacks === void 0 ? void 0 : feedbackCallbacks.onDeleteTransaction(recomputedTr);
       if (!recomputedTr.getMeta(pmHistoryPluginKey)) {

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

@@ -8,7 +8,7 @@ import { Slice } from '@atlaskit/editor-prosemirror/model';
  * 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) => {
+export const matchesRequestedBlock = (node, wanted) => {
   const {
     localId,
     resourceId

package/dist/esm/editor-commands/index.js

@@ -1,13 +1,16 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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 { defaultSchema } from '@atlaskit/adf-schema/schema-default';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { copyDomNodeWithResult, toDOM } from '@atlaskit/editor-common/copy-button';
+import { getSourceNodesFromSelectionRange } from '@atlaskit/editor-common/selection';
 import { DOMSerializer, Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findSelectedNodeOfType, removeParentNodeOfType, removeSelectedNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { getSourceProductFromResourceIdSafe } from '@atlaskit/editor-synced-block-provider/utils';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { creationMetaKey, deleteMechanismMetaKey, syncedBlockPluginKey } from '../pm-plugins/main';
@@ -83,6 +86,7 @@ export var createSyncedBlock = function createSyncedBlock(_ref) {
   // set on the final transaction before returning (see below), since the
   // typeahead path may reassign `tr` and drop meta set here.
   var createdEmpty = tr.selection.empty;
+  var nodeTypes;
 
   // If the selection is empty, we want to insert the sync block on a new line
   if (tr.selection.empty) {
@@ -124,6 +128,11 @@ export var createSyncedBlock = function createSyncedBlock(_ref) {
       });
       return false;
     }
+    if (isExperimentEnabled('platform_editor_sync_block_node_types')) {
+      nodeTypes = _toConsumableArray(new Set(getSourceNodesFromSelectionRange(tr, tr.selection).map(function (node) {
+        return node.type.name;
+      }))).sort();
+    }
     var _attrs = syncBlockStore.sourceManager.generateBodiedSyncBlockAttrs();
     var _newBodiedSyncBlockNode = bodiedSyncBlock.createAndFill(_attrs, conversionInfo.contentToInclude, fg('platform_editor_blocks_patch_8') && conversionInfo.breakoutMark ? [conversionInfo.breakoutMark] : undefined);
     if (!_newBodiedSyncBlockNode) {
@@ -145,12 +154,12 @@ export var createSyncedBlock = function createSyncedBlock(_ref) {
     tr = placeCaretInsideBodiedSyncBlock(tr, _newBodiedSyncBlockNode.attrs.localId);
   }
 
-  // Stash creation-type signals on the final transaction (after any typeahead
-  // reassignment). Set unconditionally — the store manager only reads it behind
-  // the feature gate.
+  // Stash creation-type signals on the final transaction after any typeahead
+  // reassignment. nodeTypes is populated only for gated non-empty conversions.
   tr.setMeta(creationMetaKey, {
     createdEmpty: createdEmpty,
-    inputMethod: inputMethod
+    inputMethod: inputMethod,
+    nodeTypes: nodeTypes
   });
   return tr;
 };

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

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
@@ -15,11 +16,13 @@ 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 { Slice } from '@atlaskit/editor-prosemirror/model';
 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 } from '@atlaskit/editor-synced-block-provider';
 import { getSourceProductFromResourceIdSafe } from '@atlaskit/editor-synced-block-provider/utils';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { bodiedSyncBlockNodeView } from '../nodeviews/bodiedSyncedBlock';
 import { SyncBlock as SyncBlockView } from '../nodeviews/syncedBlock';
@@ -46,7 +49,7 @@ export var deleteMechanismMetaKey = new PluginKey('syncedBlockDeleteMechanism');
 var syncedBlockPromptedFeedbackMetaKey = new PluginKey('syncedBlockPromptedFeedback');
 
 /**
- * Creation-type signals set by {@link createSyncedBlock} on the creating
+ * Creation analytics signals set by {@link createSyncedBlock} on the creating
  * transaction. The async creation handler forwards them to the store manager,
  * which attaches them to the `syncedBlockCreate` event. A dedicated key keeps
  * this transient signal isolated from plugin state.
@@ -312,9 +315,10 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
       blockType: 'source',
       entryPoint: entryPoint
     } : undefined;
+    var feedbackCallbacks;
     if (feedbackContext) {
       var sourceAttempt = ctx.queueSourceFeedback(feedbackContext);
-      return handleBodiedSyncBlockRemoval(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(tr), mechanism, {
+      feedbackCallbacks = {
         onDeleteCompleted: function onDeleteCompleted(success) {
           return ctx.completeSourceDeletion(sourceAttempt, success);
         },
@@ -327,9 +331,17 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
         onDestroy: function onDestroy() {
           return ctx.clearSourceFeedback(sourceAttempt);
         }
-      });
+      };
     }
-    return handleBodiedSyncBlockRemoval(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(tr), mechanism, undefined);
+    return handleBodiedSyncBlockRemoval({
+      removed: bodiedSyncBlockRemoved,
+      syncBlockStore: syncBlockStore,
+      api: api,
+      confirmationTransactionRef: confirmationTransactionRef,
+      deletionReason: getDeleteReason(tr),
+      mechanism: mechanism,
+      feedbackCallbacks: feedbackCallbacks
+    });
   }
   if (bodiedSyncBlockAdded.length > 0) {
     if (tr.getMeta(pmHistoryPluginKey)) {
@@ -349,7 +361,7 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
       return true;
     }
 
-    // Forward creation-type signals captured by createSyncedBlock onto the async
+    // Forward creation analytics signals captured by createSyncedBlock onto the async
     // `syncedBlockCreate` success event.
     var creationMeta = tr.getMeta(creationMetaKey);
     handleBodiedSyncBlockCreation(bodiedSyncBlockAdded, state, api, creationMeta);
@@ -1134,14 +1146,35 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
               var _trackSyncBlocks6 = trackSyncBlocks(syncBlockStore.sourceManager.isSourceBlock, tr, oldState),
                 added = _trackSyncBlocks6.added;
               if (added.length > 0) {
-                // Delete bodiedSyncBlock if it's originated from history, i.e. redo creation
-                // See filterTransaction above for more details
+                // A bodiedSyncBlock must not be (re)created from history, i.e. redo of a
+                // creation (see filterTransaction above). Unwrap it instead of deleting it:
+                // deleting the whole node also dropped the content the block was converted
+                // from (e.g. a table), and undoing that delete re-added the block and hit
+                // this guard again, so the content was unrecoverable (EDITOR-8863).
                 var _tr = newState.tr;
-                added.forEach(function (node) {
-                  if (node.from !== undefined && node.to !== undefined) {
-                    _tr.delete(node.from, node.to);
-                  }
-                });
+                if (isExperimentEnabled('platform_editor_blocks_exp_patch_10')) {
+                  // Unwrap in reverse document order so earlier replacements keep later
+                  // positions valid.
+                  _toConsumableArray(added).sort(function (a, b) {
+                    var _b$from, _a$from;
+                    return ((_b$from = b.from) !== null && _b$from !== void 0 ? _b$from : 0) - ((_a$from = a.from) !== null && _a$from !== void 0 ? _a$from : 0);
+                  }).forEach(function (_ref12) {
+                    var node = _ref12.node,
+                      from = _ref12.from,
+                      to = _ref12.to;
+                    if (node && from !== undefined && to !== undefined) {
+                      // This is ProseMirror's Transaction.replace (a document edit), not String.replace.
+                      // eslint-disable-next-line @atlassian/perf-linting/no-expensive-split-replace
+                      _tr.replace(from, to, new Slice(node.content, 0, 0));
+                    }
+                  });
+                } else {
+                  added.forEach(function (node) {
+                    if (node.from !== undefined && node.to !== undefined) {
+                      _tr.delete(node.from, node.to);
+                    }
+                  });
+                }
                 return {
                   v: _tr
                 };

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

@@ -5,7 +5,7 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { FLAG_ID } from '../../types';
 import { syncedBlockPluginKey } from '../main';
 import { deferDispatch } from './utils';
-var onRetry = function onRetry(api, resourceId) {
+var onRetry = function onRetry(api, resourceId, enrichment) {
   return function () {
     var _api$core, _api$core2;
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.focus();
@@ -21,7 +21,7 @@ var onRetry = function onRetry(api, resourceId) {
       tr.setSelection(TextSelection.create(tr.doc, from, to)).setMeta(syncedBlockPluginKey, {
         activeFlag: false
       });
-      api === null || api === void 0 || (_api$syncedBlock2 = api.syncedBlock) === null || _api$syncedBlock2 === void 0 || _api$syncedBlock2.commands.insertSyncedBlock()({
+      api === null || api === void 0 || (_api$syncedBlock2 = api.syncedBlock) === null || _api$syncedBlock2 === void 0 || _api$syncedBlock2.commands.insertSyncedBlock(enrichment === null || enrichment === void 0 ? void 0 : enrichment.inputMethod)({
         tr: tr
       });
       return tr;
@@ -69,7 +69,7 @@ var buildRevertCreationTr = function buildRevertCreationTr(tr, pos) {
  *
  * Save the new bodiedSyncBlock to backend with empty content and handles revert (if failed) and retry flow.
  *
- * @param enrichment optional creation-type signals from `createSyncedBlock`,
+ * @param enrichment optional creation analytics signals from `createSyncedBlock`,
  *   forwarded to the store manager to attach to the `syncedBlockCreate` event.
  */
 export var handleBodiedSyncBlockCreation = function handleBodiedSyncBlockCreation(bodiedSyncBlockAdded, editorState, api, enrichment) {
@@ -120,7 +120,7 @@ export var handleBodiedSyncBlockCreation = function handleBodiedSyncBlockCreatio
           return revertTr.setMeta('isConfirmedSyncBlockDeletion', true).setMeta('addToHistory', false).setMeta(syncedBlockPluginKey, {
             activeFlag: {
               id: FLAG_ID.CANNOT_CREATE_SYNC_BLOCK,
-              onRetry: onRetry(api, resourceId),
+              onRetry: onRetry(api, resourceId, enrichment),
               onDismissed: function onDismissed(tr) {
                 return tr.setMeta(syncedBlockPluginKey, _objectSpread(_objectSpread({}, tr.getMeta(syncedBlockPluginKey)), {}, {
                   retryCreationPos: {

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

@@ -2,10 +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/fg';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { FLAG_ID } from '../../types';
 import { syncedBlockPluginKey } from '../main';
-import { recomputeDeleteTransaction, recomputeUnsyncTransaction } from './recompute-delete-transaction';
+import { matchesRequestedBlock, recomputeDeleteTransaction, recomputeUnsyncTransaction } from './recompute-delete-transaction';
 var onRetry = function onRetry(api, syncBlockStore) {
   return function () {
     var _api$core;
@@ -27,7 +27,81 @@ var onDismissed = function onDismissed(syncBlockStore) {
     });
   };
 };
-export var handleBodiedSyncBlockRemoval = function handleBodiedSyncBlockRemoval(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, deletionReason, mechanism, feedbackCallbacks) {
+var topLevelSourceBlocks = function topLevelSourceBlocks(doc, isSourceBlock) {
+  var blocks = [];
+  doc.forEach(function (node) {
+    if (isSourceBlock(node)) {
+      blocks.push(node);
+    }
+  });
+  return blocks;
+};
+
+/**
+ * Whether `tr` removes every block in `wanted` from the document. Identity follows
+ * `matchesRequestedBlock` (localId, falling back to resourceId) so this agrees with the
+ * recompute helpers.
+ */
+var removesRequestedBlocks = function removesRequestedBlocks(tr, isSourceBlock, wanted) {
+  var before = topLevelSourceBlocks(tr.before, isSourceBlock);
+  var after = topLevelSourceBlocks(tr.doc, isSourceBlock);
+  return wanted.every(function (block) {
+    return before.some(function (node) {
+      return matchesRequestedBlock(node, block);
+    }) && !after.some(function (node) {
+      return matchesRequestedBlock(node, block);
+    });
+  });
+};
+
+/**
+ * Replay the undo that removed `wanted` once the source deletion has been confirmed and
+ * persisted (EDITOR-8863).
+ *
+ * The original undo transaction was rejected by `filterTransaction` so the confirmation could
+ * run, which leaves the history event on top of the undo stack. Building the undo again from
+ * the live state (via the history plugin) restores whatever the block was converted from
+ * (e.g. a table), unlike a recomputed whole-node delete which drops that content.
+ *
+ * Guard: only dispatch if that undo still removes the same source block(s). If the user
+ * edited in the meantime the top of the stack is no longer that event, so return `false` and
+ * let the caller fall back to the recomputed unwrap.
+ */
+var replayConfirmedUndo = function replayConfirmedUndo(api, isSourceBlock, wanted, onTransaction) {
+  var _api$history;
+  var undo = api === null || api === void 0 || (_api$history = api.history) === null || _api$history === void 0 ? void 0 : _api$history.commands.undo;
+  if (!undo || !(api !== null && api !== void 0 && api.core)) {
+    return false;
+  }
+  var applied = false;
+  api.core.actions.execute(function (_ref2) {
+    var tr = _ref2.tr;
+    var undoTr = undo({
+      tr: tr
+    });
+    if (!undoTr || !removesRequestedBlocks(undoTr, isSourceBlock, wanted)) {
+      return null;
+    }
+    undoTr.setMeta('isConfirmedSyncBlockDeletion', true);
+    onTransaction(undoTr);
+    applied = true;
+    return undoTr;
+  });
+  return applied;
+};
+export var handleBodiedSyncBlockRemoval = function handleBodiedSyncBlockRemoval(_ref3) {
+  var api = _ref3.api,
+    confirmationTransactionRef = _ref3.confirmationTransactionRef,
+    deletionReason = _ref3.deletionReason,
+    feedbackCallbacks = _ref3.feedbackCallbacks,
+    mechanism = _ref3.mechanism,
+    removed = _ref3.removed,
+    syncBlockStore = _ref3.syncBlockStore;
+  var removedAttrs = removed.map(function (node) {
+    return node.attrs;
+  });
+  var isSourceBlock = syncBlockStore.sourceManager.isSourceBlock;
+
   // Clear potential old pending deletion to retreat the deletion as first attempt
   syncBlockStore.sourceManager.clearPendingDeletion();
 
@@ -35,28 +109,49 @@ export var handleBodiedSyncBlockRemoval = function handleBodiedSyncBlockRemoval(
   // we block the transaction here, and wait for user confirmation to proceed with deletion.
   // 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(function (node) {
-    return node.attrs;
-  }), deletionReason, function () {
+  syncBlockStore.sourceManager.deleteSyncBlocksWithConfirmation(removedAttrs, deletionReason, function () {
     var _api$core2;
+    var closeBlockMenu = function closeBlockMenu(confirmedTr) {
+      if (isExperimentEnabled('platform_editor_blocks_exp_patch_10')) {
+        var _api$blockControls;
+        // The original transaction's closeMenu meta was rejected along with it above,
+        // so re-apply it here to close the block menu once the change actually lands.
+        api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.commands) === null || _api$blockControls === void 0 || _api$blockControls.toggleBlockMenu({
+          closeMenu: true
+        })({
+          tr: confirmedTr
+        });
+      }
+    };
+
+    // Any undo that removes a source block (creation, paste, ...) must restore what was
+    // there before. A recomputed whole-node delete drops the converted content and leaves
+    // the event on the undo stack, so replay the undo instead (EDITOR-8863).
+    var shouldReplayUndo = mechanism === 'undo' && isExperimentEnabled('platform_editor_blocks_exp_patch_10');
+    if (shouldReplayUndo && replayConfirmedUndo(api, isSourceBlock, removedAttrs, function (undoTr) {
+      closeBlockMenu(undoTr);
+      feedbackCallbacks === null || feedbackCallbacks === void 0 || feedbackCallbacks.onDeleteTransaction(undoTr);
+    })) {
+      return;
+    }
+
     // 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;
+    api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref4) {
+      var tr = _ref4.tr;
       // EDITOR-8230: unsync must remove only the sync wrapper and keep the block's
       // content inline, whereas delete removes the whole block. Before this branch,
       // the confirm path always recomputed a full delete, so unsyncing a source block
       // silently deleted its content. When the deletion was actually triggered by
       // unsync, recompute an unwrap (replaceWith content) instead of a delete.
-      var recomputedTr = deletionReason === 'source-block-unsynced' ? recomputeUnsyncTransaction(tr, syncBlockStore.sourceManager.isSourceBlock, bodiedSyncBlockRemoved.map(function (node) {
-        return node.attrs;
-      })) : recomputeDeleteTransaction(tr, syncBlockStore.sourceManager.isSourceBlock, bodiedSyncBlockRemoved.map(function (node) {
-        return node.attrs;
-      }));
+      // The same applies when the undo could not be replayed (the undo stack changed
+      // while the backend delete was in flight): the backend delete has already
+      // succeeded, so drop the wrapper but keep the content (EDITOR-8863).
+      var recomputedTr = deletionReason === 'source-block-unsynced' || shouldReplayUndo ? recomputeUnsyncTransaction(tr, isSourceBlock, removedAttrs) : recomputeDeleteTransaction(tr, isSourceBlock, removedAttrs);
 
       // The target node(s) no longer exist in the live document (e.g.
       // a remote collaborator already removed them). There is nothing
@@ -67,16 +162,7 @@ export var handleBodiedSyncBlockRemoval = function handleBodiedSyncBlockRemoval(
       if (!recomputedTr) {
         return null;
       }
-      if (fg('platform_editor_blocks_patch_10')) {
-        var _api$blockControls;
-        // The original transaction's closeMenu meta was rejected along with it above,
-        // so re-apply it here to close the block menu once the delete actually lands.
-        api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.commands) === null || _api$blockControls === void 0 || _api$blockControls.toggleBlockMenu({
-          closeMenu: true
-        })({
-          tr: recomputedTr
-        });
-      }
+      closeBlockMenu(recomputedTr);
       recomputedTr.setMeta('isConfirmedSyncBlockDeletion', true);
       feedbackCallbacks === null || feedbackCallbacks === void 0 || feedbackCallbacks.onDeleteTransaction(recomputedTr);
       if (!recomputedTr.getMeta(pmHistoryPluginKey)) {
@@ -89,8 +175,8 @@ export var handleBodiedSyncBlockRemoval = function handleBodiedSyncBlockRemoval(
   }, function (success) {
     var _api$core3;
     feedbackCallbacks === null || feedbackCallbacks === void 0 || feedbackCallbacks.onDeleteCompleted(success);
-    api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref3) {
-      var tr = _ref3.tr;
+    api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref5) {
+      var tr = _ref5.tr;
       var newState;
       if (!success) {
         newState = {

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

@@ -11,7 +11,7 @@ import { Slice } from '@atlaskit/editor-prosemirror/model';
  * 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) {
+export var matchesRequestedBlock = function matchesRequestedBlock(node, wanted) {
   var _ref = node.attrs,
     localId = _ref.localId,
     resourceId = _ref.resourceId;

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

@@ -19,7 +19,7 @@ export declare const syncedBlockPluginKey: PluginKey;
  */
 export declare const deleteMechanismMetaKey: PluginKey<DeletionMechanism>;
 /**
- * Creation-type signals set by {@link createSyncedBlock} on the creating
+ * Creation analytics signals set by {@link createSyncedBlock} on the creating
  * transaction. The async creation handler forwards them to the store manager,
  * which attaches them to the `syncedBlockCreate` event. A dedicated key keeps
  * this transient signal isolated from plugin state.
@@ -27,6 +27,7 @@ export declare const deleteMechanismMetaKey: PluginKey<DeletionMechanism>;
 export type SyncedBlockCreationMeta = {
     createdEmpty?: boolean;
     inputMethod?: INPUT_METHOD;
+    nodeTypes?: string[];
 };
 export declare const creationMetaKey: PluginKey<SyncedBlockCreationMeta>;
 type SyncedBlockPluginState = {

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

@@ -7,7 +7,7 @@ import type { SyncBlockInfo } from '../../types';
  *
  * Save the new bodiedSyncBlock to backend with empty content and handles revert (if failed) and retry flow.
  *
- * @param enrichment optional creation-type signals from `createSyncedBlock`,
+ * @param enrichment optional creation analytics signals from `createSyncedBlock`,
  *   forwarded to the store manager to attach to the `syncedBlockCreate` event.
  */
 export declare const handleBodiedSyncBlockCreation: (bodiedSyncBlockAdded: SyncBlockInfo[], editorState: EditorState, api: ExtractInjectionAPI<SyncedBlockPlugin> | undefined, enrichment?: CreateSuccessEnrichment) => void;

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

@@ -7,10 +7,18 @@ import type { SyncBlockInfo } from '../../types';
 export type TransactionRef = {
     current: Transaction | undefined;
 };
-type SourceFeedbackCallbacks = {
+export type SourceFeedbackCallbacks = {
     onDeleteCompleted: (success: boolean) => void;
     onDeleteTransaction: (tr: Transaction) => void;
     onDestroy: () => void;
 };
-export declare const handleBodiedSyncBlockRemoval: (bodiedSyncBlockRemoved: SyncBlockInfo[], syncBlockStore: SyncBlockStoreManager, api: ExtractInjectionAPI<SyncedBlockPlugin> | undefined, confirmationTransactionRef: TransactionRef, deletionReason: DeletionReason, mechanism?: DeletionMechanism, feedbackCallbacks?: SourceFeedbackCallbacks) => boolean;
-export {};
+export type HandleBodiedSyncBlockRemovalOptions = {
+    api: ExtractInjectionAPI<SyncedBlockPlugin> | undefined;
+    confirmationTransactionRef: TransactionRef;
+    deletionReason: DeletionReason;
+    feedbackCallbacks?: SourceFeedbackCallbacks;
+    mechanism?: DeletionMechanism;
+    removed: SyncBlockInfo[];
+    syncBlockStore: SyncBlockStoreManager;
+};
+export declare const handleBodiedSyncBlockRemoval: ({ api, confirmationTransactionRef, deletionReason, feedbackCallbacks, mechanism, removed, syncBlockStore, }: HandleBodiedSyncBlockRemovalOptions) => boolean;

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

@@ -1,6 +1,16 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { SyncBlockAttrs } from '../../types';
+/**
+ * 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).
+ */
+export declare const matchesRequestedBlock: (node: PMNode, wanted: SyncBlockAttrs) => boolean;
 /**
  * Recompute a source `bodiedSyncBlock` delete from the live document.
  *

package/dist/types/syncedBlockPluginType.d.ts

@@ -12,6 +12,7 @@ import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabl
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { FloatingToolbarPlugin } from '@atlaskit/editor-plugin-floating-toolbar';
 import type { FocusPlugin } from '@atlaskit/editor-plugin-focus';
+import type { HistoryPlugin } from '@atlaskit/editor-plugin-history';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
 import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
 import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
@@ -136,6 +137,7 @@ export type SyncedBlockPlugin = NextEditorPlugin<'syncedBlock', {
         OptionalPlugin<ContentFormatPlugin>,
         OptionalPlugin<UserIntentPlugin>,
         OptionalPlugin<FocusPlugin>,
+        OptionalPlugin<HistoryPlugin>,
         OptionalPlugin<UiControlRegistryPlugin>
     ];
     pluginConfiguration: SyncedBlockPluginOptions | undefined;