@atlaskit/editor-plugin-synced-block 8.4.2 → 8.4.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 8.4.3
+
+### Patch Changes
+
+- [`085a281306c03`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/085a281306c03) -
+  Add defensive mechanisms for synced block EntityNotFound errors:
+  - Add retry with exponential backoff when fetching synced block references returns EntityNotFound
+    (up to 3 retries with 2s/4s/8s delays)
+  - Add transformPasted handler to convert any bodiedSyncBlock nodes arriving via paste into
+    syncBlock references, preventing createBlock from being called with the wrong parentId
+
+  Both changes are gated behind `platform_synced_block_patch_13`.
+
+- Updated dependencies
+
 ## 8.4.2
 
 ### Patch Changes

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

@@ -18,9 +18,10 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _view = require("@atlaskit/editor-prosemirror/view");
+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 _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _bodiedSyncedBlock = require("../nodeviews/bodiedSyncedBlock");
@@ -153,6 +154,7 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
   // events this lets us triangulate cross-product paste behaviour without standing up a
   // dedicated `cross_product_paste` event subject.
   var isPaste = Boolean((_tr$getMeta = tr.getMeta('paste')) !== null && _tr$getMeta !== void 0 ? _tr$getMeta : tr.getMeta('uiEvent') === 'paste');
