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

package/dist/es2019/hooks/useFetchSyncBlockTitle.js

@@ -1,5 +1,7 @@
-import { useEffect, useState } from 'react';
-export const useFetchSyncBlockTitle = (manager, syncBlockNode) => {
+import { useEffect, useRef, useState } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
+const useFetchSyncBlockTitleBase = (manager, syncBlockNode) => {
   // Initialize state from cache to prevent flickering during re-renders
   const [sourceTitle, setSourceTitle] = useState(() => {
     var _cachedData$data;
@@ -24,4 +26,35 @@ export const useFetchSyncBlockTitle = (manager, syncBlockNode) => {
     };
   }, [manager, syncBlockNode]);
   return sourceTitle;
-};
+};
+const useFetchSyncBlockTitlePatched = (manager, syncBlockNode) => {
+  var _syncBlockNode$attrs, _syncBlockNode$attrs2;
+  const nodeRef = useRef(syncBlockNode);
+  nodeRef.current = syncBlockNode;
+  const nodeTypeName = syncBlockNode.type.name;
+  const resourceId = (_syncBlockNode$attrs = syncBlockNode.attrs) === null || _syncBlockNode$attrs === void 0 ? void 0 : _syncBlockNode$attrs.resourceId;
+  const 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
+  const [sourceTitle, setSourceTitle] = useState(() => {
+    var _cachedData$data2;
+    if (nodeTypeName !== 'syncBlock') {
+      return undefined;
+    }
+    if (!resourceId) {
+      return undefined;
+    }
+    const cachedData = manager.referenceManager.getFromCache(resourceId);
+    return cachedData === null || cachedData === void 0 ? void 0 : (_cachedData$data2 = cachedData.data) === null || _cachedData$data2 === void 0 ? void 0 : _cachedData$data2.sourceTitle;
+  });
+  useEffect(() => {
+    const unsubscribe = manager.referenceManager.subscribeToSourceTitle(nodeRef.current, title => {
+      setSourceTitle(title);
+    });
+    return () => {
+      unsubscribe();
+    };
+  }, [manager, nodeTypeName, resourceId, localId]);
+  return sourceTitle;
+};
+export const useFetchSyncBlockTitle = conditionalHooksFactory(() => fg('platform_synced_block_patch_4'), useFetchSyncBlockTitlePatched, useFetchSyncBlockTitleBase);

package/dist/es2019/hooks/useHandleContentChanges.js

@@ -1,5 +1,8 @@
 import { useEffect } from 'react';
 export const 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.
   useEffect(() => {
     manager.sourceManager.updateSyncBlockData(syncBlockNode);
   }, [manager, syncBlockNode]);

package/dist/es2019/providers/syncBlockProvider.js

@@ -1,6 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import { useMemo } from 'react';
+import { useMemo, useRef } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
 import { getProductFromSourceAri } from '../clients/block-service/ari';
 import { getPageIdAndTypeFromConfluencePageAri } from '../clients/confluence/ari';
 import { fetchConfluencePageInfo } from '../clients/confluence/sourceInfo';
@@ -289,7 +290,7 @@ const createSyncedBlockProvider = ({
 }) => {
   return new SyncedBlockProvider(fetchProvider, writeProvider);
 };
