@atlaskit/editor-synced-block-provider 2.15.4 → 2.15.6

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-synced-block-provider
 
+## 2.15.6
+
+### Patch Changes
+
+- [`d40079fdeef5d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d40079fdeef5d) -
+  EDITOR-4044 Fix a race condition in source sync block dirty tracking logic
+- [`267f0abf6b4cf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/267f0abf6b4cf) -
+  EDITOR-4044 Fix a race condition in reference sync block dirty tracking logic
+- Updated dependencies
+
+## 2.15.5
+
+### Patch Changes
+
+- [`a4ed9f55162ae`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a4ed9f55162ae) -
+  EDITOR-3960 Refactor Synced Blocks initialization to remove multiple re-renders and duplicated
+  fetches
+- Updated dependencies
+
 ## 2.15.4
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -3,12 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "ReferenceSyncBlockStoreManager", {
-  enumerable: true,
-  get: function get() {
-    return _referenceSyncBlockStoreManager.ReferenceSyncBlockStoreManager;
-  }
-});
 Object.defineProperty(exports, "SyncBlockError", {
   enumerable: true,
   get: function get() {
@@ -171,6 +165,12 @@ Object.defineProperty(exports, "useMemoizedContentAPIProviders", {
     return _confluenceContentAPI.useMemoizedContentAPIProviders;
   }
 });
+Object.defineProperty(exports, "useMemoizedSyncBlockStoreManager", {
+  enumerable: true,
+  get: function get() {
+    return _syncBlockStoreManager.useMemoizedSyncBlockStoreManager;
+  }
+});
 Object.defineProperty(exports, "useMemoizedSyncedBlockProvider", {
   enumerable: true,
   get: function get() {
@@ -188,7 +188,6 @@ var _blockServiceAPI = require("./providers/block-service/blockServiceAPI");
 var _confluenceContentAPI = require("./providers/confluence/confluenceContentAPI");
 var _sourceInfo = require("./clients/confluence/sourceInfo");
 var _syncBlockProvider = require("./providers/syncBlockProvider");
-var _referenceSyncBlockStoreManager = require("./store-manager/referenceSyncBlockStoreManager");
 var _syncBlockStoreManager = require("./store-manager/syncBlockStoreManager");
 var _resolveSyncBlockInstance = require("./utils/resolveSyncBlockInstance");
 var _utils = require("./utils/utils");

package/dist/cjs/providers/block-service/blockServiceAPI.js

@@ -386,7 +386,8 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
                     blockAri: (0, _ari.generateBlockAriFromReference)(_this.sourceAri, block.resourceId),
                     blockInstanceId: block.localId
                   };
-                }, noContent)
+                }),
+                noContent: noContent
               });
             case 3:
               return _context6.abrupt("return", {

package/dist/cjs/providers/syncBlockProvider.js

@@ -32,7 +32,7 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
    * @param sourceId
    * @param nestedRendererDataProviders
    */
-  function SyncBlockProvider(fetchProvider, writeProvider, sourceId, providerOptions) {
+  function SyncBlockProvider(fetchProvider, writeProvider, sourceId) {
     var _this;
     (0, _classCallCheck2.default)(this, SyncBlockProvider);
     _this = _callSuper(this, SyncBlockProvider);
@@ -40,11 +40,16 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
     _this.fetchProvider = fetchProvider;
     _this.writeProvider = writeProvider;
     _this.sourceId = sourceId;
-    _this.providerOptions = providerOptions;
+    _this.providerOptions = {};
     return _this;
   }
   (0, _inherits2.default)(SyncBlockProvider, _SyncBlockDataProvide);
   return (0, _createClass2.default)(SyncBlockProvider, [{
+    key: "setProviderOptions",
+    value: function setProviderOptions(providerOptions) {
+      this.providerOptions = providerOptions;
+    }
+  }, {
     key: "getProduct",
     value: function getProduct() {
       return this.writeProvider.product;
@@ -304,12 +309,13 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
   }]);
 }(_types2.SyncBlockDataProvider);
 var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(fetchProvider, writeProvider, sourceId, providerOptions, getSSRData) {
-  return (0, _react.useMemo)(function () {
-    var syncBlockProvider = new SyncBlockProvider(fetchProvider, writeProvider, sourceId, providerOptions);
-    var ssrData = getSSRData ? getSSRData() : undefined;
-    if (ssrData) {
-      syncBlockProvider.setSSRData(ssrData);
-    }
-    return syncBlockProvider;
-  }, [fetchProvider, writeProvider, sourceId, providerOptions, getSSRData]);
+  var syncBlockProvider = (0, _react.useMemo)(function () {
+    return new SyncBlockProvider(fetchProvider, writeProvider, sourceId);
+  }, [fetchProvider, writeProvider, sourceId]);
+  syncBlockProvider.setProviderOptions(providerOptions);
+  var ssrData = getSSRData ? getSSRData() : undefined;
+  if (ssrData) {
+    syncBlockProvider.setSSRData(ssrData);
+  }
+  return syncBlockProvider;
 };

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

@@ -39,7 +39,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     this.subscriptions = new Map();
     this.titleSubscriptions = new Map();
     this.dataProvider = dataProvider;
-    this.syncBlockURLRequests = new Map();
+    this.syncBlockFetchDataRequests = new Map();
+    this.syncBlockSourceInfoRequests = new Map();
     this.providerFactories = new Map();
     this.fireAnalyticsEvent = fireAnalyticsEvent;
   }
@@ -160,7 +161,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
         if (!resourceId || !this.dataProvider) {
           throw new Error('Data provider or resourceId not set');
         }
-        if (this.syncBlockURLRequests.get(resourceId)) {
+        if (this.syncBlockSourceInfoRequests.get(resourceId)) {
           return;
         }
         var existingSyncBlock = this.getFromCache(resourceId);
@@ -181,7 +182,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
           (_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 || _this$fireAnalyticsEv2.call(this, (0, _errorHandling.getSourceInfoErrorPayload)('SourceAri, product or blockInstanceId missing'));
           return;
         }
-        this.syncBlockURLRequests.set(resourceId, true);
+        this.syncBlockSourceInfoRequests.set(resourceId, true);
         this.dataProvider.fetchSyncBlockSourceInfo(blockInstanceId, sourceAri, product, this.fireAnalyticsEvent).then(function (sourceInfo) {
           if (!sourceInfo) {
             return;
@@ -194,7 +195,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
           var _this$fireAnalyticsEv3;
           (_this$fireAnalyticsEv3 = _this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 || _this$fireAnalyticsEv3.call(_this, (0, _errorHandling.getSourceInfoErrorPayload)(error.message));
         }).finally(function () {
-          _this.syncBlockURLRequests.delete(resourceId);
+          _this.syncBlockSourceInfoRequests.delete(resourceId);
         });
       } catch (error) {
         var _this$fireAnalyticsEv4;
@@ -215,7 +216,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     value: (function () {
       var _fetchSyncBlocksData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(syncBlockNodes) {
         var _this2 = this;
-        var nodesToFetch, blocksWithNotFoundError, data, resolvedData;
+        var nodesToFetch, data, resolvedData;
         return _regenerator.default.wrap(function _callee2$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -223,7 +224,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
                 _context3.next = 2;
                 break;
               }
-              return _context3.abrupt("return", Promise.resolve([]));
+              return _context3.abrupt("return");
             case 2:
               if (this.dataProvider) {
                 _context3.next = 4;
@@ -232,18 +233,27 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
               throw new Error('Data provider not set');
             case 4:
               // Don't fetch for not_found error since the source is already deleted
-              nodesToFetch = [], blocksWithNotFoundError = [];
+              nodesToFetch = [];
               syncBlockNodes.forEach(function (node) {
+                if (_this2.syncBlockFetchDataRequests.get(node.attrs.resourceId)) {
+                  return;
+                }
                 var existingSyncBlock = _this2.getFromCache(node.attrs.resourceId);
                 if ((existingSyncBlock === null || existingSyncBlock === void 0 ? void 0 : existingSyncBlock.error) === _types.SyncBlockError.NotFound) {
-                  blocksWithNotFoundError.push(existingSyncBlock);
-                } else {
-                  nodesToFetch.push(node);
+                  return;
                 }
+                nodesToFetch.push(node);
               });
-              _context3.next = 8;
-              return this.dataProvider.fetchNodesData(nodesToFetch);
-            case 8:
+              nodesToFetch.forEach(function (node) {
+                _this2.syncBlockFetchDataRequests.set(node.attrs.resourceId, true);
+              });
+              _context3.next = 9;
+              return this.dataProvider.fetchNodesData(nodesToFetch).finally(function () {
+                nodesToFetch.forEach(function (node) {
+                  _this2.syncBlockFetchDataRequests.delete(node.attrs.resourceId);
+                });
+              });
+            case 9:
               data = _context3.sent;
               resolvedData = [];
               data.forEach(function (syncBlockInstance) {
@@ -263,7 +273,6 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
                 }
                 _this2.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
               });
-              return _context3.abrupt("return", [].concat(resolvedData, blocksWithNotFoundError));
             case 12:
             case "end":
               return _context3.stop();
@@ -527,7 +536,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
 
     /**
      * Update reference synced blocks on the document with the BE
-     * 
+     *
      * @returns true if the reference synced blocks are updated successfully, false otherwise
      */
   }, {
@@ -565,42 +574,50 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
                 });
               });
               if (!(blocks.length === 0)) {
-                _context4.next = 10;
+                _context4.next = 11;
                 break;
               }
+              this.isCacheDirty = false;
               return _context4.abrupt("return", true);
-            case 10:
-              _context4.next = 12;
+            case 11:
+              // 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
+              // on a live page and the reference sync block is being saved while the user
+              // is still making changes, the new changes might not be saved if they all happen
+              // exactly at a time when the updateReferenceData is being executed asynchronously.
+              this.isCacheDirty = false;
+              _context4.next = 14;
               return this.dataProvider.updateReferenceData(blocks);
-            case 12:
+            case 14:
               updateResult = _context4.sent;
               if (!updateResult.success) {
                 success = false;
                 (_this$fireAnalyticsEv9 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv9 === void 0 || _this$fireAnalyticsEv9.call(this, (0, _errorHandling.updateReferenceErrorPayload)(updateResult.error || 'Failed to update reference synced blocks on the document'));
               }
-              _context4.next = 21;
+              _context4.next = 23;
               break;
-            case 16:
-              _context4.prev = 16;
+            case 18:
+              _context4.prev = 18;
               _context4.t0 = _context4["catch"](3);
               success = false;
               (0, _monitoring.logException)(_context4.t0, {
                 location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
               });
               (_this$fireAnalyticsEv0 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv0 === void 0 || _this$fireAnalyticsEv0.call(this, (0, _errorHandling.updateReferenceErrorPayload)(_context4.t0.message));
-            case 21:
-              _context4.prev = 21;
-              if (success) {
-                this.isCacheDirty = false;
+            case 23:
+              _context4.prev = 23;
+              if (!success) {
+                // set isCacheDirty back to true for cases where it failed to update the reference synced blocks on the BE
+                this.isCacheDirty = true;
               }
-              return _context4.finish(21);
-            case 24:
+              return _context4.finish(23);
+            case 26:
               return _context4.abrupt("return", success);
-            case 25:
+            case 27:
             case "end":
               return _context4.stop();
           }
-        }, _callee3, this, [[3, 16, 21, 24]]);
+        }, _callee3, this, [[3, 18, 23, 26]]);
       }));
       function flush() {
         return _flush.apply(this, arguments);
@@ -614,7 +631,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       this.syncBlockCache.clear();
       this.subscriptions.clear();
       this.titleSubscriptions.clear();
-      this.syncBlockURLRequests.clear();
+      this.syncBlockFetchDataRequests.clear();
+      this.syncBlockSourceInfoRequests.clear();
       this.providerFactories.clear();
       this.isRefreshingSubscriptions = false;
       this.providerFactories.forEach(function (providerFactory) {

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

@@ -109,6 +109,13 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
                     }
                   });
                   bodiedSyncBlockData.push(syncBlockData);
