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

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 16.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
+## 15.1.0
+
+### Minor Changes
+
+- [`db3dc405020c5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/db3dc405020c5) -
+  Fix undo of a source synced block creation deleting the converted content (e.g. a table). Behind
+  the `platform_editor_blocks_exp_patch_10` experiment, once the deletion is confirmed and persisted
+  the undo is replayed against the live editor state instead of recomputing a whole-node delete, and
+  a redo of the creation unwraps the block instead of deleting its content.
+  `@atlaskit/editor-plugin-history` gains an `undo` `EditorCommand` that builds the next history
+  undo onto a given transaction. EDITOR-8863
+
+### Patch Changes
+
+- [`abbc0c11100c8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/abbc0c11100c8) -
+  EDITOR-8863: replace platform_editor_blocks_patch_10 feature gate with
+  platform_editor_blocks_exp_patch_10 experiment for block menu close on confirmed sync block
+  deletion
+- [`b12eed2cd2633`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b12eed2cd2633) -
+  Add node type analytics for non-empty synced block conversions behind the
+  platform_editor_sync_block_node_types experiment.
+- Updated dependencies
+
 ## 15.0.10
 
 ### Patch Changes

package/afm-products/tsconfig.json

@@ -64,6 +64,9 @@
 		{
 			"path": "../../editor-plugin-focus/afm-products/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-history/afm-products/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-selection/afm-products/tsconfig.json"
 		},

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

@@ -6,13 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.unsync = exports.removeSyncedBlockAtPos = exports.removeSyncedBlock = exports.editSyncedBlockSource = exports.createSyncedBlock = exports.copySyncedBlockReferenceToClipboardEditorCommand = exports.copySyncedBlockReferenceToClipboard = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _schemaDefault = require("@atlaskit/adf-schema/schema-default");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _copyButton = require("@atlaskit/editor-common/copy-button");
+var _selection = require("@atlaskit/editor-common/selection");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _utils2 = require("@atlaskit/editor-synced-block-provider/utils");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _main = require("../pm-plugins/main");
@@ -90,6 +93,7 @@ var createSyncedBlock = exports.createSyncedBlock = function createSyncedBlock(_
   // 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) {
@@ -131,6 +135,11 @@ var createSyncedBlock = exports.createSyncedBlock = function createSyncedBlock(_
       });
       return false;
     }
+    if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_sync_block_node_types')) {
+      nodeTypes = (0, _toConsumableArray2.default)(new Set((0, _selection.getSourceNodesFromSelectionRange)(tr, tr.selection).map(function (node) {
+        return node.type.name;
+      }))).sort();
+    }
     var _attrs = syncBlockStore.sourceManager.generateBodiedSyncBlockAttrs();
     var _newBodiedSyncBlockNode = bodiedSyncBlock.createAndFill(_attrs, conversionInfo.contentToInclude, (0, _fg.fg)('platform_editor_blocks_patch_8') && conversionInfo.breakoutMark ? [conversionInfo.breakoutMark] : undefined);
     if (!_newBodiedSyncBlockNode) {
@@ -152,12 +161,12 @@ var createSyncedBlock = exports.createSyncedBlock = function createSyncedBlock(_
     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(_main.creationMetaKey, {
     createdEmpty: createdEmpty,
-    inputMethod: inputMethod
+    inputMethod: inputMethod,
+    nodeTypes: nodeTypes
   });
   return tr;
 };

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.syncedBlockPluginKey = exports.getPromptedFeedbackEntryPoint = exports.getDeleteMechanism = exports.deleteMechanismMetaKey = exports.creationMetaKey = exports.createPlugin = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -17,11 +18,13 @@ var _selection = require("@atlaskit/editor-common/selection");
 var _syncBlock = require("@atlaskit/editor-common/sync-block");
 var _utils = require("@atlaskit/editor-common/utils");
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
+var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _view2 = require("@atlaskit/editor-prosemirror/view");
 var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
 var _utils2 = require("@atlaskit/editor-synced-block-provider/utils");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _bodiedSyncedBlock = require("../nodeviews/bodiedSyncedBlock");
 var _syncedBlock = require("../nodeviews/syncedBlock");
@@ -53,7 +56,7 @@ var deleteMechanismMetaKey = exports.deleteMechanismMetaKey = new _state.PluginK
 var syncedBlockPromptedFeedbackMetaKey = new _state.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.
@@ -319,9 +322,10 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
       blockType: 'source',
       entryPoint: entryPoint
     } : undefined;
+    var feedbackCallbacks;
     if (feedbackContext) {
       var sourceAttempt = ctx.queueSourceFeedback(feedbackContext);
-      return (0, _handleBodiedSyncBlockRemoval.handleBodiedSyncBlockRemoval)(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(tr), mechanism, {
+      feedbackCallbacks = {
         onDeleteCompleted: function onDeleteCompleted(success) {
           return ctx.completeSourceDeletion(sourceAttempt, success);
         },
@@ -334,9 +338,17 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
         onDestroy: function onDestroy() {
           return ctx.clearSourceFeedback(sourceAttempt);
         }
-      });
+      };
     }
