@atlaskit/editor-synced-block-provider 4.1.0 → 4.1.2

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

@@ -3,22 +3,18 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-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) { _defineProperty(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; }
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+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) { _defineProperty(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; }
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 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';
@@ -32,6 +28,8 @@ var 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 var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
+  // Track the setTimeout handle for queued flush so we can cancel it on destroy
+
   function ReferenceSyncBlockStoreManager(dataProvider) {
     var _this = this,
       _this$dataProvider;
@@ -40,91 +38,64 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
     // 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(function () {
-      if (_this.pendingFetchRequests.size === 0) {
-        return;
-      }
-      var resourceIds = Array.from(_this.pendingFetchRequests);
-      var syncBlockNodes = resourceIds.map(function (resId) {
-        var subscriptions = _this.subscriptions.get(resId) || {};
-        var firstLocalId = Object.keys(subscriptions)[0] || '';
-        return createSyncBlockNode(firstLocalId, resId);
-      });
-      _this.pendingFetchRequests.clear();
-      _this.fetchSyncBlocksData(syncBlockNodes).catch(function (error) {
-        logException(error, {
-          location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/batchedFetchSyncBlocks'
-        });
-        resourceIds.forEach(function (resId) {
-          var _this$fireAnalyticsEv;
-          (_this$fireAnalyticsEv = _this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv === 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: function getDataProvider() {
-          return _this.dataProvider;
-        },
-        getSubscriptions: function getSubscriptions() {
-          return _this.subscriptions;
-        },
-        getFromCache: function getFromCache(rid) {
-          return _this.getFromCache(rid);
-        },
-        updateCache: function updateCache(inst) {
-          return _this.updateCache(inst);
-        },
-        fetchSyncBlockSourceInfo: function fetchSyncBlockSourceInfo(rid) {
-          return _this.fetchSyncBlockSourceInfo(rid);
-        },
-        getFireAnalyticsEvent: function getFireAnalyticsEvent() {
-          return _this.fireAnalyticsEvent;
-        }
-      });
-      this._providerFactoryManager = new SyncBlockProviderFactoryManager({
-        getDataProvider: function getDataProvider() {
-          return _this.dataProvider;
-        },
-        getFromCache: function getFromCache(rid) {
-          return _this.getFromCache(rid);
-        },
-        getFireAnalyticsEvent: function getFireAnalyticsEvent() {
-          return _this.fireAnalyticsEvent;
-        }
-      });
-      this._batchFetcher = new SyncBlockBatchFetcher({
-        getSubscriptions: function getSubscriptions() {
-          return _this.subscriptions;
-        },
-        fetchSyncBlocksData: function fetchSyncBlocksData(nodes) {
-          return _this.fetchSyncBlocksData(nodes);
-        },
-        getFireAnalyticsEvent: function getFireAnalyticsEvent() {
-          return _this.fireAnalyticsEvent;
-        }
-      });
-    }
+    this._subscriptionManager = new SyncBlockSubscriptionManager({
+      getDataProvider: function getDataProvider() {
+        return _this.dataProvider;
+      },
+      getFromCache: function getFromCache(rid) {
+        return _this.getFromCache(rid);
+      },
+      updateCache: function updateCache(inst) {
+        return _this.updateCache(inst);
+      },
+      deleteFromCache: function deleteFromCache(rid) {
+        return _this.deleteFromCache(rid);
+      },
+      debouncedBatchedFetchSyncBlocks: function debouncedBatchedFetchSyncBlocks(rid) {
+        return _this.debouncedBatchedFetchSyncBlocks(rid);
+      },
+      fetchSyncBlockSourceInfo: function fetchSyncBlockSourceInfo(rid) {
+        return _this.fetchSyncBlockSourceInfo(rid);
+      },
+      getFireAnalyticsEvent: function getFireAnalyticsEvent() {
+        return _this.fireAnalyticsEvent;
+      },
+      markCacheDirty: function markCacheDirty() {
+        _this.isCacheDirty = true;
+      }
+    });
+    this._providerFactoryManager = new SyncBlockProviderFactoryManager({
+      getDataProvider: function getDataProvider() {
+        return _this.dataProvider;
+      },
+      getFromCache: function getFromCache(rid) {
+        return _this.getFromCache(rid);
+      },
+      getFireAnalyticsEvent: function getFireAnalyticsEvent() {
+        return _this.fireAnalyticsEvent;
+      }
+    });
+    this._batchFetcher = new SyncBlockBatchFetcher({
+      getSubscriptions: function getSubscriptions() {
+        return _this._subscriptionManager.getSubscriptions();
+      },
+      fetchSyncBlocksData: function fetchSyncBlocksData(nodes) {
+        return _this.fetchSyncBlocksData(nodes);
+      },
+      getFireAnalyticsEvent: function getFireAnalyticsEvent() {
+        return _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());
@@ -139,21 +110,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   return _createClass(ReferenceSyncBlockStoreManager, [{
     key: "setRealTimeSubscriptionsEnabled",
     value: function 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);
     }
 
     /**
@@ -162,10 +119,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "isRealTimeSubscriptionsEnabled",
     value: function isRealTimeSubscriptionsEnabled() {
-      if (this._subscriptionManager && fg('platform_synced_block_patch_5')) {
-        return this._subscriptionManager.isRealTimeSubscriptionsEnabled();
-      }
-      return this.useRealTimeSubscriptions;
+      return this._subscriptionManager.isRealTimeSubscriptionsEnabled();
     }
 
     /**
@@ -175,10 +129,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "getSubscribedResourceIds",
     value: function getSubscribedResourceIds() {
-      if (this._subscriptionManager && fg('platform_synced_block_patch_5')) {
-        return this._subscriptionManager.getSubscribedResourceIds();
-      }
-      return Array.from(this.subscriptions.keys());
+      return this._subscriptionManager.getSubscribedResourceIds();
     }
 
     /**
@@ -189,38 +140,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "onSubscriptionsChanged",
     value: function onSubscriptionsChanged(listener) {
-      var _this2 = this;
-      if (this._subscriptionManager && fg('platform_synced_block_patch_5')) {
-        return this._subscriptionManager.onSubscriptionsChanged(listener);
-      }
-      this.subscriptionChangeListeners.add(listener);
-      return function () {
-        _this2.subscriptionChangeListeners.delete(listener);
-      };
-    }
-
-    /**
-     * Notifies all subscription change listeners.
-     */
-  }, {
-    key: "notifySubscriptionChangeListeners",
-    value: function notifySubscriptionChangeListeners() {
-      var _this3 = this;
-      if (this._subscriptionManager && fg('platform_synced_block_patch_5')) {
-        this._subscriptionManager.notifySubscriptionChangeListeners();
-        return;
-      }
-      this.subscriptionChangeListeners.forEach(function (listener) {
-        try {
-          listener();
-        } catch (error) {
-          var _this3$fireAnalyticsE;
-          logException(error, {
-            location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/notifySubscriptionChangeListeners'
-          });
-          (_this3$fireAnalyticsE = _this3.fireAnalyticsEvent) === null || _this3$fireAnalyticsE === void 0 || _this3$fireAnalyticsE.call(_this3, fetchErrorPayload(error.message));
-        }
-      });
+      return this._subscriptionManager.onSubscriptionsChanged(listener);
     }
 
     /**
@@ -231,19 +151,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "handleSubscriptionUpdate",
     value: function handleSubscriptionUpdate(syncBlockInstance) {
-      if (this._subscriptionManager && fg('platform_synced_block_patch_5')) {
-        this._subscriptionManager.handleSubscriptionUpdate(syncBlockInstance);
-        return;
-      }
-      if (!syncBlockInstance.resourceId) {
-        return;
-      }
-      var existingSyncBlock = this.getFromCache(syncBlockInstance.resourceId);
-      var resolvedSyncBlockInstance = existingSyncBlock ? resolveSyncBlockInstance(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
-      this.updateCache(resolvedSyncBlockInstance);
-      if (!syncBlockInstance.error) {
-        this.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
-      }
+      this._subscriptionManager.handleSubscriptionUpdate(syncBlockInstance);
     }
   }, {
     key: "setFireAnalyticsEvent",
@@ -317,233 +225,6 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
         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>}
-     */
-  }, {
-    key: "refreshSubscriptions",
-    value: (function () {
-      var _refreshSubscriptions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var syncBlocks, _iterator, _step, _loop, _this$fireAnalyticsEv2;
-        return _regeneratorRuntime.wrap(function _callee$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              if (!this.useRealTimeSubscriptions) {
-                _context2.next = 2;
-                break;
-              }
-              return _context2.abrupt("return");
-            case 2:
-              if (!this.isRefreshingSubscriptions) {
-                _context2.next = 4;
-                break;
-              }
-              return _context2.abrupt("return");
-            case 4:
-              this.isRefreshingSubscriptions = true;
-              syncBlocks = [];
-              _iterator = _createForOfIteratorHelper(this.subscriptions.entries());
-              _context2.prev = 7;
-              _loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop() {
-                var _step$value, resourceId, callbacks;
-                return _regeneratorRuntime.wrap(function _loop$(_context) {
-                  while (1) switch (_context.prev = _context.next) {
-                    case 0:
-                      _step$value = _slicedToArray(_step.value, 2), resourceId = _step$value[0], callbacks = _step$value[1];
-                      Object.keys(callbacks).forEach(function (localId) {
-                        syncBlocks.push(createSyncBlockNode(localId, resourceId));
-                      });
-                    case 2:
-                    case "end":
-                      return _context.stop();
-                  }
-                }, _loop);
-              });
-              _iterator.s();
-            case 10:
-              if ((_step = _iterator.n()).done) {
-                _context2.next = 14;
-                break;
-              }
-              return _context2.delegateYield(_loop(), "t0", 12);
-            case 12:
-              _context2.next = 10;
-              break;
-            case 14:
-              _context2.next = 19;
-              break;
-            case 16:
-              _context2.prev = 16;
-              _context2.t1 = _context2["catch"](7);
-              _iterator.e(_context2.t1);
-            case 19:
-              _context2.prev = 19;
-              _iterator.f();
-              return _context2.finish(19);
-            case 22:
-              _context2.prev = 22;
-              _context2.next = 25;
-              return this.fetchSyncBlocksData(syncBlocks);
-            case 25:
-              _context2.next = 31;
-              break;
-            case 27:
-              _context2.prev = 27;
-              _context2.t2 = _context2["catch"](22);
-              logException(_context2.t2, {
-                location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
-              });
-              (_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 || _this$fireAnalyticsEv2.call(this, fetchErrorPayload(_context2.t2.message));
-            case 31:
-              _context2.prev = 31;
-              this.isRefreshingSubscriptions = false;
-              return _context2.finish(31);
-            case 34:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee, this, [[7, 16, 19, 22], [22, 27, 31, 34]]);
-      }));
-      function refreshSubscriptions() {
-        return _refreshSubscriptions.apply(this, arguments);
-      }
-      return refreshSubscriptions;
-    }()
-    /**
-     * Sets up a GraphQL subscription for a specific block.
-     * @param resourceId - The resource ID of the block to subscribe to
-     */
-    )
-  }, {
-    key: "setupGraphQLSubscription",
-    value: function setupGraphQLSubscription(resourceId) {
-      var _this$dataProvider3,
-        _this4 = this;
-      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;
-      }
-      var unsubscribe = this.dataProvider.subscribeToBlockUpdates(resourceId, function (syncBlockInstance) {
-        // Handle the subscription update
-        _this4.handleGraphQLSubscriptionUpdate(syncBlockInstance);
-      }, function (error) {
-        var _this4$fireAnalyticsE;
-        logException(error, {
-          location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/graphql-subscription'
-        });
-        (_this4$fireAnalyticsE = _this4.fireAnalyticsEvent) === null || _this4$fireAnalyticsE === void 0 || _this4$fireAnalyticsE.call(_this4, fetchErrorPayload(error.message));
-      });
-      if (unsubscribe) {
-        this.graphqlSubscriptions.set(resourceId, unsubscribe);
-      }
-    }
-
-    /**
-     * Handles updates received from GraphQL subscriptions.
-     * @param syncBlockInstance - The updated sync block instance
-     */
-  }, {
-    key: "handleGraphQLSubscriptionUpdate",
-    value: function handleGraphQLSubscriptionUpdate(syncBlockInstance) {
-      var _this5 = this;
-      if (!syncBlockInstance.resourceId) {
-        return;
-      }
-      var existingSyncBlock = this.getFromCache(syncBlockInstance.resourceId);
-      var resolvedSyncBlockInstance = existingSyncBlock ? resolveSyncBlockInstance(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
-      this.updateCache(resolvedSyncBlockInstance);
-      if (!syncBlockInstance.error) {
-        var callbacks = this.subscriptions.get(syncBlockInstance.resourceId);
-        var localIds = callbacks ? Object.keys(callbacks) : [];
-        localIds.forEach(function (localId) {
-          var _this5$fireAnalyticsE, _syncBlockInstance$da;
-          (_this5$fireAnalyticsE = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE === void 0 || _this5$fireAnalyticsE.call(_this5, 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$fireAnalyticsEv3;
-        var 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$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 || _this$fireAnalyticsEv3.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
-     */
-  }, {
-    key: "cleanupGraphQLSubscription",
-    value: function cleanupGraphQLSubscription(resourceId) {
-      if (this._subscriptionManager && fg('platform_synced_block_patch_5')) {
-        this._subscriptionManager.cleanupSubscription(resourceId);
-        return;
-      }
-      var unsubscribe = this.graphqlSubscriptions.get(resourceId);
-      if (unsubscribe) {
-        unsubscribe();
-        this.graphqlSubscriptions.delete(resourceId);
-      }
-    }
-
-    /**
-     * Sets up GraphQL subscriptions for all currently subscribed blocks.
-     */
-  }, {
-    key: "setupGraphQLSubscriptionsForAllBlocks",
-    value: function setupGraphQLSubscriptionsForAllBlocks() {
-      if (this._subscriptionManager && fg('platform_synced_block_patch_5')) {
-        this._subscriptionManager.setupSubscriptionsForAllBlocks();
-        return;
-      }
-      var _iterator2 = _createForOfIteratorHelper(this.subscriptions.keys()),
-        _step2;
-      try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var resourceId = _step2.value;
-          this.setupGraphQLSubscription(resourceId);
-        }
-      } catch (err) {
-        _iterator2.e(err);
-      } finally {
-        _iterator2.f();
-      }
-    }
-
-    /**
-     * Cleans up all GraphQL subscriptions.
-     */
-  }, {
-    key: "cleanupAllGraphQLSubscriptions",
-    value: function cleanupAllGraphQLSubscriptions() {
-      if (this._subscriptionManager && fg('platform_synced_block_patch_5')) {
-        this._subscriptionManager.cleanupAll();
-        return;
-      }
-      var _iterator3 = _createForOfIteratorHelper(this.graphqlSubscriptions.values()),
-        _step3;
-      try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var unsubscribe = _step3.value;
-          unsubscribe();
-        }
-      } catch (err) {
-        _iterator3.e(err);
-      } finally {
-        _iterator3.f();
-      }
-      this.graphqlSubscriptions.clear();
-    }
   }, {
     key: "fetchSyncBlockSourceInfoBySourceAri",
     value: function fetchSyncBlockSourceInfoBySourceAri(sourceAri) {
@@ -555,18 +236,18 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
         var sourceInfo = this.dataProvider.fetchSyncBlockSourceInfo(undefined, sourceAri, undefined, hasAccess);
         return sourceInfo;
       } catch (error) {
-        var _this$fireAnalyticsEv4;
+        var _this$fireAnalyticsEv;
         logException(error, {
           location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/fetchSyncBlockSourceInfoBySourceAri'
         });
-        (_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 || _this$fireAnalyticsEv4.call(this, getSourceInfoErrorPayload(error.message));
+        (_this$fireAnalyticsEv = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv === void 0 || _this$fireAnalyticsEv.call(this, getSourceInfoErrorPayload(error.message));
         return Promise.resolve(undefined);
       }
     }
   }, {
     key: "fetchSyncBlockSourceInfo",
     value: function fetchSyncBlockSourceInfo(resourceId) {
-      var _this6 = this;
+      var _this2 = this;
       try {
         var _this$fetchSourceInfo;
         if (!resourceId || !this.dataProvider) {
@@ -600,54 +281,54 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
           });
         }
         if (!sourceAri || !product || !blockInstanceId) {
-          var _this$fireAnalyticsEv5;
-          (_this$fireAnalyticsEv5 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv5 === void 0 || _this$fireAnalyticsEv5.call(this, getSourceInfoErrorPayload('SourceAri, product or blockInstanceId missing', resourceId));
+          var _this$fireAnalyticsEv2;
+          (_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === 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 || _this$fetchSourceInfo.start({});
         var sourceInfoPromise = this.dataProvider.fetchSyncBlockSourceInfo(blockInstanceId, sourceAri, product, true // hasAccess
         ).then(function (sourceInfo) {
           if (!sourceInfo) {
-            var _this6$fetchSourceInf, _this6$fireAnalyticsE;
-            (_this6$fetchSourceInf = _this6.fetchSourceInfoExperience) === null || _this6$fetchSourceInf === void 0 || _this6$fetchSourceInf.failure({
+            var _this2$fetchSourceInf, _this2$fireAnalyticsE;
+            (_this2$fetchSourceInf = _this2.fetchSourceInfoExperience) === null || _this2$fetchSourceInf === void 0 || _this2$fetchSourceInf.failure({
               reason: 'No source info returned'
             });
-            (_this6$fireAnalyticsE = _this6.fireAnalyticsEvent) === null || _this6$fireAnalyticsE === void 0 || _this6$fireAnalyticsE.call(_this6, getSourceInfoErrorPayload('No source info returned', resourceId));
+            (_this2$fireAnalyticsE = _this2.fireAnalyticsEvent) === null || _this2$fireAnalyticsE === void 0 || _this2$fireAnalyticsE.call(_this2, getSourceInfoErrorPayload('No source info returned', resourceId));
             return undefined;
           }
-          _this6.updateCacheWithSourceInfo(resourceId, sourceInfo);
+          _this2.updateCacheWithSourceInfo(resourceId, sourceInfo);
           if (sourceInfo.title) {
-            _this6.updateSourceTitleSubscriptions(resourceId, sourceInfo.title);
+            _this2._subscriptionManager.updateSourceTitleSubscriptions(resourceId, sourceInfo.title);
           }
           if (sourceInfo.title && sourceInfo.url) {
-            var _this6$fetchSourceInf2;
-            (_this6$fetchSourceInf2 = _this6.fetchSourceInfoExperience) === null || _this6$fetchSourceInf2 === void 0 || _this6$fetchSourceInf2.success();
+            var _this2$fetchSourceInf2;
+            (_this2$fetchSourceInf2 = _this2.fetchSourceInfoExperience) === null || _this2$fetchSourceInf2 === void 0 || _this2$fetchSourceInf2.success();
           } else {
-            var _this6$fetchSourceInf3, _this6$fireAnalyticsE2;
-            (_this6$fetchSourceInf3 = _this6.fetchSourceInfoExperience) === null || _this6$fetchSourceInf3 === void 0 || _this6$fetchSourceInf3.failure({
+            var _this2$fetchSourceInf3, _this2$fireAnalyticsE2;
+            (_this2$fetchSourceInf3 = _this2.fetchSourceInfoExperience) === null || _this2$fetchSourceInf3 === void 0 || _this2$fetchSourceInf3.failure({
               reason: 'Missing title or url'
             });
-            (_this6$fireAnalyticsE2 = _this6.fireAnalyticsEvent) === null || _this6$fireAnalyticsE2 === void 0 || _this6$fireAnalyticsE2.call(_this6, getSourceInfoErrorPayload('Missing title or url', resourceId));
+            (_this2$fireAnalyticsE2 = _this2.fireAnalyticsEvent) === null || _this2$fireAnalyticsE2 === void 0 || _this2$fireAnalyticsE2.call(_this2, getSourceInfoErrorPayload('Missing title or url', resourceId));
           }
           return sourceInfo;
         }).catch(function (error) {
-          var _this6$fetchSourceInf4, _this6$fireAnalyticsE3;
-          (_this6$fetchSourceInf4 = _this6.fetchSourceInfoExperience) === null || _this6$fetchSourceInf4 === void 0 || _this6$fetchSourceInf4.failure({
+          var _this2$fetchSourceInf4, _this2$fireAnalyticsE3;
+          (_this2$fetchSourceInf4 = _this2.fetchSourceInfoExperience) === null || _this2$fetchSourceInf4 === void 0 || _this2$fetchSourceInf4.failure({
             reason: error.message
           });
-          (_this6$fireAnalyticsE3 = _this6.fireAnalyticsEvent) === null || _this6$fireAnalyticsE3 === void 0 || _this6$fireAnalyticsE3.call(_this6, getSourceInfoErrorPayload(error.message, resourceId));
+          (_this2$fireAnalyticsE3 = _this2.fireAnalyticsEvent) === null || _this2$fireAnalyticsE3 === void 0 || _this2$fireAnalyticsE3.call(_this2, getSourceInfoErrorPayload(error.message, resourceId));
           return undefined;
         }).finally(function () {
-          _this6.syncBlockSourceInfoRequests.delete(resourceId);
+          _this2.syncBlockSourceInfoRequests.delete(resourceId);
         });
         this.syncBlockSourceInfoRequests.set(resourceId, sourceInfoPromise);
         return sourceInfoPromise;
       } catch (error) {
-        var _this$fireAnalyticsEv6;
+        var _this$fireAnalyticsEv3;
         logException(error, {
           location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
         });
-        (_this$fireAnalyticsEv6 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv6 === void 0 || _this$fireAnalyticsEv6.call(this, getSourceInfoErrorPayload(error.message, resourceId));
+        (_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 || _this$fireAnalyticsEv3.call(this, getSourceInfoErrorPayload(error.message, resourceId));
       }
       return Promise.resolve(undefined);
     }
@@ -660,31 +341,31 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "processPrefetchedData",
     value: (function () {
-      var _processPrefetchedData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(prefetchedData) {
+      var _processPrefetchedData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(prefetchedData) {
         var _this$fetchExperience,
-          _this7 = this;
+          _this3 = this;
         var prefetchedResolvedData, _this$processFetchedD, hasUnexpectedError, hasExpectedError, _this$fetchExperience2, _this$fetchExperience3, _this$fetchExperience4, _this$fetchExperience5;
-        return _regeneratorRuntime.wrap(function _callee2$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
             case 0:
               if (prefetchedData) {
-                _context3.next = 2;
+                _context.next = 2;
                 break;
               }
-              return _context3.abrupt("return");
+              return _context.abrupt("return");
             case 2:
               // start the fetch experience (this should be started much earlier to properly track performance, but better late than never)
               (_this$fetchExperience = this.fetchExperience) === null || _this$fetchExperience === void 0 || _this$fetchExperience.start({});
 
               // mark the sync block requests as in fly
               prefetchedData.resourceIds.forEach(function (resourceId) {
-                _this7.syncBlockFetchDataRequests.set(resourceId, true);
+                _this3.syncBlockFetchDataRequests.set(resourceId, true);
               });
-              _context3.prev = 4;
-              _context3.next = 7;
+              _context.prev = 4;
+              _context.next = 7;
               return prefetchedData.prefetchPromise;
             case 7:
-              prefetchedResolvedData = _context3.sent;
+              prefetchedResolvedData = _context.sent;
               _this$processFetchedD = this.processFetchedData(prefetchedResolvedData), hasUnexpectedError = _this$processFetchedD.hasUnexpectedError, hasExpectedError = _this$processFetchedD.hasExpectedError;
               if (hasUnexpectedError) {
                 (_this$fetchExperience2 = this.fetchExperience) === null || _this$fetchExperience2 === void 0 || _this$fetchExperience2.failure({
@@ -697,26 +378,26 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
               } else {
                 (_this$fetchExperience4 = this.fetchExperience) === null || _this$fetchExperience4 === void 0 || _this$fetchExperience4.success();
               }
-              _context3.next = 15;
+              _context.next = 15;
               break;
             case 12:
-              _context3.prev = 12;
-              _context3.t0 = _context3["catch"](4);
+              _context.prev = 12;
+              _context.t0 = _context["catch"](4);
               (_this$fetchExperience5 = this.fetchExperience) === null || _this$fetchExperience5 === void 0 || _this$fetchExperience5.failure({
-                reason: "Prefetch promise rejected: ".concat(_context3.t0.message)
+                reason: "Prefetch promise rejected: ".concat(_context.t0.message)
               });
             case 15:
-              _context3.prev = 15;
-              // Clean up in-flight markers so subsequent fetches (e.g. refreshSubscriptions) are not blocked
+              _context.prev = 15;
+              // Clean up in-flight markers so subsequent fetches are not blocked
               prefetchedData.resourceIds.forEach(function (resourceId) {
-                _this7.syncBlockFetchDataRequests.delete(resourceId);
+                _this3.syncBlockFetchDataRequests.delete(resourceId);
               });
-              return _context3.finish(15);
+              return _context.finish(15);
             case 18:
             case "end":
-              return _context3.stop();
+              return _context.stop();
           }
-        }, _callee2, this, [[4, 12, 15, 18]]);
+        }, _callee, this, [[4, 12, 15, 18]]);
       }));
       function processPrefetchedData(_x) {
         return _processPrefetchedData.apply(this, arguments);
@@ -732,56 +413,56 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "fetchSyncBlocksData",
     value: (function () {
-      var _fetchSyncBlocksData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(syncBlockNodes) {
-        var _this8 = this,
+      var _fetchSyncBlocksData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(syncBlockNodes) {
+        var _this4 = this,
           _this$fetchExperience6;
         var nodesToFetch, data, _this$processFetchedD2, hasUnexpectedError, hasExpectedError, _this$fetchExperience7, _this$fetchExperience8, _this$fetchExperience9;
-        return _regeneratorRuntime.wrap(function _callee3$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               if (!(syncBlockNodes.length === 0)) {
-                _context4.next = 2;
+                _context2.next = 2;
                 break;
               }
-              return _context4.abrupt("return");
+              return _context2.abrupt("return");
             case 2:
               // Don't fetch for not_found error since the source is already deleted
               nodesToFetch = [];
               syncBlockNodes.forEach(function (node) {
                 var _existingSyncBlock$er;
-                if (_this8.syncBlockFetchDataRequests.get(node.attrs.resourceId)) {
+                if (_this4.syncBlockFetchDataRequests.get(node.attrs.resourceId)) {
                   return;
                 }
-                var existingSyncBlock = _this8.getFromCache(node.attrs.resourceId);
+                var existingSyncBlock = _this4.getFromCache(node.attrs.resourceId);
                 if ((existingSyncBlock === null || existingSyncBlock === void 0 || (_existingSyncBlock$er = existingSyncBlock.error) === null || _existingSyncBlock$er === void 0 ? void 0 : _existingSyncBlock$er.type) === SyncBlockError.NotFound) {
                   return;
                 }
                 nodesToFetch.push(node);
               });
               if (!(nodesToFetch.length === 0)) {
-                _context4.next = 6;
+                _context2.next = 6;
                 break;
               }
-              return _context4.abrupt("return");
+              return _context2.abrupt("return");
             case 6:
               if (this.dataProvider) {
-                _context4.next = 8;
+                _context2.next = 8;
                 break;
               }
               throw new Error('Data provider not set');
             case 8:
               nodesToFetch.forEach(function (node) {
-                _this8.syncBlockFetchDataRequests.set(node.attrs.resourceId, true);
+                _this4.syncBlockFetchDataRequests.set(node.attrs.resourceId, true);
               });
               (_this$fetchExperience6 = this.fetchExperience) === null || _this$fetchExperience6 === void 0 || _this$fetchExperience6.start({});
-              _context4.next = 12;
+              _context2.next = 12;
               return this.dataProvider.fetchNodesData(nodesToFetch).finally(function () {
                 nodesToFetch.forEach(function (node) {
-                  _this8.syncBlockFetchDataRequests.delete(node.attrs.resourceId);
+                  _this4.syncBlockFetchDataRequests.delete(node.attrs.resourceId);
                 });
               });
             case 12:
-              data = _context4.sent;
+              data = _context2.sent;
               _this$processFetchedD2 = this.processFetchedData(data), hasUnexpectedError = _this$processFetchedD2.hasUnexpectedError, hasExpectedError = _this$processFetchedD2.hasExpectedError;
               if (hasUnexpectedError) {
                 (_this$fetchExperience7 = this.fetchExperience) === null || _this$fetchExperience7 === void 0 || _this$fetchExperience7.failure({
@@ -796,9 +477,9 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
               }
             case 15:
             case "end":
-              return _context4.stop();
+              return _context2.stop();
           }
-        }, _callee3, this);
+        }, _callee2, this);
       }));
       function fetchSyncBlocksData(_x2) {
         return _fetchSyncBlocksData.apply(this, arguments);
@@ -808,7 +489,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "processFetchedData",
     value: function processFetchedData(data) {
-      var _this9 = this;
+      var _this5 = this;
       if (!data) {
         return {
           hasUnexpectedError: false,
@@ -820,28 +501,28 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
       data.forEach(function (syncBlockInstance) {
         var _resolvedSyncBlockIns;
         if (!syncBlockInstance.resourceId) {
-          var _syncBlockInstance$er3, _syncBlockInstance$er4, _this9$fireAnalyticsE;
-          var 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';
-          (_this9$fireAnalyticsE = _this9.fireAnalyticsEvent) === null || _this9$fireAnalyticsE === void 0 || _this9$fireAnalyticsE.call(_this9, fetchErrorPayload(payload));
+          var _syncBlockInstance$er, _syncBlockInstance$er2, _this5$fireAnalyticsE;
+          var 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';
+          (_this5$fireAnalyticsE = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE === void 0 || _this5$fireAnalyticsE.call(_this5, fetchErrorPayload(payload));
           return;
         }
-        var existingSyncBlock = _this9.getFromCache(syncBlockInstance.resourceId);
+        var existingSyncBlock = _this5.getFromCache(syncBlockInstance.resourceId);
         var resolvedSyncBlockInstance = existingSyncBlock ? resolveSyncBlockInstance(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
-        _this9.updateCache(resolvedSyncBlockInstance);
+        _this5.updateCache(resolvedSyncBlockInstance);
 
         // Check if this is a newly added unpublished sync block and notify
         // Only trigger for sync blocks that were just added (not refreshed or loaded on page init)
-        if (!syncBlockInstance.error && ((_resolvedSyncBlockIns = resolvedSyncBlockInstance.data) === null || _resolvedSyncBlockIns === void 0 ? void 0 : _resolvedSyncBlockIns.status) === 'unpublished' && _this9.newlyAddedSyncBlocks.has(syncBlockInstance.resourceId) && _this9.onUnpublishedSyncBlockDetected) {
+        if (!syncBlockInstance.error && ((_resolvedSyncBlockIns = resolvedSyncBlockInstance.data) === null || _resolvedSyncBlockIns === void 0 ? void 0 : _resolvedSyncBlockIns.status) === 'unpublished' && _this5.newlyAddedSyncBlocks.has(syncBlockInstance.resourceId) && _this5.onUnpublishedSyncBlockDetected) {
           // Remove from newly added set after checking to prevent duplicate flags
-          _this9.newlyAddedSyncBlocks.delete(syncBlockInstance.resourceId);
-          _this9.onUnpublishedSyncBlockDetected(resolvedSyncBlockInstance.resourceId);
-        } else if (_this9.newlyAddedSyncBlocks.has(syncBlockInstance.resourceId)) {
+          _this5.newlyAddedSyncBlocks.delete(syncBlockInstance.resourceId);
+          _this5.onUnpublishedSyncBlockDetected(resolvedSyncBlockInstance.resourceId);
+        } else if (_this5.newlyAddedSyncBlocks.has(syncBlockInstance.resourceId)) {
           // Remove from newly added set even if not unpublished (to clean up)
-          _this9.newlyAddedSyncBlocks.delete(syncBlockInstance.resourceId);
+          _this5.newlyAddedSyncBlocks.delete(syncBlockInstance.resourceId);
         }
         if (syncBlockInstance.error) {
-          var _this9$fireAnalyticsE2;
-          (_this9$fireAnalyticsE2 = _this9.fireAnalyticsEvent) === null || _this9$fireAnalyticsE2 === void 0 || _this9$fireAnalyticsE2.call(_this9, fetchErrorPayload(syncBlockInstance.error.reason || syncBlockInstance.error.type, syncBlockInstance.resourceId));
+          var _this5$fireAnalyticsE2;
+          (_this5$fireAnalyticsE2 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE2 === void 0 || _this5$fireAnalyticsE2.call(_this5, 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) {
@@ -849,13 +530,13 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
           }
           return;
         }
-        var callbacks = _this9.subscriptions.get(syncBlockInstance.resourceId);
+        var callbacks = _this5._subscriptionManager.getSubscriptions().get(syncBlockInstance.resourceId);
         var localIds = callbacks ? Object.keys(callbacks) : [];
         localIds.forEach(function (localId) {
-          var _this9$fireAnalyticsE3, _syncBlockInstance$da2;
-          (_this9$fireAnalyticsE3 = _this9.fireAnalyticsEvent) === null || _this9$fireAnalyticsE3 === void 0 || _this9$fireAnalyticsE3.call(_this9, fetchSuccessPayload(syncBlockInstance.resourceId, localId, (_syncBlockInstance$da2 = syncBlockInstance.data) === null || _syncBlockInstance$da2 === void 0 ? void 0 : _syncBlockInstance$da2.product));
+          var _this5$fireAnalyticsE3, _syncBlockInstance$da;
+          (_this5$fireAnalyticsE3 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE3 === void 0 || _this5$fireAnalyticsE3.call(_this5, fetchSuccessPayload(syncBlockInstance.resourceId, localId, (_syncBlockInstance$da = syncBlockInstance.data) === null || _syncBlockInstance$da === void 0 ? void 0 : _syncBlockInstance$da.product));
         });
-        _this9.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
+        _this5.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
       });
       return {
         hasUnexpectedError: hasUnexpectedError,
@@ -882,182 +563,54 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
     value: function updateCache(syncBlock) {
       var resourceId = syncBlock.resourceId;
       if (resourceId) {
-        var _this$dataProvider4;
-        (_this$dataProvider4 = this.dataProvider) === null || _this$dataProvider4 === void 0 || _this$dataProvider4.updateCache(_defineProperty({}, resourceId, syncBlock), {
+        var _this$dataProvider3;
+        (_this$dataProvider3 = this.dataProvider) === null || _this$dataProvider3 === void 0 || _this$dataProvider3.updateCache(_defineProperty({}, resourceId, syncBlock), {
           strategy: 'merge',
           source: 'network'
         });
-        var callbacks = this.subscriptions.get(resourceId);
-        if (callbacks) {
-          Object.values(callbacks).forEach(function (callback) {
-            callback(syncBlock);
-          });
-        }
+        this._subscriptionManager.notifySubscriptionCallbacks(resourceId, syncBlock);
         this.updateSessionCache(resourceId);
       }
     }
-  }, {
-    key: "updateSourceTitleSubscriptions",
-    value: function updateSourceTitleSubscriptions(resourceId, title) {
-      var callbacks = this.titleSubscriptions.get(resourceId);
-      if (callbacks) {
-        Object.values(callbacks).forEach(function (callback) {
-          callback(title);
-        });
-      }
-    }
   }, {
     key: "getFromCache",
     value: function getFromCache(resourceId) {
-      var _this$dataProvider5;
+      var _this$dataProvider4;
       var syncBlockNode = createSyncBlockNode('', resourceId);
-      return (_this$dataProvider5 = this.dataProvider) === null || _this$dataProvider5 === void 0 || (_this$dataProvider5 = _this$dataProvider5.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider5 === void 0 ? void 0 : _this$dataProvider5.data;
+      return (_this$dataProvider4 = this.dataProvider) === null || _this$dataProvider4 === void 0 || (_this$dataProvider4 = _this$dataProvider4.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider4 === void 0 ? void 0 : _this$dataProvider4.data;
     }
   }, {
     key: "deleteFromCache",
     value: function deleteFromCache(resourceId) {
-      var _this$dataProvider6;
-      (_this$dataProvider6 = this.dataProvider) === null || _this$dataProvider6 === 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 || _this$dataProvider5.removeFromCache([resourceId]);
+      this._providerFactoryManager.deleteFactory(resourceId);
     }
   }, {
     key: "debouncedBatchedFetchSyncBlocks",
     value: function 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);
     }
   }, {
     key: "setSSRDataInSessionCache",
     value: function setSSRDataInSessionCache(resourceIds) {
-      var _this0 = this;
+      var _this6 = this;
       if (!resourceIds || resourceIds.length === 0) {
         return;
       }
       resourceIds.forEach(function (resourceId) {
-        _this0.updateSessionCache(resourceId);
+        _this6.updateSessionCache(resourceId);
       });
     }
   }, {
     key: "subscribeToSyncBlock",
     value: function subscribeToSyncBlock(resourceId, localId, callback) {
-      var _this$dataProvider7,
-        _this1 = this;
-      // 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.
-      var pendingDeletion = this.pendingCacheDeletions.get(resourceId);
-      if (pendingDeletion) {
-        clearTimeout(pendingDeletion);
-        this.pendingCacheDeletions.delete(resourceId);
-      }
-
-      // add to subscriptions map
-      var resourceSubscriptions = this.subscriptions.get(resourceId) || {};
-      var isNewResourceSubscription = Object.keys(resourceSubscriptions).length === 0;
-      this.subscriptions.set(resourceId, _objectSpread(_objectSpread({}, resourceSubscriptions), {}, _defineProperty({}, 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();
-      }
-      var syncBlockNode = createSyncBlockNode(localId, resourceId);
-      var cachedData = (_this$dataProvider7 = this.dataProvider) === null || _this$dataProvider7 === void 0 || (_this$dataProvider7 = _this$dataProvider7.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider7 === void 0 ? void 0 : _this$dataProvider7.data;
-      if (cachedData) {
-        callback(cachedData);
-      } else {
-        this.debouncedBatchedFetchSyncBlocks(resourceId);
-      }
-
-      // Set up GraphQL subscription if real-time subscriptions are enabled
-      var useRealTime = this._subscriptionManager && fg('platform_synced_block_patch_5') ? this._subscriptionManager.shouldUseRealTime() : this.useRealTimeSubscriptions;
-      if (useRealTime) {
-        this.setupGraphQLSubscription(resourceId);
-      }
-      return function () {
-        var resourceSubscriptions = _this1.subscriptions.get(resourceId);
-        if (resourceSubscriptions) {
-          // Unsubscription means a reference synced block is removed from the document
-          _this1.isCacheDirty = true;
-          delete resourceSubscriptions[localId];
-          if (Object.keys(resourceSubscriptions).length === 0) {
-            _this1.subscriptions.delete(resourceId);
-
-            // Clean up GraphQL subscription when no more local subscribers
-            _this1.cleanupGraphQLSubscription(resourceId);
-
-            // Notify listeners that subscription was removed
-            _this1.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
-            var deletionTimeout = setTimeout(function () {
-              // Only delete if still no subscribers (wasn't re-subscribed)
-              if (!_this1.subscriptions.has(resourceId)) {
-                _this1.deleteFromCache(resourceId);
-              }
-              _this1.pendingCacheDeletions.delete(resourceId);
-            }, 1000);
-            _this1.pendingCacheDeletions.set(resourceId, deletionTimeout);
-          } else {
-            _this1.subscriptions.set(resourceId, resourceSubscriptions);
-          }
-        }
-      };
+      return this._subscriptionManager.subscribeToSyncBlock(resourceId, localId, callback);
     }
   }, {
     key: "subscribeToSourceTitle",
     value: function subscribeToSourceTitle(node, callback) {
-      var _cachedData$data,
-        _this10 = this;
-      // check node is a sync block, as we only support sync block subscriptions
-      if (node.type.name !== 'syncBlock') {
-        return function () {};
-      }
-      var _node$attrs = node.attrs,
-        resourceId = _node$attrs.resourceId,
-        localId = _node$attrs.localId;
-      if (!localId || !resourceId) {
-        return function () {};
-      }
-      var 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
-      var resourceSubscriptions = this.titleSubscriptions.get(resourceId) || {};
-      this.titleSubscriptions.set(resourceId, _objectSpread(_objectSpread({}, resourceSubscriptions), {}, _defineProperty({}, localId, callback)));
-      return function () {
-        var resourceSubscriptions = _this10.titleSubscriptions.get(resourceId);
-        if (resourceSubscriptions) {
-          delete resourceSubscriptions[localId];
-          if (Object.keys(resourceSubscriptions).length === 0) {
-            _this10.titleSubscriptions.delete(resourceId);
-          } else {
-            _this10.titleSubscriptions.set(resourceId, resourceSubscriptions);
-          }
-        }
-      };
+      return this._subscriptionManager.subscribeToSourceTitle(node, callback);
     }
   }, {
     key: "subscribe",
@@ -1067,19 +620,19 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
         if (node.type.name !== 'syncBlock') {
           throw new Error('Only sync block node subscriptions are supported');
         }
-        var _node$attrs2 = node.attrs,
-          resourceId = _node$attrs2.resourceId,
-          localId = _node$attrs2.localId;
+        var _node$attrs = node.attrs,
+          resourceId = _node$attrs.resourceId,
+          localId = _node$attrs.localId;
         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$fireAnalyticsEv7;
+        var _this$fireAnalyticsEv4;
         logException(error, {
           location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
         });
-        (_this$fireAnalyticsEv7 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv7 === void 0 || _this$fireAnalyticsEv7.call(this, fetchErrorPayload(error.message));
+        (_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 || _this$fireAnalyticsEv4.call(this, fetchErrorPayload(error.message));
         return function () {};
       }
     }
@@ -1102,148 +655,12 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "getProviderFactory",
     value: function getProviderFactory(resourceId) {
-      if (this._providerFactoryManager && fg('platform_synced_block_patch_5')) {
-        return this._providerFactoryManager.getProviderFactory(resourceId);
-      }
-      if (!this.dataProvider) {
-        var _this$fireAnalyticsEv8;
-        var error = new Error('Data provider not set');
-        logException(error, {
-          location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
-        });
-        (_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 || _this$fireAnalyticsEv8.call(this, fetchErrorPayload(error.message));
-        return undefined;
-      }
-      var _this$dataProvider$ge = this.dataProvider.getSyncedBlockRendererProviderOptions(),
-        parentDataProviders = _this$dataProvider$ge.parentDataProviders,
-        providerCreator = _this$dataProvider$ge.providerCreator;
-      var 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$fireAnalyticsEv9;
-          logException(error, {
-            location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
-          });
-          (_this$fireAnalyticsEv9 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv9 === void 0 || _this$fireAnalyticsEv9.call(this, fetchErrorPayload(error.message, resourceId));
-        }
-      }
-      return providerFactory;
+      return this._providerFactoryManager.getProviderFactory(resourceId);
     }
   }, {
     key: "getSSRProviders",
     value: function getSSRProviders(resourceId) {
-      if (this._providerFactoryManager && fg('platform_synced_block_patch_5')) {
-        return this._providerFactoryManager.getSSRProviders(resourceId);
-      }
-      if (!this.dataProvider) {
-        return null;
-      }
-      var _this$dataProvider$ge2 = this.dataProvider.getSyncedBlockRendererProviderOptions(),
-        providerCreator = _this$dataProvider$ge2.providerCreator;
-      if (!(providerCreator !== null && providerCreator !== void 0 && providerCreator.createSSRMediaProvider)) {
-        return null;
-      }
-      var parsedResourceId = parseResourceId(resourceId);
-      if (!parsedResourceId) {
-        return null;
-      }
-      var contentId = parsedResourceId.contentId,
-        contentProduct = parsedResourceId.product;
-      try {
-        var mediaProvider = providerCreator.createSSRMediaProvider({
-          contentId: contentId,
-          contentProduct: contentProduct
-        });
-        if (mediaProvider) {
-          return {
-            media: mediaProvider
-          };
-        }
-      } catch (error) {
-        logException(error, {
-          location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
-        });
-      }
-      return null;
-    }
-  }, {
-    key: "retrieveDynamicProviders",
-    value: function retrieveDynamicProviders(resourceId, providerFactory, providerCreator) {
-      var _syncBlock$data2, _syncBlock$data3;
-      if (!this.dataProvider) {
-        throw new Error('Data provider not set');
-      }
-      var hasMediaProvider = providerFactory.hasProvider('mediaProvider');
-      var hasEmojiProvider = providerFactory.hasProvider('emojiProvider');
-      var hasCardProvider = providerFactory.hasProvider('cardProvider');
-      if (hasMediaProvider && hasEmojiProvider && hasCardProvider) {
-        return;
-      }
-      var syncBlock = this.getFromCache(resourceId);
-      if (!(syncBlock !== null && syncBlock !== void 0 && syncBlock.data)) {
-        return;
-      }
-      if (!syncBlock.data.sourceAri || !syncBlock.data.product) {
-        var _this$fireAnalyticsEv0;
-        (_this$fireAnalyticsEv0 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv0 === void 0 || _this$fireAnalyticsEv0.call(this, fetchErrorPayload('Sync block source ari or product not found'));
-        return;
-      }
-      var 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');
-      }
-      var contentId = parentInfo.contentId,
-        contentProduct = parentInfo.contentProduct;
-      if (!hasMediaProvider) {
-        if (providerCreator.createMediaProvider && contentId && contentProduct) {
-          var mediaProvider = providerCreator.createMediaProvider({
-            contentProduct: contentProduct,
-            contentId: contentId
-          });
-          if (mediaProvider) {
-            providerFactory.setProvider('mediaProvider', mediaProvider);
-          }
-        }
-      }
-      if (!hasEmojiProvider) {
-        if (providerCreator.createEmojiProvider && contentId && contentProduct) {
-          var emojiProvider = providerCreator.createEmojiProvider({
-            contentProduct: contentProduct,
-            contentId: contentId
-          });
-          if (emojiProvider) {
-            providerFactory.setProvider('emojiProvider', emojiProvider);
-          }
-        }
-      }
-      if (!hasCardProvider) {
-        if (providerCreator.createSmartLinkProvider) {
-          var smartLinkProvider = providerCreator.createSmartLinkProvider();
-          if (smartLinkProvider) {
-            providerFactory.setProvider('cardProvider', smartLinkProvider);
-          }
-        }
-      }
+      return this._providerFactoryManager.getSSRProviders(resourceId);
     }
 
     /**
@@ -1254,49 +671,49 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "flush",
     value: (function () {
-      var _flush = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-        var _this11 = this;
-        var success, syncedBlocksToFlush, _this$saveExperience, blocks, _iterator4, _step4, _loop2, updateResult, _this$saveExperience2, _this$fireAnalyticsEv1, _this$saveExperience3, _this$fireAnalyticsEv10, _this$saveExperience4;
-        return _regeneratorRuntime.wrap(function _callee4$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _flush = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+        var _this7 = this;
+        var success, syncedBlocksToFlush, _this$saveExperience, blocks, _iterator, _step, _loop, updateResult, _this$saveExperience2, _this$fireAnalyticsEv5, _this$saveExperience3, _this$fireAnalyticsEv6, _this$saveExperience4;
+        return _regeneratorRuntime.wrap(function _callee3$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               if (this.isCacheDirty) {
-                _context6.next = 2;
+                _context4.next = 2;
                 break;
               }
-              return _context6.abrupt("return", true);
+              return _context4.abrupt("return", true);
             case 2:
               if (!this.isFlushInProgress) {
-                _context6.next = 7;
+                _context4.next = 7;
                 break;
               }
               // Mark that another flush is needed after the current one completes
               this.flushNeededAfterCurrent = true;
 
               // We return true here because we know the pending flush will handle the dirty cache
-              return _context6.abrupt("return", true);
+              return _context4.abrupt("return", true);
             case 7:
               this.isFlushInProgress = true;
             case 8:
               success = true; // a copy of the subscriptions STRUCTURE (without the callbacks)
               // To be saved as the last flushed structure if the flush is successful
               syncedBlocksToFlush = {};
-              _context6.prev = 10;
+              _context4.prev = 10;
               if (this.dataProvider) {
-                _context6.next = 13;
+                _context4.next = 13;
                 break;
               }
               throw new Error('Data provider not set');
             case 13:
               blocks = []; // First, build the complete subscription structure
-              _iterator4 = _createForOfIteratorHelper(this.subscriptions.entries());
-              _context6.prev = 15;
-              _loop2 = /*#__PURE__*/_regeneratorRuntime.mark(function _loop2() {
-                var _step4$value, resourceId, callbacks;
-                return _regeneratorRuntime.wrap(function _loop2$(_context5) {
-                  while (1) switch (_context5.prev = _context5.next) {
+              _iterator = _createForOfIteratorHelper(this._subscriptionManager.getSubscriptions().entries());
+              _context4.prev = 15;
+              _loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop() {
+                var _step$value, resourceId, callbacks;
+                return _regeneratorRuntime.wrap(function _loop$(_context3) {
+                  while (1) switch (_context3.prev = _context3.next) {
                     case 0:
-                      _step4$value = _slicedToArray(_step4.value, 2), resourceId = _step4$value[0], callbacks = _step4$value[1];
+                      _step$value = _slicedToArray(_step.value, 2), resourceId = _step$value[0], callbacks = _step$value[1];
                       syncedBlocksToFlush[resourceId] = {};
                       Object.keys(callbacks).forEach(function (localId) {
                         blocks.push({
@@ -1307,38 +724,38 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
                       });
                     case 3:
                     case "end":
-                      return _context5.stop();
+                      return _context3.stop();
                   }
-                }, _loop2);
+                }, _loop);
               });
-              _iterator4.s();
+              _iterator.s();
             case 18:
-              if ((_step4 = _iterator4.n()).done) {
-                _context6.next = 22;
+              if ((_step = _iterator.n()).done) {
+                _context4.next = 22;
                 break;
               }
-              return _context6.delegateYield(_loop2(), "t0", 20);
+              return _context4.delegateYield(_loop(), "t0", 20);
             case 20:
-              _context6.next = 18;
+              _context4.next = 18;
               break;
             case 22:
-              _context6.next = 27;
+              _context4.next = 27;
               break;
             case 24:
-              _context6.prev = 24;
-              _context6.t1 = _context6["catch"](15);
-              _iterator4.e(_context6.t1);
+              _context4.prev = 24;
+              _context4.t1 = _context4["catch"](15);
+              _iterator.e(_context4.t1);
             case 27:
-              _context6.prev = 27;
-              _iterator4.f();
-              return _context6.finish(27);
+              _context4.prev = 27;
+              _iterator.f();
+              return _context4.finish(27);
             case 30:
               if (!isEqual(syncedBlocksToFlush, this.lastFlushedSyncedBlocks)) {
-                _context6.next = 33;
+                _context4.next = 33;
                 break;
               }
               this.isCacheDirty = false; // Reset since we're considering this a successful no-op flush
-              return _context6.abrupt("return", true);
+              return _context4.abrupt("return", true);
             case 33:
               // reset isCacheDirty early to prevent race condition
               // There is a race condition where if a user makes changes (create/delete) to a reference sync block
@@ -1347,32 +764,32 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
               // exactly at a time when the updateReferenceData is being executed asynchronously.
               this.isCacheDirty = false;
               (_this$saveExperience = this.saveExperience) === null || _this$saveExperience === void 0 || _this$saveExperience.start();
-              _context6.next = 37;
+              _context4.next = 37;
               return this.dataProvider.updateReferenceData(blocks);
             case 37:
-              updateResult = _context6.sent;
+              updateResult = _context4.sent;
               if (!updateResult.success) {
                 success = false;
                 (_this$saveExperience2 = this.saveExperience) === null || _this$saveExperience2 === void 0 || _this$saveExperience2.failure({
                   reason: updateResult.error || 'Failed to update reference synced blocks on the document'
                 });
-                (_this$fireAnalyticsEv1 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv1 === void 0 || _this$fireAnalyticsEv1.call(this, updateReferenceErrorPayload(updateResult.error || 'Failed to update reference synced blocks on the document'));
+                (_this$fireAnalyticsEv5 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv5 === void 0 || _this$fireAnalyticsEv5.call(this, updateReferenceErrorPayload(updateResult.error || 'Failed to update reference synced blocks on the document'));
               }
-              _context6.next = 47;
+              _context4.next = 47;
               break;
             case 41:
-              _context6.prev = 41;
-              _context6.t2 = _context6["catch"](10);
+              _context4.prev = 41;
+              _context4.t2 = _context4["catch"](10);
               success = false;
-              logException(_context6.t2, {
+              logException(_context4.t2, {
                 location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
               });
               (_this$saveExperience3 = this.saveExperience) === null || _this$saveExperience3 === void 0 || _this$saveExperience3.failure({
-                reason: _context6.t2.message
+                reason: _context4.t2.message
               });
-              (_this$fireAnalyticsEv10 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv10 === void 0 || _this$fireAnalyticsEv10.call(this, updateReferenceErrorPayload(_context6.t2.message));
+              (_this$fireAnalyticsEv6 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv6 === void 0 || _this$fireAnalyticsEv6.call(this, updateReferenceErrorPayload(_context4.t2.message));
             case 47:
-              _context6.prev = 47;
+              _context4.prev = 47;
               if (!success) {
                 // set isCacheDirty back to true for cases where it failed to update the reference synced blocks on the BE
                 this.isCacheDirty = true;
@@ -1390,18 +807,18 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
                 // Use setTimeout to avoid deep recursion and run queued flush asynchronously
                 // Note: flush() handles all exceptions internally and never rejects
                 this.queuedFlushTimeout = setTimeout(function () {
-                  _this11.queuedFlushTimeout = undefined;
-                  void _this11.flush();
+                  _this7.queuedFlushTimeout = undefined;
+                  void _this7.flush();
                 }, 0);
               }
-              return _context6.finish(47);
+              return _context4.finish(47);
             case 52:
-              return _context6.abrupt("return", success);
+              return _context4.abrupt("return", success);
             case 53:
             case "end":
-              return _context6.stop();
+              return _context4.stop();
           }
-        }, _callee4, this, [[10, 41, 47, 52], [15, 24, 27, 30]]);
+        }, _callee3, this, [[10, 41, 47, 52], [15, 24, 27, 30]]);
       }));
       function flush() {
         return _flush.apply(this, arguments);
@@ -1411,36 +828,19 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "destroy",
     value: function destroy() {
-      var _this$dataProvider8, _this$saveExperience5, _this$fetchExperience0, _this$fetchSourceInfo2;
+      var _this$dataProvider6, _this$saveExperience5, _this$fetchExperience0, _this$fetchSourceInfo2;
       // 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 || _this$_subscriptionMa.destroy();
-        (_this$_providerFactor = this._providerFactoryManager) === null || _this$_providerFactor === void 0 || _this$_providerFactor.destroy();
-        (_this$_batchFetcher = this._batchFetcher) === null || _this$_batchFetcher === void 0 || _this$_batchFetcher.destroy();
-      }
-
-      // Clean up all GraphQL subscriptions first
-      this.cleanupAllGraphQLSubscriptions();
-      (_this$dataProvider8 = this.dataProvider) === null || _this$dataProvider8 === 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 || _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(function (providerFactory) {
-        providerFactory.destroy();
-      });
-      this.providerFactories.clear();
       (_this$saveExperience5 = this.saveExperience) === null || _this$saveExperience5 === void 0 || _this$saveExperience5.abort({
         reason: 'editorDestroyed'
       });
@@ -1451,9 +851,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
         reason: 'editorDestroyed'
       });
       this.fireAnalyticsEvent = undefined;
-      if (fg('platform_synced_block_patch_5')) {
-        syncBlockInMemorySessionCache.clear();
-      }
+      syncBlockInMemorySessionCache.clear();
     }
   }]);
 }();