+
+                  // reset isDirty early to prevent race condition
+                  // There is a race condition where if a user makes changes to a source sync block
+                  // on a live page and the source sync block is being saved while the user
+                  // is still making changes, the new changes might not be saved if they all happen
+                  // exactly at a time when the writeNodesData is being executed asynchronously.
+                  syncBlockData.isDirty = false;
                 }
               });
               if (!(bodiedSyncBlockNodes.length === 0)) {
@@ -122,11 +129,11 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
             case 10:
               writeResults = _context.sent;
               writeResults.forEach(function (result) {
-                // set isDirty to false on write success and unrecoverable errors like not found
-                if (result.resourceId && (result.error === _types.SyncBlockError.NotFound || !result.error)) {
+                // set isDirty to true for cases where it failed to save the sync block to the BE
+                if (result.resourceId && result.error && result.error !== _types.SyncBlockError.NotFound) {
                   var cachedData = _this2.syncBlockCache.get(result.resourceId);
                   if (cachedData) {
-                    cachedData.isDirty = false;
+                    cachedData.isDirty = true;
                   }
                 }
               });

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

@@ -4,9 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SyncBlockStoreManager = void 0;
+exports.useMemoizedSyncBlockStoreManager = exports.SyncBlockStoreManager = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _react = require("react");
 var _referenceSyncBlockStoreManager = require("./referenceSyncBlockStoreManager");
 var _sourceSyncBlockStoreManager = require("./sourceSyncBlockStoreManager");
 // A parent store manager responsible for the lifecycle and state management of sync blocks in an editor instance.
@@ -39,4 +40,10 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
       this.sourceSyncBlockStoreManager.destroy();
     }
   }]);