-    return (0, _handleBodiedSyncBlockRemoval.handleBodiedSyncBlockRemoval)(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(tr), mechanism, undefined);
+    return (0, _handleBodiedSyncBlockRemoval.handleBodiedSyncBlockRemoval)({
+      removed: bodiedSyncBlockRemoved,
+      syncBlockStore: syncBlockStore,
+      api: api,
+      confirmationTransactionRef: confirmationTransactionRef,
+      deletionReason: getDeleteReason(tr),
+      mechanism: mechanism,
+      feedbackCallbacks: feedbackCallbacks
+    });
   }
   if (bodiedSyncBlockAdded.length > 0) {
     if (tr.getMeta(_utils.pmHistoryPluginKey)) {
@@ -356,7 +368,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);
     (0, _handleBodiedSyncBlockCreation.handleBodiedSyncBlockCreation)(bodiedSyncBlockAdded, state, api, creationMeta);
@@ -1141,14 +1153,35 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
               var _trackSyncBlocks6 = (0, _trackSyncBlocks7.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 ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_blocks_exp_patch_10')) {
+                  // Unwrap in reverse document order so earlier replacements keep later
+                  // positions valid.
+                  (0, _toConsumableArray2.default)(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 _model.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/cjs/pm-plugins/utils/handle-bodied-sync-block-creation.js

@@ -12,7 +12,7 @@ var _main = require("../main");
 var _utils = require("./utils");
 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, 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();
@@ -28,7 +28,7 @@ var onRetry = function onRetry(api, resourceId) {
       tr.setSelection(_state.TextSelection.create(tr.doc, from, to)).setMeta(_main.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;
@@ -76,7 +76,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.
  */
 var handleBodiedSyncBlockCreation = exports.handleBodiedSyncBlockCreation = function handleBodiedSyncBlockCreation(bodiedSyncBlockAdded, editorState, api, enrichment) {
@@ -127,7 +127,7 @@ var handleBodiedSyncBlockCreation = exports.handleBodiedSyncBlockCreation = func
           return revertTr.setMeta('isConfirmedSyncBlockDeletion', true).setMeta('addToHistory', false).setMeta(_main.syncedBlockPluginKey, {
             activeFlag: {
               id: _types.FLAG_ID.CANNOT_CREATE_SYNC_BLOCK,
-              onRetry: onRetry(api, resourceId),
+              onRetry: onRetry(api, resourceId, enrichment),
               onDismissed: function onDismissed(tr) {
                 return tr.setMeta(_main.syncedBlockPluginKey, _objectSpread(_objectSpread({}, tr.getMeta(_main.syncedBlockPluginKey)), {}, {
                   retryCreationPos: {

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

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.handleBodiedSyncBlockRemoval = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _utils = require("@atlaskit/editor-common/utils");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _types = require("../../types");
 var _main = require("../main");
 var _recomputeDeleteTransaction = require("./recompute-delete-transaction");
@@ -34,7 +34,81 @@ var onDismissed = function onDismissed(syncBlockStore) {
     });
   };
 };
-var handleBodiedSyncBlockRemoval = exports.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 (0, _recomputeDeleteTransaction.matchesRequestedBlock)(node, block);
+    }) && !after.some(function (node) {
+      return (0, _recomputeDeleteTransaction.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;
+};
+var handleBodiedSyncBlockRemoval = exports.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();
 
@@ -42,28 +116,49 @@ var handleBodiedSyncBlockRemoval = exports.handleBodiedSyncBlockRemoval = functi
   // 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 ((0, _isExperimentEnabled.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' && (0, _isExperimentEnabled.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' ? (0, _recomputeDeleteTransaction.recomputeUnsyncTransaction)(tr, syncBlockStore.sourceManager.isSourceBlock, bodiedSyncBlockRemoved.map(function (node) {
-        return node.attrs;
-      })) : (0, _recomputeDeleteTransaction.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 ? (0, _recomputeDeleteTransaction.recomputeUnsyncTransaction)(tr, isSourceBlock, removedAttrs) : (0, _recomputeDeleteTransaction.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
@@ -74,16 +169,7 @@ var handleBodiedSyncBlockRemoval = exports.handleBodiedSyncBlockRemoval = functi
       if (!recomputedTr) {
         return null;
       }
-      if ((0, _fg.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(_utils.pmHistoryPluginKey)) {
@@ -96,8 +182,8 @@ var handleBodiedSyncBlockRemoval = exports.handleBodiedSyncBlockRemoval = functi
   }, 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/cjs/pm-plugins/utils/recompute-delete-transaction.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.recomputeUnsyncTransaction = exports.recomputeDeleteTransaction = void 0;
+exports.recomputeUnsyncTransaction = exports.recomputeDeleteTransaction = exports.matchesRequestedBlock = void 0;
 var _model = require("@atlaskit/editor-prosemirror/model");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -17,7 +17,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
  * 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 matchesRequestedBlock = exports.matchesRequestedBlock = function matchesRequestedBlock(node, wanted) {
   var _ref = node.attrs,
     localId = _ref.localId,
     resourceId = _ref.resourceId;

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

@@ -1,10 +1,12 @@
 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';
@@ -86,6 +88,7 @@ export const createSyncedBlock = ({
   // set on the final transaction before returning (see below), since the
   // typeahead path may reassign `tr` and drop meta set here.
   const createdEmpty = tr.selection.empty;
+  let nodeTypes;
 
   // If the selection is empty, we want to insert the sync block on a new line
   if (tr.selection.empty) {
@@ -127,6 +130,9 @@ export const createSyncedBlock = ({
       });
       return false;
     }
+    if (isExperimentEnabled('platform_editor_sync_block_node_types')) {
+      nodeTypes = [...new Set(getSourceNodesFromSelectionRange(tr, tr.selection).map(node => node.type.name))].sort();
+    }
     const attrs = syncBlockStore.sourceManager.generateBodiedSyncBlockAttrs();
     const newBodiedSyncBlockNode = bodiedSyncBlock.createAndFill(attrs, conversionInfo.contentToInclude, fg('platform_editor_blocks_patch_8') && conversionInfo.breakoutMark ? [conversionInfo.breakoutMark] : undefined);
     if (!newBodiedSyncBlockNode) {
@@ -148,12 +154,12 @@ export const createSyncedBlock = ({
     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,
-    inputMethod
+    inputMethod,
+    nodeTypes
   });
   return tr;
 };

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

@@ -6,11 +6,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';
@@ -37,7 +39,7 @@ export const deleteMechanismMetaKey = new PluginKey('syncedBlockDeleteMechanism'
 const 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.
@@ -292,18 +294,27 @@ const filterTransactionOnline = ({
       blockType: 'source',
       entryPoint
     } : undefined;
+    let feedbackCallbacks;
     if (feedbackContext) {
       const sourceAttempt = ctx.queueSourceFeedback(feedbackContext);
-      return handleBodiedSyncBlockRemoval(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(tr), mechanism, {
+      feedbackCallbacks = {
         onDeleteCompleted: success => ctx.completeSourceDeletion(sourceAttempt, success),
         onDeleteTransaction: deleteTr => deleteTr.setMeta(syncedBlockPromptedFeedbackMetaKey, {
           context: feedbackContext,
           sourceAttempt
         }),
         onDestroy: () => ctx.clearSourceFeedback(sourceAttempt)
-      });
+      };
     }
-    return handleBodiedSyncBlockRemoval(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(tr), mechanism, undefined);
+    return handleBodiedSyncBlockRemoval({
+      removed: bodiedSyncBlockRemoved,
+      syncBlockStore,
+      api,
+      confirmationTransactionRef,
+      deletionReason: getDeleteReason(tr),
+      mechanism,
+      feedbackCallbacks
+    });
   }
   if (bodiedSyncBlockAdded.length > 0) {
     if (tr.getMeta(pmHistoryPluginKey)) {
@@ -323,7 +334,7 @@ const filterTransactionOnline = ({
       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.
     const creationMeta = tr.getMeta(creationMetaKey);
     handleBodiedSyncBlockCreation(bodiedSyncBlockAdded, state, api, creationMeta);
@@ -1068,16 +1079,38 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
             added
           } = trackSyncBlocks(syncBlockStore.sourceManager.isSourceBlock, tr, oldState);
           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).
             const {
               tr
             } = newState;
-            added.forEach(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.
+              [...added].sort((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(({
+                node,
+                from,
+                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(node => {
+                if (node.from !== undefined && node.to !== undefined) {
+                  tr.delete(node.from, node.to);
+                }
+              });
+            }
             return tr;
           }
         }

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

@@ -2,7 +2,7 @@ import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { FLAG_ID } from '../../types';
 import { syncedBlockPluginKey } from '../main';
 import { deferDispatch } from './utils';
-const onRetry = (api, resourceId) => {
+const onRetry = (api, resourceId, enrichment) => {
   return () => {
     var _api$core, _api$core2;
     api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.focus();
@@ -19,7 +19,7 @@ const onRetry = (api, resourceId) => {
       tr.setSelection(TextSelection.create(tr.doc, from, to)).setMeta(syncedBlockPluginKey, {
         activeFlag: false
       });
-      api === null || api === void 0 ? void 0 : (_api$syncedBlock2 = api.syncedBlock) === null || _api$syncedBlock2 === void 0 ? void 0 : _api$syncedBlock2.commands.insertSyncedBlock()({
+      api === null || api === void 0 ? void 0 : (_api$syncedBlock2 = api.syncedBlock) === null || _api$syncedBlock2 === void 0 ? void 0 : _api$syncedBlock2.commands.insertSyncedBlock(enrichment === null || enrichment === void 0 ? void 0 : enrichment.inputMethod)({
         tr
       });
       return tr;
@@ -67,7 +67,7 @@ const 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 const handleBodiedSyncBlockCreation = (bodiedSyncBlockAdded, editorState, api, enrichment) => {
@@ -121,7 +121,7 @@ export const handleBodiedSyncBlockCreation = (bodiedSyncBlockAdded, editorState,
           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: tr => tr.setMeta(syncedBlockPluginKey, {
                 ...tr.getMeta(syncedBlockPluginKey),
                 retryCreationPos: {