@atlaskit/editor-synced-block-provider 6.6.3 → 6.6.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-synced-block-provider
 
+## 6.6.4
+
+### Patch Changes
+
+- [`7ddc63dca3716`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7ddc63dca3716) -
+  Fix synced block reference showing unpublished error when created from existing content on a live
+  page without further edits
+
 ## 6.6.3
 
 ### Patch Changes

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

@@ -12,6 +12,7 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("../common/types");
 var _errorHandling = require("../utils/errorHandling");
 var _experienceTracking = require("../utils/experienceTracking");
@@ -21,6 +22,9 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (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; }
+/** Maximum time (ms) flush() will wait for in-flight block creations before proceeding. */
+var FLUSH_CREATION_AWAIT_TIMEOUT_MS = 1000;
+
 // A store manager responsible for the lifecycle and state management of source sync blocks in an editor instance.
 // Designed to manage local in-memory state and synchronize with an external data provider.
 // Supports create, flush, and delete operations for source sync blocks.
@@ -31,6 +35,22 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
     var _this = this;
     (0, _classCallCheck2.default)(this, SourceSyncBlockStoreManager);
     (0, _defineProperty2.default)(this, "hasReceivedContentChange", false);
+    /**
+     * Promises for in-flight block creations, keyed by resourceId.
+     * `flush()` awaits these so that blocks created from existing content are
+     * persisted even if no further edits trigger a subsequent flush.
+     * See EDITOR-7112.
+     */
+    (0, _defineProperty2.default)(this, "pendingCreationPromises", new Map());
+    /**
+     * Set of resource IDs whose creation was still in-flight when a `flush()`
+     * timed out. Each completion (success or failure) is removed from this set;
+     * the first successful completion of any of these IDs triggers
+     * `postCreationFlushCallback` so the content is eventually persisted.
+     * Tracking IDs (not just a boolean) avoids dropping late completions when
+     * multiple blocks are created concurrently. See EDITOR-7112.
+     */
+    (0, _defineProperty2.default)(this, "creationsTimedOutDuringFlush", new Set());
     (0, _defineProperty2.default)(this, "setPendingDeletion", function (Ids, value) {
       if (_this.viewMode === 'view') {
         return;
@@ -57,6 +77,18 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
     value: function registerFlushCompletionCallback(callback) {
       this.flushCompletionCallback = callback;
     }
+
+    /**
+     * Register a callback to be invoked when flush() timed out waiting for a
+     * pending block creation and that creation subsequently completes. The
+     * callback should trigger a deferred flush to persist the content that
+     * was skipped due to the timeout. See EDITOR-7112.
+     */
+  }, {
+    key: "registerPostCreationFlushCallback",
+    value: function registerPostCreationFlushCallback(callback) {
+      this.postCreationFlushCallback = callback;
+    }
   }, {
     key: "setFireAnalyticsEvent",
     value: function setFireAnalyticsEvent(fireAnalyticsEvent) {
@@ -134,7 +166,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
     value: (function () {
       var _flush = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var _this2 = this;
-        var _this$saveExperience, bodiedSyncBlockNodes, bodiedSyncBlockData, writeResults, _this$saveExperience2, _this$saveExperience3, _this$fireAnalyticsEv2, _this$flushCompletion;
+        var _this$saveExperience, timedOut, timeoutId, timeout, _iterator, _step, resourceId, bodiedSyncBlockNodes, bodiedSyncBlockData, writeResults, _this$saveExperience2, _this$saveExperience3, _this$fireAnalyticsEv2, _this$flushCompletion;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -145,6 +177,39 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
               }
               return _context.abrupt("return", true);
             case 3:
+              if (!(this.pendingCreationPromises.size > 0 && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_12'))) {
+                _context.next = 10;
+                break;
+              }
+              timedOut = false;
+              timeout = new Promise(function (resolve) {
+                timeoutId = setTimeout(function () {
+                  timedOut = true;
+                  resolve();
+                }, FLUSH_CREATION_AWAIT_TIMEOUT_MS);
+              });
+              _context.next = 8;
+              return Promise.race([Promise.all(this.pendingCreationPromises.values()), timeout]);
+            case 8:
+              if (timeoutId !== undefined) {
+                clearTimeout(timeoutId);
+              }
+              if (timedOut) {
+                // Record every still-in-flight creation so each late
+                // completion is tracked independently.
+                _iterator = _createForOfIteratorHelper(this.pendingCreationPromises.keys());
+                try {
+                  for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                    resourceId = _step.value;
+                    this.creationsTimedOutDuringFlush.add(resourceId);
+                  }
+                } catch (err) {
+                  _iterator.e(err);
+                } finally {
+                  _iterator.f();
+                }
+              }
+            case 10:
               bodiedSyncBlockNodes = [];
               bodiedSyncBlockData = [];
               Array.from(this.syncBlockCache.values()).forEach(function (syncBlockData) {
@@ -174,21 +239,21 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
                 }
               });
               if (!(bodiedSyncBlockNodes.length === 0)) {
-                _context.next = 8;
+                _context.next = 15;
                 break;
               }
               return _context.abrupt("return", Promise.resolve(true));
-            case 8:
+            case 15:
               if (this.dataProvider) {
-                _context.next = 10;
+                _context.next = 17;
                 break;
               }
               throw new Error('Data provider not set');
-            case 10:
+            case 17:
               (_this$saveExperience = this.saveExperience) === null || _this$saveExperience === void 0 || _this$saveExperience.start({});
-              _context.next = 13;
+              _context.next = 20;
               return this.dataProvider.writeNodesData(bodiedSyncBlockNodes, bodiedSyncBlockData);
-            case 13:
+            case 20:
               writeResults = _context.sent;
               writeResults.forEach(function (result) {
                 // set isDirty to true for cases where it failed to save the sync block to the BE
@@ -202,7 +267,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
               if (!writeResults.every(function (result) {
                 return result.resourceId && !result.error;
               })) {
-                _context.next = 21;
+                _context.next = 28;
                 break;
               }
               (_this$saveExperience2 = this.saveExperience) === null || _this$saveExperience2 === void 0 || _this$saveExperience2.success();
@@ -218,7 +283,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
                 }
               });
               return _context.abrupt("return", true);
-            case 21:
+            case 28:
               (_this$saveExperience3 = this.saveExperience) === null || _this$saveExperience3 === void 0 || _this$saveExperience3.failure();
               writeResults.filter(function (result) {
                 return !result.resourceId || result.error;
@@ -227,11 +292,11 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
                 (_this2$fireAnalyticsE2 = _this2.fireAnalyticsEvent) === null || _this2$fireAnalyticsE2 === void 0 || _this2$fireAnalyticsE2.call(_this2, (0, _errorHandling.updateErrorPayload)(result.error || 'Failed to write data', result.resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(result.resourceId)));
               });
               return _context.abrupt("return", false);
-            case 24:
-              _context.next = 31;
+            case 31:
+              _context.next = 38;
               break;
-            case 26:
-              _context.prev = 26;
+            case 33:
+              _context.prev = 33;
               _context.t0 = _context["catch"](0);
               (0, _monitoring.logException)(_context.t0, {
                 location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
@@ -239,15 +304,15 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
               // Top-level flush failure is not tied to a single resourceId.
               (_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 || _this$fireAnalyticsEv2.call(this, (0, _errorHandling.updateErrorPayload)(_context.t0.message));
               return _context.abrupt("return", false);
-            case 31:
-              _context.prev = 31;
+            case 38:
+              _context.prev = 38;
               (_this$flushCompletion = this.flushCompletionCallback) === null || _this$flushCompletion === void 0 || _this$flushCompletion.call(this);
-              return _context.finish(31);
-            case 34:
+              return _context.finish(38);
+            case 41:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[0, 26, 31, 34]]);
+        }, _callee, this, [[0, 33, 38, 41]]);
       }));
       function flush() {
         return _flush.apply(this, arguments);
@@ -303,10 +368,20 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
       if (onCompletion) {
         this.creationCompletionCallbacks.delete(resourceId);
         onCompletion(success);
+        // If a previous flush() timed out waiting for this specific
+        // creation, drop it from the tracking set regardless of outcome so
+        // it does not leak. See EDITOR-7112.
+        var wasTimedOut = this.creationsTimedOutDuringFlush.delete(resourceId);
         if (success) {
           // If creation is successful, set hasReceivedContentChange to true
           // to indicate that there are unsaved changes in the cache
           this.hasReceivedContentChange = true;
+          // If flush() timed out waiting for this creation, notify the
+          // plugin so it can trigger a deferred flush. See EDITOR-7112.
+          if (wasTimedOut) {
+            var _this$postCreationFlu;
+            (_this$postCreationFlu = this.postCreationFlushCallback) === null || _this$postCreationFlu === void 0 || _this$postCreationFlu.call(this);
+          }
         }
       } else {
         var _this$fireAnalyticsEv3;
@@ -386,7 +461,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
         }
         this.creationCompletionCallbacks.set(resourceId, onCompletion);
         (_this$createExperienc = this.createExperience) === null || _this$createExperienc === void 0 || _this$createExperienc.start({});
-        this.dataProvider.createNodeData({
+        var creationPromise = this.dataProvider.createNodeData({
           content: [],
           blockInstanceId: blockInstanceId,
           resourceId: resourceId
@@ -414,7 +489,10 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
             reason: error.message
           });
           (_this4$fireAnalyticsE2 = _this4.fireAnalyticsEvent) === null || _this4$fireAnalyticsE2 === void 0 || _this4$fireAnalyticsE2.call(_this4, (0, _errorHandling.createErrorPayload)(error.message, resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(resourceId)));
+        }).finally(function () {
+          _this4.pendingCreationPromises.delete(resourceId);
         });
+        this.pendingCreationPromises.set(resourceId, creationPromise);
       } catch (error) {
         var _this$fireAnalyticsEv6;
         if (this.isPendingCreation(resourceId)) {
@@ -575,7 +653,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
     value: (function () {
       var _fetchAndCacheStatuses = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
         var _this6 = this;
-        var sourceToReferenceMap, syncBlockNodes, results, _iterator, _step, _sourceToReferenceMap, _result$data, result, sourceResourceId, cached;
+        var sourceToReferenceMap, syncBlockNodes, results, _iterator2, _step2, _sourceToReferenceMap, _result$data, result, sourceResourceId, cached;
         return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -611,10 +689,10 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
               return this.dataProvider.fetchNodesData(syncBlockNodes);
             case 7:
               results = _context4.sent;
-              _iterator = _createForOfIteratorHelper(results);
+              _iterator2 = _createForOfIteratorHelper(results);
               try {
-                for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                  result = _step.value;
+                for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                  result = _step2.value;
                   // Map the reference resourceId back to the source resourceId
                   sourceResourceId = (_sourceToReferenceMap = sourceToReferenceMap.get(result.resourceId)) !== null && _sourceToReferenceMap !== void 0 ? _sourceToReferenceMap : result.resourceId;
                   cached = this.syncBlockCache.get(sourceResourceId);
@@ -623,9 +701,9 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
                   }
                 }
               } catch (err) {
-                _iterator.e(err);
+                _iterator2.e(err);
               } finally {
-                _iterator.f();
+                _iterator2.f();
               }
               _context4.next = 14;
               break;
@@ -801,6 +879,9 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
       this.confirmationCallback = undefined;
       this.creationCompletionCallbacks.clear();
       this.flushCompletionCallback = undefined;
+      this.postCreationFlushCallback = undefined;
+      this.pendingCreationPromises.clear();
+      this.creationsTimedOutDuringFlush.clear();
       this.dataProvider = undefined;
       (_this$saveExperience4 = this.saveExperience) === null || _this$saveExperience4 === void 0 || _this$saveExperience4.abort({
         reason: 'editorDestroyed'

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

@@ -1,9 +1,13 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { logException } from '@atlaskit/editor-common/monitoring';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SyncBlockError } from '../common/types';
 import { updateErrorPayload, createErrorPayload, deleteErrorPayload, updateCacheErrorPayload, getSourceInfoErrorPayload, updateSuccessPayload, createSuccessPayload, deleteSuccessPayload, fetchReferencesErrorPayload } from '../utils/errorHandling';
 import { getCreateSourceExperience, getDeleteSourceExperience, getSaveSourceExperience, getFetchSourceInfoExperience } from '../utils/experienceTracking';
 import { convertSyncBlockPMNodeToSyncBlockData, getSourceProductFromResourceIdSafe } from '../utils/utils';
+/** Maximum time (ms) flush() will wait for in-flight block creations before proceeding. */
+const FLUSH_CREATION_AWAIT_TIMEOUT_MS = 1000;
+
 // A store manager responsible for the lifecycle and state management of source sync blocks in an editor instance.
 // Designed to manage local in-memory state and synchronize with an external data provider.
 // Supports create, flush, and delete operations for source sync blocks.
@@ -12,6 +16,22 @@ import { convertSyncBlockPMNodeToSyncBlockData, getSourceProductFromResourceIdSa
 export class SourceSyncBlockStoreManager {
   constructor(dataProvider, viewMode, isLivePage) {
     _defineProperty(this, "hasReceivedContentChange", false);
+    /**
+     * Promises for in-flight block creations, keyed by resourceId.
+     * `flush()` awaits these so that blocks created from existing content are
+     * persisted even if no further edits trigger a subsequent flush.
+     * See EDITOR-7112.
+     */
+    _defineProperty(this, "pendingCreationPromises", new Map());
+    /**
+     * Set of resource IDs whose creation was still in-flight when a `flush()`
+     * timed out. Each completion (success or failure) is removed from this set;
+     * the first successful completion of any of these IDs triggers
+     * `postCreationFlushCallback` so the content is eventually persisted.
+     * Tracking IDs (not just a boolean) avoids dropping late completions when
+     * multiple blocks are created concurrently. See EDITOR-7112.
+     */
+    _defineProperty(this, "creationsTimedOutDuringFlush", new Set());
     _defineProperty(this, "setPendingDeletion", (Ids, value) => {
       if (this.viewMode === 'view') {
         return;
@@ -36,6 +56,16 @@ export class SourceSyncBlockStoreManager {
   registerFlushCompletionCallback(callback) {
     this.flushCompletionCallback = callback;
   }
+
+  /**
+   * Register a callback to be invoked when flush() timed out waiting for a
+   * pending block creation and that creation subsequently completes. The
+   * callback should trigger a deferred flush to persist the content that
+   * was skipped due to the timeout. See EDITOR-7112.
+   */
+  registerPostCreationFlushCallback(callback) {
+    this.postCreationFlushCallback = callback;
+  }
   setFireAnalyticsEvent(fireAnalyticsEvent) {
     this.fireAnalyticsEvent = fireAnalyticsEvent;
     this.createExperience = getCreateSourceExperience(fireAnalyticsEvent);
@@ -110,6 +140,39 @@ export class SourceSyncBlockStoreManager {
       if (this.viewMode === 'view') {
         return true;
       }
+
+      // Wait (up to FLUSH_CREATION_AWAIT_TIMEOUT_MS) for any in-flight
+      // block creations to complete before iterating the cache. Without
+      // this, blocks created from existing content are skipped
+      // (isPendingCreation check below) and if no further edits are made,
+      // no subsequent flush is triggered — causing references to show an
+      // "unpublished" error.
+      // If the timeout expires, any block whose creation is still
+      // in-flight is recorded in `creationsTimedOutDuringFlush` so that
+      // `commitPendingCreation()` can trigger a follow-up flush once that
+      // specific creation completes.
+      // See EDITOR-7112.
+      if (this.pendingCreationPromises.size > 0 && fg('platform_synced_block_patch_12')) {
+        let timedOut = false;
+        let timeoutId;
+        const timeout = new Promise(resolve => {
+          timeoutId = setTimeout(() => {
+            timedOut = true;
+            resolve();
+          }, FLUSH_CREATION_AWAIT_TIMEOUT_MS);
+        });
+        await Promise.race([Promise.all(this.pendingCreationPromises.values()), timeout]);
+        if (timeoutId !== undefined) {
+          clearTimeout(timeoutId);
+        }
+        if (timedOut) {
+          // Record every still-in-flight creation so each late
+          // completion is tracked independently.
+          for (const resourceId of this.pendingCreationPromises.keys()) {
+            this.creationsTimedOutDuringFlush.add(resourceId);
+          }
+        }
+      }
       const bodiedSyncBlockNodes = [];
       const bodiedSyncBlockData = [];
       Array.from(this.syncBlockCache.values()).forEach(syncBlockData => {
@@ -232,10 +295,20 @@ export class SourceSyncBlockStoreManager {
     if (onCompletion) {
       this.creationCompletionCallbacks.delete(resourceId);
       onCompletion(success);
+      // If a previous flush() timed out waiting for this specific
+      // creation, drop it from the tracking set regardless of outcome so
+      // it does not leak. See EDITOR-7112.
+      const wasTimedOut = this.creationsTimedOutDuringFlush.delete(resourceId);
       if (success) {
         // If creation is successful, set hasReceivedContentChange to true
         // to indicate that there are unsaved changes in the cache
         this.hasReceivedContentChange = true;
+        // If flush() timed out waiting for this creation, notify the
+        // plugin so it can trigger a deferred flush. See EDITOR-7112.
+        if (wasTimedOut) {
+          var _this$postCreationFlu;
+          (_this$postCreationFlu = this.postCreationFlushCallback) === null || _this$postCreationFlu === void 0 ? void 0 : _this$postCreationFlu.call(this);
+        }
       }
     } else {
       var _this$fireAnalyticsEv5;
@@ -308,7 +381,7 @@ export class SourceSyncBlockStoreManager {
       }
       this.creationCompletionCallbacks.set(resourceId, onCompletion);
       (_this$createExperienc = this.createExperience) === null || _this$createExperienc === void 0 ? void 0 : _this$createExperienc.start({});
-      this.dataProvider.createNodeData({
+      const creationPromise = this.dataProvider.createNodeData({
         content: [],
         blockInstanceId,
         resourceId
@@ -336,7 +409,10 @@ export class SourceSyncBlockStoreManager {
           reason: error.message
         });
         (_this$fireAnalyticsEv9 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv9 === void 0 ? void 0 : _this$fireAnalyticsEv9.call(this, createErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
+      }).finally(() => {
+        this.pendingCreationPromises.delete(resourceId);
       });
+      this.pendingCreationPromises.set(resourceId, creationPromise);
     } catch (error) {
       var _this$fireAnalyticsEv0;
       if (this.isPendingCreation(resourceId)) {
@@ -584,6 +660,9 @@ export class SourceSyncBlockStoreManager {
     this.confirmationCallback = undefined;
     this.creationCompletionCallbacks.clear();
     this.flushCompletionCallback = undefined;
+    this.postCreationFlushCallback = undefined;
+    this.pendingCreationPromises.clear();
+    this.creationsTimedOutDuringFlush.clear();
     this.dataProvider = undefined;
     (_this$saveExperience4 = this.saveExperience) === null || _this$saveExperience4 === void 0 ? void 0 : _this$saveExperience4.abort({
       reason: 'editorDestroyed'

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

@@ -3,17 +3,21 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-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 { SyncBlockError } from '../common/types';
 import { updateErrorPayload, createErrorPayload, deleteErrorPayload, updateCacheErrorPayload, getSourceInfoErrorPayload, updateSuccessPayload, createSuccessPayload, deleteSuccessPayload, fetchReferencesErrorPayload } from '../utils/errorHandling';
 import { getCreateSourceExperience, getDeleteSourceExperience, getSaveSourceExperience, getFetchSourceInfoExperience } from '../utils/experienceTracking';
 import { convertSyncBlockPMNodeToSyncBlockData, getSourceProductFromResourceIdSafe } from '../utils/utils';
+/** Maximum time (ms) flush() will wait for in-flight block creations before proceeding. */
+var FLUSH_CREATION_AWAIT_TIMEOUT_MS = 1000;
+
 // A store manager responsible for the lifecycle and state management of source sync blocks in an editor instance.
 // Designed to manage local in-memory state and synchronize with an external data provider.
 // Supports create, flush, and delete operations for source sync blocks.
@@ -24,6 +28,22 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
     var _this = this;
     _classCallCheck(this, SourceSyncBlockStoreManager);
     _defineProperty(this, "hasReceivedContentChange", false);
+    /**
+     * Promises for in-flight block creations, keyed by resourceId.
+     * `flush()` awaits these so that blocks created from existing content are
+     * persisted even if no further edits trigger a subsequent flush.
+     * See EDITOR-7112.
+     */
+    _defineProperty(this, "pendingCreationPromises", new Map());
+    /**
+     * Set of resource IDs whose creation was still in-flight when a `flush()`
+     * timed out. Each completion (success or failure) is removed from this set;
+     * the first successful completion of any of these IDs triggers
+     * `postCreationFlushCallback` so the content is eventually persisted.
+     * Tracking IDs (not just a boolean) avoids dropping late completions when
+     * multiple blocks are created concurrently. See EDITOR-7112.
+     */
+    _defineProperty(this, "creationsTimedOutDuringFlush", new Set());
     _defineProperty(this, "setPendingDeletion", function (Ids, value) {
       if (_this.viewMode === 'view') {
         return;
@@ -50,6 +70,18 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
     value: function registerFlushCompletionCallback(callback) {
       this.flushCompletionCallback = callback;
     }
+
+    /**
+     * Register a callback to be invoked when flush() timed out waiting for a
+     * pending block creation and that creation subsequently completes. The
+     * callback should trigger a deferred flush to persist the content that
+     * was skipped due to the timeout. See EDITOR-7112.
+     */
+  }, {
+    key: "registerPostCreationFlushCallback",
+    value: function registerPostCreationFlushCallback(callback) {
+      this.postCreationFlushCallback = callback;
+    }
   }, {
     key: "setFireAnalyticsEvent",
     value: function setFireAnalyticsEvent(fireAnalyticsEvent) {
@@ -127,7 +159,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
     value: (function () {
       var _flush = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var _this2 = this;
-        var _this$saveExperience, bodiedSyncBlockNodes, bodiedSyncBlockData, writeResults, _this$saveExperience2, _this$saveExperience3, _this$fireAnalyticsEv2, _this$flushCompletion;
+        var _this$saveExperience, timedOut, timeoutId, timeout, _iterator, _step, resourceId, bodiedSyncBlockNodes, bodiedSyncBlockData, writeResults, _this$saveExperience2, _this$saveExperience3, _this$fireAnalyticsEv2, _this$flushCompletion;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -138,6 +170,39 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
               }
               return _context.abrupt("return", true);
             case 3:
+              if (!(this.pendingCreationPromises.size > 0 && fg('platform_synced_block_patch_12'))) {
+                _context.next = 10;
+                break;
+              }
+              timedOut = false;
+              timeout = new Promise(function (resolve) {
+                timeoutId = setTimeout(function () {
+                  timedOut = true;
+                  resolve();
+                }, FLUSH_CREATION_AWAIT_TIMEOUT_MS);
+              });
+              _context.next = 8;
+              return Promise.race([Promise.all(this.pendingCreationPromises.values()), timeout]);
+            case 8:
+              if (timeoutId !== undefined) {
+                clearTimeout(timeoutId);
+              }
+              if (timedOut) {
+                // Record every still-in-flight creation so each late
+                // completion is tracked independently.
+                _iterator = _createForOfIteratorHelper(this.pendingCreationPromises.keys());
+                try {
+                  for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                    resourceId = _step.value;
+                    this.creationsTimedOutDuringFlush.add(resourceId);
+                  }
+                } catch (err) {
+                  _iterator.e(err);
+                } finally {
+                  _iterator.f();
+                }
+              }
+            case 10:
               bodiedSyncBlockNodes = [];
               bodiedSyncBlockData = [];
               Array.from(this.syncBlockCache.values()).forEach(function (syncBlockData) {
@@ -167,21 +232,21 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
                 }
               });
               if (!(bodiedSyncBlockNodes.length === 0)) {
-                _context.next = 8;
+                _context.next = 15;
                 break;
               }
               return _context.abrupt("return", Promise.resolve(true));
-            case 8:
+            case 15:
               if (this.dataProvider) {
-                _context.next = 10;
+                _context.next = 17;
                 break;
               }
               throw new Error('Data provider not set');
-            case 10:
+            case 17:
               (_this$saveExperience = this.saveExperience) === null || _this$saveExperience === void 0 || _this$saveExperience.start({});
-              _context.next = 13;
+              _context.next = 20;
               return this.dataProvider.writeNodesData(bodiedSyncBlockNodes, bodiedSyncBlockData);
-            case 13:
+            case 20:
               writeResults = _context.sent;
               writeResults.forEach(function (result) {
                 // set isDirty to true for cases where it failed to save the sync block to the BE
@@ -195,7 +260,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
               if (!writeResults.every(function (result) {
                 return result.resourceId && !result.error;
               })) {
-                _context.next = 21;
+                _context.next = 28;
                 break;
               }
               (_this$saveExperience2 = this.saveExperience) === null || _this$saveExperience2 === void 0 || _this$saveExperience2.success();
@@ -211,7 +276,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
                 }
               });
               return _context.abrupt("return", true);
-            case 21:
+            case 28:
               (_this$saveExperience3 = this.saveExperience) === null || _this$saveExperience3 === void 0 || _this$saveExperience3.failure();
               writeResults.filter(function (result) {
                 return !result.resourceId || result.error;
@@ -220,11 +285,11 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
                 (_this2$fireAnalyticsE2 = _this2.fireAnalyticsEvent) === null || _this2$fireAnalyticsE2 === void 0 || _this2$fireAnalyticsE2.call(_this2, updateErrorPayload(result.error || 'Failed to write data', result.resourceId, getSourceProductFromResourceIdSafe(result.resourceId)));
               });
               return _context.abrupt("return", false);
-            case 24:
-              _context.next = 31;
+            case 31:
+              _context.next = 38;
               break;
-            case 26:
-              _context.prev = 26;
+            case 33:
+              _context.prev = 33;
               _context.t0 = _context["catch"](0);
               logException(_context.t0, {
                 location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
@@ -232,15 +297,15 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
               // Top-level flush failure is not tied to a single resourceId.
               (_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 || _this$fireAnalyticsEv2.call(this, updateErrorPayload(_context.t0.message));
               return _context.abrupt("return", false);
-            case 31:
-              _context.prev = 31;
+            case 38:
+              _context.prev = 38;
               (_this$flushCompletion = this.flushCompletionCallback) === null || _this$flushCompletion === void 0 || _this$flushCompletion.call(this);
-              return _context.finish(31);
-            case 34:
+              return _context.finish(38);
+            case 41:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[0, 26, 31, 34]]);
+        }, _callee, this, [[0, 33, 38, 41]]);
       }));
       function flush() {
         return _flush.apply(this, arguments);
@@ -296,10 +361,20 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
       if (onCompletion) {
         this.creationCompletionCallbacks.delete(resourceId);
         onCompletion(success);
+        // If a previous flush() timed out waiting for this specific
+        // creation, drop it from the tracking set regardless of outcome so
+        // it does not leak. See EDITOR-7112.
+        var wasTimedOut = this.creationsTimedOutDuringFlush.delete(resourceId);
         if (success) {
           // If creation is successful, set hasReceivedContentChange to true
           // to indicate that there are unsaved changes in the cache
           this.hasReceivedContentChange = true;
+          // If flush() timed out waiting for this creation, notify the
+          // plugin so it can trigger a deferred flush. See EDITOR-7112.
+          if (wasTimedOut) {
+            var _this$postCreationFlu;
+            (_this$postCreationFlu = this.postCreationFlushCallback) === null || _this$postCreationFlu === void 0 || _this$postCreationFlu.call(this);
+          }
         }
       } else {
         var _this$fireAnalyticsEv3;
@@ -379,7 +454,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
         }
         this.creationCompletionCallbacks.set(resourceId, onCompletion);
         (_this$createExperienc = this.createExperience) === null || _this$createExperienc === void 0 || _this$createExperienc.start({});
-        this.dataProvider.createNodeData({
+        var creationPromise = this.dataProvider.createNodeData({
           content: [],
           blockInstanceId: blockInstanceId,
           resourceId: resourceId
@@ -407,7 +482,10 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
             reason: error.message
           });
           (_this4$fireAnalyticsE2 = _this4.fireAnalyticsEvent) === null || _this4$fireAnalyticsE2 === void 0 || _this4$fireAnalyticsE2.call(_this4, createErrorPayload(error.message, resourceId, getSourceProductFromResourceIdSafe(resourceId)));
+        }).finally(function () {
+          _this4.pendingCreationPromises.delete(resourceId);
         });
+        this.pendingCreationPromises.set(resourceId, creationPromise);
       } catch (error) {
         var _this$fireAnalyticsEv6;
         if (this.isPendingCreation(resourceId)) {
@@ -568,7 +646,7 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
     value: (function () {
       var _fetchAndCacheStatuses = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
         var _this6 = this;
-        var sourceToReferenceMap, syncBlockNodes, results, _iterator, _step, _sourceToReferenceMap, _result$data, result, sourceResourceId, cached;
+        var sourceToReferenceMap, syncBlockNodes, results, _iterator2, _step2, _sourceToReferenceMap, _result$data, result, sourceResourceId, cached;
         return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -604,10 +682,10 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
               return this.dataProvider.fetchNodesData(syncBlockNodes);
             case 7:
               results = _context4.sent;
-              _iterator = _createForOfIteratorHelper(results);
+              _iterator2 = _createForOfIteratorHelper(results);
               try {
-                for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                  result = _step.value;
+                for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                  result = _step2.value;
                   // Map the reference resourceId back to the source resourceId
                   sourceResourceId = (_sourceToReferenceMap = sourceToReferenceMap.get(result.resourceId)) !== null && _sourceToReferenceMap !== void 0 ? _sourceToReferenceMap : result.resourceId;
                   cached = this.syncBlockCache.get(sourceResourceId);
@@ -616,9 +694,9 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
                   }
                 }
               } catch (err) {
-                _iterator.e(err);
+                _iterator2.e(err);
               } finally {
-                _iterator.f();
+                _iterator2.f();
               }
               _context4.next = 14;
               break;
@@ -794,6 +872,9 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
       this.confirmationCallback = undefined;
       this.creationCompletionCallbacks.clear();
       this.flushCompletionCallback = undefined;
+      this.postCreationFlushCallback = undefined;
+      this.pendingCreationPromises.clear();
+      this.creationsTimedOutDuringFlush.clear();
       this.dataProvider = undefined;
       (_this$saveExperience4 = this.saveExperience) === null || _this$saveExperience4 === void 0 || _this$saveExperience4.abort({
         reason: 'editorDestroyed'

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

@@ -18,6 +18,23 @@ export declare class SourceSyncBlockStoreManager {
     private deletionRetryInfo?;
     private creationCompletionCallbacks;
     private flushCompletionCallback?;
+    private postCreationFlushCallback?;
+    /**
+     * Promises for in-flight block creations, keyed by resourceId.
+     * `flush()` awaits these so that blocks created from existing content are
+     * persisted even if no further edits trigger a subsequent flush.
+     * See EDITOR-7112.
+     */
+    private pendingCreationPromises;
+    /**
+     * Set of resource IDs whose creation was still in-flight when a `flush()`
+     * timed out. Each completion (success or failure) is removed from this set;
+     * the first successful completion of any of these IDs triggers
+     * `postCreationFlushCallback` so the content is eventually persisted.
+     * Tracking IDs (not just a boolean) avoids dropping late completions when
+     * multiple blocks are created concurrently. See EDITOR-7112.
+     */
+    private creationsTimedOutDuringFlush;
     private createExperience;
     private saveExperience;
     private deleteExperience;
@@ -29,6 +46,13 @@ export declare class SourceSyncBlockStoreManager {
      * hasUnsavedBodiedSyncBlockChanges is recalculated in plugin state.
      */
     registerFlushCompletionCallback(callback: () => void): void;
+    /**
+     * Register a callback to be invoked when flush() timed out waiting for a
+     * pending block creation and that creation subsequently completes. The
+     * callback should trigger a deferred flush to persist the content that
+     * was skipped due to the timeout. See EDITOR-7112.
+     */
+    registerPostCreationFlushCallback(callback: () => void): void;
     setFireAnalyticsEvent(fireAnalyticsEvent?: (payload: SyncBlockEventPayload) => void): void;
     isSourceBlock(node: PMNode): boolean;
     /**

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

@@ -18,6 +18,23 @@ export declare class SourceSyncBlockStoreManager {
     private deletionRetryInfo?;
     private creationCompletionCallbacks;
     private flushCompletionCallback?;
+    private postCreationFlushCallback?;
+    /**
+     * Promises for in-flight block creations, keyed by resourceId.
+     * `flush()` awaits these so that blocks created from existing content are
+     * persisted even if no further edits trigger a subsequent flush.
+     * See EDITOR-7112.
+     */
+    private pendingCreationPromises;
+    /**
+     * Set of resource IDs whose creation was still in-flight when a `flush()`
+     * timed out. Each completion (success or failure) is removed from this set;
+     * the first successful completion of any of these IDs triggers
+     * `postCreationFlushCallback` so the content is eventually persisted.
+     * Tracking IDs (not just a boolean) avoids dropping late completions when
+     * multiple blocks are created concurrently. See EDITOR-7112.
+     */
+    private creationsTimedOutDuringFlush;
     private createExperience;
     private saveExperience;
     private deleteExperience;
@@ -29,6 +46,13 @@ export declare class SourceSyncBlockStoreManager {
      * hasUnsavedBodiedSyncBlockChanges is recalculated in plugin state.
      */
     registerFlushCompletionCallback(callback: () => void): void;
+    /**
+     * Register a callback to be invoked when flush() timed out waiting for a
+     * pending block creation and that creation subsequently completes. The
+     * callback should trigger a deferred flush to persist the content that
+     * was skipped due to the timeout. See EDITOR-7112.
+     */
+    registerPostCreationFlushCallback(callback: () => void): void;
     setFireAnalyticsEvent(fireAnalyticsEvent?: (payload: SyncBlockEventPayload) => void): void;
     isSourceBlock(node: PMNode): boolean;
     /**

package/package.json

@@ -29,7 +29,7 @@
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/node-data-provider": "^11.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^81.0.0",
+		"@atlaskit/tmp-editor-statsig": "^81.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"graphql-ws": "^5.14.2",
@@ -38,7 +38,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.32.0",
+		"@atlaskit/editor-common": "^114.35.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -81,11 +81,16 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "6.6.3",
+	"version": "6.6.4",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
+	},
+	"platform-feature-flags": {
+		"platform_synced_block_patch_12": {
+			"type": "boolean"
+		}
 	}
 }