-}();
+}();
+var useMemoizedSyncBlockStoreManager = exports.useMemoizedSyncBlockStoreManager = function useMemoizedSyncBlockStoreManager(dataProvider, fireAnalyticsEvent) {
+  return (0, _react.useMemo)(function () {
+    var syncBlockStoreManager = new SyncBlockStoreManager(dataProvider, fireAnalyticsEvent);
+    return syncBlockStoreManager;
+  }, [dataProvider, fireAnalyticsEvent]);
+};

package/dist/es2019/index.js

@@ -17,9 +17,10 @@ export { useMemoizedBlockServiceAPIProviders } from './providers/block-service/b
 export { createContentAPIProvidersWithDefaultKey, useMemoizedContentAPIProviders } from './providers/confluence/confluenceContentAPI';
 export { fetchConfluencePageInfo } from './clients/confluence/sourceInfo';
 export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider } from './providers/syncBlockProvider';
+
 // store managers
-export { ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';
-export { SyncBlockStoreManager } from './store-manager/syncBlockStoreManager';
+
+export { SyncBlockStoreManager, useMemoizedSyncBlockStoreManager } from './store-manager/syncBlockStoreManager';
 
 // utils
 export { resolveSyncBlockInstance } from './utils/resolveSyncBlockInstance';

package/dist/es2019/providers/block-service/blockServiceAPI.js

@@ -213,7 +213,7 @@ class BlockServiceADFWriteProvider {
     } catch (error) {
       if (error instanceof BlockError) {
         if (error.status === 404) {
-          // User should not be blocked by not_found error when deleting, 
+          // User should not be blocked by not_found error when deleting,
           // hence returns successful result for 404 error
           return {
             resourceId,
@@ -248,7 +248,8 @@ class BlockServiceADFWriteProvider {
         blocks: blocks.map(block => ({
           blockAri: generateBlockAriFromReference(this.sourceAri, block.resourceId),
           blockInstanceId: block.localId
-        }), noContent)
+        })),
+        noContent
       });
       return {
         success: true

package/dist/es2019/providers/syncBlockProvider.js

@@ -15,12 +15,15 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
    * @param sourceId
    * @param nestedRendererDataProviders
    */
-  constructor(fetchProvider, writeProvider, sourceId, providerOptions) {
+  constructor(fetchProvider, writeProvider, sourceId) {
     super();
     _defineProperty(this, "name", 'syncBlockProvider');
     this.fetchProvider = fetchProvider;
     this.writeProvider = writeProvider;
     this.sourceId = sourceId;
+    this.providerOptions = {};
+  }
+  setProviderOptions(providerOptions) {
     this.providerOptions = providerOptions;
   }
   getProduct() {
@@ -205,12 +208,11 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
   }
 }
 export const useMemoizedSyncedBlockProvider = (fetchProvider, writeProvider, sourceId, providerOptions, getSSRData) => {
-  return useMemo(() => {
-    const syncBlockProvider = new SyncBlockProvider(fetchProvider, writeProvider, sourceId, providerOptions);
-    const ssrData = getSSRData ? getSSRData() : undefined;
-    if (ssrData) {
-      syncBlockProvider.setSSRData(ssrData);
-    }
-    return syncBlockProvider;
-  }, [fetchProvider, writeProvider, sourceId, providerOptions, getSSRData]);
+  const syncBlockProvider = useMemo(() => new SyncBlockProvider(fetchProvider, writeProvider, sourceId), [fetchProvider, writeProvider, sourceId]);
+  syncBlockProvider.setProviderOptions(providerOptions);
+  const ssrData = getSSRData ? getSSRData() : undefined;
+  if (ssrData) {
+    syncBlockProvider.setSSRData(ssrData);
+  }
+  return syncBlockProvider;
 };

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

@@ -22,7 +22,8 @@ export class ReferenceSyncBlockStoreManager {
     this.subscriptions = new Map();
     this.titleSubscriptions = new Map();
     this.dataProvider = dataProvider;
-    this.syncBlockURLRequests = new Map();
+    this.syncBlockFetchDataRequests = new Map();
+    this.syncBlockSourceInfoRequests = new Map();
     this.providerFactories = new Map();
     this.fireAnalyticsEvent = fireAnalyticsEvent;
   }
@@ -76,7 +77,7 @@ export class ReferenceSyncBlockStoreManager {
       if (!resourceId || !this.dataProvider) {
         throw new Error('Data provider or resourceId not set');
       }
-      if (this.syncBlockURLRequests.get(resourceId)) {
+      if (this.syncBlockSourceInfoRequests.get(resourceId)) {
         return;
       }
       const existingSyncBlock = this.getFromCache(resourceId);
@@ -98,7 +99,7 @@ export class ReferenceSyncBlockStoreManager {
         (_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 ? void 0 : _this$fireAnalyticsEv2.call(this, getSourceInfoErrorPayload('SourceAri, product or blockInstanceId missing'));
         return;
       }
-      this.syncBlockURLRequests.set(resourceId, true);
+      this.syncBlockSourceInfoRequests.set(resourceId, true);
       this.dataProvider.fetchSyncBlockSourceInfo(blockInstanceId, sourceAri, product, this.fireAnalyticsEvent).then(sourceInfo => {
         if (!sourceInfo) {
           return;
@@ -111,7 +112,7 @@ export class ReferenceSyncBlockStoreManager {
         var _this$fireAnalyticsEv3;
         (_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 ? void 0 : _this$fireAnalyticsEv3.call(this, getSourceInfoErrorPayload(error.message));
       }).finally(() => {
-        this.syncBlockURLRequests.delete(resourceId);
+        this.syncBlockSourceInfoRequests.delete(resourceId);
       });
     } catch (error) {
       var _this$fireAnalyticsEv4;
@@ -129,24 +130,32 @@ export class ReferenceSyncBlockStoreManager {
    */
   async fetchSyncBlocksData(syncBlockNodes) {
     if (syncBlockNodes.length === 0) {
-      return Promise.resolve([]);
+      return;
     }
     if (!this.dataProvider) {
       throw new Error('Data provider not set');
     }
 
     // Don't fetch for not_found error since the source is already deleted
-    const nodesToFetch = [],
-      blocksWithNotFoundError = [];
+    const nodesToFetch = [];
     syncBlockNodes.forEach(node => {
+      if (this.syncBlockFetchDataRequests.get(node.attrs.resourceId)) {
+        return;
+      }
       const existingSyncBlock = this.getFromCache(node.attrs.resourceId);
       if ((existingSyncBlock === null || existingSyncBlock === void 0 ? void 0 : existingSyncBlock.error) === SyncBlockError.NotFound) {
-        blocksWithNotFoundError.push(existingSyncBlock);
-      } else {
-        nodesToFetch.push(node);
+        return;
       }
+      nodesToFetch.push(node);
+    });
+    nodesToFetch.forEach(node => {
+      this.syncBlockFetchDataRequests.set(node.attrs.resourceId, true);
+    });
+    const data = await this.dataProvider.fetchNodesData(nodesToFetch).finally(() => {
+      nodesToFetch.forEach(node => {
+        this.syncBlockFetchDataRequests.delete(node.attrs.resourceId);
+      });
     });
-    const data = await this.dataProvider.fetchNodesData(nodesToFetch);
     const resolvedData = [];
     data.forEach(syncBlockInstance => {
       if (!syncBlockInstance.resourceId) {
@@ -165,7 +174,6 @@ export class ReferenceSyncBlockStoreManager {
       }
       this.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
     });
-    return [...resolvedData, ...blocksWithNotFoundError];
   }
   updateCacheWithSourceInfo(resourceId, sourceInfo) {
     const existingSyncBlock = this.getFromCache(resourceId);
@@ -409,7 +417,7 @@ export class ReferenceSyncBlockStoreManager {
 
   /**
    * Update reference synced blocks on the document with the BE
-   * 
+   *
    * @returns true if the reference synced blocks are updated successfully, false otherwise
    */
   async flush() {
@@ -433,8 +441,16 @@ export class ReferenceSyncBlockStoreManager {
         });
       });
       if (blocks.length === 0) {
+        this.isCacheDirty = false;
         return true;
       }
+
+      // 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
+      // on a live page and the reference sync block is being saved while the user
+      // is still making changes, the new changes might not be saved if they all happen
+      // exactly at a time when the updateReferenceData is being executed asynchronously.
+      this.isCacheDirty = false;
       const updateResult = await this.dataProvider.updateReferenceData(blocks);
       if (!updateResult.success) {
         var _this$fireAnalyticsEv10;
@@ -449,8 +465,9 @@ export class ReferenceSyncBlockStoreManager {
       });
       (_this$fireAnalyticsEv11 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv11 === void 0 ? void 0 : _this$fireAnalyticsEv11.call(this, updateReferenceErrorPayload(error.message));
     } finally {
-      if (success) {
-        this.isCacheDirty = false;
+      if (!success) {
+        // set isCacheDirty back to true for cases where it failed to update the reference synced blocks on the BE
+        this.isCacheDirty = true;
       }
     }
     return success;
@@ -460,7 +477,8 @@ export class ReferenceSyncBlockStoreManager {
     this.syncBlockCache.clear();
     this.subscriptions.clear();
     this.titleSubscriptions.clear();
-    this.syncBlockURLRequests.clear();
+    this.syncBlockFetchDataRequests.clear();
+    this.syncBlockSourceInfoRequests.clear();
     this.providerFactories.clear();
     this.isRefreshingSubscriptions = false;
     this.providerFactories.forEach(providerFactory => {

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

@@ -82,6 +82,13 @@ export class SourceSyncBlockStoreManager {
             }
           });
           bodiedSyncBlockData.push(syncBlockData);
+
+          // reset isDirty early to prevent race condition
+          // There is a race condition where if a user makes changes to a source sync block
+          // on a live page and the source sync block is being saved while the user
+          // is still making changes, the new changes might not be saved if they all happen
+          // exactly at a time when the writeNodesData is being executed asynchronously.
+          syncBlockData.isDirty = false;
         }
       });
       if (bodiedSyncBlockNodes.length === 0) {
@@ -89,11 +96,11 @@ export class SourceSyncBlockStoreManager {
       }
       const writeResults = await this.dataProvider.writeNodesData(bodiedSyncBlockNodes, bodiedSyncBlockData);
       writeResults.forEach(result => {
-        // set isDirty to false on write success and unrecoverable errors like not found
-        if (result.resourceId && (result.error === SyncBlockError.NotFound || !result.error)) {
+        // set isDirty to true for cases where it failed to save the sync block to the BE
+        if (result.resourceId && result.error && result.error !== SyncBlockError.NotFound) {
           const cachedData = this.syncBlockCache.get(result.resourceId);
           if (cachedData) {
-            cachedData.isDirty = false;
+            cachedData.isDirty = true;
           }
         }
       });

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

@@ -1,3 +1,4 @@
+import { useMemo } from 'react';
 import { ReferenceSyncBlockStoreManager } from './referenceSyncBlockStoreManager';
 import { SourceSyncBlockStoreManager } from './sourceSyncBlockStoreManager';
 
@@ -23,4 +24,10 @@ export class SyncBlockStoreManager {
     this.referenceSyncBlockStoreManager.destroy();
     this.sourceSyncBlockStoreManager.destroy();
   }
-}
+}
+export const useMemoizedSyncBlockStoreManager = (dataProvider, fireAnalyticsEvent) => {
+  return useMemo(() => {
+    const syncBlockStoreManager = new SyncBlockStoreManager(dataProvider, fireAnalyticsEvent);
+    return syncBlockStoreManager;
+  }, [dataProvider, fireAnalyticsEvent]);
+};

package/dist/esm/index.js

@@ -17,9 +17,10 @@ export { useMemoizedBlockServiceAPIProviders } from './providers/block-service/b
 export { createContentAPIProvidersWithDefaultKey, useMemoizedContentAPIProviders } from './providers/confluence/confluenceContentAPI';
 export { fetchConfluencePageInfo } from './clients/confluence/sourceInfo';
 export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider } from './providers/syncBlockProvider';
+
 // store managers
-export { ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';
-export { SyncBlockStoreManager } from './store-manager/syncBlockStoreManager';
+
+export { SyncBlockStoreManager, useMemoizedSyncBlockStoreManager } from './store-manager/syncBlockStoreManager';
 
 // utils
 export { resolveSyncBlockInstance } from './utils/resolveSyncBlockInstance';

package/dist/esm/providers/block-service/blockServiceAPI.js

@@ -378,7 +378,8 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
                     blockAri: generateBlockAriFromReference(_this.sourceAri, block.resourceId),
                     blockInstanceId: block.localId
                   };
-                }, noContent)
+                }),
+                noContent: noContent
               });
             case 3:
               return _context6.abrupt("return", {

package/dist/esm/providers/syncBlockProvider.js

@@ -25,7 +25,7 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
    * @param sourceId
    * @param nestedRendererDataProviders
    */
-  function SyncBlockProvider(fetchProvider, writeProvider, sourceId, providerOptions) {
+  function SyncBlockProvider(fetchProvider, writeProvider, sourceId) {
     var _this;
     _classCallCheck(this, SyncBlockProvider);
     _this = _callSuper(this, SyncBlockProvider);
@@ -33,11 +33,16 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
     _this.fetchProvider = fetchProvider;
     _this.writeProvider = writeProvider;
     _this.sourceId = sourceId;
-    _this.providerOptions = providerOptions;
+    _this.providerOptions = {};
     return _this;
   }
   _inherits(SyncBlockProvider, _SyncBlockDataProvide);
   return _createClass(SyncBlockProvider, [{
+    key: "setProviderOptions",
+    value: function setProviderOptions(providerOptions) {
+      this.providerOptions = providerOptions;
+    }
+  }, {
     key: "getProduct",
     value: function getProduct() {
       return this.writeProvider.product;
@@ -297,12 +302,13 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
   }]);
 }(SyncBlockDataProvider);
 export var useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(fetchProvider, writeProvider, sourceId, providerOptions, getSSRData) {
-  return useMemo(function () {
-    var syncBlockProvider = new SyncBlockProvider(fetchProvider, writeProvider, sourceId, providerOptions);
-    var ssrData = getSSRData ? getSSRData() : undefined;
-    if (ssrData) {
-      syncBlockProvider.setSSRData(ssrData);
-    }
-    return syncBlockProvider;
-  }, [fetchProvider, writeProvider, sourceId, providerOptions, getSSRData]);
+  var syncBlockProvider = useMemo(function () {
+    return new SyncBlockProvider(fetchProvider, writeProvider, sourceId);
+  }, [fetchProvider, writeProvider, sourceId]);
+  syncBlockProvider.setProviderOptions(providerOptions);
+  var ssrData = getSSRData ? getSSRData() : undefined;
+  if (ssrData) {
+    syncBlockProvider.setSSRData(ssrData);
+  }
+  return syncBlockProvider;
 };

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

@@ -33,7 +33,8 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
     this.subscriptions = new Map();
     this.titleSubscriptions = new Map();
     this.dataProvider = dataProvider;
-    this.syncBlockURLRequests = new Map();
+    this.syncBlockFetchDataRequests = new Map();
+    this.syncBlockSourceInfoRequests = new Map();
     this.providerFactories = new Map();
     this.fireAnalyticsEvent = fireAnalyticsEvent;
   }
@@ -154,7 +155,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
         if (!resourceId || !this.dataProvider) {
           throw new Error('Data provider or resourceId not set');
         }
-        if (this.syncBlockURLRequests.get(resourceId)) {
+        if (this.syncBlockSourceInfoRequests.get(resourceId)) {
           return;
         }
         var existingSyncBlock = this.getFromCache(resourceId);
@@ -175,7 +176,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
           (_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 || _this$fireAnalyticsEv2.call(this, getSourceInfoErrorPayload('SourceAri, product or blockInstanceId missing'));
           return;
         }
-        this.syncBlockURLRequests.set(resourceId, true);
+        this.syncBlockSourceInfoRequests.set(resourceId, true);
         this.dataProvider.fetchSyncBlockSourceInfo(blockInstanceId, sourceAri, product, this.fireAnalyticsEvent).then(function (sourceInfo) {
           if (!sourceInfo) {
             return;
@@ -188,7 +189,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
           var _this$fireAnalyticsEv3;
           (_this$fireAnalyticsEv3 = _this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 || _this$fireAnalyticsEv3.call(_this, getSourceInfoErrorPayload(error.message));
         }).finally(function () {
-          _this.syncBlockURLRequests.delete(resourceId);
+          _this.syncBlockSourceInfoRequests.delete(resourceId);
         });
       } catch (error) {
         var _this$fireAnalyticsEv4;
@@ -209,7 +210,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
     value: (function () {
       var _fetchSyncBlocksData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(syncBlockNodes) {
         var _this2 = this;
-        var nodesToFetch, blocksWithNotFoundError, data, resolvedData;
+        var nodesToFetch, data, resolvedData;
         return _regeneratorRuntime.wrap(function _callee2$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -217,7 +218,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
                 _context3.next = 2;
                 break;
               }
-              return _context3.abrupt("return", Promise.resolve([]));
+              return _context3.abrupt("return");
             case 2:
               if (this.dataProvider) {
                 _context3.next = 4;
@@ -226,18 +227,27 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
               throw new Error('Data provider not set');
             case 4:
               // Don't fetch for not_found error since the source is already deleted
-              nodesToFetch = [], blocksWithNotFoundError = [];
+              nodesToFetch = [];
               syncBlockNodes.forEach(function (node) {
+                if (_this2.syncBlockFetchDataRequests.get(node.attrs.resourceId)) {
+                  return;
+                }
                 var existingSyncBlock = _this2.getFromCache(node.attrs.resourceId);
                 if ((existingSyncBlock === null || existingSyncBlock === void 0 ? void 0 : existingSyncBlock.error) === SyncBlockError.NotFound) {
-                  blocksWithNotFoundError.push(existingSyncBlock);
-                } else {
-                  nodesToFetch.push(node);
+                  return;
                 }
+                nodesToFetch.push(node);
               });
-              _context3.next = 8;
-              return this.dataProvider.fetchNodesData(nodesToFetch);
-            case 8:
+              nodesToFetch.forEach(function (node) {
+                _this2.syncBlockFetchDataRequests.set(node.attrs.resourceId, true);
+              });
+              _context3.next = 9;
+              return this.dataProvider.fetchNodesData(nodesToFetch).finally(function () {
+                nodesToFetch.forEach(function (node) {
+                  _this2.syncBlockFetchDataRequests.delete(node.attrs.resourceId);
+                });
+              });
+            case 9:
               data = _context3.sent;
               resolvedData = [];
               data.forEach(function (syncBlockInstance) {
@@ -257,7 +267,6 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
                 }
                 _this2.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
               });
-              return _context3.abrupt("return", [].concat(resolvedData, blocksWithNotFoundError));
             case 12:
             case "end":
               return _context3.stop();
@@ -521,7 +530,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
 
     /**
      * Update reference synced blocks on the document with the BE
-     * 
+     *
      * @returns true if the reference synced blocks are updated successfully, false otherwise
      */
   }, {
@@ -559,42 +568,50 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
                 });
               });
               if (!(blocks.length === 0)) {
-                _context4.next = 10;
+                _context4.next = 11;
                 break;
               }
+              this.isCacheDirty = false;
               return _context4.abrupt("return", true);
-            case 10:
-              _context4.next = 12;
+            case 11:
+              // 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
+              // on a live page and the reference sync block is being saved while the user
+              // is still making changes, the new changes might not be saved if they all happen
+              // exactly at a time when the updateReferenceData is being executed asynchronously.
+              this.isCacheDirty = false;
+              _context4.next = 14;
               return this.dataProvider.updateReferenceData(blocks);
-            case 12:
+            case 14:
               updateResult = _context4.sent;
               if (!updateResult.success) {
                 success = false;
                 (_this$fireAnalyticsEv9 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv9 === void 0 || _this$fireAnalyticsEv9.call(this, updateReferenceErrorPayload(updateResult.error || 'Failed to update reference synced blocks on the document'));
               }
-              _context4.next = 21;
+              _context4.next = 23;
               break;
-            case 16:
-              _context4.prev = 16;
+            case 18:
+              _context4.prev = 18;
               _context4.t0 = _context4["catch"](3);
               success = false;
               logException(_context4.t0, {
                 location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
               });
               (_this$fireAnalyticsEv0 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv0 === void 0 || _this$fireAnalyticsEv0.call(this, updateReferenceErrorPayload(_context4.t0.message));
-            case 21:
-              _context4.prev = 21;
-              if (success) {
-                this.isCacheDirty = false;
+            case 23:
+              _context4.prev = 23;
+              if (!success) {
+                // set isCacheDirty back to true for cases where it failed to update the reference synced blocks on the BE
+                this.isCacheDirty = true;
               }
-              return _context4.finish(21);
-            case 24:
+              return _context4.finish(23);
+            case 26:
               return _context4.abrupt("return", success);
-            case 25:
+            case 27:
             case "end":
               return _context4.stop();
           }
-        }, _callee3, this, [[3, 16, 21, 24]]);
+        }, _callee3, this, [[3, 18, 23, 26]]);
       }));
       function flush() {
         return _flush.apply(this, arguments);
@@ -608,7 +625,8 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
       this.syncBlockCache.clear();
       this.subscriptions.clear();
       this.titleSubscriptions.clear();
-      this.syncBlockURLRequests.clear();
+      this.syncBlockFetchDataRequests.clear();
+      this.syncBlockSourceInfoRequests.clear();
       this.providerFactories.clear();
       this.isRefreshingSubscriptions = false;
       this.providerFactories.forEach(function (providerFactory) {

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

@@ -103,6 +103,13 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
                     }
                   });
                   bodiedSyncBlockData.push(syncBlockData);
+
+                  // reset isDirty early to prevent race condition
+                  // There is a race condition where if a user makes changes to a source sync block
+                  // on a live page and the source sync block is being saved while the user
+                  // is still making changes, the new changes might not be saved if they all happen
+                  // exactly at a time when the writeNodesData is being executed asynchronously.
+                  syncBlockData.isDirty = false;
                 }
               });
               if (!(bodiedSyncBlockNodes.length === 0)) {
@@ -116,11 +123,11 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
             case 10:
               writeResults = _context.sent;
               writeResults.forEach(function (result) {
-                // set isDirty to false on write success and unrecoverable errors like not found
-                if (result.resourceId && (result.error === SyncBlockError.NotFound || !result.error)) {
+                // set isDirty to true for cases where it failed to save the sync block to the BE
+                if (result.resourceId && result.error && result.error !== SyncBlockError.NotFound) {
                   var cachedData = _this2.syncBlockCache.get(result.resourceId);
                   if (cachedData) {
-                    cachedData.isDirty = false;
+                    cachedData.isDirty = true;
                   }
                 }
               });

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

@@ -1,5 +1,6 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
+import { useMemo } from 'react';
 import { ReferenceSyncBlockStoreManager } from './referenceSyncBlockStoreManager';
 import { SourceSyncBlockStoreManager } from './sourceSyncBlockStoreManager';
 
@@ -33,4 +34,10 @@ export var SyncBlockStoreManager = /*#__PURE__*/function () {
       this.sourceSyncBlockStoreManager.destroy();
     }
   }]);
