@atlaskit/editor-synced-block-provider 4.0.1 → 4.1.1

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

@@ -1,14 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import isEqual from 'lodash/isEqual';
-import rafSchedule from 'raf-schd';
 import { logException } from '@atlaskit/editor-common/monitoring';
-import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { SyncBlockError } from '../common/types';
 import { fetchErrorPayload, fetchSuccessPayload, getSourceInfoErrorPayload, updateReferenceErrorPayload } from '../utils/errorHandling';
 import { getFetchExperience, getFetchSourceInfoExperience, getSaveReferenceExperience } from '../utils/experienceTracking';
 import { resolveSyncBlockInstance } from '../utils/resolveSyncBlockInstance';
-import { parseResourceId } from '../utils/resourceId';
 import { createSyncBlockNode } from '../utils/utils';
 import { SyncBlockBatchFetcher } from './syncBlockBatchFetcher';
 import { syncBlockInMemorySessionCache } from './syncBlockInMemorySessionCache';
@@ -22,73 +18,46 @@ const CACHE_KEY_PREFIX = 'sync-block-data-';
 // Handles fetching source URL and title for sync blocks.
 // Can be used in both editor and renderer contexts.
 export class ReferenceSyncBlockStoreManager {
+  // Track the setTimeout handle for queued flush so we can cancel it on destroy
+
   constructor(dataProvider) {
     var _this$dataProvider;
     // Keeps track of addition and deletion of reference synced blocks on the document
     // This starts as true to always flush the cache when document is saved for the first time
     // to cater the case when a editor session is closed without document being updated right after reference block is deleted
     _defineProperty(this, "isCacheDirty", true);
-    _defineProperty(this, "isRefreshingSubscriptions", false);
-    // Flag to indicate if real-time subscriptions are enabled
-    _defineProperty(this, "useRealTimeSubscriptions", false);
     // Keep track of the last flushed subscriptions to optimize cache flushing on document save
     _defineProperty(this, "lastFlushedSyncedBlocks", {});
     // Track if a flush operation is currently in progress
     _defineProperty(this, "isFlushInProgress", false);
     // Track if another flush is needed after the current one completes
     _defineProperty(this, "flushNeededAfterCurrent", false);
-    _defineProperty(this, "pendingFetchRequests", new Set());
-    _defineProperty(this, "scheduledBatchFetch", rafSchedule(() => {
-      if (this.pendingFetchRequests.size === 0) {
-        return;
-      }
-      const resourceIds = Array.from(this.pendingFetchRequests);
-      const syncBlockNodes = resourceIds.map(resId => {
-        const subscriptions = this.subscriptions.get(resId) || {};
-        const firstLocalId = Object.keys(subscriptions)[0] || '';
-        return createSyncBlockNode(firstLocalId, resId);
-      });
-      this.pendingFetchRequests.clear();
-      this.fetchSyncBlocksData(syncBlockNodes).catch(error => {
-        logException(error, {
-          location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/batchedFetchSyncBlocks'
-        });
-        resourceIds.forEach(resId => {
-          var _this$fireAnalyticsEv;
-          (_this$fireAnalyticsEv = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv === void 0 ? void 0 : _this$fireAnalyticsEv.call(this, fetchErrorPayload(error.message, resId));
-        });
-      });
-    }));
-    this.subscriptions = new Map();
-    this.titleSubscriptions = new Map();
     this.dataProvider = dataProvider;
     this.syncBlockFetchDataRequests = new Map();
     this.syncBlockSourceInfoRequests = new Map();
-    this.providerFactories = new Map();
-    this.pendingCacheDeletions = new Map();
-    this.graphqlSubscriptions = new Map();
-    this.subscriptionChangeListeners = new Set();
     this.newlyAddedSyncBlocks = new Set();
-    if (fg('platform_synced_block_patch_5')) {
-      this._subscriptionManager = new SyncBlockSubscriptionManager({
-        getDataProvider: () => this.dataProvider,
-        getSubscriptions: () => this.subscriptions,
-        getFromCache: rid => this.getFromCache(rid),
-        updateCache: inst => this.updateCache(inst),
-        fetchSyncBlockSourceInfo: rid => this.fetchSyncBlockSourceInfo(rid),
-        getFireAnalyticsEvent: () => this.fireAnalyticsEvent
-      });
-      this._providerFactoryManager = new SyncBlockProviderFactoryManager({
-        getDataProvider: () => this.dataProvider,
-        getFromCache: rid => this.getFromCache(rid),
-        getFireAnalyticsEvent: () => this.fireAnalyticsEvent
-      });
-      this._batchFetcher = new SyncBlockBatchFetcher({
-        getSubscriptions: () => this.subscriptions,
-        fetchSyncBlocksData: nodes => this.fetchSyncBlocksData(nodes),
-        getFireAnalyticsEvent: () => this.fireAnalyticsEvent
-      });
-    }
+    this._subscriptionManager = new SyncBlockSubscriptionManager({
+      getDataProvider: () => this.dataProvider,
+      getFromCache: rid => this.getFromCache(rid),
+      updateCache: inst => this.updateCache(inst),
+      deleteFromCache: rid => this.deleteFromCache(rid),
+      debouncedBatchedFetchSyncBlocks: rid => this.debouncedBatchedFetchSyncBlocks(rid),
+      fetchSyncBlockSourceInfo: rid => this.fetchSyncBlockSourceInfo(rid),
+      getFireAnalyticsEvent: () => this.fireAnalyticsEvent,
+      markCacheDirty: () => {
+        this.isCacheDirty = true;
+      }
+    });
+    this._providerFactoryManager = new SyncBlockProviderFactoryManager({
+      getDataProvider: () => this.dataProvider,
+      getFromCache: rid => this.getFromCache(rid),
+      getFireAnalyticsEvent: () => this.fireAnalyticsEvent
+    });
+    this._batchFetcher = new SyncBlockBatchFetcher({
+      getSubscriptions: () => this._subscriptionManager.getSubscriptions(),
+      fetchSyncBlocksData: nodes => this.fetchSyncBlocksData(nodes),
+      getFireAnalyticsEvent: () => this.fireAnalyticsEvent
+    });
 
     // The provider might have SSR data cache already set, so we need to update the cache in session memory storage
     this.setSSRDataInSessionCache((_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getNodeDataCacheKeys());
@@ -101,31 +70,14 @@ export class ReferenceSyncBlockStoreManager {
    * @param enabled - Whether to enable real-time subscriptions
    */
   setRealTimeSubscriptionsEnabled(enabled) {
-    if (this._subscriptionManager && fg('platform_synced_block_patch_5')) {
-      this._subscriptionManager.setRealTimeSubscriptionsEnabled(enabled);
-      return;
-    }
-    if (this.useRealTimeSubscriptions === enabled) {
-      return;
-    }
-    this.useRealTimeSubscriptions = enabled;
-    if (enabled) {
-      // Set up subscriptions for all currently subscribed blocks
-      this.setupGraphQLSubscriptionsForAllBlocks();
-    } else {
-      // Clean up all GraphQL subscriptions
-      this.cleanupAllGraphQLSubscriptions();
-    }
+    this._subscriptionManager.setRealTimeSubscriptionsEnabled(enabled);
   }
 
   /**
    * Checks if real-time subscriptions are currently enabled.
    */
   isRealTimeSubscriptionsEnabled() {
-    if (this._subscriptionManager && fg('platform_synced_block_patch_5')) {
-      return this._subscriptionManager.isRealTimeSubscriptionsEnabled();
-    }
-    return this.useRealTimeSubscriptions;
+    return this._subscriptionManager.isRealTimeSubscriptionsEnabled();
   }
 
   /**
@@ -133,10 +85,7 @@ export class ReferenceSyncBlockStoreManager {
    * Used by React components to render subscription components.
    */
   getSubscribedResourceIds() {
-    if (this._subscriptionManager && fg('platform_synced_block_patch_5')) {
-      return this._subscriptionManager.getSubscribedResourceIds();
-    }
-    return Array.from(this.subscriptions.keys());
+    return this._subscriptionManager.getSubscribedResourceIds();
   }
 
   /**
@@ -145,34 +94,7 @@ export class ReferenceSyncBlockStoreManager {
    * @returns Unsubscribe function to remove the listener
    */
   onSubscriptionsChanged(listener) {
-    if (this._subscriptionManager && fg('platform_synced_block_patch_5')) {
-      return this._subscriptionManager.onSubscriptionsChanged(listener);
-    }
-    this.subscriptionChangeListeners.add(listener);
-    return () => {
-      this.subscriptionChangeListeners.delete(listener);
-    };
-  }
-
-  /**
-   * Notifies all subscription change listeners.
-   */
-  notifySubscriptionChangeListeners() {
-    if (this._subscriptionManager && fg('platform_synced_block_patch_5')) {
-      this._subscriptionManager.notifySubscriptionChangeListeners();
-      return;
-    }
-    this.subscriptionChangeListeners.forEach(listener => {
-      try {
-        listener();
-      } catch (error) {
-        var _this$fireAnalyticsEv2;
-        logException(error, {
-          location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/notifySubscriptionChangeListeners'
-        });
-        (_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 ? void 0 : _this$fireAnalyticsEv2.call(this, fetchErrorPayload(error.message));
-      }
-    });
+    return this._subscriptionManager.onSubscriptionsChanged(listener);
   }
 
   /**
@@ -181,19 +103,7 @@ export class ReferenceSyncBlockStoreManager {
    * @param syncBlockInstance - The updated sync block instance
    */
   handleSubscriptionUpdate(syncBlockInstance) {
-    if (this._subscriptionManager && fg('platform_synced_block_patch_5')) {
-      this._subscriptionManager.handleSubscriptionUpdate(syncBlockInstance);
-      return;
-    }
-    if (!syncBlockInstance.resourceId) {
-      return;
-    }
-    const existingSyncBlock = this.getFromCache(syncBlockInstance.resourceId);
-    const resolvedSyncBlockInstance = existingSyncBlock ? resolveSyncBlockInstance(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
-    this.updateCache(resolvedSyncBlockInstance);
-    if (!syncBlockInstance.error) {
-      this.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
-    }
+    this._subscriptionManager.handleSubscriptionUpdate(syncBlockInstance);
   }
   setFireAnalyticsEvent(fireAnalyticsEvent) {
     this.fireAnalyticsEvent = fireAnalyticsEvent;
@@ -251,143 +161,6 @@ export class ReferenceSyncBlockStoreManager {
       return undefined;
     }
   }
-
-  /**
-   * Refreshes the subscriptions for all sync blocks.
-   * This is a fallback polling mechanism when real-time subscriptions are not enabled.
-   * @returns {Promise<void>}
-   */
-  async refreshSubscriptions() {
-    // Skip polling refresh if real-time subscriptions are enabled
-    if (this.useRealTimeSubscriptions) {
-      return;
-    }
-    if (this.isRefreshingSubscriptions) {
-      return;
-    }
-    this.isRefreshingSubscriptions = true;
-    const syncBlocks = [];
-    for (const [resourceId, callbacks] of this.subscriptions.entries()) {
-      Object.keys(callbacks).forEach(localId => {
-        syncBlocks.push(createSyncBlockNode(localId, resourceId));
-      });
-    }
-    try {
-      // fetch latest data for all subscribed sync blocks
-      // this function will update the cache and call the subscriptions
-      await this.fetchSyncBlocksData(syncBlocks);
-    } catch (error) {
-      var _this$fireAnalyticsEv3;
-      logException(error, {
-        location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
-      });
-      (_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 ? void 0 : _this$fireAnalyticsEv3.call(this, fetchErrorPayload(error.message));
-    } finally {
-      this.isRefreshingSubscriptions = false;
-    }
-  }
-
-  /**
-   * Sets up a GraphQL subscription for a specific block.
-   * @param resourceId - The resource ID of the block to subscribe to
-   */
-  setupGraphQLSubscription(resourceId) {
-    var _this$dataProvider3;
-    if (this._subscriptionManager && fg('platform_synced_block_patch_5')) {
-      this._subscriptionManager.setupSubscription(resourceId);
-      return;
-    }
-
-    // Don't set up duplicate subscriptions
-    if (this.graphqlSubscriptions.has(resourceId)) {
-      return;
-    }
-    if (!((_this$dataProvider3 = this.dataProvider) !== null && _this$dataProvider3 !== void 0 && _this$dataProvider3.subscribeToBlockUpdates)) {
-      return;
-    }
-    const unsubscribe = this.dataProvider.subscribeToBlockUpdates(resourceId, syncBlockInstance => {
-      // Handle the subscription update
-      this.handleGraphQLSubscriptionUpdate(syncBlockInstance);
-    }, error => {
-      var _this$fireAnalyticsEv4;
-      logException(error, {
-        location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/graphql-subscription'
-      });
-      (_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 ? void 0 : _this$fireAnalyticsEv4.call(this, fetchErrorPayload(error.message));
-    });
-    if (unsubscribe) {
-      this.graphqlSubscriptions.set(resourceId, unsubscribe);
-    }
-  }
-
-  /**
-   * Handles updates received from GraphQL subscriptions.
-   * @param syncBlockInstance - The updated sync block instance
-   */
-  handleGraphQLSubscriptionUpdate(syncBlockInstance) {
-    if (!syncBlockInstance.resourceId) {
-      return;
-    }
-    const existingSyncBlock = this.getFromCache(syncBlockInstance.resourceId);
-    const resolvedSyncBlockInstance = existingSyncBlock ? resolveSyncBlockInstance(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
-    this.updateCache(resolvedSyncBlockInstance);
-    if (!syncBlockInstance.error) {
-      const callbacks = this.subscriptions.get(syncBlockInstance.resourceId);
-      const localIds = callbacks ? Object.keys(callbacks) : [];
-      localIds.forEach(localId => {
-        var _this$fireAnalyticsEv5, _syncBlockInstance$da;
-        (_this$fireAnalyticsEv5 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv5 === void 0 ? void 0 : _this$fireAnalyticsEv5.call(this, fetchSuccessPayload(syncBlockInstance.resourceId, localId, (_syncBlockInstance$da = syncBlockInstance.data) === null || _syncBlockInstance$da === void 0 ? void 0 : _syncBlockInstance$da.product));
-      });
-      this.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
-    } else {
-      var _syncBlockInstance$er, _syncBlockInstance$er2, _this$fireAnalyticsEv6;
-      const errorMessage = ((_syncBlockInstance$er = syncBlockInstance.error) === null || _syncBlockInstance$er === void 0 ? void 0 : _syncBlockInstance$er.reason) || ((_syncBlockInstance$er2 = syncBlockInstance.error) === null || _syncBlockInstance$er2 === void 0 ? void 0 : _syncBlockInstance$er2.type);
-      (_this$fireAnalyticsEv6 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv6 === void 0 ? void 0 : _this$fireAnalyticsEv6.call(this, fetchErrorPayload(errorMessage, syncBlockInstance.resourceId));
-    }
-  }
-
-  /**
-   * Cleans up the GraphQL subscription for a specific block.
-   * @param resourceId - The resource ID of the block to unsubscribe from
-   */
-  cleanupGraphQLSubscription(resourceId) {
-    if (this._subscriptionManager && fg('platform_synced_block_patch_5')) {
-      this._subscriptionManager.cleanupSubscription(resourceId);
-      return;
-    }
-    const unsubscribe = this.graphqlSubscriptions.get(resourceId);
-    if (unsubscribe) {
-      unsubscribe();
-      this.graphqlSubscriptions.delete(resourceId);
-    }
-  }
-
-  /**
-   * Sets up GraphQL subscriptions for all currently subscribed blocks.
-   */
-  setupGraphQLSubscriptionsForAllBlocks() {
-    if (this._subscriptionManager && fg('platform_synced_block_patch_5')) {
-      this._subscriptionManager.setupSubscriptionsForAllBlocks();
-      return;
-    }
-    for (const resourceId of this.subscriptions.keys()) {
-      this.setupGraphQLSubscription(resourceId);
-    }
-  }
-
-  /**
-   * Cleans up all GraphQL subscriptions.
-   */
-  cleanupAllGraphQLSubscriptions() {
-    if (this._subscriptionManager && fg('platform_synced_block_patch_5')) {
-      this._subscriptionManager.cleanupAll();
-      return;
-    }
-    for (const unsubscribe of this.graphqlSubscriptions.values()) {
-      unsubscribe();
-    }
-    this.graphqlSubscriptions.clear();
-  }
   fetchSyncBlockSourceInfoBySourceAri(sourceAri, hasAccess = true) {
     try {
       if (!this.dataProvider) {
@@ -396,11 +169,11 @@ export class ReferenceSyncBlockStoreManager {
       const sourceInfo = this.dataProvider.fetchSyncBlockSourceInfo(undefined, sourceAri, undefined, hasAccess);
       return sourceInfo;
     } catch (error) {
-      var _this$fireAnalyticsEv7;
+      var _this$fireAnalyticsEv;
       logException(error, {
         location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/fetchSyncBlockSourceInfoBySourceAri'
       });
-      (_this$fireAnalyticsEv7 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv7 === void 0 ? void 0 : _this$fireAnalyticsEv7.call(this, getSourceInfoErrorPayload(error.message));
+      (_this$fireAnalyticsEv = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv === void 0 ? void 0 : _this$fireAnalyticsEv.call(this, getSourceInfoErrorPayload(error.message));
       return Promise.resolve(undefined);
     }
   }
@@ -439,42 +212,42 @@ export class ReferenceSyncBlockStoreManager {
         });
       }
       if (!sourceAri || !product || !blockInstanceId) {
-        var _this$fireAnalyticsEv8;
-        (_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 ? void 0 : _this$fireAnalyticsEv8.call(this, getSourceInfoErrorPayload('SourceAri, product or blockInstanceId missing', resourceId));
+        var _this$fireAnalyticsEv2;
+        (_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 ? void 0 : _this$fireAnalyticsEv2.call(this, getSourceInfoErrorPayload('SourceAri, product or blockInstanceId missing', resourceId));
         return Promise.resolve(undefined);
       }
       (_this$fetchSourceInfo = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo === void 0 ? void 0 : _this$fetchSourceInfo.start({});
       const sourceInfoPromise = this.dataProvider.fetchSyncBlockSourceInfo(blockInstanceId, sourceAri, product, true // hasAccess
       ).then(sourceInfo => {
         if (!sourceInfo) {
-          var _this$fetchSourceInfo2, _this$fireAnalyticsEv9;
+          var _this$fetchSourceInfo2, _this$fireAnalyticsEv3;
           (_this$fetchSourceInfo2 = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo2 === void 0 ? void 0 : _this$fetchSourceInfo2.failure({
             reason: 'No source info returned'
           });
-          (_this$fireAnalyticsEv9 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv9 === void 0 ? void 0 : _this$fireAnalyticsEv9.call(this, getSourceInfoErrorPayload('No source info returned', resourceId));
+          (_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 ? void 0 : _this$fireAnalyticsEv3.call(this, getSourceInfoErrorPayload('No source info returned', resourceId));
           return undefined;
         }
         this.updateCacheWithSourceInfo(resourceId, sourceInfo);
         if (sourceInfo.title) {
-          this.updateSourceTitleSubscriptions(resourceId, sourceInfo.title);
+          this._subscriptionManager.updateSourceTitleSubscriptions(resourceId, sourceInfo.title);
         }
         if (sourceInfo.title && sourceInfo.url) {
           var _this$fetchSourceInfo3;
           (_this$fetchSourceInfo3 = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo3 === void 0 ? void 0 : _this$fetchSourceInfo3.success();
         } else {
-          var _this$fetchSourceInfo4, _this$fireAnalyticsEv0;
+          var _this$fetchSourceInfo4, _this$fireAnalyticsEv4;
           (_this$fetchSourceInfo4 = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo4 === void 0 ? void 0 : _this$fetchSourceInfo4.failure({
             reason: 'Missing title or url'
           });
-          (_this$fireAnalyticsEv0 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv0 === void 0 ? void 0 : _this$fireAnalyticsEv0.call(this, getSourceInfoErrorPayload('Missing title or url', resourceId));
+          (_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 ? void 0 : _this$fireAnalyticsEv4.call(this, getSourceInfoErrorPayload('Missing title or url', resourceId));
         }
         return sourceInfo;
       }).catch(error => {
-        var _this$fetchSourceInfo5, _this$fireAnalyticsEv1;
+        var _this$fetchSourceInfo5, _this$fireAnalyticsEv5;
         (_this$fetchSourceInfo5 = this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo5 === void 0 ? void 0 : _this$fetchSourceInfo5.failure({
           reason: error.message
         });
-        (_this$fireAnalyticsEv1 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv1 === void 0 ? void 0 : _this$fireAnalyticsEv1.call(this, getSourceInfoErrorPayload(error.message, resourceId));
+        (_this$fireAnalyticsEv5 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv5 === void 0 ? void 0 : _this$fireAnalyticsEv5.call(this, getSourceInfoErrorPayload(error.message, resourceId));
         return undefined;
       }).finally(() => {
         this.syncBlockSourceInfoRequests.delete(resourceId);
@@ -482,11 +255,11 @@ export class ReferenceSyncBlockStoreManager {
       this.syncBlockSourceInfoRequests.set(resourceId, sourceInfoPromise);
       return sourceInfoPromise;
     } catch (error) {
-      var _this$fireAnalyticsEv10;
+      var _this$fireAnalyticsEv6;
       logException(error, {
         location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
       });
-      (_this$fireAnalyticsEv10 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv10 === void 0 ? void 0 : _this$fireAnalyticsEv10.call(this, getSourceInfoErrorPayload(error.message, resourceId));
+      (_this$fireAnalyticsEv6 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv6 === void 0 ? void 0 : _this$fireAnalyticsEv6.call(this, getSourceInfoErrorPayload(error.message, resourceId));
     }
     return Promise.resolve(undefined);
   }
@@ -535,7 +308,7 @@ export class ReferenceSyncBlockStoreManager {
         reason: `Prefetch promise rejected: ${error.message}`
       });
     } finally {
-      // Clean up in-flight markers so subsequent fetches (e.g. refreshSubscriptions) are not blocked
+      // Clean up in-flight markers so subsequent fetches are not blocked
       prefetchedData.resourceIds.forEach(resourceId => {
         this.syncBlockFetchDataRequests.delete(resourceId);
       });
@@ -612,9 +385,9 @@ export class ReferenceSyncBlockStoreManager {
     data.forEach(syncBlockInstance => {
       var _resolvedSyncBlockIns;
       if (!syncBlockInstance.resourceId) {
-        var _syncBlockInstance$er3, _syncBlockInstance$er4, _this$fireAnalyticsEv11;
-        const payload = ((_syncBlockInstance$er3 = syncBlockInstance.error) === null || _syncBlockInstance$er3 === void 0 ? void 0 : _syncBlockInstance$er3.reason) || ((_syncBlockInstance$er4 = syncBlockInstance.error) === null || _syncBlockInstance$er4 === void 0 ? void 0 : _syncBlockInstance$er4.type) || 'Returned sync block instance does not have resource id';
-        (_this$fireAnalyticsEv11 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv11 === void 0 ? void 0 : _this$fireAnalyticsEv11.call(this, fetchErrorPayload(payload));
+        var _syncBlockInstance$er, _syncBlockInstance$er2, _this$fireAnalyticsEv7;
+        const payload = ((_syncBlockInstance$er = syncBlockInstance.error) === null || _syncBlockInstance$er === void 0 ? void 0 : _syncBlockInstance$er.reason) || ((_syncBlockInstance$er2 = syncBlockInstance.error) === null || _syncBlockInstance$er2 === void 0 ? void 0 : _syncBlockInstance$er2.type) || 'Returned sync block instance does not have resource id';
+        (_this$fireAnalyticsEv7 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv7 === void 0 ? void 0 : _this$fireAnalyticsEv7.call(this, fetchErrorPayload(payload));
         return;
       }
       const existingSyncBlock = this.getFromCache(syncBlockInstance.resourceId);
@@ -632,8 +405,8 @@ export class ReferenceSyncBlockStoreManager {
         this.newlyAddedSyncBlocks.delete(syncBlockInstance.resourceId);
       }
       if (syncBlockInstance.error) {
-        var _this$fireAnalyticsEv12;
-        (_this$fireAnalyticsEv12 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv12 === void 0 ? void 0 : _this$fireAnalyticsEv12.call(this, fetchErrorPayload(syncBlockInstance.error.reason || syncBlockInstance.error.type, syncBlockInstance.resourceId));
+        var _this$fireAnalyticsEv8;
+        (_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 ? void 0 : _this$fireAnalyticsEv8.call(this, fetchErrorPayload(syncBlockInstance.error.reason || syncBlockInstance.error.type, syncBlockInstance.resourceId));
         if (syncBlockInstance.error.type === SyncBlockError.NotFound || syncBlockInstance.error.type === SyncBlockError.Forbidden) {
           hasExpectedError = true;
         } else if (syncBlockInstance.error) {
@@ -641,11 +414,11 @@ export class ReferenceSyncBlockStoreManager {
         }
         return;
       }
-      const callbacks = this.subscriptions.get(syncBlockInstance.resourceId);
+      const callbacks = this._subscriptionManager.getSubscriptions().get(syncBlockInstance.resourceId);
       const localIds = callbacks ? Object.keys(callbacks) : [];
       localIds.forEach(localId => {
-        var _this$fireAnalyticsEv13, _syncBlockInstance$da2;
-        (_this$fireAnalyticsEv13 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv13 === void 0 ? void 0 : _this$fireAnalyticsEv13.call(this, fetchSuccessPayload(syncBlockInstance.resourceId, localId, (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product));
+        var _this$fireAnalyticsEv9, _syncBlockInstance$da;
+        (_this$fireAnalyticsEv9 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv9 === void 0 ? void 0 : _this$fireAnalyticsEv9.call(this, fetchSuccessPayload(syncBlockInstance.resourceId, localId, (_syncBlockInstance$da = syncBlockInstance.data) === null || _syncBlockInstance$da === void 0 ? void 0 : _syncBlockInstance$da.product));
       });
       this.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
     });
@@ -673,56 +446,29 @@ export class ReferenceSyncBlockStoreManager {
       resourceId
     } = syncBlock;
     if (resourceId) {
-      var _this$dataProvider4;
-      (_this$dataProvider4 = this.dataProvider) === null || _this$dataProvider4 === void 0 ? void 0 : _this$dataProvider4.updateCache({
+      var _this$dataProvider3;
+      (_this$dataProvider3 = this.dataProvider) === null || _this$dataProvider3 === void 0 ? void 0 : _this$dataProvider3.updateCache({
         [resourceId]: syncBlock
       }, {
         strategy: 'merge',
         source: 'network'
       });
-      const callbacks = this.subscriptions.get(resourceId);
-      if (callbacks) {
-        Object.values(callbacks).forEach(callback => {
-          callback(syncBlock);
-        });
-      }
+      this._subscriptionManager.notifySubscriptionCallbacks(resourceId, syncBlock);
       this.updateSessionCache(resourceId);
     }
   }
-  updateSourceTitleSubscriptions(resourceId, title) {
-    const callbacks = this.titleSubscriptions.get(resourceId);
-    if (callbacks) {
-      Object.values(callbacks).forEach(callback => {
-        callback(title);
-      });
-    }
-  }
   getFromCache(resourceId) {
-    var _this$dataProvider5, _this$dataProvider5$g;
+    var _this$dataProvider4, _this$dataProvider4$g;
     const syncBlockNode = createSyncBlockNode('', resourceId);
-    return (_this$dataProvider5 = this.dataProvider) === null || _this$dataProvider5 === void 0 ? void 0 : (_this$dataProvider5$g = _this$dataProvider5.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider5$g === void 0 ? void 0 : _this$dataProvider5$g.data;
+    return (_this$dataProvider4 = this.dataProvider) === null || _this$dataProvider4 === void 0 ? void 0 : (_this$dataProvider4$g = _this$dataProvider4.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider4$g === void 0 ? void 0 : _this$dataProvider4$g.data;
   }
   deleteFromCache(resourceId) {
-    var _this$dataProvider6;
-    (_this$dataProvider6 = this.dataProvider) === null || _this$dataProvider6 === void 0 ? void 0 : _this$dataProvider6.removeFromCache([resourceId]);
-    if (this._providerFactoryManager && fg('platform_synced_block_patch_5')) {
-      this._providerFactoryManager.deleteFactory(resourceId);
-    } else {
-      this.providerFactories.delete(resourceId);
-    }
+    var _this$dataProvider5;
+    (_this$dataProvider5 = this.dataProvider) === null || _this$dataProvider5 === void 0 ? void 0 : _this$dataProvider5.removeFromCache([resourceId]);
+    this._providerFactoryManager.deleteFactory(resourceId);
   }
   debouncedBatchedFetchSyncBlocks(resourceId) {
-    if (this._batchFetcher && fg('platform_synced_block_patch_5')) {
-      this._batchFetcher.queueFetch(resourceId);
-      return;
-    }
-    // Only add to pending requests if there are active subscriptions for this resource
-    if (this.subscriptions.has(resourceId) && Object.keys(this.subscriptions.get(resourceId) || {}).length > 0) {
-      this.pendingFetchRequests.add(resourceId);
-      this.scheduledBatchFetch();
-    } else {
-      this.pendingFetchRequests.delete(resourceId);
-    }
+    this._batchFetcher.queueFetch(resourceId);
   }
   setSSRDataInSessionCache(resourceIds) {
     if (!resourceIds || resourceIds.length === 0) {
@@ -733,114 +479,10 @@ export class ReferenceSyncBlockStoreManager {
     });
   }
   subscribeToSyncBlock(resourceId, localId, callback) {
-    var _this$dataProvider7, _this$dataProvider7$g;
-    // Cancel any pending cache deletion for this resourceId.
-    // This handles the case where a block is moved - the old component unmounts
-    // (scheduling deletion) but the new component mounts and subscribes before
-    // the deletion timeout fires.
-    const pendingDeletion = this.pendingCacheDeletions.get(resourceId);
-    if (pendingDeletion) {
-      clearTimeout(pendingDeletion);
-      this.pendingCacheDeletions.delete(resourceId);
-    }
-
-    // add to subscriptions map
-    const resourceSubscriptions = this.subscriptions.get(resourceId) || {};
-    const isNewResourceSubscription = Object.keys(resourceSubscriptions).length === 0;
-    this.subscriptions.set(resourceId, {
-      ...resourceSubscriptions,
-      [localId]: callback
-    });
-
-    // New subscription means new reference synced block is added to the document
-    this.isCacheDirty = true;
-
-    // Notify listeners if this is a new resource subscription
-    if (isNewResourceSubscription) {
-      this.notifySubscriptionChangeListeners();
-    }
-    const syncBlockNode = createSyncBlockNode(localId, resourceId);
-    const cachedData = (_this$dataProvider7 = this.dataProvider) === null || _this$dataProvider7 === void 0 ? void 0 : (_this$dataProvider7$g = _this$dataProvider7.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider7$g === void 0 ? void 0 : _this$dataProvider7$g.data;
-    if (cachedData) {
-      callback(cachedData);
-    } else {
-      this.debouncedBatchedFetchSyncBlocks(resourceId);
-    }
-
-    // Set up GraphQL subscription if real-time subscriptions are enabled
-    const useRealTime = this._subscriptionManager && fg('platform_synced_block_patch_5') ? this._subscriptionManager.shouldUseRealTime() : this.useRealTimeSubscriptions;
-    if (useRealTime) {
-      this.setupGraphQLSubscription(resourceId);
-    }
-    return () => {
-      const resourceSubscriptions = this.subscriptions.get(resourceId);
-      if (resourceSubscriptions) {
-        // Unsubscription means a reference synced block is removed from the document
-        this.isCacheDirty = true;
-        delete resourceSubscriptions[localId];
-        if (Object.keys(resourceSubscriptions).length === 0) {
-          this.subscriptions.delete(resourceId);
-
-          // Clean up GraphQL subscription when no more local subscribers
-          this.cleanupGraphQLSubscription(resourceId);
-
-          // Notify listeners that subscription was removed
-          this.notifySubscriptionChangeListeners();
-
-          // Delay cache deletion to handle block moves (unmount/remount).
-          // When a block is moved, the old component unmounts before the new one mounts.
-          // By delaying deletion, we give the new component time to subscribe and
-          // cancel this pending deletion, preserving the cached data.
-          // TODO: EDITOR-4152 - Rework this logic
-          const deletionTimeout = setTimeout(() => {
-            // Only delete if still no subscribers (wasn't re-subscribed)
-            if (!this.subscriptions.has(resourceId)) {
-              this.deleteFromCache(resourceId);
-            }
-            this.pendingCacheDeletions.delete(resourceId);
-          }, 1000);
-          this.pendingCacheDeletions.set(resourceId, deletionTimeout);
-        } else {
-          this.subscriptions.set(resourceId, resourceSubscriptions);
-        }
-      }
-    };
+    return this._subscriptionManager.subscribeToSyncBlock(resourceId, localId, callback);
   }
   subscribeToSourceTitle(node, callback) {
-    var _cachedData$data;
-    // check node is a sync block, as we only support sync block subscriptions
-    if (node.type.name !== 'syncBlock') {
-      return () => {};
-    }
-    const {
-      resourceId,
-      localId
-    } = node.attrs;
-    if (!localId || !resourceId) {
-      return () => {};
-    }
-    const cachedData = this.getFromCache(resourceId);
-    if (cachedData !== null && cachedData !== void 0 && (_cachedData$data = cachedData.data) !== null && _cachedData$data !== void 0 && _cachedData$data.sourceTitle) {
-      callback(cachedData.data.sourceTitle);
-    }
-
-    // add to subscriptions map
-    const resourceSubscriptions = this.titleSubscriptions.get(resourceId) || {};
-    this.titleSubscriptions.set(resourceId, {
-      ...resourceSubscriptions,
-      [localId]: callback
-    });
-    return () => {
-      const resourceSubscriptions = this.titleSubscriptions.get(resourceId);
-      if (resourceSubscriptions) {
-        delete resourceSubscriptions[localId];
-        if (Object.keys(resourceSubscriptions).length === 0) {
-          this.titleSubscriptions.delete(resourceId);
-        } else {
-          this.titleSubscriptions.set(resourceId, resourceSubscriptions);
-        }
-      }
-    };
+    return this._subscriptionManager.subscribeToSourceTitle(node, callback);
   }
   subscribe(node, callback) {
     try {
@@ -855,13 +497,13 @@ export class ReferenceSyncBlockStoreManager {
       if (!localId || !resourceId) {
         throw new Error('Missing local id or resource id');
       }
-      return this.subscribeToSyncBlock(resourceId, localId, callback);
+      return this._subscriptionManager.subscribeToSyncBlock(resourceId, localId, callback);
     } catch (error) {
-      var _this$fireAnalyticsEv14;
+      var _this$fireAnalyticsEv0;
       logException(error, {
         location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
       });
-      (_this$fireAnalyticsEv14 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv14 === void 0 ? void 0 : _this$fireAnalyticsEv14.call(this, fetchErrorPayload(error.message));
+      (_this$fireAnalyticsEv0 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv0 === void 0 ? void 0 : _this$fireAnalyticsEv0.call(this, fetchErrorPayload(error.message));
       return () => {};
     }
   }
@@ -880,150 +522,10 @@ export class ReferenceSyncBlockStoreManager {
     return (_syncBlock$data = syncBlock.data) === null || _syncBlock$data === void 0 ? void 0 : _syncBlock$data.sourceURL;
   }
   getProviderFactory(resourceId) {
-    if (this._providerFactoryManager && fg('platform_synced_block_patch_5')) {
-      return this._providerFactoryManager.getProviderFactory(resourceId);
-    }
-    if (!this.dataProvider) {
-      var _this$fireAnalyticsEv15;
-      const error = new Error('Data provider not set');
-      logException(error, {
-        location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
-      });
-      (_this$fireAnalyticsEv15 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv15 === void 0 ? void 0 : _this$fireAnalyticsEv15.call(this, fetchErrorPayload(error.message));
-      return undefined;
-    }
-    const {
-      parentDataProviders,
-      providerCreator
-    } = this.dataProvider.getSyncedBlockRendererProviderOptions();
-    let providerFactory = this.providerFactories.get(resourceId);
-    if (!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$fireAnalyticsEv16;
-        logException(error, {
-          location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
-        });
-        (_this$fireAnalyticsEv16 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv16 === void 0 ? void 0 : _this$fireAnalyticsEv16.call(this, fetchErrorPayload(error.message, resourceId));
-      }
-    }
-    return providerFactory;
+    return this._providerFactoryManager.getProviderFactory(resourceId);
   }
   getSSRProviders(resourceId) {
-    if (this._providerFactoryManager && fg('platform_synced_block_patch_5')) {
-      return this._providerFactoryManager.getSSRProviders(resourceId);
-    }
-    if (!this.dataProvider) {
-      return null;
-    }
-    const {
-      providerCreator
-    } = this.dataProvider.getSyncedBlockRendererProviderOptions();
-    if (!(providerCreator !== null && providerCreator !== void 0 && providerCreator.createSSRMediaProvider)) {
-      return null;
-    }
-    const parsedResourceId = parseResourceId(resourceId);
-    if (!parsedResourceId) {
-      return null;
-    }
-    const {
-      contentId,
-      product: contentProduct
-    } = parsedResourceId;
-    try {
-      const mediaProvider = providerCreator.createSSRMediaProvider({
-        contentId,
-        contentProduct
-      });
-      if (mediaProvider) {
-        return {
-          media: mediaProvider
-        };
-      }
-    } catch (error) {
-      logException(error, {
-        location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
-      });
-    }
-    return null;
-  }
-  retrieveDynamicProviders(resourceId, providerFactory, providerCreator) {
-    var _syncBlock$data2, _syncBlock$data3;
-    if (!this.dataProvider) {
-      throw new Error('Data provider not set');
-    }
-    const hasMediaProvider = providerFactory.hasProvider('mediaProvider');
-    const hasEmojiProvider = providerFactory.hasProvider('emojiProvider');
-    const hasCardProvider = providerFactory.hasProvider('cardProvider');
-    if (hasMediaProvider && hasEmojiProvider && hasCardProvider) {
-      return;
-    }
-    const syncBlock = this.getFromCache(resourceId);
-    if (!(syncBlock !== null && syncBlock !== void 0 && syncBlock.data)) {
-      return;
-    }
-    if (!syncBlock.data.sourceAri || !syncBlock.data.product) {
-      var _this$fireAnalyticsEv17;
-      (_this$fireAnalyticsEv17 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv17 === void 0 ? void 0 : _this$fireAnalyticsEv17.call(this, fetchErrorPayload('Sync block source ari or product not found'));
-      return;
-    }
-    const parentInfo = this.dataProvider.retrieveSyncBlockParentInfo((_syncBlock$data2 = syncBlock.data) === null || _syncBlock$data2 === void 0 ? void 0 : _syncBlock$data2.sourceAri, (_syncBlock$data3 = syncBlock.data) === null || _syncBlock$data3 === void 0 ? void 0 : _syncBlock$data3.product);
-    if (!parentInfo) {
-      throw new Error('Unable to retrieve sync block parent info');
-    }
-    const {
-      contentId,
-      contentProduct
-    } = parentInfo;
-    if (!hasMediaProvider) {
-      if (providerCreator.createMediaProvider && contentId && contentProduct) {
-        const mediaProvider = providerCreator.createMediaProvider({
-          contentProduct,
-          contentId
-        });
-        if (mediaProvider) {
-          providerFactory.setProvider('mediaProvider', mediaProvider);
-        }
-      }
-    }
-    if (!hasEmojiProvider) {
-      if (providerCreator.createEmojiProvider && contentId && contentProduct) {
-        const emojiProvider = providerCreator.createEmojiProvider({
-          contentProduct,
-          contentId
-        });
-        if (emojiProvider) {
-          providerFactory.setProvider('emojiProvider', emojiProvider);
-        }
-      }
-    }
-    if (!hasCardProvider) {
-      if (providerCreator.createSmartLinkProvider) {
-        const smartLinkProvider = providerCreator.createSmartLinkProvider();
-        if (smartLinkProvider) {
-          providerFactory.setProvider('cardProvider', smartLinkProvider);
-        }
-      }
-    }
+    return this._providerFactoryManager.getSSRProviders(resourceId);
   }
 
   /**
@@ -1059,7 +561,7 @@ export class ReferenceSyncBlockStoreManager {
       const blocks = [];
 
       // First, build the complete subscription structure
-      for (const [resourceId, callbacks] of this.subscriptions.entries()) {
+      for (const [resourceId, callbacks] of this._subscriptionManager.getSubscriptions().entries()) {
         syncedBlocksToFlush[resourceId] = {};
         Object.keys(callbacks).forEach(localId => {
           blocks.push({
@@ -1088,15 +590,15 @@ export class ReferenceSyncBlockStoreManager {
       (_this$saveExperience = this.saveExperience) === null || _this$saveExperience === void 0 ? void 0 : _this$saveExperience.start();
       const updateResult = await this.dataProvider.updateReferenceData(blocks);
       if (!updateResult.success) {
-        var _this$saveExperience2, _this$fireAnalyticsEv18;
+        var _this$saveExperience2, _this$fireAnalyticsEv1;
         success = false;
         (_this$saveExperience2 = this.saveExperience) === null || _this$saveExperience2 === void 0 ? void 0 : _this$saveExperience2.failure({
           reason: updateResult.error || 'Failed to update reference synced blocks on the document'
         });
-        (_this$fireAnalyticsEv18 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv18 === void 0 ? void 0 : _this$fireAnalyticsEv18.call(this, updateReferenceErrorPayload(updateResult.error || 'Failed to update reference synced blocks on the document'));
+        (_this$fireAnalyticsEv1 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv1 === void 0 ? void 0 : _this$fireAnalyticsEv1.call(this, updateReferenceErrorPayload(updateResult.error || 'Failed to update reference synced blocks on the document'));
       }
     } catch (error) {
-      var _this$saveExperience3, _this$fireAnalyticsEv19;
+      var _this$saveExperience3, _this$fireAnalyticsEv10;
       success = false;
       logException(error, {
         location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
@@ -1104,7 +606,7 @@ export class ReferenceSyncBlockStoreManager {
       (_this$saveExperience3 = this.saveExperience) === null || _this$saveExperience3 === void 0 ? void 0 : _this$saveExperience3.failure({
         reason: error.message
       });
-      (_this$fireAnalyticsEv19 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv19 === void 0 ? void 0 : _this$fireAnalyticsEv19.call(this, updateReferenceErrorPayload(error.message));
+      (_this$fireAnalyticsEv10 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv10 === void 0 ? void 0 : _this$fireAnalyticsEv10.call(this, updateReferenceErrorPayload(error.message));
     } finally {
       if (!success) {
         // set isCacheDirty back to true for cases where it failed to update the reference synced blocks on the BE
@@ -1132,36 +634,19 @@ export class ReferenceSyncBlockStoreManager {
     return success;
   }
   destroy() {
-    var _this$dataProvider8, _this$saveExperience5, _this$fetchExperience0, _this$fetchSourceInfo6;
+    var _this$dataProvider6, _this$saveExperience5, _this$fetchExperience0, _this$fetchSourceInfo6;
     // Cancel any queued flush to prevent it from running after destroy
     if (this.queuedFlushTimeout) {
       clearTimeout(this.queuedFlushTimeout);
       this.queuedFlushTimeout = undefined;
     }
-    if (fg('platform_synced_block_patch_5')) {
-      var _this$_subscriptionMa, _this$_providerFactor, _this$_batchFetcher;
-      (_this$_subscriptionMa = this._subscriptionManager) === null || _this$_subscriptionMa === void 0 ? void 0 : _this$_subscriptionMa.destroy();
-      (_this$_providerFactor = this._providerFactoryManager) === null || _this$_providerFactor === void 0 ? void 0 : _this$_providerFactor.destroy();
-      (_this$_batchFetcher = this._batchFetcher) === null || _this$_batchFetcher === void 0 ? void 0 : _this$_batchFetcher.destroy();
-    }
-
-    // Clean up all GraphQL subscriptions first
-    this.cleanupAllGraphQLSubscriptions();
-    (_this$dataProvider8 = this.dataProvider) === null || _this$dataProvider8 === void 0 ? void 0 : _this$dataProvider8.resetCache();
-    this.scheduledBatchFetch.cancel();
-    this.pendingFetchRequests.clear();
+    this._subscriptionManager.destroy();
+    this._providerFactoryManager.destroy();
+    this._batchFetcher.destroy();
+    (_this$dataProvider6 = this.dataProvider) === null || _this$dataProvider6 === void 0 ? void 0 : _this$dataProvider6.resetCache();
     this.dataProvider = undefined;
-    this.subscriptions.clear();
-    this.titleSubscriptions.clear();
     this.syncBlockFetchDataRequests.clear();
     this.syncBlockSourceInfoRequests.clear();
-    this.isRefreshingSubscriptions = false;
-    this.useRealTimeSubscriptions = false;
-    this.subscriptionChangeListeners.clear();
-    this.providerFactories.forEach(providerFactory => {
-      providerFactory.destroy();
-    });
-    this.providerFactories.clear();
     (_this$saveExperience5 = this.saveExperience) === null || _this$saveExperience5 === void 0 ? void 0 : _this$saveExperience5.abort({
       reason: 'editorDestroyed'
     });
@@ -1172,8 +657,6 @@ export class ReferenceSyncBlockStoreManager {
       reason: 'editorDestroyed'
     });
     this.fireAnalyticsEvent = undefined;
-    if (fg('platform_synced_block_patch_5')) {
-      syncBlockInMemorySessionCache.clear();
-    }
+    syncBlockInMemorySessionCache.clear();
   }
 }