+  var isPasteOrDrop = isPaste || tr.getMeta('uiEvent') === 'drop';
   syncBlockAdded.forEach(function (syncBlock) {
     var _api$analytics2;
     api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.fireAnalyticsEvent({
@@ -180,6 +182,16 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
       // After true is returned here and the node is created, we delete the node in the filterTransaction immediately, which cancels out the creation
       return true;
     }
+
+    // Defense-in-depth: if a bodiedSyncBlock arrives via paste or drag-and-drop,
+    // it may have bypassed transformCopied (e.g. cut, browser clipboard).
+    // Do not call createBlock — it would use this page's parentId which may
+    // be wrong. The bodiedSyncBlock content will still be inserted but will
+    // not be registered as a source block in Block Service, which is safer
+    // than creating a zombie block under the wrong ARI.
+    if (isPasteOrDrop && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_13')) {
+      return true;
+    }
     (0, _handleBodiedSyncBlockCreation.handleBodiedSyncBlockCreation)(bodiedSyncBlockAdded, state, api);
     return true;
   }
@@ -232,7 +244,7 @@ var buildStatusDecorations = function buildStatusDecorations(doc, syncBlockStore
   // Fast path: when all status flags are off and no creations are in flight,
   // no node can produce a decoration — skip the full doc traversal.
   if (!isOffline && !isViewMode && !isDragging && !syncBlockStore.sourceManager.hasPendingCreations()) {
-    return _view.DecorationSet.empty;
+    return _view2.DecorationSet.empty;
   }
   var offlineDecorations = [];
   var viewModeDecorations = [];
@@ -240,22 +252,22 @@ var buildStatusDecorations = function buildStatusDecorations(doc, syncBlockStore
   var dragDecorations = [];
   doc.descendants(function (node, pos) {
     if (node.type.name === 'bodiedSyncBlock' && isOffline) {
-      offlineDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {
+      offlineDecorations.push(_view2.Decoration.node(pos, pos + node.nodeSize, {
         class: _syncBlock.SyncBlockStateCssClassName.disabledClassName
       }));
     }
     if (syncBlockStore.isSyncBlock(node) && isViewMode) {
-      viewModeDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {
+      viewModeDecorations.push(_view2.Decoration.node(pos, pos + node.nodeSize, {
         class: _syncBlock.SyncBlockStateCssClassName.viewModeClassName
       }));
     }
     if (node.type.name === 'bodiedSyncBlock' && syncBlockStore.sourceManager.isPendingCreation(node.attrs.resourceId)) {
-      loadingDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {
+      loadingDecorations.push(_view2.Decoration.node(pos, pos + node.nodeSize, {
         class: _syncBlock.SyncBlockStateCssClassName.creationLoadingClassName
       }));
     }
     if (isDragging && syncBlockStore.isSyncBlock(node)) {
-      dragDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {
+      dragDecorations.push(_view2.Decoration.node(pos, pos + node.nodeSize, {
         class: _syncBlock.SyncBlockStateCssClassName.draggingClassName
       }));
     }
@@ -263,7 +275,7 @@ var buildStatusDecorations = function buildStatusDecorations(doc, syncBlockStore
     // only traverse the top-level node of the document, as syncBlock and bodiedSyncBlock are top-level nodes
     return false;
   });
-  return _view.DecorationSet.create(doc, [].concat(offlineDecorations, viewModeDecorations, loadingDecorations, dragDecorations));
+  return _view2.DecorationSet.create(doc, [].concat(offlineDecorations, viewModeDecorations, loadingDecorations, dragDecorations));
 };
 
 /**
@@ -396,7 +408,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
         // When the perf gate is ON and the doc has synced blocks we do a
         // single traversal here; afterwards `apply()` will map or rebuild
         // only when a status signal changes.
-        var initStatusDecorationSet = docHasSyncedBlocks && isPerfExperimentOn ? buildStatusDecorations(instance.doc, syncBlockStore, initIsOffline, initIsViewMode, initIsDragging) : _view.DecorationSet.empty;
+        var initStatusDecorationSet = docHasSyncedBlocks && isPerfExperimentOn ? buildStatusDecorations(instance.doc, syncBlockStore, initIsOffline, initIsViewMode, initIsDragging) : _view2.DecorationSet.empty;
         return {
           selectionDecorationSet: (0, _selectionDecorations.calculateDecorations)(instance.doc, instance.selection, instance.schema),
           activeFlag: false,
@@ -482,7 +494,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
         if (isPerfExperimentOn) {
           if (!nextHasSyncedBlocks) {
             // No synced blocks → keep empty status decorations
-            nextStatusDecorationSet = _view.DecorationSet.empty;
+            nextStatusDecorationSet = _view2.DecorationSet.empty;
           } else {
             var _api$connectivity4, _api$editorViewMode3, _api$userIntent3;
             // Read current shared-state signals
@@ -570,7 +582,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
       decorations: function decorations(state) {
         var currentPluginState = syncedBlockPluginKey.getState(state);
         if (!currentPluginState) {
-          return _view.DecorationSet.empty;
+          return _view2.DecorationSet.empty;
         }
         var selectionDecorationSet = currentPluginState.selectionDecorationSet,
           statusDecorationSet = currentPluginState.statusDecorationSet,
@@ -598,7 +610,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           // omit selection decorations (matches old behaviour).
           var statusDecorations = statusDecorationSet.find();
           if (statusDecorations.length === 0) {
-            return hasFocus ? selectionDecorationSet : _view.DecorationSet.empty;
+            return hasFocus ? selectionDecorationSet : _view2.DecorationSet.empty;
           } else {
             return hasFocus ? selectionDecorationSet.add(state.doc, statusDecorations) : statusDecorationSet;
           }
@@ -618,22 +630,22 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           var dragDecorations = [];
           state.doc.descendants(function (node, pos) {
             if (node.type.name === 'bodiedSyncBlock' && isOffline) {
-              offlineDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {
+              offlineDecorations.push(_view2.Decoration.node(pos, pos + node.nodeSize, {
                 class: _syncBlock.SyncBlockStateCssClassName.disabledClassName
               }));
             }
             if (_syncBlockStore.isSyncBlock(node) && isViewMode) {
-              viewModeDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {
+              viewModeDecorations.push(_view2.Decoration.node(pos, pos + node.nodeSize, {
                 class: _syncBlock.SyncBlockStateCssClassName.viewModeClassName
               }));
             }
             if (node.type.name === 'bodiedSyncBlock' && _syncBlockStore.sourceManager.isPendingCreation(node.attrs.resourceId)) {
-              loadingDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {
+              loadingDecorations.push(_view2.Decoration.node(pos, pos + node.nodeSize, {
                 class: _syncBlock.SyncBlockStateCssClassName.creationLoadingClassName
               }));
             }
             if (isDragging && _syncBlockStore.isSyncBlock(node)) {
-              dragDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {
+              dragDecorations.push(_view2.Decoration.node(pos, pos + node.nodeSize, {
                 class: _syncBlock.SyncBlockStateCssClassName.draggingClassName
               }));
             }
@@ -641,7 +653,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           if (api !== null && api !== void 0 && (_api$focus2 = api.focus) !== null && _api$focus2 !== void 0 && (_api$focus2 = _api$focus2.sharedState) !== null && _api$focus2 !== void 0 && (_api$focus2 = _api$focus2.currentState()) !== null && _api$focus2 !== void 0 && _api$focus2.hasFocus) {
             return selectionDecorationSet.add(doc, offlineDecorations).add(doc, viewModeDecorations).add(doc, loadingDecorations).add(doc, dragDecorations);
           } else {
-            return _view.DecorationSet.empty.add(doc, offlineDecorations).add(doc, viewModeDecorations).add(doc, loadingDecorations).add(doc, dragDecorations);
+            return _view2.DecorationSet.empty.add(doc, offlineDecorations).add(doc, viewModeDecorations).add(doc, loadingDecorations).add(doc, dragDecorations);
           }
         }
       },
@@ -662,6 +674,30 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           return false;
         }
       },
+      transformPasted: function transformPasted(slice, _view) {
+        if (!(0, _platformFeatureFlags.fg)('platform_synced_block_patch_13')) {
+          return slice;
+        }
+
+        // Defense against bodiedSyncBlock nodes arriving via paste
+        // (e.g. drag-and-drop, cut-paste, or browser-level clipboard
+        // operations that bypass the transformCopied handler).
+        // We cannot convert to a syncBlock reference here because we don't
+        // know the source page's parentId (generateResourceIdForReference
+        // would use the current page's parentId which is wrong).
+        // Instead, strip the bodiedSyncBlock wrapper and keep only the
+        // inner content to prevent createBlock being called with the
+        // wrong parentId.
+        return (0, _utils.mapSlice)(slice, function (node) {
+          if (node.type.name === 'bodiedSyncBlock' && node.attrs.resourceId) {
+            // Return the inner content without the sync block wrapper.
+            // This is the same behavior as when a partial selection of
+            // a bodiedSyncBlock is copied (see transformCopied line 937).
+            return node.content;
+          }
+          return node;
+        });
+      },
       transformCopied: function transformCopied(slice, _ref9) {
         var state = _ref9.state;
         var pluginState = syncedBlockPluginKey.getState(state);

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

@@ -11,6 +11,7 @@ import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/tra
 import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
 import { convertPMNodesToSyncBlockNodes, rebaseTransaction } from '@atlaskit/editor-synced-block-provider';
 import { getSourceProductFromResourceIdSafe } from '@atlaskit/editor-synced-block-provider/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { bodiedSyncBlockNodeView, bodiedSyncBlockNodeViewOld } from '../nodeviews/bodiedSyncedBlock';
@@ -129,6 +130,7 @@ const filterTransactionOnline = ({
   // events this lets us triangulate cross-product paste behaviour without standing up a
   // dedicated `cross_product_paste` event subject.
   const isPaste = Boolean((_tr$getMeta = tr.getMeta('paste')) !== null && _tr$getMeta !== void 0 ? _tr$getMeta : tr.getMeta('uiEvent') === 'paste');
+  const isPasteOrDrop = isPaste || tr.getMeta('uiEvent') === 'drop';
   syncBlockAdded.forEach(syncBlock => {
     var _api$analytics2, _api$analytics2$actio;
     api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : (_api$analytics2$actio = _api$analytics2.actions) === null || _api$analytics2$actio === void 0 ? void 0 : _api$analytics2$actio.fireAnalyticsEvent({
@@ -156,6 +158,16 @@ const filterTransactionOnline = ({
       // After true is returned here and the node is created, we delete the node in the filterTransaction immediately, which cancels out the creation
       return true;
     }
+
+    // Defense-in-depth: if a bodiedSyncBlock arrives via paste or drag-and-drop,
+    // it may have bypassed transformCopied (e.g. cut, browser clipboard).
+    // Do not call createBlock — it would use this page's parentId which may
+    // be wrong. The bodiedSyncBlock content will still be inserted but will
+    // not be registered as a source block in Block Service, which is safer
+    // than creating a zombie block under the wrong ARI.
+    if (isPasteOrDrop && fg('platform_synced_block_patch_13')) {
+      return true;
+    }
     handleBodiedSyncBlockCreation(bodiedSyncBlockAdded, state, api);
     return true;
   }
@@ -630,6 +642,30 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           return false;
         }
       },
+      transformPasted: (slice, _view) => {
+        if (!fg('platform_synced_block_patch_13')) {
+          return slice;
+        }
+
+        // Defense against bodiedSyncBlock nodes arriving via paste
+        // (e.g. drag-and-drop, cut-paste, or browser-level clipboard
+        // operations that bypass the transformCopied handler).
+        // We cannot convert to a syncBlock reference here because we don't
+        // know the source page's parentId (generateResourceIdForReference
+        // would use the current page's parentId which is wrong).
+        // Instead, strip the bodiedSyncBlock wrapper and keep only the
+        // inner content to prevent createBlock being called with the
+        // wrong parentId.
+        return mapSlice(slice, node => {
+          if (node.type.name === 'bodiedSyncBlock' && node.attrs.resourceId) {
+            // Return the inner content without the sync block wrapper.
+            // This is the same behavior as when a partial selection of
+            // a bodiedSyncBlock is copied (see transformCopied line 937).
+            return node.content;
+          }
+          return node;
+        });
+      },
       transformCopied: (slice, {
         state
       }) => {

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

@@ -19,6 +19,7 @@ import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/tra
 import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
 import { convertPMNodesToSyncBlockNodes, rebaseTransaction } from '@atlaskit/editor-synced-block-provider';
 import { getSourceProductFromResourceIdSafe } from '@atlaskit/editor-synced-block-provider/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { bodiedSyncBlockNodeView, bodiedSyncBlockNodeViewOld } from '../nodeviews/bodiedSyncedBlock';
@@ -146,6 +147,7 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
   // events this lets us triangulate cross-product paste behaviour without standing up a
   // dedicated `cross_product_paste` event subject.
   var isPaste = Boolean((_tr$getMeta = tr.getMeta('paste')) !== null && _tr$getMeta !== void 0 ? _tr$getMeta : tr.getMeta('uiEvent') === 'paste');
+  var isPasteOrDrop = isPaste || tr.getMeta('uiEvent') === 'drop';
   syncBlockAdded.forEach(function (syncBlock) {
     var _api$analytics2;
     api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.fireAnalyticsEvent({
@@ -173,6 +175,16 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
       // After true is returned here and the node is created, we delete the node in the filterTransaction immediately, which cancels out the creation
       return true;
     }
+
+    // Defense-in-depth: if a bodiedSyncBlock arrives via paste or drag-and-drop,
+    // it may have bypassed transformCopied (e.g. cut, browser clipboard).
+    // Do not call createBlock — it would use this page's parentId which may
+    // be wrong. The bodiedSyncBlock content will still be inserted but will
+    // not be registered as a source block in Block Service, which is safer
+    // than creating a zombie block under the wrong ARI.
+    if (isPasteOrDrop && fg('platform_synced_block_patch_13')) {
+      return true;
+    }
     handleBodiedSyncBlockCreation(bodiedSyncBlockAdded, state, api);
     return true;
   }
@@ -655,6 +667,30 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
           return false;
         }
       },
+      transformPasted: function transformPasted(slice, _view) {
+        if (!fg('platform_synced_block_patch_13')) {
+          return slice;
+        }
+
+        // Defense against bodiedSyncBlock nodes arriving via paste
+        // (e.g. drag-and-drop, cut-paste, or browser-level clipboard
+        // operations that bypass the transformCopied handler).
+        // We cannot convert to a syncBlock reference here because we don't
+        // know the source page's parentId (generateResourceIdForReference
+        // would use the current page's parentId which is wrong).
+        // Instead, strip the bodiedSyncBlock wrapper and keep only the
+        // inner content to prevent createBlock being called with the
+        // wrong parentId.
+        return mapSlice(slice, function (node) {
+          if (node.type.name === 'bodiedSyncBlock' && node.attrs.resourceId) {
+            // Return the inner content without the sync block wrapper.
+            // This is the same behavior as when a partial selection of
+            // a bodiedSyncBlock is copied (see transformCopied line 937).
+            return node.content;
+          }
+          return node;
+        });
+      },
       transformCopied: function transformCopied(slice, _ref9) {
         var state = _ref9.state;
         var pluginState = syncedBlockPluginKey.getState(state);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "8.4.2",
+	"version": "8.4.3",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -30,7 +30,7 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^52.14.0",
 		"@atlaskit/button": "23.11.8",
-		"@atlaskit/dropdown-menu": "16.9.4",
+		"@atlaskit/dropdown-menu": "16.9.5",
 		"@atlaskit/editor-json-transformer": "^8.32.0",
 		"@atlaskit/editor-plugin-analytics": "^10.1.0",
 		"@atlaskit/editor-plugin-block-menu": "^9.2.0",