@atlaskit/editor-plugin-synced-block 5.3.32 → 5.3.34

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 5.3.34
+
+### Patch Changes
+
+- [`6424f86f6390a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6424f86f6390a) -
+  Improve Synced Blocks robustness
+- Updated dependencies
+
+## 5.3.33
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 5.3.32
 
 ### Patch Changes

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

@@ -153,9 +153,7 @@ var copySyncedBlockReferenceToClipboardInternal = function copySyncedBlockRefere
   }
   var domNode = (0, _copyButton.toDOM)(referenceSyncBlockNode, schema);
   (0, _copyButton.copyDomNode)(domNode, referenceSyncBlockNode.type, selection);
-
-  // Use setTimeout to dispatch transaction in next tick and avoid re-entrant dispatch
-  setTimeout(function () {
+  (0, _utils2.deferDispatch)(function () {
     api === null || api === void 0 || api.core.actions.execute(function (_ref3) {
       var _api$analytics4;
       var tr = _ref3.tr;
@@ -175,7 +173,7 @@ var copySyncedBlockReferenceToClipboardInternal = function copySyncedBlockRefere
         }
       });
     });
-  }, 0);
+  });
   return true;
 };
 var editSyncedBlockSource = exports.editSyncedBlockSource = function editSyncedBlockSource(syncBlockStore, api) {

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.syncedBlockPluginKey = exports.createPlugin = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -24,7 +26,7 @@ var _handleBodiedSyncBlockCreation = require("./utils/handle-bodied-sync-block-c
 var _handleBodiedSyncBlockRemoval = require("./utils/handle-bodied-sync-block-removal");
 var _ignoreDomEvent = require("./utils/ignore-dom-event");
 var _selectionDecorations = require("./utils/selection-decorations");
-var _trackSyncBlocks6 = require("./utils/track-sync-blocks");
+var _trackSyncBlocks8 = require("./utils/track-sync-blocks");
 var _utils2 = require("./utils/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; }
@@ -66,8 +68,7 @@ var mapRetryCreationPosMap = function mapRetryCreationPosMap(oldMap, newRetryCre
   return newMap;
 };
 var showCopiedFlag = function showCopiedFlag(api) {
-  // Use setTimeout to dispatch transaction in next tick and avoid re-entrant dispatch
-  setTimeout(function () {
+  (0, _utils2.deferDispatch)(function () {
     api === null || api === void 0 || api.core.actions.execute(function (_ref) {
       var tr = _ref.tr;
       return tr.setMeta(syncedBlockPluginKey, {
@@ -76,7 +77,7 @@ var showCopiedFlag = function showCopiedFlag(api) {
         }
       });
     });
-  }, 0);
+  });
 };
 var showInlineExtensionInSyncBlockWarningIfNeeded = function showInlineExtensionInSyncBlockWarningIfNeeded(tr, state, api, inlineExtensionFlagShown) {
   var _api$connectivity;
@@ -90,8 +91,7 @@ var showInlineExtensionInSyncBlockWarningIfNeeded = function showInlineExtension
   // Only show the flag on the first instance per sync block (same as UNPUBLISHED_SYNC_BLOCK_PASTED)
   if (resourceId && !inlineExtensionFlagShown.has(resourceId)) {
     inlineExtensionFlagShown.add(resourceId);
-    // Use setTimeout to dispatch in next tick and avoid re-entrant dispatch from filterTransaction
-    setTimeout(function () {
+    (0, _utils2.deferDispatch)(function () {
       api === null || api === void 0 || api.core.actions.execute(function (_ref2) {
         var tr = _ref2.tr;
         return tr.setMeta(syncedBlockPluginKey, {
@@ -100,7 +100,7 @@ var showInlineExtensionInSyncBlockWarningIfNeeded = function showInlineExtension
           }
         });
       });
-    }, 0);
+    });
   }
 };
 var getDeleteReason = function getDeleteReason(tr) {
@@ -110,36 +110,176 @@ var getDeleteReason = function getDeleteReason(tr) {
   }
   return reason;
 };
+var filterTransactionOnline = function filterTransactionOnline(_ref3) {
+  var tr = _ref3.tr,
+    state = _ref3.state,
+    syncBlockStore = _ref3.syncBlockStore,
+    api = _ref3.api,
+    confirmationTransactionRef = _ref3.confirmationTransactionRef,
+    bodiedSyncBlockRemoved = _ref3.bodiedSyncBlockRemoved,
+    bodiedSyncBlockAdded = _ref3.bodiedSyncBlockAdded,
+    inlineExtensionFlagShown = _ref3.inlineExtensionFlagShown;
+  var _trackSyncBlocks = (0, _trackSyncBlocks8.trackSyncBlocks)(function (node) {
+      return node.type.name === 'syncBlock';
+    }, tr, state),
+    syncBlockRemoved = _trackSyncBlocks.removed,
+    syncBlockAdded = _trackSyncBlocks.added;
+  syncBlockRemoved.forEach(function (syncBlock) {
+    var _api$analytics;
+    api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.fireAnalyticsEvent({
+      action: _analytics.ACTION.DELETED,
+      actionSubject: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,
+      actionSubjectId: _analytics.ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_DELETE,
+      attributes: {
+        resourceId: syncBlock.attrs.resourceId,
+        blockInstanceId: syncBlock.attrs.localId
+      },
+      eventType: _analytics.EVENT_TYPE.OPERATIONAL
+    });
+  });
+  syncBlockAdded.forEach(function (syncBlock) {
+    if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
+      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({
+        action: _analytics.ACTION.INSERTED,
+        actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
+        actionSubjectId: _analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK,
+        attributes: {
+          resourceId: syncBlock.attrs.resourceId,
+          blockInstanceId: syncBlock.attrs.localId
+        },
+        eventType: _analytics.EVENT_TYPE.TRACK
+      });
+    } else {
+      var _api$analytics3;
+      api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || (_api$analytics3 = _api$analytics3.actions) === null || _api$analytics3 === void 0 || _api$analytics3.fireAnalyticsEvent({
+        action: _analytics.ACTION.INSERTED,
+        actionSubject: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,
+        actionSubjectId: _analytics.ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_CREATE,
+        attributes: {
+          resourceId: syncBlock.attrs.resourceId,
+          blockInstanceId: syncBlock.attrs.localId
+        },
+        eventType: _analytics.EVENT_TYPE.OPERATIONAL
+      });
+    }
+  });
+  if (bodiedSyncBlockRemoved.length > 0) {
+    // eslint-disable-next-line no-param-reassign
+    confirmationTransactionRef.current = tr;
+    return (0, _handleBodiedSyncBlockRemoval.handleBodiedSyncBlockRemoval)(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(tr));
+  }
+  if (bodiedSyncBlockAdded.length > 0) {
+    if (tr.getMeta(_utils.pmHistoryPluginKey)) {
+      // We don't allow bodiedSyncBlock creation via redo, however, we need to return true here to let transaction through so history can be updated properly.
+      // If we simply returns false, creation from redo is blocked as desired, but this results in editor showing redo as possible even though it's not.
+      // 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;
+    }
+    (0, _handleBodiedSyncBlockCreation.handleBodiedSyncBlockCreation)(bodiedSyncBlockAdded, state, api);
+    return true;
+  }
+  showInlineExtensionInSyncBlockWarningIfNeeded(tr, state, api, inlineExtensionFlagShown);
+  return true;
+};
+var filterTransactionOffline = function filterTransactionOffline(_ref4) {
+  var tr = _ref4.tr,
+    state = _ref4.state,
+    api = _ref4.api,
+    isConfirmedSyncBlockDeletion = _ref4.isConfirmedSyncBlockDeletion,
+    bodiedSyncBlockRemoved = _ref4.bodiedSyncBlockRemoved,
+    bodiedSyncBlockAdded = _ref4.bodiedSyncBlockAdded;
+  var _trackSyncBlocks2 = (0, _trackSyncBlocks8.trackSyncBlocks)(function (node) {
+      return node.type.name === 'syncBlock';
+    }, tr, state),
+    syncBlockRemoved = _trackSyncBlocks2.removed,
+    syncBlockAdded = _trackSyncBlocks2.added;
+  var errorFlag = false;
+  if (isConfirmedSyncBlockDeletion || bodiedSyncBlockRemoved.length > 0 || syncBlockRemoved.length > 0) {
+    errorFlag = _types.FLAG_ID.CANNOT_DELETE_WHEN_OFFLINE;
+  } else if (bodiedSyncBlockAdded.length > 0 || syncBlockAdded.length > 0) {
+    errorFlag = _types.FLAG_ID.CANNOT_CREATE_WHEN_OFFLINE;
+  } else if ((0, _trackSyncBlocks8.hasEditInSyncBlock)(tr, state)) {
+    errorFlag = _types.FLAG_ID.CANNOT_EDIT_WHEN_OFFLINE;
+  }
+  if (errorFlag) {
+    (0, _utils2.deferDispatch)(function () {
+      api === null || api === void 0 || api.core.actions.execute(function (_ref5) {
+        var tr = _ref5.tr;
+        return tr.setMeta(syncedBlockPluginKey, {
+          activeFlag: {
+            id: errorFlag
+          }
+        });
+      });
+    });
+    return false;
+  }
+  return true;
+};
+
+/**
+ * Encapsulates mutable state that persists across transactions in the
+ * synced block plugin. Replaces module-level closure variables so state
+ * is explicitly scoped to a single plugin instance.
+ */
+var SyncedBlockPluginContext = /*#__PURE__*/function () {
+  function SyncedBlockPluginContext() {
+    (0, _classCallCheck2.default)(this, SyncedBlockPluginContext);
+    (0, _defineProperty2.default)(this, "confirmationTransactionRef", {
+      current: undefined
+    });
+    (0, _defineProperty2.default)(this, "_isCopyEvent", false);
+    (0, _defineProperty2.default)(this, "unpublishedFlagShown", new Set());
+    (0, _defineProperty2.default)(this, "inlineExtensionFlagShown", new Set());
+  }
+  return (0, _createClass2.default)(SyncedBlockPluginContext, [{
+    key: "isCopyEvent",
+    get: function get() {
+      return this._isCopyEvent;
+    }
+  }, {
+    key: "markCopyEvent",
+    value: function markCopyEvent() {
+      this._isCopyEvent = true;
+    }
+  }, {
+    key: "consumeCopyEvent",
+    value: function consumeCopyEvent() {
+      var was = this._isCopyEvent;
+      this._isCopyEvent = false;
+      return was;
+    }
+  }]);
+}();
 var createPlugin = exports.createPlugin = function createPlugin(options, pmPluginFactoryParams, syncBlockStore, api) {
-  var _ref3 = options || {},
-    _ref3$useLongPressSel = _ref3.useLongPressSelection,
-    useLongPressSelection = _ref3$useLongPressSel === void 0 ? false : _ref3$useLongPressSel;
-  var confirmationTransactionRef = {
+  var _ctx$confirmationTran, _ctx$unpublishedFlagS, _ctx$inlineExtensionF;
+  var _ref6 = options || {},
+    _ref6$useLongPressSel = _ref6.useLongPressSelection,
+    useLongPressSelection = _ref6$useLongPressSel === void 0 ? false : _ref6$useLongPressSel;
+  var ctx = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_5') ? new SyncedBlockPluginContext() : undefined;
+  var confirmationTransactionRef = (_ctx$confirmationTran = ctx === null || ctx === void 0 ? void 0 : ctx.confirmationTransactionRef) !== null && _ctx$confirmationTran !== void 0 ? _ctx$confirmationTran : {
     current: undefined
   };
-  // Track if a copy event occurred to distinguish copy from drag and drop
   var isCopyEvent = false;
-  // Track which sync blocks have already triggered the unpublished flag
-  var unpublishedFlagShown = new Set();
-  // Track which sync blocks have already triggered the inline extension in sync block flag
-  var inlineExtensionFlagShown = new Set();
+  var unpublishedFlagShown = (_ctx$unpublishedFlagS = ctx === null || ctx === void 0 ? void 0 : ctx.unpublishedFlagShown) !== null && _ctx$unpublishedFlagS !== void 0 ? _ctx$unpublishedFlagS : new Set();
+  var inlineExtensionFlagShown = (_ctx$inlineExtensionF = ctx === null || ctx === void 0 ? void 0 : ctx.inlineExtensionFlagShown) !== null && _ctx$inlineExtensionF !== void 0 ? _ctx$inlineExtensionF : new Set();
 
   // Set up callback to detect unpublished sync blocks when they're fetched
   syncBlockStore.referenceManager.setOnUnpublishedSyncBlockDetected(function (resourceId) {
     // Only show the flag once per sync block
     if (!unpublishedFlagShown.has(resourceId)) {
       unpublishedFlagShown.add(resourceId);
-      // Use setTimeout to dispatch transaction in next tick and avoid re-entrant dispatch
-      setTimeout(function () {
-        api === null || api === void 0 || api.core.actions.execute(function (_ref4) {
-          var tr = _ref4.tr;
+      (0, _utils2.deferDispatch)(function () {
+        api === null || api === void 0 || api.core.actions.execute(function (_ref7) {
+          var tr = _ref7.tr;
           return tr.setMeta(syncedBlockPluginKey, {
             activeFlag: {
               id: _types.FLAG_ID.UNPUBLISHED_SYNC_BLOCK_PASTED
             }
           });
         });
-      }, 0);
+      });
     }
   });
   return new _safePlugin.SafePlugin({
@@ -182,20 +322,22 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
     props: {
       nodeViews: {
         syncBlock: function syncBlock(node, view, getPos, _decorations) {
-          // To support SSR, pass `syncBlockStore` here
-          // and do not use lazy loading.
-          // We cannot start rendering and then load `syncBlockStore` asynchronously,
-          // because obtaining it is asynchronous (sharedPluginState.currentState() is delayed).
-          return new _syncedBlock.SyncBlock({
-            api: api,
-            options: options,
-            node: node,
-            view: view,
-            getPos: getPos,
-            portalProviderAPI: pmPluginFactoryParams.portalProviderAPI,
-            eventDispatcher: pmPluginFactoryParams.eventDispatcher,
-            syncBlockStore: syncBlockStore
-          }).init();
+          return (
+            // To support SSR, pass `syncBlockStore` here
+            // and do not use lazy loading.
+            // We cannot start rendering and then load `syncBlockStore` asynchronously,
+            // because obtaining it is asynchronous (sharedPluginState.currentState() is delayed).
+            new _syncedBlock.SyncBlock({
+              api: api,
+              options: options,
+              node: node,
+              view: view,
+              getPos: getPos,
+              portalProviderAPI: pmPluginFactoryParams.portalProviderAPI,
+              eventDispatcher: pmPluginFactoryParams.eventDispatcher,
+              syncBlockStore: syncBlockStore
+            }).init()
+          );
         },
         bodiedSyncBlock: (0, _bodiedLazySyncedBlock.lazyBodiedSyncBlockView)({
           pluginOptions: options,
@@ -246,17 +388,23 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           return (0, _ignoreDomEvent.shouldIgnoreDomEvent)(view, event, api);
         },
         copy: function copy() {
-          isCopyEvent = true;
+          if (ctx) {
+            ctx.markCopyEvent();
+          } else {
+            isCopyEvent = true;
+          }
           return false;
         }
       },
-      transformCopied: function transformCopied(slice, _ref5) {
-        var state = _ref5.state;
+      transformCopied: function transformCopied(slice, _ref8) {
+        var state = _ref8.state;
         var pluginState = syncedBlockPluginKey.getState(state);
         var syncBlockStore = pluginState === null || pluginState === void 0 ? void 0 : pluginState.syncBlockStore;
         var schema = state.schema;
-        var isCopy = isCopyEvent;
-        isCopyEvent = false;
+        var isCopy = ctx ? ctx.consumeCopyEvent() : isCopyEvent;
+        if (!ctx) {
+          isCopyEvent = false;
+        }
         if (!syncBlockStore || !isCopy) {
           return slice;
         }
@@ -295,11 +443,10 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
 
       // Track newly added reference sync blocks before processing the transaction
       if (tr.docChanged && !tr.getMeta('isRemote')) {
-        var _trackSyncBlocks = (0, _trackSyncBlocks6.trackSyncBlocks)(function (node) {
+        var _trackSyncBlocks3 = (0, _trackSyncBlocks8.trackSyncBlocks)(function (node) {
             return node.type.name === 'syncBlock';
           }, tr, state),
-          added = _trackSyncBlocks.added;
-        // Mark newly added sync blocks so we can detect unpublished status when data is fetched
+          added = _trackSyncBlocks3.added;
         added.forEach(function (nodeInfo) {
           var _nodeInfo$attrs;
           if ((_nodeInfo$attrs = nodeInfo.attrs) !== null && _nodeInfo$attrs !== void 0 && _nodeInfo$attrs.resourceId) {
@@ -307,26 +454,40 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           }
         });
       }
-
-      // Ignore transactions that don't change the document
-      // or are from remote (collab) or already confirmed sync block deletion
-      // We only care about local changes that change the document
-      // and are not yet confirmed for sync block deletion
       if (!tr.docChanged || Boolean(tr.getMeta('isRemote')) || !isOffline && isConfirmedSyncBlockDeletion) {
         return true;
       }
-      var _trackSyncBlocks2 = (0, _trackSyncBlocks6.trackSyncBlocks)(syncBlockStore.sourceManager.isSourceBlock, tr, state),
-        bodiedSyncBlockRemoved = _trackSyncBlocks2.removed,
-        bodiedSyncBlockAdded = _trackSyncBlocks2.added;
+      var _trackSyncBlocks4 = (0, _trackSyncBlocks8.trackSyncBlocks)(syncBlockStore.sourceManager.isSourceBlock, tr, state),
+        bodiedSyncBlockRemoved = _trackSyncBlocks4.removed,
+        bodiedSyncBlockAdded = _trackSyncBlocks4.added;
+      if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_5')) {
+        return isOffline ? filterTransactionOffline({
+          tr: tr,
+          state: state,
+          api: api,
+          isConfirmedSyncBlockDeletion: isConfirmedSyncBlockDeletion,
+          bodiedSyncBlockRemoved: bodiedSyncBlockRemoved,
+          bodiedSyncBlockAdded: bodiedSyncBlockAdded
+        }) : filterTransactionOnline({
+          tr: tr,
+          state: state,
+          syncBlockStore: syncBlockStore,
+          api: api,
+          confirmationTransactionRef: confirmationTransactionRef,
+          bodiedSyncBlockRemoved: bodiedSyncBlockRemoved,
+          bodiedSyncBlockAdded: bodiedSyncBlockAdded,
+          inlineExtensionFlagShown: inlineExtensionFlagShown
+        });
+      }
       if (!isOffline) {
-        var _trackSyncBlocks3 = (0, _trackSyncBlocks6.trackSyncBlocks)(function (node) {
+        var _trackSyncBlocks5 = (0, _trackSyncBlocks8.trackSyncBlocks)(function (node) {
             return node.type.name === 'syncBlock';
           }, tr, state),
-          syncBlockRemoved = _trackSyncBlocks3.removed,
-          syncBlockAdded = _trackSyncBlocks3.added;
-        syncBlockRemoved.forEach(function (syncBlock) {
-          var _api$analytics;
-          api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.fireAnalyticsEvent({
+          _syncBlockRemoved = _trackSyncBlocks5.removed,
+          _syncBlockAdded = _trackSyncBlocks5.added;
+        _syncBlockRemoved.forEach(function (syncBlock) {
+          var _api$analytics4;
+          api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 || (_api$analytics4 = _api$analytics4.actions) === null || _api$analytics4 === void 0 || _api$analytics4.fireAnalyticsEvent({
             action: _analytics.ACTION.DELETED,
             actionSubject: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,
             actionSubjectId: _analytics.ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_DELETE,
@@ -337,10 +498,10 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
             eventType: _analytics.EVENT_TYPE.OPERATIONAL
           });
         });
-        syncBlockAdded.forEach(function (syncBlock) {
+        _syncBlockAdded.forEach(function (syncBlock) {
           if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
-            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({
+            var _api$analytics5;
+            api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 || (_api$analytics5 = _api$analytics5.actions) === null || _api$analytics5 === void 0 || _api$analytics5.fireAnalyticsEvent({
               action: _analytics.ACTION.INSERTED,
               actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
               actionSubjectId: _analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK,
@@ -351,8 +512,8 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
               eventType: _analytics.EVENT_TYPE.TRACK
             });
           } else {
-            var _api$analytics3;
-            api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || (_api$analytics3 = _api$analytics3.actions) === null || _api$analytics3 === void 0 || _api$analytics3.fireAnalyticsEvent({
+            var _api$analytics6;
+            api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 || (_api$analytics6 = _api$analytics6.actions) === null || _api$analytics6 === void 0 || _api$analytics6.fireAnalyticsEvent({
               action: _analytics.ACTION.INSERTED,
               actionSubject: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,
               actionSubjectId: _analytics.ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_CREATE,
@@ -369,7 +530,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           return (0, _handleBodiedSyncBlockRemoval.handleBodiedSyncBlockRemoval)(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(tr));
         }
         if (bodiedSyncBlockAdded.length > 0) {
-          if (Boolean(tr.getMeta(_utils.pmHistoryPluginKey))) {
+          if (tr.getMeta(_utils.pmHistoryPluginKey)) {
             // We don't allow bodiedSyncBlock creation via redo, however, we need to return true here to let transaction through so history can be updated properly.
             // If we simply returns false, creation from redo is blocked as desired, but this results in editor showing redo as possible even though it's not.
             // After true is returned here and the node is created, we delete the node in the filterTransaction immediately, which cancels out the creation
@@ -380,36 +541,34 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
         }
         showInlineExtensionInSyncBlockWarningIfNeeded(tr, state, api, inlineExtensionFlagShown);
         return true;
-      } else {
-        var _trackSyncBlocks4 = (0, _trackSyncBlocks6.trackSyncBlocks)(function (node) {
-            return node.type.name === 'syncBlock';
-          }, tr, state),
-          _syncBlockRemoved = _trackSyncBlocks4.removed,
-          _syncBlockAdded = _trackSyncBlocks4.added;
-        var errorFlag = false;
+      }
+      var _trackSyncBlocks6 = (0, _trackSyncBlocks8.trackSyncBlocks)(function (node) {
+          return node.type.name === 'syncBlock';
+        }, tr, state),
+        syncBlockRemoved = _trackSyncBlocks6.removed,
+        syncBlockAdded = _trackSyncBlocks6.added;
+      var errorFlag = false;
 
-        // Disable (bodied)syncBlock node deletion/creation/edition in offline mode and trigger an error flag instead
-        if (isConfirmedSyncBlockDeletion || bodiedSyncBlockRemoved.length > 0 || _syncBlockRemoved.length > 0) {
-          errorFlag = _types.FLAG_ID.CANNOT_DELETE_WHEN_OFFLINE;
-        } else if (bodiedSyncBlockAdded.length > 0 || _syncBlockAdded.length > 0) {
-          errorFlag = _types.FLAG_ID.CANNOT_CREATE_WHEN_OFFLINE;
-        } else if ((0, _trackSyncBlocks6.hasEditInSyncBlock)(tr, state)) {
-          errorFlag = _types.FLAG_ID.CANNOT_EDIT_WHEN_OFFLINE;
-        }
-        if (errorFlag) {
-          // Use setTimeout to dispatch transaction in next tick and avoid re-entrant dispatch
-          setTimeout(function () {
-            api === null || api === void 0 || api.core.actions.execute(function (_ref6) {
-              var tr = _ref6.tr;
-              return tr.setMeta(syncedBlockPluginKey, {
-                activeFlag: {
-                  id: errorFlag
-                }
-              });
+      // Disable (bodied)syncBlock node deletion/creation/edition in offline mode and trigger an error flag instead
+      if (isConfirmedSyncBlockDeletion || bodiedSyncBlockRemoved.length > 0 || syncBlockRemoved.length > 0) {
+        errorFlag = _types.FLAG_ID.CANNOT_DELETE_WHEN_OFFLINE;
+      } else if (bodiedSyncBlockAdded.length > 0 || syncBlockAdded.length > 0) {
+        errorFlag = _types.FLAG_ID.CANNOT_CREATE_WHEN_OFFLINE;
+      } else if ((0, _trackSyncBlocks8.hasEditInSyncBlock)(tr, state)) {
+        errorFlag = _types.FLAG_ID.CANNOT_EDIT_WHEN_OFFLINE;
+      }
+      if (errorFlag) {
+        (0, _utils2.deferDispatch)(function () {
+          api === null || api === void 0 || api.core.actions.execute(function (_ref9) {
+            var tr = _ref9.tr;
+            return tr.setMeta(syncedBlockPluginKey, {
+              activeFlag: {
+                id: errorFlag
+              }
             });
-          }, 0);
-          return false;
-        }
+          });
+        });
+        return false;
       }
       return true;
     },
@@ -426,29 +585,27 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
       try {
         var _loop = function _loop() {
             var tr = _step2.value;
-            if (!tr.getMeta(_utils.pmHistoryPluginKey)) {
-              return 0; // continue
-            }
-            var _trackSyncBlocks5 = (0, _trackSyncBlocks6.trackSyncBlocks)(syncBlockStore.sourceManager.isSourceBlock, tr, oldState),
-              added = _trackSyncBlocks5.added;
-            if (added.length > 0) {
-              // Delete bodiedSyncBlock if it's originated from history, i.e. redo creation
-              // See filterTransaction above for more details
-              var _tr = newState.tr;
-              added.forEach(function (node) {
-                if (node.from !== undefined && node.to !== undefined) {
-                  _tr.delete(node.from, node.to);
-                }
-              });
-              return {
-                v: _tr
-              };
+            if (tr.getMeta(_utils.pmHistoryPluginKey)) {
+              var _trackSyncBlocks7 = (0, _trackSyncBlocks8.trackSyncBlocks)(syncBlockStore.sourceManager.isSourceBlock, tr, oldState),
+                added = _trackSyncBlocks7.added;
+              if (added.length > 0) {
+                // Delete bodiedSyncBlock if it's originated from history, i.e. redo creation
+                // See filterTransaction above for more details
+                var _tr = newState.tr;
+                added.forEach(function (node) {
+                  if (node.from !== undefined && node.to !== undefined) {
+                    _tr.delete(node.from, node.to);
+                  }
+                });
+                return {
+                  v: _tr
+                };
+              }
             }
           },
           _ret;
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           _ret = _loop();
-          if (_ret === 0) continue;
           if (_ret) return _ret.v;
         }
       } catch (err) {

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

@@ -9,6 +9,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _types = require("../../types");
 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) {
@@ -86,7 +87,7 @@ var handleBodiedSyncBlockCreation = exports.handleBodiedSyncBlockCreation = func
       to: node.to
     };
     var resourceId = node.attrs.resourceId;
-    setTimeout(function () {
+    (0, _utils.deferDispatch)(function () {
       var _api$core3;
       api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref2) {
         var tr = _ref2.tr;

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

@@ -3,11 +3,23 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.wasInlineExtensionInsertedInBodiedSyncBlock = exports.sliceFullyContainsNode = exports.isBodiedSyncBlockNode = exports.findSyncBlockOrBodiedSyncBlock = exports.findSyncBlock = exports.findBodiedSyncBlock = exports.canBeConvertedToSyncBlock = void 0;
+exports.wasInlineExtensionInsertedInBodiedSyncBlock = exports.sliceFullyContainsNode = exports.isBodiedSyncBlockNode = exports.findSyncBlockOrBodiedSyncBlock = exports.findSyncBlock = exports.findBodiedSyncBlock = exports.deferDispatch = exports.canBeConvertedToSyncBlock = void 0;
 var _selection = require("@atlaskit/editor-common/selection");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+/**
+ * Defers a callback to the next microtask (when gated) or next macrotask via setTimeout(0).
+ * Used to avoid re-entrant ProseMirror dispatch cycles.
+ */
+var deferDispatch = exports.deferDispatch = function deferDispatch(fn) {
+  if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_5')) {
+    queueMicrotask(fn);
+  } else {
+    setTimeout(fn, 0);
+  }
+};
 var findSyncBlock = exports.findSyncBlock = function findSyncBlock(schema, selection) {
   var syncBlock = schema.nodes.syncBlock;
   return (0, _utils.findSelectedNodeOfType)(syncBlock)(selection);