@atlaskit/editor-plugin-synced-block 5.3.13 → 5.3.14

package/dist/es2019/pm-plugins/main.js

@@ -7,15 +7,39 @@ import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
 import { convertPMNodesToSyncBlockNodes, rebaseTransaction } from '@atlaskit/editor-synced-block-provider';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { lazyBodiedSyncBlockView } from '../nodeviews/bodiedLazySyncedBlock';
 import { SyncBlock as SyncBlockView } from '../nodeviews/syncedBlock';
 import { FLAG_ID } from '../types';
+import { handleBodiedSyncBlockCreation } from './utils/handle-bodied-sync-block-creation';
 import { handleBodiedSyncBlockRemoval } from './utils/handle-bodied-sync-block-removal';
 import { shouldIgnoreDomEvent } from './utils/ignore-dom-event';
 import { calculateDecorations } from './utils/selection-decorations';
 import { hasEditInSyncBlock, trackSyncBlocks } from './utils/track-sync-blocks';
 import { sliceFullyContainsNode } from './utils/utils';
 export const syncedBlockPluginKey = new PluginKey('syncedBlockPlugin');
+const mapRetryCreationPosMap = (oldMap, newRetryCreationPos, mapPos) => {
+  const resourceId = newRetryCreationPos === null || newRetryCreationPos === void 0 ? void 0 : newRetryCreationPos.resourceId;
+  const newMap = new Map(oldMap);
+  if (resourceId) {
+    const pos = newRetryCreationPos.pos;
+    if (!pos) {
+      newMap.delete(resourceId);
+    } else {
+      newMap.set(resourceId, pos);
+    }
+  }
+  if (newMap.size === 0) {
+    return newMap;
+  }
+  for (const [id, pos] of newMap.entries()) {
+    newMap.set(id, {
+      from: mapPos(pos.from),
+      to: mapPos(pos.to)
+    });
+  }
+  return newMap;
+};
 const showCopiedFlag = api => {
   // Use setTimeout to dispatch transaction in next tick and avoid re-entrant dispatch
   setTimeout(() => {
@@ -77,7 +101,8 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
         return {
           selectionDecorationSet: calculateDecorations(instance.doc, instance.selection, instance.schema),
           activeFlag: false,
-          syncBlockStore: syncBlockStore
+          syncBlockStore: syncBlockStore,
+          retryCreationPosMap: new Map()
         };
       },
       apply: (tr, currentPluginState, oldEditorState) => {
@@ -86,16 +111,23 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
         const {
           activeFlag,
           selectionDecorationSet,
-          bodiedSyncBlockDeletionStatus
+          bodiedSyncBlockDeletionStatus,
+          retryCreationPosMap
         } = currentPluginState;
         let newDecorationSet = selectionDecorationSet.map(tr.mapping, tr.doc);
         if (!tr.selection.eq(oldEditorState.selection)) {
           newDecorationSet = calculateDecorations(tr.doc, tr.selection, tr.doc.type.schema);
         }
+        let newRetryCreationPosMap = retryCreationPosMap;
+        if (fg('platform_synced_block_patch_1')) {
+          const newPosEntry = meta === null || meta === void 0 ? void 0 : meta.retryCreationPos;
+          newRetryCreationPosMap = mapRetryCreationPosMap(retryCreationPosMap, newPosEntry, tr.mapping.map.bind(tr.mapping));
+        }
         return {
           activeFlag: (_meta$activeFlag = meta === null || meta === void 0 ? void 0 : meta.activeFlag) !== null && _meta$activeFlag !== void 0 ? _meta$activeFlag : activeFlag,
           selectionDecorationSet: newDecorationSet,
           syncBlockStore: syncBlockStore,
+          retryCreationPosMap: newRetryCreationPosMap,
           bodiedSyncBlockDeletionStatus: (_meta$bodiedSyncBlock = meta === null || meta === void 0 ? void 0 : meta.bodiedSyncBlockDeletionStatus) !== null && _meta$bodiedSyncBlock !== void 0 ? _meta$bodiedSyncBlock : bodiedSyncBlockDeletionStatus
         };
       }
@@ -125,8 +157,10 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
         })
       },
       decorations: state => {
-        var _syncedBlockPluginKey, _syncedBlockPluginKey2, _api$connectivity, _api$connectivity$sha, _api$editorViewMode, _api$editorViewMode$s;
-        const selectionDecorationSet = (_syncedBlockPluginKey = (_syncedBlockPluginKey2 = syncedBlockPluginKey.getState(state)) === null || _syncedBlockPluginKey2 === void 0 ? void 0 : _syncedBlockPluginKey2.selectionDecorationSet) !== null && _syncedBlockPluginKey !== void 0 ? _syncedBlockPluginKey : DecorationSet.empty;
+        var _currentPluginState$s, _api$connectivity, _api$connectivity$sha, _api$editorViewMode, _api$editorViewMode$s;
+        const currentPluginState = syncedBlockPluginKey.getState(state);
+        const selectionDecorationSet = (_currentPluginState$s = currentPluginState === null || currentPluginState === void 0 ? void 0 : currentPluginState.selectionDecorationSet) !== null && _currentPluginState$s !== void 0 ? _currentPluginState$s : DecorationSet.empty;
+        const syncBlockStore = currentPluginState === null || currentPluginState === void 0 ? void 0 : currentPluginState.syncBlockStore;
         const {
           doc
         } = state;
@@ -134,6 +168,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
         const isViewMode = (api === null || api === void 0 ? void 0 : (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 ? void 0 : (_api$editorViewMode$s = _api$editorViewMode.sharedState.currentState()) === null || _api$editorViewMode$s === void 0 ? void 0 : _api$editorViewMode$s.mode) === 'view';
         const offlineDecorations = [];
         const viewModeDecorations = [];
+        const loadingDecorations = [];
         state.doc.descendants((node, pos) => {
           if (node.type.name === 'bodiedSyncBlock' && isOffline) {
             offlineDecorations.push(Decoration.node(pos, pos + node.nodeSize, {
@@ -145,8 +180,13 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
               class: SyncBlockStateCssClassName.viewModeClassName
             }));
           }
+          if (node.type.name === 'bodiedSyncBlock' && syncBlockStore.sourceManager.isPendingCreation(node.attrs.resourceId) && fg('platform_synced_block_patch_1')) {
+            loadingDecorations.push(Decoration.node(pos, pos + node.nodeSize, {
+              class: SyncBlockStateCssClassName.creationLoadingClassName
+            }));
+          }
         });
-        return selectionDecorationSet.add(doc, offlineDecorations).add(doc, viewModeDecorations);
+        return selectionDecorationSet.add(doc, offlineDecorations).add(doc, viewModeDecorations).add(doc, loadingDecorations);
       },
       handleClickOn: createSelectionClickHandler(['bodiedSyncBlock'], target => !!target.closest(`.${BodiedSyncBlockSharedCssClassName.prefix}`), {
         useLongPressSelection
@@ -209,6 +249,12 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
       var _api$connectivity2, _api$connectivity2$sh;
       const isOffline = isOfflineMode(api === null || api === void 0 ? void 0 : (_api$connectivity2 = api.connectivity) === null || _api$connectivity2 === void 0 ? void 0 : (_api$connectivity2$sh = _api$connectivity2.sharedState.currentState()) === null || _api$connectivity2$sh === void 0 ? void 0 : _api$connectivity2$sh.mode);
       const isConfirmedSyncBlockDeletion = Boolean(tr.getMeta('isConfirmedSyncBlockDeletion'));
+      const hasNoPendingRequest = fg('platform_synced_block_patch_1') ? false :
+      // requireConfirmationBeforeDelete is always true, so this evaluates to false and hence redundant
+      !(syncBlockStore !== null && syncBlockStore !== void 0 && syncBlockStore.sourceManager.requireConfirmationBeforeDelete()) && !syncBlockStore.sourceManager.hasPendingCreation();
+      const isCommitsCreation = fg('platform_synced_block_patch_1') ? false :
+      // For patch 1, we don't intercept the insert transaction, hence it's redundant
+      Boolean(tr.getMeta('isCommitSyncBlockCreation'));
 
       // Track newly added reference sync blocks before processing the transaction
       if (tr.docChanged && !tr.getMeta('isRemote')) {
@@ -228,7 +274,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
       // or are from remote (collab) or already confirmed sync block deletion
       // We only care about local changes that change the document
       // and are not yet confirmed for sync block deletion
-      if (!tr.docChanged || !(syncBlockStore !== null && syncBlockStore !== void 0 && syncBlockStore.sourceManager.requireConfirmationBeforeDelete()) && !syncBlockStore.sourceManager.hasPendingCreation() || Boolean(tr.getMeta('isRemote')) || Boolean(tr.getMeta('isCommitSyncBlockCreation')) || !isOffline && isConfirmedSyncBlockDeletion) {
+      if (!tr.docChanged || hasNoPendingRequest || Boolean(tr.getMeta('isRemote')) || isCommitsCreation || !isOffline && isConfirmedSyncBlockDeletion) {
         return true;
       }
       const {
@@ -277,18 +323,22 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
             // After true is returned here and the node is created, we delete the node in the filterTransaction immediately, which cancels out the creation
             return true;
           }
-
-          // If there is bodiedSyncBlock node addition and it's waiting for the result of saving the node to backend (syncBlockStore.hasPendingCreation()),
-          // we need to intercept the transaction and save it in insert callback so that we only insert it to the document when backend call if backend call is successful
-          // The callback will be evoked by in SourceSyncBlockStoreManager.commitPendingCreation
-          syncBlockStore.sourceManager.registerCreationCallback(() => {
-            var _api$core;
-            api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(() => {
-              return tr.setMeta('isCommitSyncBlockCreation', true);
+          if (fg('platform_synced_block_patch_1')) {
+            handleBodiedSyncBlockCreation(bodiedSyncBlockAdded, state, api);
+            return true;
+          } else {
+            // If there is bodiedSyncBlock node addition and it's waiting for the result of saving the node to backend (syncBlockStore.hasPendingCreation()),
+            // we need to intercept the transaction and save it in insert callback so that we only insert it to the document when backend call if backend call is successful
+            // The callback will be evoked by in SourceSyncBlockStoreManager.commitPendingCreation
+            syncBlockStore.sourceManager.registerCreationCallback(() => {
+              var _api$core;
+              api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(() => {
+                return tr.setMeta('isCommitSyncBlockCreation', true);
+              });
+              api === null || api === void 0 ? void 0 : api.core.actions.focus();
             });
-            api === null || api === void 0 ? void 0 : api.core.actions.focus();
-          });
-          return false;
+            return false;
+          }
         }
       } else {
         const {

package/dist/es2019/pm-plugins/utils/handle-bodied-sync-block-creation.js

@@ -0,0 +1,134 @@
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { FLAG_ID } from '../../types';
+import { syncedBlockPluginKey } from '../main';
+const onRetry = (api, resourceId) => {
+  return () => {
+    var _api$core, _api$core2;
+    api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.focus();
+    api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(({
+      tr
+    }) => {
+      var _api$syncedBlock, _api$syncedBlock$shar, _api$syncedBlock$shar2, _api$syncedBlock2;
+      const pos = api === null || api === void 0 ? void 0 : (_api$syncedBlock = api.syncedBlock) === null || _api$syncedBlock === void 0 ? void 0 : (_api$syncedBlock$shar = _api$syncedBlock.sharedState.currentState()) === null || _api$syncedBlock$shar === void 0 ? void 0 : (_api$syncedBlock$shar2 = _api$syncedBlock$shar.retryCreationPosMap) === null || _api$syncedBlock$shar2 === void 0 ? void 0 : _api$syncedBlock$shar2.get(resourceId);
+      const from = pos === null || pos === void 0 ? void 0 : pos.from;
+      const to = pos === null || pos === void 0 ? void 0 : pos.to;
+      if (from === undefined || to === undefined) {
+        return tr;
+      }
+      tr.setSelection(TextSelection.create(tr.doc, from, to)).setMeta(syncedBlockPluginKey, {
+        activeFlag: false
+      });
+      api === null || api === void 0 ? void 0 : (_api$syncedBlock2 = api.syncedBlock) === null || _api$syncedBlock2 === void 0 ? void 0 : _api$syncedBlock2.commands.insertSyncedBlock()({
+        tr
+      });
+      return tr;
+    });
+  };
+};
+const getRevertCreationPos = (api, doc, resourceId) => {
+  var _api$syncedBlock3, _api$syncedBlock3$sha, _api$syncedBlock3$sha2;
+  const retryCreationPos = api === null || api === void 0 ? void 0 : (_api$syncedBlock3 = api.syncedBlock) === null || _api$syncedBlock3 === void 0 ? void 0 : (_api$syncedBlock3$sha = _api$syncedBlock3.sharedState.currentState()) === null || _api$syncedBlock3$sha === void 0 ? void 0 : (_api$syncedBlock3$sha2 = _api$syncedBlock3$sha.retryCreationPosMap) === null || _api$syncedBlock3$sha2 === void 0 ? void 0 : _api$syncedBlock3$sha2.get(resourceId);
+  if (retryCreationPos) {
+    return retryCreationPos;
+  }
+
+  // Fallback to find the positions in case BE call returns before plugin state becomes available
+  // which is highly unlikely
+  let currentPos;
+  doc.descendants((node, pos) => {
+    if (currentPos) {
+      return false;
+    }
+    if (node.type.name === 'bodiedSyncBlock' && resourceId === node.attrs.resourceId) {
+      currentPos = {
+        from: pos,
+        to: pos + node.nodeSize
+      };
+      return false;
+    }
+  });
+  return currentPos;
+};
+const buildRevertCreationTr = (tr, pos) => {
+  var _tr$doc$nodeAt;
+  const content = (_tr$doc$nodeAt = tr.doc.nodeAt(pos.from)) === null || _tr$doc$nodeAt === void 0 ? void 0 : _tr$doc$nodeAt.content;
+  if (content) {
+    tr.replaceWith(pos.from, pos.to, content);
+    const contentFrom = tr.mapping.map(pos.from);
+    tr.setSelection(TextSelection.create(tr.doc, contentFrom, contentFrom + content.size));
+  } else {
+    tr.delete(pos.from, pos.to);
+  }
+  return tr;
+};
+
+/**
+ *
+ * Save the new bodiedSyncBlock to backend with empty content and handles revert (if failed) and retry flow
+ */
+export const handleBodiedSyncBlockCreation = (bodiedSyncBlockAdded, editorState, api) => {
+  const syncBlockStore = syncedBlockPluginKey.getState(editorState).syncBlockStore;
+  bodiedSyncBlockAdded.forEach(node => {
+    if (node.from === undefined || node.to === undefined) {
+      return;
+    }
+    const retryCreationPos = {
+      from: node.from,
+      to: node.to
+    };
+    const resourceId = node.attrs.resourceId;
+    setTimeout(() => {
+      var _api$core3;
+      api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(({
+        tr
+      }) => {
+        return tr.setMeta(syncedBlockPluginKey, {
+          retryCreationPos: {
+            resourceId,
+            pos: retryCreationPos
+          }
+        });
+      });
+    });
+    syncBlockStore.sourceManager.createBodiedSyncBlockNode(node.attrs, success => {
+      if (success) {
+        var _api$core4, _api$core5;
+        api === null || api === void 0 ? void 0 : (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions.execute(({
+          tr
+        }) => {
+          return tr.setMeta(syncedBlockPluginKey, {
+            retryCreationPos: {
+              resourceId,
+              pos: undefined
+            }
+          });
+        });
+        api === null || api === void 0 ? void 0 : (_api$core5 = api.core) === null || _api$core5 === void 0 ? void 0 : _api$core5.actions.focus();
+      } else {
+        var _api$core6;
+        api === null || api === void 0 ? void 0 : (_api$core6 = api.core) === null || _api$core6 === void 0 ? void 0 : _api$core6.actions.execute(({
+          tr
+        }) => {
+          const revertCreationPos = getRevertCreationPos(api, tr.doc, resourceId);
+          if (!revertCreationPos) {
+            return tr;
+          }
+          const revertTr = buildRevertCreationTr(tr, revertCreationPos);
+          return revertTr.setMeta('isConfirmedSyncBlockDeletion', true).setMeta('addToHistory', false).setMeta(syncedBlockPluginKey, {
+            activeFlag: {
+              id: FLAG_ID.CANNOT_CREATE_SYNC_BLOCK,
+              onRetry: onRetry(api, resourceId),
+              onDismissed: tr => tr.setMeta(syncedBlockPluginKey, {
+                ...tr.getMeta(syncedBlockPluginKey),
+                retryCreationPos: {
+                  resourceId,
+                  pos: undefined
+                }
+              })
+            }
+          });
+        });
+      }
+    }, node.node);
+  });
+};

package/dist/es2019/pm-plugins/utils/track-sync-blocks.js

@@ -66,6 +66,7 @@ export const trackSyncBlocks = (predicate, tr, state) => {
         const syncBlockAttr = node.attrs;
         syncBlockMapNew[syncBlockAttr.localId] = {
           attrs: syncBlockAttr,
+          node: node,
           from: offset,
           to: offset + node.nodeSize
         };

package/dist/es2019/syncedBlockPlugin.js

@@ -135,12 +135,14 @@ export const syncedBlockPlugin = ({
       const {
         activeFlag,
         syncBlockStore: currentSyncBlockStore,
-        bodiedSyncBlockDeletionStatus
+        bodiedSyncBlockDeletionStatus,
+        retryCreationPosMap
       } = syncedBlockPluginKey.getState(editorState);
       return {
         activeFlag,
         syncBlockStore: currentSyncBlockStore,
-        bodiedSyncBlockDeletionStatus
+        bodiedSyncBlockDeletionStatus,
+        retryCreationPosMap
       };
     }
   };

package/dist/es2019/types/index.js

@@ -5,6 +5,7 @@ export let FLAG_ID = /*#__PURE__*/function (FLAG_ID) {
   FLAG_ID["FAIL_TO_DELETE"] = "fail-to-delete";
   FLAG_ID["SYNC_BLOCK_COPIED"] = "sync-block-copied";
   FLAG_ID["UNPUBLISHED_SYNC_BLOCK_PASTED"] = "unpublished-sync-block-pasted";
+  FLAG_ID["CANNOT_CREATE_SYNC_BLOCK"] = "cannot-create-sync-block";
   return FLAG_ID;
 }({});
 export const SYNCED_BLOCK_BUTTON_TEST_ID = {

package/dist/es2019/ui/Flag.js

@@ -37,6 +37,11 @@ const flagMap = {
     title: messages.unpublishedSyncBlockPastedTitle,
     description: messages.unpublishedSyncBlockPastedDescription,
     type: 'info'
+  },
+  [FLAG_ID.CANNOT_CREATE_SYNC_BLOCK]: {
+    title: messages.cannotCreateSyncBlockTitle,
+    description: messages.CannotCreateSyncBlockDescription,
+    type: 'error'
   }
 };
 export const Flag = ({

package/dist/es2019/ui/floating-toolbar.js

@@ -20,6 +20,9 @@ export const getToolbarConfig = (state, intl, api, syncBlockStore) => {
   if (!syncBlockObject) {
     return;
   }
+  if (syncBlockStore.sourceManager.isPendingCreation(syncBlockObject.node.attrs.resourceId) && fg('platform_synced_block_patch_1')) {
+    return;
+  }
   const syncBlockInstance = syncBlockStore.referenceManager.getFromCache(syncBlockObject.node.attrs.resourceId);
   const isUnsyncedBlock = (syncBlockInstance === null || syncBlockInstance === void 0 ? void 0 : (_syncBlockInstance$er = syncBlockInstance.error) === null || _syncBlockInstance$er === void 0 ? void 0 : _syncBlockInstance$er.type) === SyncBlockError.NotFound;
   const isErroredBlock = syncBlockInstance === null || syncBlockInstance === void 0 ? void 0 : syncBlockInstance.error;

package/dist/esm/editor-commands/index.js

@@ -38,7 +38,9 @@ export var createSyncedBlock = function createSyncedBlock(_ref) {
 
     // Save the new node with empty content to backend
     // This is so that the node can be copied and referenced without the source being saved/published
-    syncBlockStore.sourceManager.createBodiedSyncBlockNode(attrs);
+    if (!fg('platform_synced_block_patch_1')) {
+      syncBlockStore.sourceManager.createBodiedSyncBlockNode(attrs, function () {});
+    }
     if (typeAheadInsert) {
       tr = typeAheadInsert(newBodiedSyncBlockNode);
     } else {
@@ -75,15 +77,15 @@ export var createSyncedBlock = function createSyncedBlock(_ref) {
 
     // Save the new node with empty content to backend
     // This is so that the node can be copied and referenced without the source being saved/published
-    syncBlockStore.sourceManager.createBodiedSyncBlockNode(_attrs, _newBodiedSyncBlockNode);
+    if (!fg('platform_synced_block_patch_1')) {
+      // Moved to appendTransaction
+      syncBlockStore.sourceManager.createBodiedSyncBlockNode(_attrs, function () {}, _newBodiedSyncBlockNode);
+    }
     tr.replaceWith(conversionInfo.from, conversionInfo.to, _newBodiedSyncBlockNode).scrollIntoView();
 
     // set selection to the start of the previous selection for the position taken up by the start of the new synced block
     tr.setSelection(TextSelection.create(tr.doc, conversionInfo.from));
   }
-
-  // This transaction will be intercepted in filterTransaction and dispatched when saving to backend succeeds
-  // see filterTransaction for more details
   return tr;
 };
 export var copySyncedBlockReferenceToClipboardEditorCommand = function copySyncedBlockReferenceToClipboardEditorCommand(syncBlockStore, inputMethod, api) {

package/dist/esm/pm-plugins/main.js

@@ -1,9 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+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; }
 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; }
-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 { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
@@ -13,15 +14,50 @@ import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet, Decoration } from '@atlaskit/editor-prosemirror/view';
 import { convertPMNodesToSyncBlockNodes, rebaseTransaction } from '@atlaskit/editor-synced-block-provider';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { lazyBodiedSyncBlockView } from '../nodeviews/bodiedLazySyncedBlock';
 import { SyncBlock as SyncBlockView } from '../nodeviews/syncedBlock';
 import { FLAG_ID } from '../types';
+import { handleBodiedSyncBlockCreation } from './utils/handle-bodied-sync-block-creation';
 import { handleBodiedSyncBlockRemoval } from './utils/handle-bodied-sync-block-removal';
 import { shouldIgnoreDomEvent } from './utils/ignore-dom-event';
 import { calculateDecorations } from './utils/selection-decorations';
 import { hasEditInSyncBlock, trackSyncBlocks } from './utils/track-sync-blocks';
 import { sliceFullyContainsNode } from './utils/utils';
 export var syncedBlockPluginKey = new PluginKey('syncedBlockPlugin');
+var mapRetryCreationPosMap = function mapRetryCreationPosMap(oldMap, newRetryCreationPos, mapPos) {
+  var resourceId = newRetryCreationPos === null || newRetryCreationPos === void 0 ? void 0 : newRetryCreationPos.resourceId;
+  var newMap = new Map(oldMap);
+  if (resourceId) {
+    var pos = newRetryCreationPos.pos;
+    if (!pos) {
+      newMap.delete(resourceId);
+    } else {
+      newMap.set(resourceId, pos);
+    }
+  }
+  if (newMap.size === 0) {
+    return newMap;
+  }
+  var _iterator = _createForOfIteratorHelper(newMap.entries()),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var _step$value = _slicedToArray(_step.value, 2),
+        id = _step$value[0],
+        _pos = _step$value[1];
+      newMap.set(id, {
+        from: mapPos(_pos.from),
+        to: mapPos(_pos.to)
+      });
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return newMap;
+};
 var showCopiedFlag = function showCopiedFlag(api) {
   // Use setTimeout to dispatch transaction in next tick and avoid re-entrant dispatch
   setTimeout(function () {
@@ -83,7 +119,8 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
         return {
           selectionDecorationSet: calculateDecorations(instance.doc, instance.selection, instance.schema),
           activeFlag: false,
-          syncBlockStore: syncBlockStore
+          syncBlockStore: syncBlockStore,
+          retryCreationPosMap: new Map()
         };
       },
       apply: function apply(tr, currentPluginState, oldEditorState) {
@@ -91,15 +128,22 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
         var meta = tr.getMeta(syncedBlockPluginKey);
         var activeFlag = currentPluginState.activeFlag,
           selectionDecorationSet = currentPluginState.selectionDecorationSet,
-          bodiedSyncBlockDeletionStatus = currentPluginState.bodiedSyncBlockDeletionStatus;
+          bodiedSyncBlockDeletionStatus = currentPluginState.bodiedSyncBlockDeletionStatus,
+          retryCreationPosMap = currentPluginState.retryCreationPosMap;
         var newDecorationSet = selectionDecorationSet.map(tr.mapping, tr.doc);
         if (!tr.selection.eq(oldEditorState.selection)) {
           newDecorationSet = calculateDecorations(tr.doc, tr.selection, tr.doc.type.schema);
         }
+        var newRetryCreationPosMap = retryCreationPosMap;
+        if (fg('platform_synced_block_patch_1')) {
+          var newPosEntry = meta === null || meta === void 0 ? void 0 : meta.retryCreationPos;
+          newRetryCreationPosMap = mapRetryCreationPosMap(retryCreationPosMap, newPosEntry, tr.mapping.map.bind(tr.mapping));
+        }
         return {
           activeFlag: (_meta$activeFlag = meta === null || meta === void 0 ? void 0 : meta.activeFlag) !== null && _meta$activeFlag !== void 0 ? _meta$activeFlag : activeFlag,
           selectionDecorationSet: newDecorationSet,
           syncBlockStore: syncBlockStore,
+          retryCreationPosMap: newRetryCreationPosMap,
           bodiedSyncBlockDeletionStatus: (_meta$bodiedSyncBlock = meta === null || meta === void 0 ? void 0 : meta.bodiedSyncBlockDeletionStatus) !== null && _meta$bodiedSyncBlock !== void 0 ? _meta$bodiedSyncBlock : bodiedSyncBlockDeletionStatus
         };
       }
@@ -129,13 +173,16 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
         })
       },
       decorations: function decorations(state) {
-        var _syncedBlockPluginKey, _syncedBlockPluginKey2, _api$connectivity, _api$editorViewMode;
-        var selectionDecorationSet = (_syncedBlockPluginKey = (_syncedBlockPluginKey2 = syncedBlockPluginKey.getState(state)) === null || _syncedBlockPluginKey2 === void 0 ? void 0 : _syncedBlockPluginKey2.selectionDecorationSet) !== null && _syncedBlockPluginKey !== void 0 ? _syncedBlockPluginKey : DecorationSet.empty;
+        var _currentPluginState$s, _api$connectivity, _api$editorViewMode;
+        var currentPluginState = syncedBlockPluginKey.getState(state);
+        var selectionDecorationSet = (_currentPluginState$s = currentPluginState === null || currentPluginState === void 0 ? void 0 : currentPluginState.selectionDecorationSet) !== null && _currentPluginState$s !== void 0 ? _currentPluginState$s : DecorationSet.empty;
+        var syncBlockStore = currentPluginState === null || currentPluginState === void 0 ? void 0 : currentPluginState.syncBlockStore;
         var doc = state.doc;
         var isOffline = isOfflineMode(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode);
         var isViewMode = (api === null || api === void 0 || (_api$editorViewMode = api.editorViewMode) === null || _api$editorViewMode === void 0 || (_api$editorViewMode = _api$editorViewMode.sharedState.currentState()) === null || _api$editorViewMode === void 0 ? void 0 : _api$editorViewMode.mode) === 'view';
         var offlineDecorations = [];
         var viewModeDecorations = [];
+        var loadingDecorations = [];
         state.doc.descendants(function (node, pos) {
           if (node.type.name === 'bodiedSyncBlock' && isOffline) {
             offlineDecorations.push(Decoration.node(pos, pos + node.nodeSize, {
@@ -147,8 +194,13 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
               class: SyncBlockStateCssClassName.viewModeClassName
             }));
           }
+          if (node.type.name === 'bodiedSyncBlock' && syncBlockStore.sourceManager.isPendingCreation(node.attrs.resourceId) && fg('platform_synced_block_patch_1')) {
+            loadingDecorations.push(Decoration.node(pos, pos + node.nodeSize, {
+              class: SyncBlockStateCssClassName.creationLoadingClassName
+            }));
+          }
         });
-        return selectionDecorationSet.add(doc, offlineDecorations).add(doc, viewModeDecorations);
+        return selectionDecorationSet.add(doc, offlineDecorations).add(doc, viewModeDecorations).add(doc, loadingDecorations);
       },
       handleClickOn: createSelectionClickHandler(['bodiedSyncBlock'], function (target) {
         return !!target.closest(".".concat(BodiedSyncBlockSharedCssClassName.prefix));
@@ -209,6 +261,12 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
       var _api$connectivity2;
       var isOffline = isOfflineMode(api === null || api === void 0 || (_api$connectivity2 = api.connectivity) === null || _api$connectivity2 === void 0 || (_api$connectivity2 = _api$connectivity2.sharedState.currentState()) === null || _api$connectivity2 === void 0 ? void 0 : _api$connectivity2.mode);
       var isConfirmedSyncBlockDeletion = Boolean(tr.getMeta('isConfirmedSyncBlockDeletion'));
+      var hasNoPendingRequest = fg('platform_synced_block_patch_1') ? false :
+      // requireConfirmationBeforeDelete is always true, so this evaluates to false and hence redundant
+      !(syncBlockStore !== null && syncBlockStore !== void 0 && syncBlockStore.sourceManager.requireConfirmationBeforeDelete()) && !syncBlockStore.sourceManager.hasPendingCreation();
+      var isCommitsCreation = fg('platform_synced_block_patch_1') ? false :
+      // For patch 1, we don't intercept the insert transaction, hence it's redundant
+      Boolean(tr.getMeta('isCommitSyncBlockCreation'));
 
       // Track newly added reference sync blocks before processing the transaction
       if (tr.docChanged && !tr.getMeta('isRemote')) {
@@ -229,7 +287,7 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
       // or are from remote (collab) or already confirmed sync block deletion
       // We only care about local changes that change the document
       // and are not yet confirmed for sync block deletion
-      if (!tr.docChanged || !(syncBlockStore !== null && syncBlockStore !== void 0 && syncBlockStore.sourceManager.requireConfirmationBeforeDelete()) && !syncBlockStore.sourceManager.hasPendingCreation() || Boolean(tr.getMeta('isRemote')) || Boolean(tr.getMeta('isCommitSyncBlockCreation')) || !isOffline && isConfirmedSyncBlockDeletion) {
+      if (!tr.docChanged || hasNoPendingRequest || Boolean(tr.getMeta('isRemote')) || isCommitsCreation || !isOffline && isConfirmedSyncBlockDeletion) {
         return true;
       }
       var _trackSyncBlocks2 = trackSyncBlocks(syncBlockStore.sourceManager.isSourceBlock, tr, state),
@@ -278,18 +336,22 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
             // After true is returned here and the node is created, we delete the node in the filterTransaction immediately, which cancels out the creation
             return true;
           }
-
-          // If there is bodiedSyncBlock node addition and it's waiting for the result of saving the node to backend (syncBlockStore.hasPendingCreation()),
-          // we need to intercept the transaction and save it in insert callback so that we only insert it to the document when backend call if backend call is successful
-          // The callback will be evoked by in SourceSyncBlockStoreManager.commitPendingCreation
-          syncBlockStore.sourceManager.registerCreationCallback(function () {
-            var _api$core;
-            api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function () {
-              return tr.setMeta('isCommitSyncBlockCreation', true);
+          if (fg('platform_synced_block_patch_1')) {
+            handleBodiedSyncBlockCreation(bodiedSyncBlockAdded, state, api);
+            return true;
+          } else {
+            // If there is bodiedSyncBlock node addition and it's waiting for the result of saving the node to backend (syncBlockStore.hasPendingCreation()),
+            // we need to intercept the transaction and save it in insert callback so that we only insert it to the document when backend call if backend call is successful
+            // The callback will be evoked by in SourceSyncBlockStoreManager.commitPendingCreation
+            syncBlockStore.sourceManager.registerCreationCallback(function () {
+              var _api$core;
+              api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function () {
+                return tr.setMeta('isCommitSyncBlockCreation', true);
+              });
+              api === null || api === void 0 || api.core.actions.focus();
             });
-            api === null || api === void 0 || api.core.actions.focus();
-          });
-          return false;
+            return false;
+          }
         }
       } else {
         var _trackSyncBlocks4 = trackSyncBlocks(function (node) {
@@ -332,11 +394,11 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
           confirmationTransactionRef.current = rebaseTransaction(confirmationTransactionRef.current, tr, newState);
         }
       });
-      var _iterator = _createForOfIteratorHelper(trs),
-        _step;
+      var _iterator2 = _createForOfIteratorHelper(trs),
+        _step2;
       try {
         var _loop = function _loop() {
-            var tr = _step.value;
+            var tr = _step2.value;
             if (!tr.getMeta(pmHistoryPluginKey)) {
               return 0; // continue
             }
@@ -357,15 +419,15 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
             }
           },
           _ret;
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           _ret = _loop();
           if (_ret === 0) continue;
           if (_ret) return _ret.v;
         }
       } catch (err) {
-        _iterator.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator.f();
+        _iterator2.f();
       }
       return null;
     }