@atlaskit/editor-synced-block-provider 3.29.0 → 3.29.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-synced-block-provider
 
+## 3.29.2
+
+### Patch Changes
+
+- [`8806992b3642c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8806992b3642c) -
+  EDITOR-5454 update synced block insert success event to use document inserted event
+- [`0f351c68adbac`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0f351c68adbac) -
+  Improve robustness
+- Updated dependencies
+
+## 3.29.1
+
+### Patch Changes
+
+- [`53c9f85806f98`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/53c9f85806f98) -
+  EDITOR-5275 Store synced blocks data in session storage for look up during page transitions
+- Updated dependencies
+
 ## 3.29.0
 
 ### Minor Changes

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

@@ -35,8 +35,10 @@ var generateBlockAriFromReference = exports.generateBlockAriFromReference = func
 };
 
 /**
- * Extracts the local ID from a block ARI.
- * @param ari - the block ARI. E.G ari:cloud:blocks:cloudId:synced-block/localId
+ * Extracts the local ID from a source block ARI.
+ * Designed for source block ARIs of the form: ari:cloud:blocks:{cloudId}:synced-block/{localId}
+ * where the localId is a UUID immediately after synced-block/.
+ * @param ari - the source block ARI. E.G ari:cloud:blocks:cloudId:synced-block/79d4f3f4-51df-451b-b9a1-751bc77b1e77
  * @returns the localId of the block node. A randomly generated UUID
  */
 var getLocalIdFromBlockResourceId = exports.getLocalIdFromBlockResourceId = function getLocalIdFromBlockResourceId(ari) {
@@ -44,7 +46,7 @@ var getLocalIdFromBlockResourceId = exports.getLocalIdFromBlockResourceId = func
   if (match !== null && match !== void 0 && match[1]) {
     return match[1];
   }
-  throw new Error("Invalid page ARI: ".concat(ari));
+  throw new Error("Invalid block ARI: ".concat(ari));
 };
 var getProductFromSourceAri = exports.getProductFromSourceAri = function getProductFromSourceAri(ari) {
   var jiraMatch = ari === null || ari === void 0 ? void 0 : ari.search(/ari:cloud:jira:.*/);

package/dist/cjs/index.js

@@ -3,6 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "BlockError", {
+  enumerable: true,
+  get: function get() {
+    return _blockService.BlockError;
+  }
+});
+Object.defineProperty(exports, "ReferenceSyncBlockStoreManager", {
+  enumerable: true,
+  get: function get() {
+    return _referenceSyncBlockStoreManager.ReferenceSyncBlockStoreManager;
+  }
+});
 Object.defineProperty(exports, "SyncBlockError", {
   enumerable: true,
   get: function get() {
@@ -18,7 +30,7 @@ Object.defineProperty(exports, "SyncBlockStoreManager", {
 Object.defineProperty(exports, "SyncedBlockProvider", {
   enumerable: true,
   get: function get() {
-    return _syncBlockProvider.SyncBlockProvider;
+    return _syncBlockProvider.SyncedBlockProvider;
   }
 });
 Object.defineProperty(exports, "batchFetchData", {
@@ -27,6 +39,12 @@ Object.defineProperty(exports, "batchFetchData", {
     return _blockServiceAPI.batchFetchData;
   }
 });
+Object.defineProperty(exports, "blockAriToResourceId", {
+  enumerable: true,
+  get: function get() {
+    return _blockServiceAPI.blockAriToResourceId;
+  }
+});
 Object.defineProperty(exports, "convertPMNodesToSyncBlockNodes", {
   enumerable: true,
   get: function get() {
@@ -45,6 +63,12 @@ Object.defineProperty(exports, "convertSyncBlockPMNodeToSyncBlockData", {
     return _utils.convertSyncBlockPMNodeToSyncBlockData;
   }
 });
+Object.defineProperty(exports, "convertToSyncBlockData", {
+  enumerable: true,
+  get: function get() {
+    return _blockServiceAPI.convertToSyncBlockData;
+  }
+});
 Object.defineProperty(exports, "createResourceIdForReference", {
   enumerable: true,
   get: function get() {
@@ -57,6 +81,12 @@ Object.defineProperty(exports, "createSyncBlockNode", {
     return _utils.createSyncBlockNode;
   }
 });
+Object.defineProperty(exports, "extractResourceIdFromBlockAri", {
+  enumerable: true,
+  get: function get() {
+    return _blockServiceAPI.extractResourceIdFromBlockAri;
+  }
+});
 Object.defineProperty(exports, "fetchConfluencePageInfo", {
   enumerable: true,
   get: function get() {
@@ -207,12 +237,14 @@ var _useFetchSyncBlockData = require("./hooks/useFetchSyncBlockData");
 var _useFetchSyncBlockTitle = require("./hooks/useFetchSyncBlockTitle");
 var _useHandleContentChanges = require("./hooks/useHandleContentChanges");
 var _ari = require("./clients/block-service/ari");
+var _blockService = require("./clients/block-service/blockService");
 var _ari2 = require("./clients/confluence/ari");
 var _fetchMediaToken = require("./clients/confluence/fetchMediaToken");
 var _ari3 = require("./clients/jira/ari");
 var _blockServiceAPI = require("./providers/block-service/blockServiceAPI");
 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 _resourceId = require("./utils/resourceId");

package/dist/cjs/providers/syncBlockProvider.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useMemoizedSyncedBlockProvider = exports.SyncBlockProvider = void 0;
+exports.useMemoizedSyncedBlockProvider = exports.SyncedBlockProvider = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -24,26 +24,26 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
+var SyncedBlockProvider = exports.SyncedBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
   /**
-   * Constructor for the SyncBlockProvider
+   * Constructor for the SyncedBlockProvider
    *
    * @param fetchProvider
    * @param writeProvider
    * @param nestedRendererDataProviders
    */
-  function SyncBlockProvider(fetchProvider, writeProvider) {
+  function SyncedBlockProvider(fetchProvider, writeProvider) {
     var _this;
-    (0, _classCallCheck2.default)(this, SyncBlockProvider);
-    _this = _callSuper(this, SyncBlockProvider);
+    (0, _classCallCheck2.default)(this, SyncedBlockProvider);
+    _this = _callSuper(this, SyncedBlockProvider);
     (0, _defineProperty2.default)(_this, "name", 'syncBlockProvider');
     _this.fetchProvider = fetchProvider;
     _this.writeProvider = writeProvider;
     _this.providerOptions = {};
     return _this;
   }
-  (0, _inherits2.default)(SyncBlockProvider, _SyncBlockDataProvide);
-  return (0, _createClass2.default)(SyncBlockProvider, [{
+  (0, _inherits2.default)(SyncedBlockProvider, _SyncBlockDataProvide);
+  return (0, _createClass2.default)(SyncedBlockProvider, [{
     key: "setProviderOptions",
     value: function setProviderOptions(providerOptions) {
       this.providerOptions = providerOptions;
@@ -441,11 +441,11 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
       return undefined;
     }
   }]);
-}(_types2.SyncBlockDataProvider);
+}(_types2.SyncBlockDataProviderInterface);
 var createSyncedBlockProvider = function createSyncedBlockProvider(_ref) {
   var fetchProvider = _ref.fetchProvider,
     writeProvider = _ref.writeProvider;
-  return new SyncBlockProvider(fetchProvider, writeProvider);
+  return new SyncedBlockProvider(fetchProvider, writeProvider);
 };
 var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(_ref2) {
   var fetchProvider = _ref2.fetchProvider,

package/dist/cjs/providers/types.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SyncBlockDataProvider = void 0;
+exports.SyncBlockDataProviderInterface = void 0;
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -18,11 +18,11 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * Mainly used for representing the state of a sync block after fetching from a data provider.
  * This will be used in both data processing and rendering contexts.
  */
-var SyncBlockDataProvider = exports.SyncBlockDataProvider = /*#__PURE__*/function (_NodeDataProvider) {
-  function SyncBlockDataProvider() {
-    (0, _classCallCheck2.default)(this, SyncBlockDataProvider);
-    return _callSuper(this, SyncBlockDataProvider, arguments);
+var SyncBlockDataProviderInterface = exports.SyncBlockDataProviderInterface = /*#__PURE__*/function (_NodeDataProvider) {
+  function SyncBlockDataProviderInterface() {
+    (0, _classCallCheck2.default)(this, SyncBlockDataProviderInterface);
+    return _callSuper(this, SyncBlockDataProviderInterface, arguments);
   }
-  (0, _inherits2.default)(SyncBlockDataProvider, _NodeDataProvider);
-  return (0, _createClass2.default)(SyncBlockDataProvider);
+  (0, _inherits2.default)(SyncBlockDataProviderInterface, _NodeDataProvider);
+  return (0, _createClass2.default)(SyncBlockDataProviderInterface);
 }(_nodeDataProvider.NodeDataProvider);

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

@@ -27,6 +27,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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; }
+var SESSION_STORAGE_KEY_PREFIX = 'sync-block-data-';
+
 // A store manager responsible for the lifecycle and state management of reference sync blocks in an editor instance.
 // Designed to manage local in-memory state and synchronize with an external data provider.
 // Supports fetch, cache, and subscription for sync block data.
@@ -34,7 +36,8 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 // Can be used in both editor and renderer contexts.
 var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   function ReferenceSyncBlockStoreManager(dataProvider) {
-    var _this = this;
+    var _this = this,
+      _this$dataProvider;
     (0, _classCallCheck2.default)(this, ReferenceSyncBlockStoreManager);
     // Keeps track of addition and deletion of reference synced blocks on the document
     // This starts as true to always flush the cache when document is saved for the first time
@@ -81,6 +84,9 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     this.graphqlSubscriptions = new Map();
     this.subscriptionChangeListeners = new Set();
     this.newlyAddedSyncBlocks = new Set();
+
+    // The provider might have SSR data cache already set, so we need to update the cache in session storage
+    this.setSSRDataInSessionStorage((_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getNodeDataCacheKeys());
   }
 
   /**
@@ -217,9 +223,57 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
   }, {
     key: "getInitialSyncBlockData",
     value: function getInitialSyncBlockData(resourceId) {
-      var _this$dataProvider;
+      var _this$dataProvider2;
       var syncBlockNode = (0, _utils.createSyncBlockNode)('', resourceId);
-      return (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 || (_this$dataProvider = _this$dataProvider.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.data;
+      var data = (_this$dataProvider2 = this.dataProvider) === null || _this$dataProvider2 === void 0 || (_this$dataProvider2 = _this$dataProvider2.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider2 === void 0 ? void 0 : _this$dataProvider2.data;
+      if (data) {
+        return data;
+      }
+      if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
+        var sessionData = this.getSyncBlockDataFromSessionStorage(resourceId);
+        if (sessionData) {
+          return sessionData;
+        }
+      }
+      return undefined;
+    }
+  }, {
+    key: "updateCacheInSessionStorage",
+    value: function updateCacheInSessionStorage(resourceId) {
+      try {
+        var latestData = this.getFromCache(resourceId);
+        if (latestData) {
+          sessionStorage.setItem("".concat(SESSION_STORAGE_KEY_PREFIX).concat(resourceId), JSON.stringify(latestData));
+        }
+      } catch (error) {
+        (0, _monitoring.logException)(error, {
+          location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/updateCacheInSessionStorage'
+        });
+      }
+    }
+  }, {
+    key: "getSyncBlockDataFromSessionStorage",
+    value: function getSyncBlockDataFromSessionStorage(resourceId) {
+      var sessionData = null;
+      try {
+        sessionData = sessionStorage.getItem("".concat(SESSION_STORAGE_KEY_PREFIX).concat(resourceId));
+      } catch (error) {
+        (0, _monitoring.logException)(error, {
+          location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/getSyncBlockDataFromSessionStorage'
+        });
+        return undefined;
+      }
+      if (!sessionData) {
+        return undefined;
+      }
+      try {
+        return JSON.parse(sessionData);
+      } catch (error) {
+        (0, _monitoring.logException)(error, {
+          location: 'editor-synced-block-provider/referenceSyncBlockStoreManager/getSyncBlockDataFromSessionStorage'
+        });
+        return undefined;
+      }
     }
 
     /**
@@ -324,13 +378,13 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
   }, {
     key: "setupGraphQLSubscription",
     value: function setupGraphQLSubscription(resourceId) {
-      var _this$dataProvider2,
+      var _this$dataProvider3,
         _this4 = this;
       // Don't set up duplicate subscriptions
       if (this.graphqlSubscriptions.has(resourceId)) {
         return;
       }
-      if (!((_this$dataProvider2 = this.dataProvider) !== null && _this$dataProvider2 !== void 0 && _this$dataProvider2.subscribeToBlockUpdates)) {
+      if (!((_this$dataProvider3 = this.dataProvider) !== null && _this$dataProvider3 !== void 0 && _this$dataProvider3.subscribeToBlockUpdates)) {
         return;
       }
       var unsubscribe = this.dataProvider.subscribeToBlockUpdates(resourceId, function (syncBlockInstance) {
@@ -773,8 +827,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     value: function updateCache(syncBlock) {
       var resourceId = syncBlock.resourceId;
       if (resourceId) {
-        var _this$dataProvider3;
-        (_this$dataProvider3 = this.dataProvider) === null || _this$dataProvider3 === void 0 || _this$dataProvider3.updateCache((0, _defineProperty2.default)({}, resourceId, syncBlock), {
+        var _this$dataProvider4;
+        (_this$dataProvider4 = this.dataProvider) === null || _this$dataProvider4 === void 0 || _this$dataProvider4.updateCache((0, _defineProperty2.default)({}, resourceId, syncBlock), {
           strategy: 'merge',
           source: 'network'
         });
@@ -784,6 +838,9 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
             callback(syncBlock);
           });
         }
+        if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
+          this.updateCacheInSessionStorage(resourceId);
+        }
       }
     }
   }, {
@@ -799,15 +856,15 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
   }, {
     key: "getFromCache",
     value: function getFromCache(resourceId) {
-      var _this$dataProvider4;
+      var _this$dataProvider5;
       var syncBlockNode = (0, _utils.createSyncBlockNode)('', resourceId);
-      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;
+      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;
     }
   }, {
     key: "deleteFromCache",
     value: function deleteFromCache(resourceId) {
-      var _this$dataProvider5;
-      (_this$dataProvider5 = this.dataProvider) === null || _this$dataProvider5 === void 0 || _this$dataProvider5.removeFromCache([resourceId]);
+      var _this$dataProvider6;
+      (_this$dataProvider6 = this.dataProvider) === null || _this$dataProvider6 === void 0 || _this$dataProvider6.removeFromCache([resourceId]);
       this.providerFactories.delete(resourceId);
     }
   }, {
@@ -826,11 +883,22 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
         this.scheduledBatchFetch();
       }
     }
+  }, {
+    key: "setSSRDataInSessionStorage",
+    value: function setSSRDataInSessionStorage(resourceIds) {
+      var _this0 = this;
+      if (!resourceIds || resourceIds.length === 0) {
+        return;
+      }
+      resourceIds.forEach(function (resourceId) {
+        _this0.updateCacheInSessionStorage(resourceId);
+      });
+    }
   }, {
     key: "subscribeToSyncBlock",
     value: function subscribeToSyncBlock(resourceId, localId, callback) {
-      var _this$dataProvider6,
-        _this0 = this;
+      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
@@ -856,7 +924,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       var syncBlockNode = (0, _utils.createSyncBlockNode)(localId, resourceId);
 
       // call the callback immediately if we have cached data
-      var cachedData = (_this$dataProvider6 = this.dataProvider) === null || _this$dataProvider6 === void 0 || (_this$dataProvider6 = _this$dataProvider6.getNodeDataFromCache(syncBlockNode)) === null || _this$dataProvider6 === void 0 ? void 0 : _this$dataProvider6.data;
+      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 {
@@ -868,19 +936,19 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
         this.setupGraphQLSubscription(resourceId);
       }
       return function () {
-        var resourceSubscriptions = _this0.subscriptions.get(resourceId);
+        var resourceSubscriptions = _this1.subscriptions.get(resourceId);
         if (resourceSubscriptions) {
           // Unsubscription means a reference synced block is removed from the document
-          _this0.isCacheDirty = true;
+          _this1.isCacheDirty = true;
           delete resourceSubscriptions[localId];
           if (Object.keys(resourceSubscriptions).length === 0) {
-            _this0.subscriptions.delete(resourceId);
+            _this1.subscriptions.delete(resourceId);
 
             // Clean up GraphQL subscription when no more local subscribers
-            _this0.cleanupGraphQLSubscription(resourceId);
+            _this1.cleanupGraphQLSubscription(resourceId);
 
             // Notify listeners that subscription was removed
-            _this0.notifySubscriptionChangeListeners();
+            _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.
@@ -889,14 +957,14 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
             // TODO: EDITOR-4152 - Rework this logic
             var deletionTimeout = setTimeout(function () {
               // Only delete if still no subscribers (wasn't re-subscribed)
-              if (!_this0.subscriptions.has(resourceId)) {
-                _this0.deleteFromCache(resourceId);
+              if (!_this1.subscriptions.has(resourceId)) {
+                _this1.deleteFromCache(resourceId);
               }
-              _this0.pendingCacheDeletions.delete(resourceId);
+              _this1.pendingCacheDeletions.delete(resourceId);
             }, 1000);
-            _this0.pendingCacheDeletions.set(resourceId, deletionTimeout);
+            _this1.pendingCacheDeletions.set(resourceId, deletionTimeout);
           } else {
-            _this0.subscriptions.set(resourceId, resourceSubscriptions);
+            _this1.subscriptions.set(resourceId, resourceSubscriptions);
           }
         }
       };
@@ -905,7 +973,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     key: "subscribeToSourceTitle",
     value: function subscribeToSourceTitle(node, callback) {
       var _cachedData$data,
-        _this1 = this;
+        _this10 = this;
       // check node is a sync block, as we only support sync block subscriptions
       if (node.type.name !== 'syncBlock') {
         return function () {};
@@ -925,13 +993,13 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       var resourceSubscriptions = this.titleSubscriptions.get(resourceId) || {};
       this.titleSubscriptions.set(resourceId, _objectSpread(_objectSpread({}, resourceSubscriptions), {}, (0, _defineProperty2.default)({}, localId, callback)));
       return function () {
-        var resourceSubscriptions = _this1.titleSubscriptions.get(resourceId);
+        var resourceSubscriptions = _this10.titleSubscriptions.get(resourceId);
         if (resourceSubscriptions) {
           delete resourceSubscriptions[localId];
           if (Object.keys(resourceSubscriptions).length === 0) {
-            _this1.titleSubscriptions.delete(resourceId);
+            _this10.titleSubscriptions.delete(resourceId);
           } else {
-            _this1.titleSubscriptions.set(resourceId, resourceSubscriptions);
+            _this10.titleSubscriptions.set(resourceId, resourceSubscriptions);
           }
         }
       };
@@ -1081,7 +1149,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       }
       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 retrive sync block parent info');
+        throw new Error('Unable to retrieve sync block parent info');
       }
       var contentId = parentInfo.contentId,
         contentProduct = parentInfo.contentProduct;
@@ -1126,7 +1194,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     key: "flush",
     value: (function () {
       var _flush = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
-        var _this10 = this;
+        var _this11 = this;
         var success, syncedBlocksToFlush, _this$saveExperience, blocks, _iterator4, _step4, _loop2, updateResult, _this$saveExperience2, _this$fireAnalyticsEv1, _this$saveExperience3, _this$fireAnalyticsEv10, _this$saveExperience4;
         return _regenerator.default.wrap(function _callee4$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
@@ -1288,8 +1356,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
                   // Use setTimeout to avoid deep recursion and run queued flush asynchronously
                   // Note: flush() handles all exceptions internally and never rejects
                   this.queuedFlushTimeout = setTimeout(function () {
-                    _this10.queuedFlushTimeout = undefined;
-                    void _this10.flush();
+                    _this11.queuedFlushTimeout = undefined;
+                    void _this11.flush();
                   }, 0);
                 }
               }
@@ -1310,7 +1378,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
   }, {
     key: "destroy",
     value: function destroy() {
-      var _this$dataProvider7, _this$saveExperience5, _this$fetchExperience0, _this$fetchSourceInfo2;
+      var _this$dataProvider8, _this$saveExperience5, _this$fetchExperience0, _this$fetchSourceInfo2;
       // Cancel any queued flush to prevent it from running after destroy
       if (this.queuedFlushTimeout) {
         clearTimeout(this.queuedFlushTimeout);
@@ -1319,7 +1387,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
 
       // Clean up all GraphQL subscriptions first
       this.cleanupAllGraphQLSubscriptions();
-      (_this$dataProvider7 = this.dataProvider) === null || _this$dataProvider7 === void 0 || _this$dataProvider7.resetCache();
+      (_this$dataProvider8 = this.dataProvider) === null || _this$dataProvider8 === void 0 || _this$dataProvider8.resetCache();
       this.scheduledBatchFetch.cancel();
       this.pendingFetchRequests.clear();
       this.dataProvider = undefined;
@@ -1327,7 +1395,6 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       this.titleSubscriptions.clear();
       this.syncBlockFetchDataRequests.clear();
       this.syncBlockSourceInfoRequests.clear();
-      this.providerFactories.clear();
       this.isRefreshingSubscriptions = false;
       this.useRealTimeSubscriptions = false;
       this.subscriptionChangeListeners.clear();

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

@@ -267,7 +267,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
      */
   }, {
     key: "createBodiedSyncBlockNode",
-    value: function createBodiedSyncBlockNode(attrs, onCompletion, nodeData) {
+    value: function createBodiedSyncBlockNode(attrs, onCompletion) {
       var _this4 = this;
       var resourceId = attrs.resourceId,
         blockInstanceId = attrs.localId;

package/dist/cjs/utils/errorHandling.js

@@ -4,9 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateSuccessPayload = exports.updateReferenceErrorPayload = exports.updateErrorPayload = exports.updateCacheErrorPayload = exports.stringifyError = exports.getSourceInfoErrorPayload = exports.getErrorPayload = exports.fetchSuccessPayload = exports.fetchReferencesErrorPayload = exports.fetchErrorPayload = exports.deleteSuccessPayload = exports.deleteErrorPayload = exports.createSuccessPayload = exports.createErrorPayload = void 0;
+exports.updateSuccessPayload = exports.updateReferenceErrorPayload = exports.updateErrorPayload = exports.updateCacheErrorPayload = exports.stringifyError = exports.getSourceInfoErrorPayload = exports.getErrorPayload = exports.fetchSuccessPayload = exports.fetchReferencesErrorPayload = exports.fetchErrorPayload = exports.deleteSuccessPayload = exports.deleteErrorPayload = exports.createSuccessPayloadNew = exports.createSuccessPayload = exports.createErrorPayload = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var stringifyError = exports.stringifyError = function stringifyError(error) {
@@ -70,6 +71,25 @@ var fetchSuccessPayload = exports.fetchSuccessPayload = function fetchSuccessPay
   };
 };
 var createSuccessPayload = exports.createSuccessPayload = function createSuccessPayload(resourceId) {
+  return (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? {
+    action: _analytics.ACTION.INSERTED,
+    actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
+    actionSubjectId: _analytics.ACTION_SUBJECT_ID.BODIED_SYNCED_BLOCK,
+    eventType: _analytics.EVENT_TYPE.TRACK,
+    attributes: {
+      resourceId: resourceId
+    }
+  } : {
+    action: _analytics.ACTION.INSERTED,
+    actionSubject: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,
+    actionSubjectId: _analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_CREATE,
+    eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+    attributes: {
+      resourceId: resourceId
+    }
+  };
+};
+var createSuccessPayloadNew = exports.createSuccessPayloadNew = function createSuccessPayloadNew(resourceId) {
   return {
     action: _analytics.ACTION.INSERTED,
     actionSubject: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,

package/dist/cjs/utils/resolveSyncBlockInstance.js

@@ -11,8 +11,9 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; }
 /**
  * Merges two SyncBlockInstance objects,
- * currently it only preserves the sourceURL from the old result,
- * but this can be extended in the future to preserve other fields and resolve conflicts as needed.
+ * preserving sourceURL, sourceTitle, sourceSubType, and onSameDocument from the old result
+ * when the new result does not have them.
+ * This can be extended in the future to resolve other conflicts as needed,
  * e.g. compare timestamps or version numbers to determine which data is more recent.
  *
  * @param oldResult - The existing SyncBlockInstance object.

package/dist/cjs/utils/retry.js

@@ -50,7 +50,8 @@ var _fetchWithRetry = exports.fetchWithRetry = /*#__PURE__*/function () {
           retryAfter = response.headers.get('Retry-After');
           _context.next = 11;
           return new Promise(function (resolve) {
-            return setTimeout(resolve, retryAfter ? parseRetryAfter(retryAfter) : delay);
+            var _ref2;
+            return setTimeout(resolve, (_ref2 = retryAfter ? parseRetryAfter(retryAfter) : undefined) !== null && _ref2 !== void 0 ? _ref2 : delay);
           });
         case 11:
           return _context.abrupt("return", _fetchWithRetry(url, options, retriesRemaining - 1, delay * 2));

package/dist/es2019/clients/block-service/ari.js

@@ -31,8 +31,10 @@ export const generateBlockAriFromReference = ({
 };
 
 /**
- * Extracts the local ID from a block ARI.
- * @param ari - the block ARI. E.G ari:cloud:blocks:cloudId:synced-block/localId
+ * Extracts the local ID from a source block ARI.
+ * Designed for source block ARIs of the form: ari:cloud:blocks:{cloudId}:synced-block/{localId}
+ * where the localId is a UUID immediately after synced-block/.
+ * @param ari - the source block ARI. E.G ari:cloud:blocks:cloudId:synced-block/79d4f3f4-51df-451b-b9a1-751bc77b1e77
  * @returns the localId of the block node. A randomly generated UUID
  */
 export const getLocalIdFromBlockResourceId = ari => {
@@ -40,7 +42,7 @@ export const getLocalIdFromBlockResourceId = ari => {
   if (match !== null && match !== void 0 && match[1]) {
     return match[1];
   }
-  throw new Error(`Invalid page ARI: ${ari}`);
+  throw new Error(`Invalid block ARI: ${ari}`);
 };
 export const getProductFromSourceAri = ari => {
   const jiraMatch = ari === null || ari === void 0 ? void 0 : ari.search(/ari:cloud:jira:.*/);

package/dist/es2019/index.js

@@ -10,17 +10,17 @@ export { useHandleContentChanges } from './hooks/useHandleContentChanges';
 
 // clients
 export { generateBlockAri, generateBlockAriFromReference, getLocalIdFromBlockResourceId } from './clients/block-service/ari';
+export { BlockError } from './clients/block-service/blockService';
 export { getConfluencePageAri, getPageIdAndTypeFromConfluencePageAri } from './clients/confluence/ari';
 export { fetchMediaToken } from './clients/confluence/fetchMediaToken';
 export { getJiraWorkItemAri, getJiraWorkItemIdFromAri } from './clients/jira/ari';
 
 // providers
-export { useMemoizedBlockServiceAPIProviders, useMemoizedBlockServiceFetchOnlyAPIProvider, fetchReferences, batchFetchData } from './providers/block-service/blockServiceAPI';
+export { useMemoizedBlockServiceAPIProviders, useMemoizedBlockServiceFetchOnlyAPIProvider, fetchReferences, batchFetchData, blockAriToResourceId, convertToSyncBlockData, extractResourceIdFromBlockAri } from './providers/block-service/blockServiceAPI';
 export { fetchConfluencePageInfo } from './clients/confluence/sourceInfo';
-export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider } from './providers/syncBlockProvider';
-
+export { SyncedBlockProvider, useMemoizedSyncedBlockProvider } from './providers/syncBlockProvider';
 // store managers
-
+export { ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';
 export { SyncBlockStoreManager, useMemoizedSyncBlockStoreManager } from './store-manager/syncBlockStoreManager';
 
 // utils