@atlaskit/editor-synced-block-provider 3.30.4 → 3.30.6

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-synced-block-provider
 
+## 3.30.6
+
+### Patch Changes
+
+- [`e18437c28f9ab`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e18437c28f9ab) -
+  Improve synced blocks robustness.
+- Updated dependencies
+
+## 3.30.5
+
+### Patch Changes
+
+- [`85444e8a5672a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/85444e8a5672a) -
+  EDITOR-5526 clean up platform_synced_block_patch_2
+- Updated dependencies
+
 ## 3.30.4
 
 ### Patch Changes

package/dist/cjs/clients/block-service/blockService.js

@@ -130,7 +130,7 @@ var BATCH_RETRIEVE_BLOCKS_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_BATCH_RETRIEVE_B
 var GET_BLOCK_REFERENCES_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_REFERENCES';
 var GET_BLOCK_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_BLOCK';
 var buildGetDocumentReferenceBlocksQuery = function buildGetDocumentReferenceBlocksQuery(documentAri) {
-  return "query ".concat(GET_DOCUMENT_REFERENCE_BLOCKS_OPERATION_NAME, " {\n\tblockService_getDocumentReferenceBlocks(documentAri: \"").concat(documentAri, "\") {\n\t\tblocks {\n\t\t\tblockAri\n\t\t\tblockInstanceId\n\t\t\tcontent\n\t\t\tcontentUpdatedAt\n\t\t\tcreatedAt\n\t\t\tcreatedBy\n\t\t\tproduct\n\t\t\tsourceAri\n\t\t\tstatus\n\t\t\tversion\n\t\t}\n\t\terrors {\n\t\t\tblockAri\n\t\t\tcode\n\t\t\treason\n\t\t}\n\t}\n}");
+  return "query ".concat(GET_DOCUMENT_REFERENCE_BLOCKS_OPERATION_NAME, " {\n\tblockService_getDocumentReferenceBlocks(documentAri: ").concat((0, _platformFeatureFlags.fg)('platform_synced_block_patch_4') ? JSON.stringify(documentAri) : "\"".concat(documentAri, "\""), ") {\n\t\tblocks {\n\t\t\tblockAri\n\t\t\tblockInstanceId\n\t\t\tcontent\n\t\t\tcontentUpdatedAt\n\t\t\tcreatedAt\n\t\t\tcreatedBy\n\t\t\tproduct\n\t\t\tsourceAri\n\t\t\tstatus\n\t\t\tversion\n\t\t}\n\t\terrors {\n\t\t\tblockAri\n\t\t\tcode\n\t\t\treason\n\t\t}\n\t}\n}");
 };
 var buildGetBlockQuery = function buildGetBlockQuery(blockAri) {
   return "query ".concat(GET_BLOCK_OPERATION_NAME, " {\n\tblockService_getBlock(blockAri: ").concat(JSON.stringify(blockAri), ") {\n\t\tblockAri\n\t\tblockInstanceId\n\t\tcontent\n\t\tcontentUpdatedAt\n\t\tcreatedAt\n\t\tcreatedBy\n\t\tdeletionReason\n\t\tproduct\n\t\tsourceAri\n\t\tstatus\n\t\tversion\n\t}\n}");
@@ -161,11 +161,17 @@ var buildDeleteBlockMutation = function buildDeleteBlockMutation(blockAri, delet
  * 'jira-work-item' -> 'JIRA_WORK_ITEM'
  */
 var convertProductToGraphQLEnum = function convertProductToGraphQLEnum(product) {
-  if (product === 'confluence-page') {
-    return 'CONFLUENCE_PAGE';
+  switch (product) {
+    case 'confluence-page':
+      return 'CONFLUENCE_PAGE';
+    case 'jira-work-item':
+      return 'JIRA_WORK_ITEM';
+    default:
+      {
+        var exhaustiveCheck = product;
+        throw new Error("Unsupported product: ".concat(exhaustiveCheck));
+      }
   }
-  // product must be 'jira-work-item' at this point
-  return 'JIRA_WORK_ITEM';
 };
 var buildCreateBlockMutation = function buildCreateBlockMutation(blockAri, blockInstanceId, content, product, sourceAri, stepVersion, status) {
   var inputParts = ["blockAri: ".concat(JSON.stringify(blockAri)), "blockInstanceId: ".concat(JSON.stringify(blockInstanceId)), "content: ".concat(JSON.stringify(content)), "product: ".concat(convertProductToGraphQLEnum(product)), "sourceAri: ".concat(JSON.stringify(sourceAri))];
@@ -336,8 +342,8 @@ var batchRetrieveSyncedBlocks = exports.batchRetrieveSyncedBlocks = /*#__PURE__*
 }();
 var deleteSyncedBlock = exports.deleteSyncedBlock = /*#__PURE__*/function () {
   var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(_ref6) {
-    var _result$data3;
-    var blockAri, deleteReason, bodyData, url, response, result;
+    var _result$data3, _result$data4;
+    var blockAri, deleteReason, bodyData, url, response, result, isDeleted;
     return _regenerator.default.wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
@@ -373,12 +379,13 @@ var deleteSyncedBlock = exports.deleteSyncedBlock = /*#__PURE__*/function () {
             return e.message;
           }).join(', '));
         case 13:
-          if ((_result$data3 = result.data) !== null && _result$data3 !== void 0 && _result$data3.blockService_deleteBlock.deleted) {
-            _context4.next = 15;
+          isDeleted = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4') ? (_result$data3 = result.data) === null || _result$data3 === void 0 || (_result$data3 = _result$data3.blockService_deleteBlock) === null || _result$data3 === void 0 ? void 0 : _result$data3.deleted : (_result$data4 = result.data) === null || _result$data4 === void 0 ? void 0 : _result$data4.blockService_deleteBlock.deleted;
+          if (isDeleted) {
+            _context4.next = 16;
             break;
           }
           throw new Error('Block deletion failed; deleted flag is false');
-        case 15:
+        case 16:
         case "end":
           return _context4.stop();
       }
@@ -437,7 +444,7 @@ var updateSyncedBlock = exports.updateSyncedBlock = /*#__PURE__*/function () {
 }();
 var createSyncedBlock = exports.createSyncedBlock = /*#__PURE__*/function () {
   var _ref1 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(_ref0) {
-    var _result$data4;
+    var _result$data5;
     var blockAri, blockInstanceId, sourceAri, product, content, stepVersion, status, bodyData, url, response, result;
     return _regenerator.default.wrap(function _callee6$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
@@ -474,7 +481,7 @@ var createSyncedBlock = exports.createSyncedBlock = /*#__PURE__*/function () {
             return e.message;
           }).join(', '));
         case 13:
-          if ((_result$data4 = result.data) !== null && _result$data4 !== void 0 && _result$data4.blockService_createBlock) {
+          if ((_result$data5 = result.data) !== null && _result$data5 !== void 0 && _result$data5.blockService_createBlock) {
             _context6.next = 15;
             break;
           }
@@ -493,7 +500,7 @@ var createSyncedBlock = exports.createSyncedBlock = /*#__PURE__*/function () {
 }();
 var updateReferenceSyncedBlockOnDocument = exports.updateReferenceSyncedBlockOnDocument = /*#__PURE__*/function () {
   var _ref11 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(_ref10) {
-    var documentAri, blocks, _ref10$noContent, noContent, bodyData, url, response, result, _result$data5;
+    var documentAri, blocks, _ref10$noContent, noContent, bodyData, url, response, result, _result$data6;
     return _regenerator.default.wrap(function _callee7$(_context7) {
       while (1) switch (_context7.prev = _context7.next) {
         case 0:
@@ -534,7 +541,7 @@ var updateReferenceSyncedBlockOnDocument = exports.updateReferenceSyncedBlockOnD
             _context7.next = 17;
             break;
           }
-          if ((_result$data5 = result.data) !== null && _result$data5 !== void 0 && _result$data5.blockService_updateDocumentReferences) {
+          if ((_result$data6 = result.data) !== null && _result$data6 !== void 0 && _result$data6.blockService_updateDocumentReferences) {
             _context7.next = 16;
             break;
           }
@@ -553,7 +560,7 @@ var updateReferenceSyncedBlockOnDocument = exports.updateReferenceSyncedBlockOnD
 }();
 var getReferenceSyncedBlocksByBlockAri = exports.getReferenceSyncedBlocksByBlockAri = /*#__PURE__*/function () {
   var _ref13 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8(_ref12) {
-    var _result$data6;
+    var _result$data7;
     var blockAri, bodyData, url, response, result, graphqlResponse;
     return _regenerator.default.wrap(function _callee8$(_context8) {
       while (1) switch (_context8.prev = _context8.next) {
@@ -590,7 +597,7 @@ var getReferenceSyncedBlocksByBlockAri = exports.getReferenceSyncedBlocksByBlock
             return e.message;
           }).join(', '));
         case 13:
-          if ((_result$data6 = result.data) !== null && _result$data6 !== void 0 && _result$data6.blockService_getReferences) {
+          if ((_result$data7 = result.data) !== null && _result$data7 !== void 0 && _result$data7.blockService_getReferences) {
             _context8.next = 15;
             break;
           }

package/dist/cjs/clients/confluence/fetchMediaToken.js

@@ -9,6 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _retry = require("../../utils/retry");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -66,7 +67,7 @@ var getContentMediaSession = /*#__PURE__*/function () {
 }();
 var fetchMediaToken = exports.fetchMediaToken = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(contentId) {
-    var _response$data, _contentData$token, response, contentData, token, configuration, collection;
+    var _response$data, _contentData$token, response, contentData, token, configuration, collection, errorMsg;
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -85,19 +86,20 @@ var fetchMediaToken = exports.fetchMediaToken = /*#__PURE__*/function () {
           }
           throw new Error('Failed to get content media session data');
         case 10:
-          return _context2.abrupt("return", Promise.resolve({
+          return _context2.abrupt("return", {
             config: configuration,
             token: token,
             collectionId: collection
-          }));
+          });
         case 13:
           _context2.prev = 13;
           _context2.t0 = _context2["catch"](0);
           (0, _monitoring.logException)(_context2.t0, {
             location: 'editor-synced-block-provider/fetchMediaToken'
           });
-          throw new Error("Failed to get content media session: ".concat(_context2.t0));
-        case 17:
+          errorMsg = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4') ? _context2.t0 instanceof Error ? _context2.t0.message : String(_context2.t0) : String(_context2.t0);
+          throw new Error("Failed to get content media session: ".concat(errorMsg));
+        case 18:
         case "end":
           return _context2.stop();
       }

package/dist/cjs/hooks/useFetchSyncBlockTitle.js

@@ -7,7 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.useFetchSyncBlockTitle = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
-var useFetchSyncBlockTitle = exports.useFetchSyncBlockTitle = function useFetchSyncBlockTitle(manager, syncBlockNode) {
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
+var useFetchSyncBlockTitleBase = function useFetchSyncBlockTitleBase(manager, syncBlockNode) {
   // Initialize state from cache to prevent flickering during re-renders
   var _useState = (0, _react.useState)(function () {
       var _cachedData$data;
@@ -33,4 +35,40 @@ var useFetchSyncBlockTitle = exports.useFetchSyncBlockTitle = function useFetchS
     };
   }, [manager, syncBlockNode]);
   return sourceTitle;
-};
+};
+var useFetchSyncBlockTitlePatched = function useFetchSyncBlockTitlePatched(manager, syncBlockNode) {
+  var _syncBlockNode$attrs, _syncBlockNode$attrs2;
+  var nodeRef = (0, _react.useRef)(syncBlockNode);
+  nodeRef.current = syncBlockNode;
+  var nodeTypeName = syncBlockNode.type.name;
+  var resourceId = (_syncBlockNode$attrs = syncBlockNode.attrs) === null || _syncBlockNode$attrs === void 0 ? void 0 : _syncBlockNode$attrs.resourceId;
+  var localId = (_syncBlockNode$attrs2 = syncBlockNode.attrs) === null || _syncBlockNode$attrs2 === void 0 ? void 0 : _syncBlockNode$attrs2.localId;
+
+  // Initialize state from cache to prevent flickering during re-renders
+  var _useState3 = (0, _react.useState)(function () {
+      var _cachedData$data2;
+      if (nodeTypeName !== 'syncBlock') {
+        return undefined;
+      }
+      if (!resourceId) {
+        return undefined;
+      }
+      var cachedData = manager.referenceManager.getFromCache(resourceId);
+      return cachedData === null || cachedData === void 0 || (_cachedData$data2 = cachedData.data) === null || _cachedData$data2 === void 0 ? void 0 : _cachedData$data2.sourceTitle;
+    }),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    sourceTitle = _useState4[0],
+    setSourceTitle = _useState4[1];
+  (0, _react.useEffect)(function () {
+    var unsubscribe = manager.referenceManager.subscribeToSourceTitle(nodeRef.current, function (title) {
+      setSourceTitle(title);
+    });
+    return function () {
+      unsubscribe();
+    };
+  }, [manager, nodeTypeName, resourceId, localId]);
+  return sourceTitle;
+};
+var useFetchSyncBlockTitle = exports.useFetchSyncBlockTitle = (0, _platformFeatureFlagsReact.conditionalHooksFactory)(function () {
+  return (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4');
+}, useFetchSyncBlockTitlePatched, useFetchSyncBlockTitleBase);

package/dist/cjs/hooks/useHandleContentChanges.js

@@ -6,6 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.useHandleContentChanges = void 0;
 var _react = require("react");
 var useHandleContentChanges = exports.useHandleContentChanges = function useHandleContentChanges(manager, syncBlockNode) {
+  // syncBlockNode is intentionally in deps — its reference changes when the
+  // node content is modified by a ProseMirror transaction, which is exactly
+  // when the source manager cache needs to be updated.
   (0, _react.useEffect)(function () {
     manager.sourceManager.updateSyncBlockData(syncBlockNode);
   }, [manager, syncBlockNode]);

package/dist/cjs/providers/syncBlockProvider.js

@@ -15,6 +15,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
 var _ari = require("../clients/block-service/ari");
 var _ari2 = require("../clients/confluence/ari");
 var _sourceInfo2 = require("../clients/confluence/sourceInfo");
@@ -451,7 +452,7 @@ var createSyncedBlockProvider = function createSyncedBlockProvider(_ref) {
     writeProvider = _ref.writeProvider;
   return new SyncedBlockProvider(fetchProvider, writeProvider);
 };
-var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(_ref2) {
+var useMemoizedSyncedBlockProviderBase = function useMemoizedSyncedBlockProviderBase(_ref2) {
   var fetchProvider = _ref2.fetchProvider,
     writeProvider = _ref2.writeProvider,
     providerOptions = _ref2.providerOptions,
@@ -468,4 +469,33 @@ var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = fu
     syncBlockProvider.setSSRData(ssrData);
   }
   return syncBlockProvider;
-};
+};
+var useMemoizedSyncedBlockProviderPatched = function useMemoizedSyncedBlockProviderPatched(_ref3) {
+  var fetchProvider = _ref3.fetchProvider,
+    writeProvider = _ref3.writeProvider,
+    providerOptions = _ref3.providerOptions,
+    getSSRData = _ref3.getSSRData;
+  var syncBlockProvider = (0, _react.useMemo)(function () {
+    return createSyncedBlockProvider({
+      fetchProvider: fetchProvider,
+      writeProvider: writeProvider
+    });
+  }, [fetchProvider, writeProvider]);
+  var prevProviderOptionsRef = (0, _react.useRef)(undefined);
+  if (providerOptions !== prevProviderOptionsRef.current) {
+    prevProviderOptionsRef.current = providerOptions;
+    syncBlockProvider.setProviderOptions(providerOptions);
+  }
+  var prevSSRDataRef = (0, _react.useRef)(undefined);
+  var ssrData = getSSRData === null || getSSRData === void 0 ? void 0 : getSSRData();
+  if (ssrData !== prevSSRDataRef.current) {
+    prevSSRDataRef.current = ssrData;
+    if (ssrData) {
+      syncBlockProvider.setSSRData(ssrData);
+    }
+  }
+  return syncBlockProvider;
+};
+var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = (0, _platformFeatureFlagsReact.conditionalHooksFactory)(function () {
+  return (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4');
+}, useMemoizedSyncedBlockProviderPatched, useMemoizedSyncedBlockProviderBase);

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

@@ -392,6 +392,9 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     value: function handleGraphQLSubscriptionUpdate(syncBlockInstance) {
       var _this5 = this;
       if (!syncBlockInstance.resourceId) {
+        if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_4')) {
+          return;
+        }
         throw new Error('Sync block instance provided to graphql subscription update missing resource id');
       }
       var existingSyncBlock = this.getFromCache(syncBlockInstance.resourceId);
@@ -858,17 +861,12 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
   }, {
     key: "debouncedBatchedFetchSyncBlocks",
     value: function debouncedBatchedFetchSyncBlocks(resourceId) {
-      if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_2')) {
-        // 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);
-        }
-      } else {
+      // 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);
       }
     }
   }, {
@@ -1191,12 +1189,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
               }
               return _context6.abrupt("return", true);
             case 2:
-              if (!(0, _platformFeatureFlags.fg)('platform_synced_block_patch_2')) {
-                _context6.next = 9;
-                break;
-              }
               if (!this.isFlushInProgress) {
-                _context6.next = 8;
+                _context6.next = 7;
                 break;
               }
               // Mark that another flush is needed after the current one completes
@@ -1204,27 +1198,22 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
 
               // We return true here because we know the pending flush will handle the dirty cache
               return _context6.abrupt("return", true);
-            case 8:
+            case 7:
               this.isFlushInProgress = true;
-            case 9:
+            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 = 11;
+              _context6.prev = 10;
               if (this.dataProvider) {
-                _context6.next = 14;
+                _context6.next = 13;
                 break;
               }
               throw new Error('Data provider not set');
-            case 14:
-              blocks = [];
-              if (!(0, _platformFeatureFlags.fg)('platform_synced_block_patch_2')) {
-                _context6.next = 37;
-                break;
-              }
-              // First, build the complete subscription structure
+            case 13:
+              blocks = []; // First, build the complete subscription structure
               _iterator4 = _createForOfIteratorHelper(this.subscriptions.entries());
-              _context6.prev = 17;
+              _context6.prev = 15;
               _loop2 = /*#__PURE__*/_regenerator.default.mark(function _loop2() {
                 var _step4$value, resourceId, callbacks;
                 return _regenerator.default.wrap(function _loop2$(_context5) {
@@ -1246,50 +1235,34 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
                 }, _loop2);
               });
               _iterator4.s();
-            case 20:
+            case 18:
               if ((_step4 = _iterator4.n()).done) {
-                _context6.next = 24;
+                _context6.next = 22;
                 break;
               }
-              return _context6.delegateYield(_loop2(), "t0", 22);
+              return _context6.delegateYield(_loop2(), "t0", 20);
+            case 20:
+              _context6.next = 18;
+              break;
             case 22:
-              _context6.next = 20;
+              _context6.next = 27;
               break;
             case 24:
-              _context6.next = 29;
-              break;
-            case 26:
-              _context6.prev = 26;
-              _context6.t1 = _context6["catch"](17);
+              _context6.prev = 24;
+              _context6.t1 = _context6["catch"](15);
               _iterator4.e(_context6.t1);
-            case 29:
-              _context6.prev = 29;
+            case 27:
+              _context6.prev = 27;
               _iterator4.f();
-              return _context6.finish(29);
-            case 32:
+              return _context6.finish(27);
+            case 30:
               if (!(0, _isEqual.default)(syncedBlocksToFlush, this.lastFlushedSyncedBlocks)) {
-                _context6.next = 35;
+                _context6.next = 33;
                 break;
               }
               this.isCacheDirty = false; // Reset since we're considering this a successful no-op flush
               return _context6.abrupt("return", true);
-            case 35:
-              _context6.next = 38;
-              break;
-            case 37:
-              // Collect all reference synced blocks on the current document
-              Array.from(this.subscriptions.entries()).forEach(function (_ref2) {
-                var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
-                  resourceId = _ref3[0],
-                  callbacks = _ref3[1];
-                Object.keys(callbacks).forEach(function (localId) {
-                  blocks.push({
-                    resourceId: resourceId,
-                    localId: localId
-                  });
-                });
-              });
-            case 38:
+            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
               // on a live page and the reference sync block is being saved while the user
@@ -1297,9 +1270,9 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
               // 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 = 42;
+              _context6.next = 37;
               return this.dataProvider.updateReferenceData(blocks);
-            case 42:
+            case 37:
               updateResult = _context6.sent;
               if (!updateResult.success) {
                 success = false;
@@ -1308,11 +1281,11 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
                 });
                 (_this$fireAnalyticsEv1 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv1 === void 0 || _this$fireAnalyticsEv1.call(this, (0, _errorHandling.updateReferenceErrorPayload)(updateResult.error || 'Failed to update reference synced blocks on the document'));
               }
-              _context6.next = 52;
+              _context6.next = 47;
               break;
-            case 46:
-              _context6.prev = 46;
-              _context6.t2 = _context6["catch"](11);
+            case 41:
+              _context6.prev = 41;
+              _context6.t2 = _context6["catch"](10);
               success = false;
               (0, _monitoring.logException)(_context6.t2, {
                 location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
@@ -1321,40 +1294,37 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
                 reason: _context6.t2.message
               });
               (_this$fireAnalyticsEv10 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv10 === void 0 || _this$fireAnalyticsEv10.call(this, (0, _errorHandling.updateReferenceErrorPayload)(_context6.t2.message));
-            case 52:
-              _context6.prev = 52;
+            case 47:
+              _context6.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;
               } else {
-                if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_2')) {
-                  this.lastFlushedSyncedBlocks = syncedBlocksToFlush;
-                }
+                this.lastFlushedSyncedBlocks = syncedBlocksToFlush;
                 (_this$saveExperience4 = this.saveExperience) === null || _this$saveExperience4 === void 0 || _this$saveExperience4.success();
               }
-              if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_2')) {
-                // Always reset isFlushInProgress regardless of feature flag
-                this.isFlushInProgress = false;
 
-                // If another flush was requested while this one was in progress, execute it now
-                if (this.flushNeededAfterCurrent) {
-                  this.flushNeededAfterCurrent = false;
-                  // 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();
-                  }, 0);
-                }
+              // Always reset isFlushInProgress
+              this.isFlushInProgress = false;
+
+              // If another flush was requested while this one was in progress, execute it now
+              if (this.flushNeededAfterCurrent) {
+                this.flushNeededAfterCurrent = false;
+                // 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();
+                }, 0);
               }
-              return _context6.finish(52);
-            case 56:
+              return _context6.finish(47);
+            case 52:
               return _context6.abrupt("return", success);
-            case 57:
+            case 53:
             case "end":
               return _context6.stop();
           }
-        }, _callee4, this, [[11, 46, 52, 56], [17, 26, 29, 32]]);
+        }, _callee4, this, [[10, 41, 47, 52], [15, 24, 27, 30]]);
       }));
       function flush() {
         return _flush.apply(this, arguments);

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

@@ -12,6 +12,8 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _react = require("react");
 var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
 var _ari = require("../clients/block-service/ari");
 var _types = require("../common/types");
 var _errorHandling = require("../utils/errorHandling");
@@ -28,7 +30,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/function () {
   function SyncBlockStoreManager(dataProvider) {
     (0, _classCallCheck2.default)(this, SyncBlockStoreManager);
-    // In future, if reference manager needs to reach to source manager and read it's current in memorey cache
+    // In future, if reference manager needs to reach to source manager and read its current in memory cache
     // we can pass the source manager as a parameter to the reference manager constructor
     this.sourceSyncBlockStoreManager = new _sourceSyncBlockStoreManager.SourceSyncBlockStoreManager(dataProvider);
     this.referenceSyncBlockStoreManager = new _referenceSyncBlockStoreManager.ReferenceSyncBlockStoreManager(dataProvider);
@@ -200,11 +202,24 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
 var createSyncBlockStoreManager = function createSyncBlockStoreManager(dataProvider) {
   return new SyncBlockStoreManager(dataProvider);
 };
-var useMemoizedSyncBlockStoreManager = exports.useMemoizedSyncBlockStoreManager = function useMemoizedSyncBlockStoreManager(dataProvider, fireAnalyticsEvent) {
+var useMemoizedSyncBlockStoreManagerBase = function useMemoizedSyncBlockStoreManagerBase(dataProvider, fireAnalyticsEvent) {
   var syncBlockStoreManager = (0, _react.useMemo)(function () {
-    var syncBlockStoreManager = createSyncBlockStoreManager(dataProvider);
-    return syncBlockStoreManager;
+    return createSyncBlockStoreManager(dataProvider);
   }, [dataProvider]);
   syncBlockStoreManager.setFireAnalyticsEvent(fireAnalyticsEvent);
   return syncBlockStoreManager;
-};
+};
+var useMemoizedSyncBlockStoreManagerPatched = function useMemoizedSyncBlockStoreManagerPatched(dataProvider, fireAnalyticsEvent) {
+  var syncBlockStoreManager = (0, _react.useMemo)(function () {
+    return createSyncBlockStoreManager(dataProvider);
+  }, [dataProvider]);
+  var prevFireAnalyticsEventRef = (0, _react.useRef)(undefined);
+  if (fireAnalyticsEvent !== prevFireAnalyticsEventRef.current) {
+    prevFireAnalyticsEventRef.current = fireAnalyticsEvent;
+    syncBlockStoreManager.setFireAnalyticsEvent(fireAnalyticsEvent);
+  }
+  return syncBlockStoreManager;
+};
+var useMemoizedSyncBlockStoreManager = exports.useMemoizedSyncBlockStoreManager = (0, _platformFeatureFlagsReact.conditionalHooksFactory)(function () {
+  return (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4');
+}, useMemoizedSyncBlockStoreManagerPatched, useMemoizedSyncBlockStoreManagerBase);

package/dist/cjs/utils/experienceTracking.js

@@ -87,9 +87,9 @@ var getFetchSourceInfoExperience = exports.getFetchSourceInfoExperience = functi
 /**
  * This experience tracks when a source sync block is deleted from the BE.
  *
- * Start: When the fetchSourceInfo function is called.
- * Success: When the fetching the data is successful within the timeout duration of start.
- * Failure: When the timeout duration passes without the data being successfully fetched, or the fetch fails
+ * Start: When the delete source sync block function is called.
+ * Success: When the sync block deletion is successful within the timeout duration of start.
+ * Failure: When the timeout duration passes without the sync block being successfully deleted, or the deletion fails
  */
 var getDeleteSourceExperience = exports.getDeleteSourceExperience = function getDeleteSourceExperience(fireAnalyticsEvent) {
   return new _experiences.Experience(_experiences.EXPERIENCE_ID.ASYNC_OPERATION, {
@@ -104,9 +104,9 @@ var getDeleteSourceExperience = exports.getDeleteSourceExperience = function get
 /**
  * This experience tracks when a source sync block is created and registered to the BE.
  *
- * Start: When the fetchSourceInfo function is called.
- * Success: When the fetching the data is successful within the timeout duration of start.
- * Failure: When the timeout duration passes without the data being successfully fetched, or the fetch fails
+ * Start: When the create source sync block function is called.
+ * Success: When the sync block creation is successful within the timeout duration of start.
+ * Failure: When the timeout duration passes without the sync block being successfully created, or the creation fails
  */
 var getCreateSourceExperience = exports.getCreateSourceExperience = function getCreateSourceExperience(fireAnalyticsEvent) {
   return new _experiences.Experience(_experiences.EXPERIENCE_ID.ASYNC_OPERATION, {
@@ -119,11 +119,11 @@ var getCreateSourceExperience = exports.getCreateSourceExperience = function get
 };
 
 /**
- * This experience tracks when a source sync block is created and registered to the BE.
+ * This experience tracks when references for a sync block are fetched from the BE.
  *
- * Start: When the fetchSourceInfo function is called.
- * Success: When the fetching the data is successful within the timeout duration of start.
- * Failure: When the timeout duration passes without the data being successfully fetched, or the fetch fails
+ * Start: When the fetchReferences function is called.
+ * Success: When the fetching of references is successful within the timeout duration of start.
+ * Failure: When the timeout duration passes without references being successfully fetched, or the fetch fails
  */
 var getFetchReferencesExperience = exports.getFetchReferencesExperience = function getFetchReferencesExperience(fireAnalyticsEvent) {
   return new _experiences.Experience(_experiences.EXPERIENCE_ID.ASYNC_OPERATION, {

package/dist/cjs/utils/resourceId.js

@@ -19,7 +19,7 @@ var isSyncBlockProduct = function isSyncBlockProduct(product) {
  *
  * Format
  * - {product}/{contentId}/{uuid}
- *   - product: a recognized `SyncBlockProduct` (e.g. 'confluence-page', 'jira-issue')
+ *   - product: a recognized `SyncBlockProduct` (e.g. 'confluence-page', 'jira-work-item')
  *   - contentId: the host content identifier (e.g. page ID or issue ID)
  *   - uuid: the UUID for the specific synced block instance
  *
@@ -32,7 +32,7 @@ var isSyncBlockProduct = function isSyncBlockProduct(product) {
  * - No extra segments; returns `undefined` on any invalid input
  *
  * Notes
- * - `product` is a qualified domain like 'confluence-page' or 'jira-issue',
+ * - `product` is a qualified domain like 'confluence-page' or 'jira-work-item',
  *   not just 'confluence' or 'jira'.
  */