@atlaskit/editor-synced-block-provider 9.0.2 → 9.1.0

package/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @atlaskit/editor-synced-block-provider
 
+## 9.1.0
+
+### Minor Changes
+
+- [`b7e3a66378c6e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b7e3a66378c6e) -
+  [ux] Restore the contextual toolbar when selecting text inside a reference synced block, behind
+  `platform_editor_blocks_patch_7`.
+  - `@atlaskit/editor-plugin-toolbar`: the toolbar no longer treats focus inside a nested editable
+    region that ProseMirror does not own - such as the content island a reference synced block
+    renders - as the editor being blurred.
+  - `@atlaskit/editor-synced-block-provider`: `getProviderFactory` is now side-effect free. Applying
+    parent and dynamically created providers moved to a new `syncProviders` method. Previously this
+    ran during render, scheduling a `setState` on another component mid-render, which forced an
+    extra render pass that replaced the synced block DOM and destroyed any in-progress text
+    selection.
+
+  `syncProviders` mutates the cached factory and notifies its subscribers, so call it from an effect
+  rather than during render:
+
+  ```ts
+  const providerFactory = manager.referenceManager.getProviderFactory(resourceId);
+
+  useEffect(() => {
+  	manager.referenceManager.syncProviders(resourceId);
+  }, [manager.referenceManager, resourceId, syncBlockInstance]);
+  ```
+
+  With the flag off, `getProviderFactory` keeps applying providers inline, so existing behaviour is
+  unchanged.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 9.0.3
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 9.0.2
 
 ### Patch Changes

package/dist/cjs/hooks/useFetchSyncBlockData.js

@@ -19,7 +19,7 @@ var _utils = 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; }
 var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyncBlockData(manager, resourceId, localId, fireAnalyticsEvent) {
-  var _manager$referenceMan2, _manager$referenceMan3, _manager$referenceMan4;
+  var _manager$referenceMan2, _manager$referenceMan3, _manager$referenceMan4, _manager$referenceMan5, _manager$referenceMan6, _manager$referenceMan7;
   // Initialize both states from a single cache lookup to avoid race conditions.
   // When a block is moved/remounted, the old component's cleanup may clear the cache
   // before or after the new component mounts. By doing a single lookup, we ensure
@@ -156,6 +156,27 @@ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyn
       unsubscribe();
     };
   }, [isDataProviderReady, localId, manager.referenceManager, resourceId]);
+
+  // Pure read, safe during render. The individual provider references are effect
+  // dependencies below so a provider swapped by the host is re-applied to the
+  // cached factory, which would otherwise keep serving the previous one.
+  var _ref2 = (_manager$referenceMan5 = (_manager$referenceMan6 = (_manager$referenceMan7 = manager.referenceManager).getProviderOptions) === null || _manager$referenceMan6 === void 0 ? void 0 : _manager$referenceMan6.call(_manager$referenceMan7)) !== null && _manager$referenceMan5 !== void 0 ? _manager$referenceMan5 : {},
+    parentDataProviders = _ref2.parentDataProviders,
+    providerCreator = _ref2.providerCreator;
+
+  // Applying providers notifies subscribers synchronously, so it must not run during
+  // render - that would setState on another component mid-render and remount the block.
+  (0, _react.useEffect)(function () {
+    if (!(0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_7')) {
+      return;
+    }
+    if (!resourceId || (0, _coreUtils.isSSR)()) {
+      return;
+    }
+    manager.referenceManager.syncProviders(resourceId);
+    // `syncBlockInstance` is a dependency because the dynamic providers are derived
+    // from the fetched block data, so they can only be created once it has arrived.
+  }, [manager.referenceManager, resourceId, syncBlockInstance, parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mentionProvider, parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.profilecardProvider, parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider, providerCreator]);
   var ssrProviders = (0, _react.useMemo)(function () {
     return resourceId ? manager.referenceManager.getSSRProviders(resourceId) : null;
   }, [resourceId, manager.referenceManager]);

package/dist/cjs/store-manager/referenceSyncBlockStoreManager.js

@@ -996,6 +996,26 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     value: function getProviderFactory(resourceId) {
       return this._providerFactoryManager.getProviderFactory(resourceId);
     }
+
+    /**
+     * The provider options currently supplied by the host. Safe to read during
+     * render - it notifies nobody.
+     */
+  }, {
+    key: "getProviderOptions",
+    value: function getProviderOptions() {
+      return this._providerFactoryManager.getProviderOptions();
+    }
+
+    /**
+     * Applies the latest providers to the cached factory. Notifies subscribers, so
+     * call from an effect rather than during render.
+     */
+  }, {
+    key: "syncProviders",
+    value: function syncProviders(resourceId) {
+      this._providerFactoryManager.syncProviders(resourceId);
+    }
   }, {
     key: "getSSRProviders",
     value: function getSSRProviders(resourceId) {

package/dist/cjs/store-manager/syncBlockProviderFactoryManager.js

@@ -8,6 +8,7 @@ exports.SyncBlockProviderFactoryManager = 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 _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _monitoring = require("@atlaskit/editor-common/monitoring");
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -37,41 +38,82 @@ var SyncBlockProviderFactoryManager = exports.SyncBlockProviderFactoryManager =
         (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 || _this$deps$getFireAna((0, _errorHandling.fetchErrorPayload)(error.message, resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(resourceId), (0, _errorHandling.buildFetchErrorAttribution)((0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_3'), error.message)));
         return undefined;
       }
-      var _dataProvider$getSync = dataProvider.getSyncedBlockRendererProviderOptions(),
-        parentDataProviders = _dataProvider$getSync.parentDataProviders,
-        providerCreator = _dataProvider$getSync.providerCreator;
       var providerFactory = this.providerFactories.get(resourceId);
       if (!providerFactory) {
+        var _dataProvider$getSync = dataProvider.getSyncedBlockRendererProviderOptions(),
+          parentDataProviders = _dataProvider$getSync.parentDataProviders;
         providerFactory = _providerFactory.ProviderFactory.create({
           mentionProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mentionProvider,
           profilecardProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.profilecardProvider,
           taskDecisionProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider
         });
         this.providerFactories.set(resourceId, providerFactory);
-      } else {
-        if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.mentionProvider) {
-          providerFactory.setProvider('mentionProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mentionProvider);
-        }
-        if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.profilecardProvider) {
-          providerFactory.setProvider('profilecardProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.profilecardProvider);
-        }
-        if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.taskDecisionProvider) {
-          providerFactory.setProvider('taskDecisionProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider);
-        }
-      }
-      if (providerCreator) {
-        try {
-          this.retrieveDynamicProviders(resourceId, providerFactory, providerCreator);
-        } catch (error) {
-          var _this$deps$getFireAna2;
-          (0, _monitoring.logException)(error, {
-            location: 'editor-synced-block-provider/syncBlockProviderFactoryManager'
-          });
-          (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 || _this$deps$getFireAna2((0, _errorHandling.fetchErrorPayload)(error.message, resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(resourceId), (0, _errorHandling.buildFetchErrorAttribution)((0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_3'), error.message)));
-        }
       }
+
+      // Syncing providers notifies subscribers synchronously, so on the client it
+      // cannot run during render - callers invoke `syncProviders` from an effect
+      // instead. Effects never run while server rendering, and there are no mounted
+      // subscribers to notify, so the server keeps applying them inline.
+      var deferProviderSync = (0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_7');
+      if (deferProviderSync && !(0, _coreUtils.isSSR)()) {
+        return providerFactory;
+      }
+      this.syncProviders(resourceId, providerFactory);
       return providerFactory;
     }
+
+    /**
+     * The provider options currently supplied by the host. A pure read that does
+     * not notify subscribers, so it is safe to call during render - callers use it
+     * to detect when the host swaps a provider and the factory needs re-syncing.
+     */
+  }, {
+    key: "getProviderOptions",
+    value: function getProviderOptions() {
+      var _this$deps$getDataPro;
+      return (_this$deps$getDataPro = this.deps.getDataProvider()) === null || _this$deps$getDataPro === void 0 ? void 0 : _this$deps$getDataPro.getSyncedBlockRendererProviderOptions();
+    }
+
+    /**
+     * Applies the latest parent and dynamic providers to the cached factory.
+     * Notifies subscribers, so must be called from an effect, never during render.
+     */
+  }, {
+    key: "syncProviders",
+    value: function syncProviders(resourceId, factory) {
+      var dataProvider = this.deps.getDataProvider();
+      if (!dataProvider) {
+        return;
+      }
+      var providerFactory = factory !== null && factory !== void 0 ? factory : this.providerFactories.get(resourceId);
+      if (!providerFactory) {
+        return;
+      }
+      var _dataProvider$getSync2 = dataProvider.getSyncedBlockRendererProviderOptions(),
+        parentDataProviders = _dataProvider$getSync2.parentDataProviders,
+        providerCreator = _dataProvider$getSync2.providerCreator;
+      if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.mentionProvider) {
+        providerFactory.setProvider('mentionProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mentionProvider);
+      }
+      if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.profilecardProvider) {
+        providerFactory.setProvider('profilecardProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.profilecardProvider);
+      }
+      if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.taskDecisionProvider) {
+        providerFactory.setProvider('taskDecisionProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider);
+      }
+      if (!providerCreator) {
+        return;
+      }
+      try {
+        this.retrieveDynamicProviders(resourceId, providerFactory, providerCreator);
+      } catch (error) {
+        var _this$deps$getFireAna2;
+        (0, _monitoring.logException)(error, {
+          location: 'editor-synced-block-provider/syncBlockProviderFactoryManager'
+        });
+        (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 || _this$deps$getFireAna2((0, _errorHandling.fetchErrorPayload)(error.message, resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(resourceId), (0, _errorHandling.buildFetchErrorAttribution)((0, _platformFeatureFlags.fg)('platform_editor_blocks_patch_3'), error.message)));
+      }
+    }
   }, {
     key: "getSSRProviders",
     value: function getSSRProviders(resourceId) {
@@ -80,8 +122,8 @@ var SyncBlockProviderFactoryManager = exports.SyncBlockProviderFactoryManager =
       if (!dataProvider) {
         return null;
       }
-      var _dataProvider$getSync2 = dataProvider.getSyncedBlockRendererProviderOptions(),
-        providerCreator = _dataProvider$getSync2.providerCreator;
+      var _dataProvider$getSync3 = dataProvider.getSyncedBlockRendererProviderOptions(),
+        providerCreator = _dataProvider$getSync3.providerCreator;
       if (!(providerCreator !== null && providerCreator !== void 0 && providerCreator.createSSRMediaProvider)) {
         return null;
       }

package/dist/es2019/hooks/useFetchSyncBlockData.js

@@ -6,7 +6,7 @@ import { isProviderNotReadyError, SyncBlockError } from '../common/types';
 import { buildFetchErrorAttribution, fetchErrorPayload, getPiiSafeOriginalError } from '../utils/errorHandling';
 import { createSyncBlockNode, getSourceProductFromResourceIdSafe } from '../utils/utils';
 export const useFetchSyncBlockData = (manager, resourceId, localId, fireAnalyticsEvent) => {
-  var _manager$referenceMan2, _manager$referenceMan3, _manager$referenceMan4;
+  var _manager$referenceMan2, _manager$referenceMan3, _manager$referenceMan4, _manager$referenceMan5, _manager$referenceMan6, _manager$referenceMan7;
   // Initialize both states from a single cache lookup to avoid race conditions.
   // When a block is moved/remounted, the old component's cleanup may clear the cache
   // before or after the new component mounts. By doing a single lookup, we ensure
@@ -118,6 +118,28 @@ export const useFetchSyncBlockData = (manager, resourceId, localId, fireAnalytic
       unsubscribe();
     };
   }, [isDataProviderReady, localId, manager.referenceManager, resourceId]);
+
+  // Pure read, safe during render. The individual provider references are effect
+  // dependencies below so a provider swapped by the host is re-applied to the
+  // cached factory, which would otherwise keep serving the previous one.
+  const {
+    parentDataProviders,
+    providerCreator
+  } = (_manager$referenceMan5 = (_manager$referenceMan6 = (_manager$referenceMan7 = manager.referenceManager).getProviderOptions) === null || _manager$referenceMan6 === void 0 ? void 0 : _manager$referenceMan6.call(_manager$referenceMan7)) !== null && _manager$referenceMan5 !== void 0 ? _manager$referenceMan5 : {};
+
+  // Applying providers notifies subscribers synchronously, so it must not run during
+  // render - that would setState on another component mid-render and remount the block.
+  useEffect(() => {
+    if (!fg('platform_editor_blocks_patch_7')) {
+      return;
+    }
+    if (!resourceId || isSSR()) {
+      return;
+    }
+    manager.referenceManager.syncProviders(resourceId);
+    // `syncBlockInstance` is a dependency because the dynamic providers are derived
+    // from the fetched block data, so they can only be created once it has arrived.
+  }, [manager.referenceManager, resourceId, syncBlockInstance, parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mentionProvider, parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.profilecardProvider, parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider, providerCreator]);
   const ssrProviders = useMemo(() => {
     return resourceId ? manager.referenceManager.getSSRProviders(resourceId) : null;
   }, [resourceId, manager.referenceManager]);

package/dist/es2019/store-manager/referenceSyncBlockStoreManager.js

@@ -828,6 +828,22 @@ export class ReferenceSyncBlockStoreManager {
   getProviderFactory(resourceId) {
     return this._providerFactoryManager.getProviderFactory(resourceId);
   }
+
+  /**
+   * The provider options currently supplied by the host. Safe to read during
+   * render - it notifies nobody.
+   */
+  getProviderOptions() {
+    return this._providerFactoryManager.getProviderOptions();
+  }
+
+  /**
+   * Applies the latest providers to the cached factory. Notifies subscribers, so
+   * call from an effect rather than during render.
+   */
+  syncProviders(resourceId) {
+    this._providerFactoryManager.syncProviders(resourceId);
+  }
   getSSRProviders(resourceId) {
     return this._providerFactoryManager.getSSRProviders(resourceId);
   }

package/dist/es2019/store-manager/syncBlockProviderFactoryManager.js

@@ -1,4 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -25,42 +26,80 @@ export class SyncBlockProviderFactoryManager {
       (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 ? void 0 : _this$deps$getFireAna(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId), buildFetchErrorAttribution(fg('platform_editor_blocks_patch_3'), error.message)));
       return undefined;
     }
-    const {
-      parentDataProviders,
-      providerCreator
-    } = dataProvider.getSyncedBlockRendererProviderOptions();
     let providerFactory = this.providerFactories.get(resourceId);
     if (!providerFactory) {
+      const {
+        parentDataProviders
+      } = dataProvider.getSyncedBlockRendererProviderOptions();
       providerFactory = ProviderFactory.create({
         mentionProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mentionProvider,
         profilecardProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.profilecardProvider,
         taskDecisionProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider
       });
       this.providerFactories.set(resourceId, providerFactory);
-    } else {
-      if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.mentionProvider) {
-        providerFactory.setProvider('mentionProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mentionProvider);
-      }
-      if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.profilecardProvider) {
-        providerFactory.setProvider('profilecardProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.profilecardProvider);
-      }
-      if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.taskDecisionProvider) {
-        providerFactory.setProvider('taskDecisionProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider);
-      }
     }
-    if (providerCreator) {
-      try {
-        this.retrieveDynamicProviders(resourceId, providerFactory, providerCreator);
-      } catch (error) {
-        var _this$deps$getFireAna2;
-        logException(error, {
-          location: 'editor-synced-block-provider/syncBlockProviderFactoryManager'
-        });
-        (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 ? void 0 : _this$deps$getFireAna2(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId), buildFetchErrorAttribution(fg('platform_editor_blocks_patch_3'), error.message)));
-      }
+
+    // Syncing providers notifies subscribers synchronously, so on the client it
+    // cannot run during render - callers invoke `syncProviders` from an effect
+    // instead. Effects never run while server rendering, and there are no mounted
+    // subscribers to notify, so the server keeps applying them inline.
+    const deferProviderSync = fg('platform_editor_blocks_patch_7');
+    if (deferProviderSync && !isSSR()) {
+      return providerFactory;
     }
+    this.syncProviders(resourceId, providerFactory);
     return providerFactory;
   }
+
+  /**
+   * The provider options currently supplied by the host. A pure read that does
+   * not notify subscribers, so it is safe to call during render - callers use it
+   * to detect when the host swaps a provider and the factory needs re-syncing.
+   */
+  getProviderOptions() {
+    var _this$deps$getDataPro;
+    return (_this$deps$getDataPro = this.deps.getDataProvider()) === null || _this$deps$getDataPro === void 0 ? void 0 : _this$deps$getDataPro.getSyncedBlockRendererProviderOptions();
+  }
+
+  /**
+   * Applies the latest parent and dynamic providers to the cached factory.
+   * Notifies subscribers, so must be called from an effect, never during render.
+   */
+  syncProviders(resourceId, factory) {
+    const dataProvider = this.deps.getDataProvider();
+    if (!dataProvider) {
+      return;
+    }
+    const providerFactory = factory !== null && factory !== void 0 ? factory : this.providerFactories.get(resourceId);
+    if (!providerFactory) {
+      return;
+    }
+    const {
+      parentDataProviders,
+      providerCreator
+    } = dataProvider.getSyncedBlockRendererProviderOptions();
+    if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.mentionProvider) {
+      providerFactory.setProvider('mentionProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mentionProvider);
+    }
+    if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.profilecardProvider) {
+      providerFactory.setProvider('profilecardProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.profilecardProvider);
+    }
+    if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.taskDecisionProvider) {
+      providerFactory.setProvider('taskDecisionProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider);
+    }
+    if (!providerCreator) {
+      return;
+    }
+    try {
+      this.retrieveDynamicProviders(resourceId, providerFactory, providerCreator);
+    } catch (error) {
+      var _this$deps$getFireAna2;
+      logException(error, {
+        location: 'editor-synced-block-provider/syncBlockProviderFactoryManager'
+      });
+      (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 ? void 0 : _this$deps$getFireAna2(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId), buildFetchErrorAttribution(fg('platform_editor_blocks_patch_3'), error.message)));
+    }
+  }
   getSSRProviders(resourceId) {
     var _syncBlock$data, _syncBlock$data2;
     const dataProvider = this.deps.getDataProvider();

package/dist/esm/hooks/useFetchSyncBlockData.js

@@ -12,7 +12,7 @@ import { isProviderNotReadyError, SyncBlockError } from '../common/types';
 import { buildFetchErrorAttribution, fetchErrorPayload, getPiiSafeOriginalError } from '../utils/errorHandling';
 import { createSyncBlockNode, getSourceProductFromResourceIdSafe } from '../utils/utils';
 export var useFetchSyncBlockData = function useFetchSyncBlockData(manager, resourceId, localId, fireAnalyticsEvent) {
-  var _manager$referenceMan2, _manager$referenceMan3, _manager$referenceMan4;
+  var _manager$referenceMan2, _manager$referenceMan3, _manager$referenceMan4, _manager$referenceMan5, _manager$referenceMan6, _manager$referenceMan7;
   // Initialize both states from a single cache lookup to avoid race conditions.
   // When a block is moved/remounted, the old component's cleanup may clear the cache
   // before or after the new component mounts. By doing a single lookup, we ensure
@@ -149,6 +149,27 @@ export var useFetchSyncBlockData = function useFetchSyncBlockData(manager, resou
       unsubscribe();
     };
   }, [isDataProviderReady, localId, manager.referenceManager, resourceId]);
+
+  // Pure read, safe during render. The individual provider references are effect
+  // dependencies below so a provider swapped by the host is re-applied to the
+  // cached factory, which would otherwise keep serving the previous one.
+  var _ref2 = (_manager$referenceMan5 = (_manager$referenceMan6 = (_manager$referenceMan7 = manager.referenceManager).getProviderOptions) === null || _manager$referenceMan6 === void 0 ? void 0 : _manager$referenceMan6.call(_manager$referenceMan7)) !== null && _manager$referenceMan5 !== void 0 ? _manager$referenceMan5 : {},
+    parentDataProviders = _ref2.parentDataProviders,
+    providerCreator = _ref2.providerCreator;
+
+  // Applying providers notifies subscribers synchronously, so it must not run during
+  // render - that would setState on another component mid-render and remount the block.
+  useEffect(function () {
+    if (!fg('platform_editor_blocks_patch_7')) {
+      return;
+    }
+    if (!resourceId || isSSR()) {
+      return;
+    }
+    manager.referenceManager.syncProviders(resourceId);
+    // `syncBlockInstance` is a dependency because the dynamic providers are derived
+    // from the fetched block data, so they can only be created once it has arrived.
+  }, [manager.referenceManager, resourceId, syncBlockInstance, parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mentionProvider, parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.profilecardProvider, parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider, providerCreator]);
   var ssrProviders = useMemo(function () {
     return resourceId ? manager.referenceManager.getSSRProviders(resourceId) : null;
   }, [resourceId, manager.referenceManager]);

package/dist/esm/store-manager/referenceSyncBlockStoreManager.js

@@ -989,6 +989,26 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
     value: function getProviderFactory(resourceId) {
       return this._providerFactoryManager.getProviderFactory(resourceId);
     }
+
+    /**
+     * The provider options currently supplied by the host. Safe to read during
+     * render - it notifies nobody.
+     */
+  }, {
+    key: "getProviderOptions",
+    value: function getProviderOptions() {
+      return this._providerFactoryManager.getProviderOptions();
+    }
+
+    /**
+     * Applies the latest providers to the cached factory. Notifies subscribers, so
+     * call from an effect rather than during render.
+     */
+  }, {
+    key: "syncProviders",
+    value: function syncProviders(resourceId) {
+      this._providerFactoryManager.syncProviders(resourceId);
+    }
   }, {
     key: "getSSRProviders",
     value: function getSSRProviders(resourceId) {

package/dist/esm/store-manager/syncBlockProviderFactoryManager.js

@@ -1,6 +1,7 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -30,41 +31,82 @@ export var SyncBlockProviderFactoryManager = /*#__PURE__*/function () {
         (_this$deps$getFireAna = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna === void 0 || _this$deps$getFireAna(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId), buildFetchErrorAttribution(fg('platform_editor_blocks_patch_3'), error.message)));
         return undefined;
       }
-      var _dataProvider$getSync = dataProvider.getSyncedBlockRendererProviderOptions(),
-        parentDataProviders = _dataProvider$getSync.parentDataProviders,
-        providerCreator = _dataProvider$getSync.providerCreator;
       var providerFactory = this.providerFactories.get(resourceId);
       if (!providerFactory) {
+        var _dataProvider$getSync = dataProvider.getSyncedBlockRendererProviderOptions(),
+          parentDataProviders = _dataProvider$getSync.parentDataProviders;
         providerFactory = ProviderFactory.create({
           mentionProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mentionProvider,
           profilecardProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.profilecardProvider,
           taskDecisionProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider
         });
         this.providerFactories.set(resourceId, providerFactory);
-      } else {
-        if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.mentionProvider) {
-          providerFactory.setProvider('mentionProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mentionProvider);
-        }
-        if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.profilecardProvider) {
-          providerFactory.setProvider('profilecardProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.profilecardProvider);
-        }
-        if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.taskDecisionProvider) {
-          providerFactory.setProvider('taskDecisionProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider);
-        }
       }
-      if (providerCreator) {
-        try {
-          this.retrieveDynamicProviders(resourceId, providerFactory, providerCreator);
-        } catch (error) {
-          var _this$deps$getFireAna2;
-          logException(error, {
-            location: 'editor-synced-block-provider/syncBlockProviderFactoryManager'
-          });
-          (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 || _this$deps$getFireAna2(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId), buildFetchErrorAttribution(fg('platform_editor_blocks_patch_3'), error.message)));
-        }
+
+      // Syncing providers notifies subscribers synchronously, so on the client it
+      // cannot run during render - callers invoke `syncProviders` from an effect
+      // instead. Effects never run while server rendering, and there are no mounted
+      // subscribers to notify, so the server keeps applying them inline.
+      var deferProviderSync = fg('platform_editor_blocks_patch_7');
+      if (deferProviderSync && !isSSR()) {
+        return providerFactory;
       }
+      this.syncProviders(resourceId, providerFactory);
       return providerFactory;
     }
+
+    /**
+     * The provider options currently supplied by the host. A pure read that does
+     * not notify subscribers, so it is safe to call during render - callers use it
+     * to detect when the host swaps a provider and the factory needs re-syncing.
+     */
+  }, {
+    key: "getProviderOptions",
+    value: function getProviderOptions() {
+      var _this$deps$getDataPro;
+      return (_this$deps$getDataPro = this.deps.getDataProvider()) === null || _this$deps$getDataPro === void 0 ? void 0 : _this$deps$getDataPro.getSyncedBlockRendererProviderOptions();
+    }
+
+    /**
+     * Applies the latest parent and dynamic providers to the cached factory.
+     * Notifies subscribers, so must be called from an effect, never during render.
+     */
+  }, {
+    key: "syncProviders",
+    value: function syncProviders(resourceId, factory) {
+      var dataProvider = this.deps.getDataProvider();
+      if (!dataProvider) {
+        return;
+      }
+      var providerFactory = factory !== null && factory !== void 0 ? factory : this.providerFactories.get(resourceId);
+      if (!providerFactory) {
+        return;
+      }
+      var _dataProvider$getSync2 = dataProvider.getSyncedBlockRendererProviderOptions(),
+        parentDataProviders = _dataProvider$getSync2.parentDataProviders,
+        providerCreator = _dataProvider$getSync2.providerCreator;
+      if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.mentionProvider) {
+        providerFactory.setProvider('mentionProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mentionProvider);
+      }
+      if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.profilecardProvider) {
+        providerFactory.setProvider('profilecardProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.profilecardProvider);
+      }
+      if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.taskDecisionProvider) {
+        providerFactory.setProvider('taskDecisionProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider);
+      }
+      if (!providerCreator) {
+        return;
+      }
+      try {
+        this.retrieveDynamicProviders(resourceId, providerFactory, providerCreator);
+      } catch (error) {
+        var _this$deps$getFireAna2;
+        logException(error, {
+          location: 'editor-synced-block-provider/syncBlockProviderFactoryManager'
+        });
+        (_this$deps$getFireAna2 = this.deps.getFireAnalyticsEvent()) === null || _this$deps$getFireAna2 === void 0 || _this$deps$getFireAna2(fetchErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId), buildFetchErrorAttribution(fg('platform_editor_blocks_patch_3'), error.message)));
+      }
+    }
   }, {
     key: "getSSRProviders",
     value: function getSSRProviders(resourceId) {
@@ -73,8 +115,8 @@ export var SyncBlockProviderFactoryManager = /*#__PURE__*/function () {
       if (!dataProvider) {
         return null;
       }
-      var _dataProvider$getSync2 = dataProvider.getSyncedBlockRendererProviderOptions(),
-        providerCreator = _dataProvider$getSync2.providerCreator;
+      var _dataProvider$getSync3 = dataProvider.getSyncedBlockRendererProviderOptions(),
+        providerCreator = _dataProvider$getSync3.providerCreator;
       if (!(providerCreator !== null && providerCreator !== void 0 && providerCreator.createSSRMediaProvider)) {
         return null;
       }

package/dist/types/store-manager/referenceSyncBlockStoreManager.d.ts

@@ -4,7 +4,7 @@ import type { ProviderFactory, MediaProvider } from '@atlaskit/editor-common/pro
 import type { ViewMode } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { BlockInstanceId, ResourceId, SyncBlockNode, SyncBlockPrefetchData } from '../common/types';
-import type { SyncBlockInstance, SubscriptionCallback, SyncBlockDataProviderInterface, TitleSubscriptionCallback, SyncBlockSourceInfo } from '../providers/types';
+import type { SyncBlockInstance, SubscriptionCallback, SyncBlockDataProviderInterface, TitleSubscriptionCallback, SyncBlockSourceInfo, SyncedBlockRendererProviderOptions } from '../providers/types';
 export declare class ReferenceSyncBlockStoreManager {
     private viewMode?;
     private dataProvider?;
@@ -142,6 +142,16 @@ export declare class ReferenceSyncBlockStoreManager {
      */
     getSyncBlockURL(resourceId: ResourceId): string | undefined;
     getProviderFactory(resourceId: ResourceId): ProviderFactory | undefined;
+    /**
+     * The provider options currently supplied by the host. Safe to read during
+     * render - it notifies nobody.
+     */
+    getProviderOptions(): SyncedBlockRendererProviderOptions | undefined;
+    /**
+     * Applies the latest providers to the cached factory. Notifies subscribers, so
+     * call from an effect rather than during render.
+     */
+    syncProviders(resourceId: ResourceId): void;
     getSSRProviders(resourceId: ResourceId): {
         media: MediaProvider;
     } | null;

package/dist/types/store-manager/syncBlockProviderFactoryManager.d.ts

@@ -2,7 +2,7 @@ import type { RendererSyncBlockEventPayload } from '@atlaskit/editor-common/anal
 import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import type { MediaProvider } from '@atlaskit/editor-common/provider-factory';
 import type { ResourceId } from '../common/types';
-import type { SyncBlockInstance, SyncBlockDataProviderInterface } from '../providers/types';
+import type { SyncBlockInstance, SyncBlockDataProviderInterface, SyncedBlockRendererProviderOptions } from '../providers/types';
 export interface SyncBlockProviderFactoryManagerDeps {
     getDataProvider: () => SyncBlockDataProviderInterface | undefined;
     getFireAnalyticsEvent: () => ((payload: RendererSyncBlockEventPayload) => void) | undefined;
@@ -17,6 +17,17 @@ export declare class SyncBlockProviderFactoryManager {
     private providerFactories;
     constructor(deps: SyncBlockProviderFactoryManagerDeps);
     getProviderFactory(resourceId: ResourceId): ProviderFactory | undefined;
+    /**
+     * The provider options currently supplied by the host. A pure read that does
+     * not notify subscribers, so it is safe to call during render - callers use it
+     * to detect when the host swaps a provider and the factory needs re-syncing.
+     */
+    getProviderOptions(): SyncedBlockRendererProviderOptions | undefined;
+    /**
+     * Applies the latest parent and dynamic providers to the cached factory.
+     * Notifies subscribers, so must be called from an effect, never during render.
+     */
+    syncProviders(resourceId: ResourceId, factory?: ProviderFactory): void;
     getSSRProviders(resourceId: ResourceId): {
         media: MediaProvider;
     } | null;

package/package.json

@@ -22,7 +22,7 @@
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/node-data-provider": "^14.0.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^140.0.0",
+		"@atlaskit/tmp-editor-statsig": "^141.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.0",
 		"bind-event-listener": "^3.0.0",
@@ -32,7 +32,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^117.2.0",
+		"@atlaskit/editor-common": "^117.3.0",
 		"react": "^18.2.0 || ^19.2.0"
 	},
 	"devDependencies": {
@@ -76,7 +76,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "9.0.2",
+	"version": "9.1.0",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -95,6 +95,9 @@
 		},
 		"platform_synced_block_patch_14": {
 			"type": "boolean"
+		},
+		"platform_editor_blocks_patch_7": {
+			"type": "boolean"
 		}
 	}
 }