@atlaskit/editor-plugin-synced-block 6.0.11 → 6.0.14

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

@@ -8,9 +8,7 @@ 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 { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { lazyBodiedSyncBlockView } from '../nodeviews/bodiedLazySyncedBlock';
 import { bodiedSyncBlockNodeView, bodiedSyncBlockNodeViewOld } from '../nodeviews/bodiedSyncedBlock';
 import { SyncBlock as SyncBlockView } from '../nodeviews/syncedBlock';
 import { FLAG_ID } from '../types';
@@ -205,17 +203,13 @@ class SyncedBlockPluginContext {
   }
 }
 export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api) => {
-  var _ctx$confirmationTran, _ctx$unpublishedFlagS, _ctx$extensionFlagSho;
   const {
     useLongPressSelection = false
   } = options || {};
-  const ctx = fg('platform_synced_block_patch_5') ? new SyncedBlockPluginContext() : undefined;
-  const confirmationTransactionRef = (_ctx$confirmationTran = ctx === null || ctx === void 0 ? void 0 : ctx.confirmationTransactionRef) !== null && _ctx$confirmationTran !== void 0 ? _ctx$confirmationTran : {
-    current: undefined
-  };
-  let isCopyEvent = false;
-  const unpublishedFlagShown = (_ctx$unpublishedFlagS = ctx === null || ctx === void 0 ? void 0 : ctx.unpublishedFlagShown) !== null && _ctx$unpublishedFlagS !== void 0 ? _ctx$unpublishedFlagS : new Set();
-  const extensionFlagShown = (_ctx$extensionFlagSho = ctx === null || ctx === void 0 ? void 0 : ctx.extensionFlagShown) !== null && _ctx$extensionFlagSho !== void 0 ? _ctx$extensionFlagSho : new Set();
+  const ctx = new SyncedBlockPluginContext();
+  const confirmationTransactionRef = ctx.confirmationTransactionRef;
+  const unpublishedFlagShown = ctx.unpublishedFlagShown;
+  const extensionFlagShown = ctx.extensionFlagShown;
 
   // Set up callback to detect unpublished sync blocks when they're fetched
   syncBlockStore.referenceManager.setOnUnpublishedSyncBlockDetected(resourceId => {
@@ -244,7 +238,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           activeFlag: false,
           syncBlockStore: syncBlockStore,
           retryCreationPosMap: new Map(),
-          hasUnsavedBodiedSyncBlockChanges: fg('platform_synced_block_patch_5') ? syncBlockStore.sourceManager.hasUnsavedChanges() : undefined
+          hasUnsavedBodiedSyncBlockChanges: syncBlockStore.sourceManager.hasUnsavedChanges()
         };
       },
       apply: (tr, currentPluginState, oldEditorState) => {
@@ -256,11 +250,11 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           bodiedSyncBlockDeletionStatus,
           retryCreationPosMap
         } = currentPluginState;
-        let newDecorationSet = fg('platform_synced_block_patch_5') ? tr.docChanged ? selectionDecorationSet.map(tr.mapping, tr.doc) // only map if document changed
-        : selectionDecorationSet : selectionDecorationSet.map(tr.mapping, tr.doc);
+        let newDecorationSet = tr.docChanged ? selectionDecorationSet.map(tr.mapping, tr.doc) // only map if document changed
+        : selectionDecorationSet;
         if (!tr.selection.eq(oldEditorState.selection)) {
           newDecorationSet = calculateDecorations(tr.doc, tr.selection, tr.doc.type.schema);
-        } else if (tr.docChanged && fg('platform_synced_block_patch_5')) {
+        } else if (tr.docChanged) {
           const existingDecorationsLength = selectionDecorationSet.find().length;
           const newDecorationsLength = newDecorationSet.find().length;
 
@@ -279,7 +273,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           syncBlockStore: syncBlockStore,
           retryCreationPosMap: newRetryCreationPosMap,
           bodiedSyncBlockDeletionStatus: (_meta$bodiedSyncBlock = meta === null || meta === void 0 ? void 0 : meta.bodiedSyncBlockDeletionStatus) !== null && _meta$bodiedSyncBlock !== void 0 ? _meta$bodiedSyncBlock : bodiedSyncBlockDeletionStatus,
-          hasUnsavedBodiedSyncBlockChanges: fg('platform_synced_block_patch_5') ? syncBlockStore.sourceManager.hasUnsavedChanges() : undefined
+          hasUnsavedBodiedSyncBlockChanges: syncBlockStore.sourceManager.hasUnsavedChanges()
         };
       }
     },