-export const useMemoizedSyncedBlockProvider = ({
+const useMemoizedSyncedBlockProviderBase = ({
   fetchProvider,
   writeProvider,
   providerOptions,
@@ -305,4 +306,30 @@ export const useMemoizedSyncedBlockProvider = ({
     syncBlockProvider.setSSRData(ssrData);
   }
   return syncBlockProvider;
-};
+};
+const useMemoizedSyncedBlockProviderPatched = ({
+  fetchProvider,
+  writeProvider,
+  providerOptions,
+  getSSRData
+}) => {
+  const syncBlockProvider = useMemo(() => createSyncedBlockProvider({
+    fetchProvider,
+    writeProvider
+  }), [fetchProvider, writeProvider]);
+  const prevProviderOptionsRef = useRef(undefined);
+  if (providerOptions !== prevProviderOptionsRef.current) {
+    prevProviderOptionsRef.current = providerOptions;
+    syncBlockProvider.setProviderOptions(providerOptions);
+  }
+  const prevSSRDataRef = useRef(undefined);
+  const ssrData = getSSRData === null || getSSRData === void 0 ? void 0 : getSSRData();
+  if (ssrData !== prevSSRDataRef.current) {
+    prevSSRDataRef.current = ssrData;
+    if (ssrData) {
+      syncBlockProvider.setSSRData(ssrData);
+    }
+  }
+  return syncBlockProvider;
+};
+export const useMemoizedSyncedBlockProvider = conditionalHooksFactory(() => fg('platform_synced_block_patch_4'), useMemoizedSyncedBlockProviderPatched, useMemoizedSyncedBlockProviderBase);

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

@@ -277,6 +277,9 @@ export class ReferenceSyncBlockStoreManager {
    */
   handleGraphQLSubscriptionUpdate(syncBlockInstance) {
     if (!syncBlockInstance.resourceId) {
+      if (fg('platform_synced_block_patch_4')) {
+        return;
+      }
       throw new Error('Sync block instance provided to graphql subscription update missing resource id');
     }
     const existingSyncBlock = this.getFromCache(syncBlockInstance.resourceId);

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

@@ -1,5 +1,7 @@
-import { useMemo } from 'react';
+import { useMemo, useRef } from 'react';
 import { logException } from '@atlaskit/editor-common/monitoring';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
 import { getProductFromSourceAri } from '../clients/block-service/ari';
 import { SyncBlockError } from '../common/types';
 import { fetchReferencesErrorPayload } from '../utils/errorHandling';
@@ -14,7 +16,7 @@ import { SourceSyncBlockStoreManager } from './sourceSyncBlockStoreManager';
 // Can be used in both editor and renderer contexts.
 export class SyncBlockStoreManager {
   constructor(dataProvider) {
-    // 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(dataProvider);
     this.referenceSyncBlockStoreManager = new ReferenceSyncBlockStoreManager(dataProvider);
@@ -128,11 +130,22 @@ export class SyncBlockStoreManager {
 const createSyncBlockStoreManager = dataProvider => {
   return new SyncBlockStoreManager(dataProvider);
 };
-export const useMemoizedSyncBlockStoreManager = (dataProvider, fireAnalyticsEvent) => {
+const useMemoizedSyncBlockStoreManagerBase = (dataProvider, fireAnalyticsEvent) => {
   const syncBlockStoreManager = useMemo(() => {
-    const syncBlockStoreManager = createSyncBlockStoreManager(dataProvider);
-    return syncBlockStoreManager;
+    return createSyncBlockStoreManager(dataProvider);
   }, [dataProvider]);
   syncBlockStoreManager.setFireAnalyticsEvent(fireAnalyticsEvent);
   return syncBlockStoreManager;
-};
+};
+const useMemoizedSyncBlockStoreManagerPatched = (dataProvider, fireAnalyticsEvent) => {
+  const syncBlockStoreManager = useMemo(() => {
+    return createSyncBlockStoreManager(dataProvider);
+  }, [dataProvider]);
+  const prevFireAnalyticsEventRef = useRef(undefined);
+  if (fireAnalyticsEvent !== prevFireAnalyticsEventRef.current) {
+    prevFireAnalyticsEventRef.current = fireAnalyticsEvent;
+    syncBlockStoreManager.setFireAnalyticsEvent(fireAnalyticsEvent);
+  }
+  return syncBlockStoreManager;
+};
+export const useMemoizedSyncBlockStoreManager = conditionalHooksFactory(() => fg('platform_synced_block_patch_4'), useMemoizedSyncBlockStoreManagerPatched, useMemoizedSyncBlockStoreManagerBase);

package/dist/es2019/utils/experienceTracking.js

@@ -81,9 +81,9 @@ export const getFetchSourceInfoExperience = fireAnalyticsEvent => {
 /**
  * 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
  */
 export const getDeleteSourceExperience = fireAnalyticsEvent => {
   return new Experience(EXPERIENCE_ID.ASYNC_OPERATION, {
@@ -98,9 +98,9 @@ export const getDeleteSourceExperience = fireAnalyticsEvent => {
 /**
  * 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
  */
 export const getCreateSourceExperience = fireAnalyticsEvent => {
   return new Experience(EXPERIENCE_ID.ASYNC_OPERATION, {
@@ -113,11 +113,11 @@ export const getCreateSourceExperience = fireAnalyticsEvent => {
 };
 
 /**
- * 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
  */
 export const getFetchReferencesExperience = fireAnalyticsEvent => {
   return new Experience(EXPERIENCE_ID.ASYNC_OPERATION, {

package/dist/es2019/utils/resourceId.js

@@ -11,7 +11,7 @@ const 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
  *
@@ -24,7 +24,7 @@ const 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'.
  */
 

package/dist/es2019/utils/retry.js

@@ -1,7 +1,10 @@
-const parseRetryAfter = retryAfter => {
+import { fg } from '@atlaskit/platform-feature-flags';
+import { functionWithCondition } from '@atlaskit/platform-feature-flags-react';
+const MAX_RETRY_DELAY = 30000;
+const parseRetryAfterBase = retryAfter => {
   let newDelay;
 
-  // retryAfter can either be in ms or HTTP date
+  // retryAfter can either be in seconds or HTTP date
   const parsedRetryAfter = parseInt(retryAfter);
   if (!isNaN(parsedRetryAfter)) {
     newDelay = parsedRetryAfter * 1000;
@@ -14,16 +17,33 @@ const parseRetryAfter = retryAfter => {
   }
   return newDelay;
 };
+const parseRetryAfterPatched = retryAfter => {
+  // retryAfter can either be in seconds or HTTP date
+  const parsedRetryAfter = parseInt(retryAfter, 10);
+  if (!isNaN(parsedRetryAfter) && parsedRetryAfter > 0) {
+    return parsedRetryAfter * 1000;
+  }
+  const retryDate = new Date(retryAfter);
+  if (isNaN(retryDate.getTime())) {
+    return undefined;
+  }
+  const delayFromDate = retryDate.getTime() - Date.now();
+  if (delayFromDate > 0) {
+    return delayFromDate;
+  }
+  return undefined;
+};
+const parseRetryAfter = functionWithCondition(() => fg('platform_synced_block_patch_4'), parseRetryAfterPatched, parseRetryAfterBase);
 export const fetchWithRetry = async (url, options, retriesRemaining = 3, delay = 1000) => {
+  var _ref;
   const response = await fetch(url, options);
   const shouldRetry = !response.ok && response.status === 429 && retriesRemaining > 1;
   if (!shouldRetry) {
     return response;
   }
   const retryAfter = response.headers.get('Retry-After');
-  await new Promise(resolve => {
-    var _ref;
-    return setTimeout(resolve, (_ref = retryAfter ? parseRetryAfter(retryAfter) : undefined) !== null && _ref !== void 0 ? _ref : delay);
-  });
+  const parsedDelay = (_ref = retryAfter ? parseRetryAfter(retryAfter) : undefined) !== null && _ref !== void 0 ? _ref : delay;
+  const retryDelay = fg('platform_synced_block_patch_4') ? Math.min(parsedDelay, MAX_RETRY_DELAY) : parsedDelay;
+  await new Promise(resolve => setTimeout(resolve, retryDelay));
   return fetchWithRetry(url, options, retriesRemaining - 1, delay * 2);
 };

package/dist/es2019/utils/utils.js

@@ -30,7 +30,7 @@ export const convertPMNodeToSyncBlockNode = node => {
   return createSyncBlockNode(node.attrs.localId, node.attrs.resourceId);
 };
 export const convertPMNodesToSyncBlockNodes = nodes => {
-  return nodes.map(node => convertPMNodeToSyncBlockNode(node)).filter(node => node !== undefined) || [];
+  return nodes.map(node => convertPMNodeToSyncBlockNode(node)).filter(node => node !== undefined);
 };
 
 /*

package/dist/es2019/utils/validValue.js

@@ -1,5 +1,6 @@
+import { SYNC_BLOCK_PRODUCTS } from '../common/consts';
 export const normaliseSyncBlockProduct = value => {
-  return value === 'confluence-page' || value === 'jira-work-item' ? value : undefined;
+  return SYNC_BLOCK_PRODUCTS.includes(value) ? value : undefined;
 };
 export const normaliseSyncBlockStatus = value => {
   return value === 'active' || value === 'unpublished' || value === 'deleted' ? value : undefined;

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

@@ -123,7 +123,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(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}");
@@ -154,11 +154,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))];
@@ -329,8 +335,8 @@ export var batchRetrieveSyncedBlocks = /*#__PURE__*/function () {
 }();
 export var deleteSyncedBlock = /*#__PURE__*/function () {
   var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
@@ -366,12 +372,13 @@ export var 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 = 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();
       }
@@ -430,7 +437,7 @@ export var updateSyncedBlock = /*#__PURE__*/function () {
 }();
 export var createSyncedBlock = /*#__PURE__*/function () {
   var _ref1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(_ref0) {
-    var _result$data4;
+    var _result$data5;
     var blockAri, blockInstanceId, sourceAri, product, content, stepVersion, status, bodyData, url, response, result;
     return _regeneratorRuntime.wrap(function _callee6$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
@@ -467,7 +474,7 @@ export var 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;
           }
@@ -486,7 +493,7 @@ export var createSyncedBlock = /*#__PURE__*/function () {
 }();
 export var updateReferenceSyncedBlockOnDocument = /*#__PURE__*/function () {
   var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.wrap(function _callee7$(_context7) {
       while (1) switch (_context7.prev = _context7.next) {
         case 0:
@@ -527,7 +534,7 @@ export var updateReferenceSyncedBlockOnDocument = /*#__PURE__*/function () {
             _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;
           }
@@ -546,7 +553,7 @@ export var updateReferenceSyncedBlockOnDocument = /*#__PURE__*/function () {
 }();
 export var getReferenceSyncedBlocksByBlockAri = /*#__PURE__*/function () {
   var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(_ref12) {
-    var _result$data6;
+    var _result$data7;
     var blockAri, bodyData, url, response, result, graphqlResponse;
     return _regeneratorRuntime.wrap(function _callee8$(_context8) {
       while (1) switch (_context8.prev = _context8.next) {
@@ -583,7 +590,7 @@ export var getReferenceSyncedBlocksByBlockAri = /*#__PURE__*/function () {
             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/esm/clients/confluence/fetchMediaToken.js

@@ -4,6 +4,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { logException } from '@atlaskit/editor-common/monitoring';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { fetchWithRetry } from '../../utils/retry';
 var COMMON_HEADERS = {
   'Content-Type': 'application/json',
@@ -59,7 +60,7 @@ var getContentMediaSession = /*#__PURE__*/function () {
 }();
 export var fetchMediaToken = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -78,19 +79,20 @@ export var 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);
           logException(_context2.t0, {
             location: 'editor-synced-block-provider/fetchMediaToken'
           });
-          throw new Error("Failed to get content media session: ".concat(_context2.t0));
-        case 17:
+          errorMsg = 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/esm/hooks/useFetchSyncBlockTitle.js

@@ -1,6 +1,8 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import { useEffect, useState } from 'react';
-export var useFetchSyncBlockTitle = function useFetchSyncBlockTitle(manager, syncBlockNode) {
+import { useEffect, useRef, useState } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
+var useFetchSyncBlockTitleBase = function useFetchSyncBlockTitleBase(manager, syncBlockNode) {
   // Initialize state from cache to prevent flickering during re-renders
   var _useState = useState(function () {
       var _cachedData$data;
@@ -26,4 +28,40 @@ export var useFetchSyncBlockTitle = function useFetchSyncBlockTitle(manager, syn
     };
   }, [manager, syncBlockNode]);
   return sourceTitle;
-};
+};
+var useFetchSyncBlockTitlePatched = function useFetchSyncBlockTitlePatched(manager, syncBlockNode) {
+  var _syncBlockNode$attrs, _syncBlockNode$attrs2;
+  var nodeRef = 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 = 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 = _slicedToArray(_useState3, 2),
+    sourceTitle = _useState4[0],
+    setSourceTitle = _useState4[1];
+  useEffect(function () {
+    var unsubscribe = manager.referenceManager.subscribeToSourceTitle(nodeRef.current, function (title) {
+      setSourceTitle(title);
+    });
+    return function () {
+      unsubscribe();
+    };
+  }, [manager, nodeTypeName, resourceId, localId]);
+  return sourceTitle;
+};
+export var useFetchSyncBlockTitle = conditionalHooksFactory(function () {
+  return fg('platform_synced_block_patch_4');
+}, useFetchSyncBlockTitlePatched, useFetchSyncBlockTitleBase);

package/dist/esm/hooks/useHandleContentChanges.js

@@ -1,5 +1,8 @@
 import { useEffect } from 'react';
 export var 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.
   useEffect(function () {
     manager.sourceManager.updateSyncBlockData(syncBlockNode);
   }, [manager, syncBlockNode]);

package/dist/esm/providers/syncBlockProvider.js

@@ -10,8 +10,9 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(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; })(); }
-import { useMemo } from 'react';
+import { useMemo, useRef } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
 import { getProductFromSourceAri } from '../clients/block-service/ari';
 import { getPageIdAndTypeFromConfluencePageAri } from '../clients/confluence/ari';
 import { fetchConfluencePageInfo } from '../clients/confluence/sourceInfo';
@@ -444,7 +445,7 @@ var createSyncedBlockProvider = function createSyncedBlockProvider(_ref) {
     writeProvider = _ref.writeProvider;
   return new SyncedBlockProvider(fetchProvider, writeProvider);
 };
-export var useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(_ref2) {
+var useMemoizedSyncedBlockProviderBase = function useMemoizedSyncedBlockProviderBase(_ref2) {
   var fetchProvider = _ref2.fetchProvider,
     writeProvider = _ref2.writeProvider,
     providerOptions = _ref2.providerOptions,
@@ -461,4 +462,33 @@ export var useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvi
     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 = useMemo(function () {
+    return createSyncedBlockProvider({
+      fetchProvider: fetchProvider,
+      writeProvider: writeProvider
+    });
+  }, [fetchProvider, writeProvider]);
+  var prevProviderOptionsRef = useRef(undefined);
+  if (providerOptions !== prevProviderOptionsRef.current) {
+    prevProviderOptionsRef.current = providerOptions;
+    syncBlockProvider.setProviderOptions(providerOptions);
+  }
+  var prevSSRDataRef = 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;
+};
+export var useMemoizedSyncedBlockProvider = conditionalHooksFactory(function () {
+  return fg('platform_synced_block_patch_4');
+}, useMemoizedSyncedBlockProviderPatched, useMemoizedSyncedBlockProviderBase);

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

@@ -385,6 +385,9 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
     value: function handleGraphQLSubscriptionUpdate(syncBlockInstance) {
       var _this5 = this;
       if (!syncBlockInstance.resourceId) {
+        if (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);

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

@@ -5,8 +5,10 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { useMemo } from 'react';
+import { useMemo, useRef } from 'react';
 import { logException } from '@atlaskit/editor-common/monitoring';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
 import { getProductFromSourceAri } from '../clients/block-service/ari';
 import { SyncBlockError } from '../common/types';
 import { fetchReferencesErrorPayload } from '../utils/errorHandling';
@@ -22,7 +24,7 @@ import { SourceSyncBlockStoreManager } from './sourceSyncBlockStoreManager';
 export var SyncBlockStoreManager = /*#__PURE__*/function () {
   function SyncBlockStoreManager(dataProvider) {
     _classCallCheck(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(dataProvider);
     this.referenceSyncBlockStoreManager = new ReferenceSyncBlockStoreManager(dataProvider);
@@ -194,11 +196,24 @@ export var SyncBlockStoreManager = /*#__PURE__*/function () {
 var createSyncBlockStoreManager = function createSyncBlockStoreManager(dataProvider) {
   return new SyncBlockStoreManager(dataProvider);
 };
-export var useMemoizedSyncBlockStoreManager = function useMemoizedSyncBlockStoreManager(dataProvider, fireAnalyticsEvent) {
+var useMemoizedSyncBlockStoreManagerBase = function useMemoizedSyncBlockStoreManagerBase(dataProvider, fireAnalyticsEvent) {
   var syncBlockStoreManager = 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 = useMemo(function () {
+    return createSyncBlockStoreManager(dataProvider);
+  }, [dataProvider]);
+  var prevFireAnalyticsEventRef = useRef(undefined);
+  if (fireAnalyticsEvent !== prevFireAnalyticsEventRef.current) {
+    prevFireAnalyticsEventRef.current = fireAnalyticsEvent;
+    syncBlockStoreManager.setFireAnalyticsEvent(fireAnalyticsEvent);
+  }
+  return syncBlockStoreManager;
+};
+export var useMemoizedSyncBlockStoreManager = conditionalHooksFactory(function () {
+  return fg('platform_synced_block_patch_4');
+}, useMemoizedSyncBlockStoreManagerPatched, useMemoizedSyncBlockStoreManagerBase);