-}();
+}();
+export var useMemoizedSyncBlockStoreManager = function useMemoizedSyncBlockStoreManager(dataProvider, fireAnalyticsEvent) {
+  return useMemo(function () {
+    var syncBlockStoreManager = new SyncBlockStoreManager(dataProvider, fireAnalyticsEvent);
+    return syncBlockStoreManager;
+  }, [dataProvider, fireAnalyticsEvent]);
+};

package/dist/types/index.d.ts

@@ -11,8 +11,8 @@ export { createContentAPIProvidersWithDefaultKey, useMemoizedContentAPIProviders
 export { fetchConfluencePageInfo } from './clients/confluence/sourceInfo';
 export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider, } from './providers/syncBlockProvider';
 export type { ADFFetchProvider, ADFWriteProvider, SyncBlockDataProvider, SyncBlockInstance, MediaEmojiProviderOptions, SyncedBlockRendererProviderOptions, SyncBlockRendererProviderCreator, } from './providers/types';
-export { ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';
-export { SyncBlockStoreManager } from './store-manager/syncBlockStoreManager';
+export { type ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';
+export { SyncBlockStoreManager, useMemoizedSyncBlockStoreManager, } from './store-manager/syncBlockStoreManager';
 export { resolveSyncBlockInstance } from './utils/resolveSyncBlockInstance';
 export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode, convertPMNodesToSyncBlockNodes, getContentIdAndProductFromResourceId } from './utils/utils';
 export { fetchErrorPayload } from './utils/errorHandling';

package/dist/types/providers/syncBlockProvider.d.ts

@@ -16,7 +16,8 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
      * @param sourceId
      * @param nestedRendererDataProviders
      */
-    constructor(fetchProvider: ADFFetchProvider, writeProvider: ADFWriteProvider, sourceId: string, providerOptions: SyncedBlockRendererProviderOptions);
+    constructor(fetchProvider: ADFFetchProvider, writeProvider: ADFWriteProvider, sourceId: string);
+    setProviderOptions(providerOptions: SyncedBlockRendererProviderOptions): void;
     getProduct(): SyncBlockProduct | undefined;
     /**
      * Check if the node is supported by the provider

package/dist/types/providers/types.d.ts

@@ -85,6 +85,7 @@ export declare abstract class SyncBlockDataProvider extends NodeDataProvider<Syn
     abstract getSourceId(): ResourceId;
     abstract getProduct(): SyncBlockProduct | undefined;
     abstract fetchSyncBlockSourceInfo(localId: BlockInstanceId, sourceAri: string, sourceProduct: SyncBlockProduct, fireAnalyticsEvent?: (payload: RendererSyncBlockEventPayload) => void): Promise<SyncBlockSourceInfo | undefined>;
+    abstract setProviderOptions(providerOptions: SyncedBlockRendererProviderOptions): void;
     abstract getSyncedBlockRendererProviderOptions(): SyncedBlockRendererProviderOptions;
     abstract retrieveSyncBlockParentInfo(sourceAri: string, sourceProduct: SyncBlockProduct): SyncBlockParentInfo | undefined;
     /**

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

@@ -11,7 +11,8 @@ export declare class ReferenceSyncBlockStoreManager {
     private titleSubscriptions;
     private providerFactories;
     private fireAnalyticsEvent?;
-    private syncBlockURLRequests;
+    private syncBlockFetchDataRequests;
+    private syncBlockSourceInfoRequests;
     private isRefreshingSubscriptions;
     constructor(dataProvider?: SyncBlockDataProvider, fireAnalyticsEvent?: (payload: RendererSyncBlockEventPayload) => void);
     generateResourceIdForReference(sourceId: ResourceId): ResourceId;
@@ -28,11 +29,11 @@ export declare class ReferenceSyncBlockStoreManager {
      * @param syncBlockNodes - The array of sync block nodes to fetch data for
      * @returns The fetched sync block data results
      */
-    fetchSyncBlocksData(syncBlockNodes: SyncBlockNode[]): Promise<SyncBlockInstance[]>;
+    fetchSyncBlocksData(syncBlockNodes: SyncBlockNode[]): Promise<void>;
     private updateCacheWithSourceInfo;
     private updateCache;
     private updateSourceTitleSubscriptions;
-    private getFromCache;
+    getFromCache(resourceId: ResourceId): SyncBlockInstance | undefined;
     private deleteFromCache;
     subscribeToSyncBlock(resourceId: string, localId: string, callback: SubscriptionCallback): () => void;
     subscribeToSourceTitle(node: PMNode, callback: TitleSubscriptionCallback): () => void;

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

@@ -10,3 +10,4 @@ export declare class SyncBlockStoreManager {
     get sourceManager(): SourceSyncBlockStoreManager;
     destroy(): void;
 }
+export declare const useMemoizedSyncBlockStoreManager: (dataProvider?: SyncBlockDataProvider, fireAnalyticsEvent?: (payload: SyncBlockEventPayload) => void) => SyncBlockStoreManager;

package/dist/types-ts4.5/index.d.ts

@@ -11,8 +11,8 @@ export { createContentAPIProvidersWithDefaultKey, useMemoizedContentAPIProviders
 export { fetchConfluencePageInfo } from './clients/confluence/sourceInfo';
 export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider, } from './providers/syncBlockProvider';
 export type { ADFFetchProvider, ADFWriteProvider, SyncBlockDataProvider, SyncBlockInstance, MediaEmojiProviderOptions, SyncedBlockRendererProviderOptions, SyncBlockRendererProviderCreator, } from './providers/types';
-export { ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';
-export { SyncBlockStoreManager } from './store-manager/syncBlockStoreManager';
+export { type ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';
+export { SyncBlockStoreManager, useMemoizedSyncBlockStoreManager, } from './store-manager/syncBlockStoreManager';
 export { resolveSyncBlockInstance } from './utils/resolveSyncBlockInstance';
 export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode, convertPMNodesToSyncBlockNodes, getContentIdAndProductFromResourceId } from './utils/utils';
 export { fetchErrorPayload } from './utils/errorHandling';

package/dist/types-ts4.5/providers/syncBlockProvider.d.ts

@@ -16,7 +16,8 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
      * @param sourceId
      * @param nestedRendererDataProviders
      */
-    constructor(fetchProvider: ADFFetchProvider, writeProvider: ADFWriteProvider, sourceId: string, providerOptions: SyncedBlockRendererProviderOptions);
+    constructor(fetchProvider: ADFFetchProvider, writeProvider: ADFWriteProvider, sourceId: string);
+    setProviderOptions(providerOptions: SyncedBlockRendererProviderOptions): void;
     getProduct(): SyncBlockProduct | undefined;
     /**
      * Check if the node is supported by the provider

package/dist/types-ts4.5/providers/types.d.ts

@@ -85,6 +85,7 @@ export declare abstract class SyncBlockDataProvider extends NodeDataProvider<Syn
     abstract getSourceId(): ResourceId;
     abstract getProduct(): SyncBlockProduct | undefined;
     abstract fetchSyncBlockSourceInfo(localId: BlockInstanceId, sourceAri: string, sourceProduct: SyncBlockProduct, fireAnalyticsEvent?: (payload: RendererSyncBlockEventPayload) => void): Promise<SyncBlockSourceInfo | undefined>;
+    abstract setProviderOptions(providerOptions: SyncedBlockRendererProviderOptions): void;
     abstract getSyncedBlockRendererProviderOptions(): SyncedBlockRendererProviderOptions;
     abstract retrieveSyncBlockParentInfo(sourceAri: string, sourceProduct: SyncBlockProduct): SyncBlockParentInfo | undefined;
     /**

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

@@ -11,7 +11,8 @@ export declare class ReferenceSyncBlockStoreManager {
     private titleSubscriptions;
     private providerFactories;
     private fireAnalyticsEvent?;
-    private syncBlockURLRequests;
+    private syncBlockFetchDataRequests;
+    private syncBlockSourceInfoRequests;
     private isRefreshingSubscriptions;
     constructor(dataProvider?: SyncBlockDataProvider, fireAnalyticsEvent?: (payload: RendererSyncBlockEventPayload) => void);
     generateResourceIdForReference(sourceId: ResourceId): ResourceId;
@@ -28,11 +29,11 @@ export declare class ReferenceSyncBlockStoreManager {
      * @param syncBlockNodes - The array of sync block nodes to fetch data for
      * @returns The fetched sync block data results
      */
-    fetchSyncBlocksData(syncBlockNodes: SyncBlockNode[]): Promise<SyncBlockInstance[]>;
+    fetchSyncBlocksData(syncBlockNodes: SyncBlockNode[]): Promise<void>;
     private updateCacheWithSourceInfo;
     private updateCache;
     private updateSourceTitleSubscriptions;
-    private getFromCache;
+    getFromCache(resourceId: ResourceId): SyncBlockInstance | undefined;
     private deleteFromCache;
     subscribeToSyncBlock(resourceId: string, localId: string, callback: SubscriptionCallback): () => void;
     subscribeToSourceTitle(node: PMNode, callback: TitleSubscriptionCallback): () => void;

package/dist/types-ts4.5/store-manager/syncBlockStoreManager.d.ts

@@ -10,3 +10,4 @@ export declare class SyncBlockStoreManager {
     get sourceManager(): SourceSyncBlockStoreManager;
     destroy(): void;
 }
+export declare const useMemoizedSyncBlockStoreManager: (dataProvider?: SyncBlockDataProvider, fireAnalyticsEvent?: (payload: SyncBlockEventPayload) => void) => SyncBlockStoreManager;

package/package.json

@@ -33,7 +33,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.42.0",
+		"@atlaskit/editor-common": "^110.48.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -76,7 +76,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "2.15.4",
+	"version": "2.15.6",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",