@@ -300,7 +294,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           eventDispatcher: pmPluginFactoryParams.eventDispatcher,
           syncBlockStore: syncBlockStore
         }).init(),
-        bodiedSyncBlock: fg('platform_synced_block_patch_5') ? editorExperiment('platform_synced_block_use_new_source_nodeview', true, {
+        bodiedSyncBlock: editorExperiment('platform_synced_block_use_new_source_nodeview', true, {
           exposure: true
         }) ? bodiedSyncBlockNodeView({
           pluginOptions: options,
@@ -312,10 +306,6 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           pmPluginFactoryParams,
           api,
           syncBlockStore
-        }) : lazyBodiedSyncBlockView({
-          pluginOptions: options,
-          pmPluginFactoryParams,
-          api
         })
       },
       decorations: state => {
@@ -328,7 +318,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
         } = state;
         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 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 isDragging = fg('platform_synced_block_patch_5') ? (api === null || api === void 0 ? void 0 : (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 ? void 0 : (_api$userIntent$share = _api$userIntent.sharedState.currentState()) === null || _api$userIntent$share === void 0 ? void 0 : _api$userIntent$share.currentUserIntent) === 'dragging' : undefined;
+        const isDragging = (api === null || api === void 0 ? void 0 : (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 ? void 0 : (_api$userIntent$share = _api$userIntent.sharedState.currentState()) === null || _api$userIntent$share === void 0 ? void 0 : _api$userIntent$share.currentUserIntent) === 'dragging';
         const offlineDecorations = [];
         const viewModeDecorations = [];
         const loadingDecorations = [];
@@ -351,7 +341,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           }
 
           // Show sync block border while the user is dragging
-          if (isDragging && (node.type.name === 'bodiedSyncBlock' || node.type.name === 'syncBlock') && fg('platform_synced_block_patch_5')) {
+          if (isDragging && (node.type.name === 'bodiedSyncBlock' || node.type.name === 'syncBlock')) {
             dragDecorations.push(Decoration.node(pos, pos + node.nodeSize, {
               class: SyncBlockStateCssClassName.draggingClassName
             }));
@@ -377,11 +367,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           return shouldIgnoreDomEvent(view, event, api);
         },
         copy: () => {
-          if (ctx) {
-            ctx.markCopyEvent();
-          } else {
-            isCopyEvent = true;
-          }
+          ctx.markCopyEvent();
           return false;
         }
       },
@@ -393,10 +379,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
         const {
           schema
         } = state;
-        const isCopy = ctx ? ctx.consumeCopyEvent() : isCopyEvent;
-        if (!ctx) {
-          isCopyEvent = false;
-        }
+        const isCopy = ctx.consumeCopyEvent();
         if (!syncBlockStore || !isCopy) {
           return slice;
         }
@@ -453,100 +436,23 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
         removed: bodiedSyncBlockRemoved,
         added: bodiedSyncBlockAdded
       } = trackSyncBlocks(syncBlockStore.sourceManager.isSourceBlock, tr, state);
-      if (fg('platform_synced_block_patch_5')) {
-        return isOffline ? filterTransactionOffline({
-          tr,
-          state,
-          api,
-          isConfirmedSyncBlockDeletion,
-          bodiedSyncBlockRemoved,
-          bodiedSyncBlockAdded
-        }) : filterTransactionOnline({
-          tr,
-          state,
-          syncBlockStore,
-          api,
-          confirmationTransactionRef,
-          bodiedSyncBlockRemoved,
-          bodiedSyncBlockAdded,
-          extensionFlagShown
-        });
-      }
-      if (!isOffline) {
-        const {
-          removed: syncBlockRemoved,
-          added: syncBlockAdded
-        } = trackSyncBlocks(node => node.type.name === 'syncBlock', tr, state);
-        syncBlockRemoved.forEach(syncBlock => {
-          var _api$analytics3, _api$analytics3$actio;
-          api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : (_api$analytics3$actio = _api$analytics3.actions) === null || _api$analytics3$actio === void 0 ? void 0 : _api$analytics3$actio.fireAnalyticsEvent({
-            action: ACTION.DELETED,
-            actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-            actionSubjectId: ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_DELETE,
-            attributes: {
-              resourceId: syncBlock.attrs.resourceId,
-              blockInstanceId: syncBlock.attrs.localId
-            },
-            eventType: EVENT_TYPE.OPERATIONAL
-          });
-        });
-        syncBlockAdded.forEach(syncBlock => {
-          var _api$analytics4, _api$analytics4$actio;
-          api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : (_api$analytics4$actio = _api$analytics4.actions) === null || _api$analytics4$actio === void 0 ? void 0 : _api$analytics4$actio.fireAnalyticsEvent({
-            action: ACTION.INSERTED,
-            actionSubject: ACTION_SUBJECT.DOCUMENT,
-            actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK,
-            attributes: {
-              resourceId: syncBlock.attrs.resourceId,
-              blockInstanceId: syncBlock.attrs.localId
-            },
-            eventType: EVENT_TYPE.TRACK
-          });
-        });
-        if (bodiedSyncBlockRemoved.length > 0) {
-          confirmationTransactionRef.current = tr;
-          return handleBodiedSyncBlockRemoval(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(tr));
-        }
-        if (bodiedSyncBlockAdded.length > 0) {
-          if (tr.getMeta(pmHistoryPluginKey)) {
-            // We don't allow bodiedSyncBlock creation via redo, however, we need to return true here to let transaction through so history can be updated properly.
-            // If we simply returns false, creation from redo is blocked as desired, but this results in editor showing redo as possible even though it's not.
-            // 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;
-          }
-          handleBodiedSyncBlockCreation(bodiedSyncBlockAdded, state, api);
-          return true;
-        }
-        showExtensionInSyncBlockWarningIfNeeded(tr, state, api, extensionFlagShown);
-        return true;
-      }
-      const {
-        removed: syncBlockRemoved,
-        added: syncBlockAdded
-      } = trackSyncBlocks(node => node.type.name === 'syncBlock', tr, state);
-      let errorFlag = false;
-
-      // Disable (bodied)syncBlock node deletion/creation/edition in offline mode and trigger an error flag instead
-      if (isConfirmedSyncBlockDeletion || bodiedSyncBlockRemoved.length > 0 || syncBlockRemoved.length > 0) {
-        errorFlag = FLAG_ID.CANNOT_DELETE_WHEN_OFFLINE;
-      } else if (bodiedSyncBlockAdded.length > 0 || syncBlockAdded.length > 0) {
-        errorFlag = FLAG_ID.CANNOT_CREATE_WHEN_OFFLINE;
-      } else if (hasEditInSyncBlock(tr, state)) {
-        errorFlag = FLAG_ID.CANNOT_EDIT_WHEN_OFFLINE;
-      }
-      if (errorFlag) {
-        deferDispatch(() => {
-          api === null || api === void 0 ? void 0 : api.core.actions.execute(({
-            tr
-          }) => tr.setMeta(syncedBlockPluginKey, {
-            activeFlag: {
-              id: errorFlag
-            }
-          }));
-        });
-        return false;
-      }
-      return true;
+      return isOffline ? filterTransactionOffline({
+        tr,
+        state,
+        api,
+        isConfirmedSyncBlockDeletion,
+        bodiedSyncBlockRemoved,
+        bodiedSyncBlockAdded
+      }) : filterTransactionOnline({
+        tr,
+        state,
+        syncBlockStore,
+        api,
+        confirmationTransactionRef,
+        bodiedSyncBlockRemoved,
+        bodiedSyncBlockAdded,
+        extensionFlagShown
+      });
     },
     appendTransaction: (trs, oldState, newState) => {
       trs.filter(tr => tr.docChanged).forEach(tr => {

package/dist/es2019/pm-plugins/menu-and-toolbar-experiences.js

@@ -1,8 +1,9 @@
 import { bind } from 'bind-event-listener';
 import { ACTION, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
-import { Experience, EXPERIENCE_ID, ExperienceCheckDomMutation, ExperienceCheckTimeout, getNodeQuery, getPopupContainerFromEditorView, popupWithNestedElement } from '@atlaskit/editor-common/experiences';
+import { Experience, EXPERIENCE_ID, ExperienceCheckDomMutation, ExperienceCheckTimeout, getNodeQuery, getPopupContainerFromEditorView, popupWithNestedElement, getSelectionAncestorDOM } from '@atlaskit/editor-common/experiences';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { SYNCED_BLOCK_BUTTON_TEST_ID } from '../types';
 const TIMEOUT_DURATION = 30000;
 const pluginKey = new PluginKey('syncedBlockMenuAndToolbarExperience');
@@ -14,10 +15,13 @@ export const getMenuAndToolbarExperiencesPlugin = ({
   dispatchAnalyticsEvent
 }) => {
   let popupsTargetEl;
-  let editorViewEl;
+  const editorViewRef = {
+    current: undefined
+  };
   const getPopupsTarget = () => {
     if (!popupsTargetEl) {
-      popupsTargetEl = refs.popupsMountPoint || refs.wrapperElement || getPopupContainerFromEditorView(editorViewEl);
+      var _editorViewRef$curren;
+      popupsTargetEl = refs.popupsMountPoint || refs.wrapperElement || getPopupContainerFromEditorView(editorViewRef === null || editorViewRef === void 0 ? void 0 : (_editorViewRef$curren = editorViewRef.current) === null || _editorViewRef$curren === void 0 ? void 0 : _editorViewRef$curren.dom);
     }
     return popupsTargetEl;
   };
@@ -27,7 +31,7 @@ export const getMenuAndToolbarExperiencesPlugin = ({
     dispatchAnalyticsEvent,
     checks: [new ExperienceCheckTimeout({
       durationMs: TIMEOUT_DURATION
-    }), syncedBlockAddedToDomCheck(refs)]
+    }), syncedBlockAddedToDomCheck(refs, editorViewRef)]
   });
   const createSourceBlockMenuExperience = new Experience(EXPERIENCE_ID.MENU_ACTION, {
     action: ACTION.SYNCED_BLOCK_CREATE,
@@ -35,7 +39,7 @@ export const getMenuAndToolbarExperiencesPlugin = ({
     dispatchAnalyticsEvent,
     checks: [new ExperienceCheckTimeout({
       durationMs: TIMEOUT_DURATION
-    }), syncedBlockAddedToDomCheck(refs)]
+    }), syncedBlockAddedToDomCheck(refs, editorViewRef)]
   });
   const createSourceQuickInsertMenuExperience = new Experience(EXPERIENCE_ID.MENU_ACTION, {
     action: ACTION.SYNCED_BLOCK_CREATE,
@@ -43,7 +47,7 @@ export const getMenuAndToolbarExperiencesPlugin = ({
     dispatchAnalyticsEvent,
     checks: [new ExperienceCheckTimeout({
       durationMs: TIMEOUT_DURATION
-    }), syncedBlockAddedToDomCheck(refs)]
+    }), syncedBlockAddedToDomCheck(refs, editorViewRef)]
   });
   const deleteReferenceSyncedBlockExperience = new Experience(EXPERIENCE_ID.TOOLBAR_ACTION, {
     action: ACTION.REFERENCE_SYNCED_BLOCK_DELETE,
@@ -51,7 +55,7 @@ export const getMenuAndToolbarExperiencesPlugin = ({
     dispatchAnalyticsEvent,
     checks: [new ExperienceCheckTimeout({
       durationMs: TIMEOUT_DURATION
-    }), referenceSyncBlockRemovedFromDomCheck(refs)]
+    }), referenceSyncBlockRemovedFromDomCheck(refs, editorViewRef)]
   });
   const unsyncReferenceSyncedBlockExperience = new Experience(EXPERIENCE_ID.TOOLBAR_ACTION, {
     action: ACTION.REFERENCE_SYNCED_BLOCK_UNSYNC,
@@ -59,7 +63,7 @@ export const getMenuAndToolbarExperiencesPlugin = ({
     dispatchAnalyticsEvent,
     checks: [new ExperienceCheckTimeout({
       durationMs: TIMEOUT_DURATION
-    }), referenceSyncBlockRemovedFromDomCheck(refs)]
+    }), referenceSyncBlockRemovedFromDomCheck(refs, editorViewRef)]
   });
   const unsyncSourceSyncedBlockExperience = new Experience(EXPERIENCE_ID.TOOLBAR_ACTION, {
     action: ACTION.SYNCED_BLOCK_UNSYNC,
@@ -67,7 +71,7 @@ export const getMenuAndToolbarExperiencesPlugin = ({
     dispatchAnalyticsEvent,
     checks: [new ExperienceCheckTimeout({
       durationMs: TIMEOUT_DURATION
-    }), syncBlockDeleteConfirmationModalAddedCheck(refs)]
+    }), syncBlockDeleteConfirmationModalAddedCheck()]
   });
   const deleteSourceSyncedBlockExperience = new Experience(EXPERIENCE_ID.TOOLBAR_ACTION, {
     action: ACTION.SYNCED_BLOCK_DELETE,
@@ -75,7 +79,7 @@ export const getMenuAndToolbarExperiencesPlugin = ({
     dispatchAnalyticsEvent,
     checks: [new ExperienceCheckTimeout({
       durationMs: TIMEOUT_DURATION
-    }), syncBlockDeleteConfirmationModalAddedCheck(refs)]
+    }), syncBlockDeleteConfirmationModalAddedCheck()]
   });
   const syncedLocationsExperience = new Experience(EXPERIENCE_ID.TOOLBAR_ACTION, {
     action: ACTION.SYNCED_BLOCK_VIEW_SYNCED_LOCATIONS,
@@ -83,7 +87,7 @@ export const getMenuAndToolbarExperiencesPlugin = ({
     dispatchAnalyticsEvent,
     checks: [new ExperienceCheckTimeout({
       durationMs: TIMEOUT_DURATION
-    }), syncedLocationsDropdownOpenedCheck(refs)]
+    }), syncedLocationsDropdownOpenedCheck()]
   });
   const unbindClickListener = bind(document, {
     type: 'click',
@@ -128,11 +132,11 @@ export const getMenuAndToolbarExperiencesPlugin = ({
         if (!typeaheadPopup || !(typeaheadPopup instanceof HTMLElement)) {
           return;
         }
-        const firstItem = typeaheadPopup.querySelector('[role="option"]');
-        if (!firstItem || !(firstItem instanceof HTMLElement)) {
+        const targetElement = fg('platform_synced_block_fix_experience_tracking') ? typeaheadPopup.querySelector('[role="option"][aria-selected="true"]') : typeaheadPopup.querySelector('[role="option"]');
+        if (!targetElement || !(targetElement instanceof HTMLElement)) {
           return;
         }
-        const testId = firstItem.dataset.testid;
+        const testId = targetElement.dataset.testid;
         if (testId === SYNCED_BLOCK_BUTTON_TEST_ID.quickInsertCreate) {
           createSourceQuickInsertMenuExperience.start();
         }
@@ -144,8 +148,8 @@ export const getMenuAndToolbarExperiencesPlugin = ({
   });
   return new SafePlugin({
     key: pluginKey,
-    view: editorView => {
-      editorViewEl = editorView.dom;
+    view: view => {
+      editorViewRef.current = view;
       return {
         destroy: () => {
           createSourcePrimaryToolbarExperience.abort({
@@ -260,7 +264,7 @@ const getTarget = containerElement => {
   }
   return targetEl;
 };
-const syncedBlockAddedToDomCheck = refs => new ExperienceCheckDomMutation({
+const syncedBlockAddedToDomCheck = (refs, editorViewRef) => new ExperienceCheckDomMutation({
   onDomMutation: ({
     mutations
   }) => {
@@ -272,12 +276,22 @@ const syncedBlockAddedToDomCheck = refs => new ExperienceCheckDomMutation({
     return undefined;
   },
   observeConfig: () => {
-    return {
-      target: getTarget(refs.containerElement),
+    var _editorViewRef$curren2;
+    return [{
+      target: fg('platform_synced_block_fix_experience_tracking') ? editorViewRef === null || editorViewRef === void 0 ? void 0 : (_editorViewRef$curren2 = editorViewRef.current) === null || _editorViewRef$curren2 === void 0 ? void 0 : _editorViewRef$curren2.dom : getTarget(refs.containerElement),
       options: {
         childList: true
       }
-    };
+    },
+    // When wrapping a node with breakout mark with sync block, breakout dom is reused
+    // hence we need to observe subtree to catch sync block mutation
+    ...(fg('platform_synced_block_fix_experience_tracking') ? [{
+      target: getSelectionAncestorDOM(editorViewRef === null || editorViewRef === void 0 ? void 0 : editorViewRef.current),
+      options: {
+        childList: true,
+        subtree: true
+      }
+    }] : [])];
   }
 });
 const isBodiedSyncBlockAddedInMutation = ({
@@ -287,7 +301,7 @@ const isBodiedSyncBlockAddedInMutation = ({
   return type === 'childList' && [...addedNodes].some(isBodiedSyncBlockWithinNode);
 };
 const isBodiedSyncBlockWithinNode = node => getNodeQuery('[data-prosemirror-node-name="bodiedSyncBlock"]')(node);
-const referenceSyncBlockRemovedFromDomCheck = refs => new ExperienceCheckDomMutation({
+const referenceSyncBlockRemovedFromDomCheck = (refs, editorViewRef) => new ExperienceCheckDomMutation({
   onDomMutation: ({
     mutations
   }) => {
@@ -299,12 +313,19 @@ const referenceSyncBlockRemovedFromDomCheck = refs => new ExperienceCheckDomMuta
     return undefined;
   },
   observeConfig: () => {
-    return {
-      target: getTarget(refs.containerElement),
+    var _editorViewRef$curren3;
+    return [{
+      target: fg('platform_synced_block_fix_experience_tracking') ? editorViewRef === null || editorViewRef === void 0 ? void 0 : (_editorViewRef$curren3 = editorViewRef.current) === null || _editorViewRef$curren3 === void 0 ? void 0 : _editorViewRef$curren3.dom : getTarget(refs.containerElement),
       options: {
         childList: true
       }
-    };
+    }, ...(fg('platform_synced_block_fix_experience_tracking') ? [{
+      target: getSelectionAncestorDOM(editorViewRef === null || editorViewRef === void 0 ? void 0 : editorViewRef.current),
+      options: {
+        childList: true,
+        subtree: true
+      }
+    }] : [])];
   }
 });
 const isSyncBlockRemovedInMutation = ({
@@ -314,7 +335,7 @@ const isSyncBlockRemovedInMutation = ({
   return type === 'childList' && [...removedNodes].some(isSyncBlockWithinNode);
 };
 const isSyncBlockWithinNode = node => getNodeQuery('[data-prosemirror-node-name="syncBlock"]')(node);
-const syncBlockDeleteConfirmationModalAddedCheck = refs => new ExperienceCheckDomMutation({
+const syncBlockDeleteConfirmationModalAddedCheck = () => new ExperienceCheckDomMutation({
   onDomMutation: ({
     mutations
   }) => {
@@ -342,7 +363,7 @@ const isDeleteConfirmationModalAddedInMutation = ({
   return type === 'childList' && [...addedNodes].some(isDeleteConfirmationModalWithinNode);
 };
 const isDeleteConfirmationModalWithinNode = node => getNodeQuery('[data-testid="sync-block-delete-confirmation"]')(node);
-const syncedLocationsDropdownOpenedCheck = refs => new ExperienceCheckDomMutation({
+const syncedLocationsDropdownOpenedCheck = () => new ExperienceCheckDomMutation({
   onDomMutation: ({
     mutations
   }) => {

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

@@ -2,7 +2,6 @@ import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeOfType, findParentNodeOfTypeClosestToPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 
 /**
@@ -10,11 +9,7 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
  * Used to avoid re-entrant ProseMirror dispatch cycles.
  */
 export const deferDispatch = fn => {
-  if (fg('platform_synced_block_patch_5')) {
-    queueMicrotask(fn);
-  } else {
-    setTimeout(fn, 0);
-  }
+  queueMicrotask(fn);
 };
 export const findSyncBlock = (schema, selection) => {
   const {

package/dist/es2019/syncedBlockPlugin.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import { syncBlock, bodiedSyncBlock } from '@atlaskit/adf-schema';
 import { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { flushBodiedSyncBlocks, flushSyncBlocks } from './editor-actions';
 import { copySyncedBlockReferenceToClipboardEditorCommand, createSyncedBlock } from './editor-commands';
@@ -117,7 +116,7 @@ export const syncedBlockPlugin = ({
         syncBlockStore: currentSyncBlockStore,
         bodiedSyncBlockDeletionStatus,
         retryCreationPosMap,
-        hasUnsavedBodiedSyncBlockChanges: fg('platform_synced_block_patch_5') ? hasUnsavedBodiedSyncBlockChanges : undefined
+        hasUnsavedBodiedSyncBlockChanges
       };
     }
   };

package/dist/es2019/ui/SyncBlockRefresher.js

@@ -1,8 +1,6 @@
 import { useEffect } from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
-export const SYNC_BLOCK_FETCH_INTERVAL = 3000;
-
 // Component that manages synced block data synchronization.
 // Uses provider-based GraphQL subscriptions for updates when online.
 // Falls back to polling at regular intervals when offline.
@@ -23,19 +21,5 @@ export const SyncBlockRefresher = ({
     const useRealTimeSubscriptions = isOnline;
     syncBlockStoreManager.referenceManager.setRealTimeSubscriptionsEnabled(useRealTimeSubscriptions);
   }, [syncBlockStoreManager, isOnline]);
-  useEffect(() => {
-    if (isOnline) {
-      return;
-    }
-    const interval = window.setInterval(() => {
-      var _document;
-      if (((_document = document) === null || _document === void 0 ? void 0 : _document.visibilityState) === 'visible') {
-        syncBlockStoreManager.referenceManager.refreshSubscriptions();
-      }
-    }, SYNC_BLOCK_FETCH_INTERVAL);
-    return () => {
-      window.clearInterval(interval);
-    };
-  }, [syncBlockStoreManager, isOnline]);
   return null;
 };

package/dist/esm/nodeviews/bodiedSyncedBlock.js

@@ -12,7 +12,6 @@ import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { BodiedSyncBlockSharedCssClassName } from '@atlaskit/editor-common/sync-block';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { BodiedSyncBlockWrapper } from '../ui/BodiedSyncBlockWrapper';
 import { SyncBlockLabel } from '../ui/SyncBlockLabel';
 var toDOMOld = function toDOMOld() {
@@ -110,7 +109,7 @@ var BodiedSyncBlockOld = /*#__PURE__*/function (_ReactNodeView) {
         dom = _DOMSerializer$render.dom,
         contentDOM = _DOMSerializer$render.contentDOM;
       // In SSR, the first check won't work, so fallback to nodeType check
-      if (dom instanceof HTMLElement || dom.nodeType === 1 && fg('platform_synced_block_patch_5')) {
+      if (dom instanceof HTMLElement || dom.nodeType === 1) {
         this.updateContentEditable({
           contentDOM: contentDOM
         });