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

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 6.0.14
+
+### Patch Changes
+
+- [`7428d9bf3aa13`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7428d9bf3aa13) -
+  Clean up platform_synced_block_patch_5 feature gate
+- Updated dependencies
+
+## 6.0.13
+
+### Patch Changes
+
+- Updated dependencies
+
+## 6.0.12
+
+### Patch Changes
+
+- [`10827e937e450`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/10827e937e450) -
+  [EDITOR-5750] Fix instrumentation issues with sync block experience tracking
+- Updated dependencies
+
 ## 6.0.11
 
 ### Patch Changes

package/dist/cjs/nodeviews/bodiedSyncedBlock.js

@@ -17,7 +17,6 @@ var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/rea
 var _syncBlock = require("@atlaskit/editor-common/sync-block");
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _model = require("@atlaskit/editor-prosemirror/model");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _BodiedSyncBlockWrapper = require("../ui/BodiedSyncBlockWrapper");
 var _SyncBlockLabel = require("../ui/SyncBlockLabel");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
@@ -117,7 +116,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 && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_5')) {
+      if (dom instanceof HTMLElement || dom.nodeType === 1) {
         this.updateContentEditable({
           contentDOM: contentDOM
         });

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

@@ -18,9 +18,7 @@ var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
-var _bodiedLazySyncedBlock = require("../nodeviews/bodiedLazySyncedBlock");
 var _bodiedSyncedBlock = require("../nodeviews/bodiedSyncedBlock");
 var _syncedBlock = require("../nodeviews/syncedBlock");
 var _types = require("../types");
@@ -28,7 +26,7 @@ var _handleBodiedSyncBlockCreation = require("./utils/handle-bodied-sync-block-c
 var _handleBodiedSyncBlockRemoval = require("./utils/handle-bodied-sync-block-removal");
 var _ignoreDomEvent = require("./utils/ignore-dom-event");
 var _selectionDecorations = require("./utils/selection-decorations");
-var _trackSyncBlocks8 = require("./utils/track-sync-blocks");
+var _trackSyncBlocks6 = require("./utils/track-sync-blocks");
 var _utils2 = require("./utils/utils");
 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; }
@@ -120,7 +118,7 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
     bodiedSyncBlockRemoved = _ref3.bodiedSyncBlockRemoved,
     bodiedSyncBlockAdded = _ref3.bodiedSyncBlockAdded,
     extensionFlagShown = _ref3.extensionFlagShown;
-  var _trackSyncBlocks = (0, _trackSyncBlocks8.trackSyncBlocks)(function (node) {
+  var _trackSyncBlocks = (0, _trackSyncBlocks6.trackSyncBlocks)(function (node) {
       return node.type.name === 'syncBlock';
     }, tr, state),
     syncBlockRemoved = _trackSyncBlocks.removed,
@@ -176,7 +174,7 @@ var filterTransactionOffline = function filterTransactionOffline(_ref4) {
     isConfirmedSyncBlockDeletion = _ref4.isConfirmedSyncBlockDeletion,
     bodiedSyncBlockRemoved = _ref4.bodiedSyncBlockRemoved,
     bodiedSyncBlockAdded = _ref4.bodiedSyncBlockAdded;
-  var _trackSyncBlocks2 = (0, _trackSyncBlocks8.trackSyncBlocks)(function (node) {
+  var _trackSyncBlocks2 = (0, _trackSyncBlocks6.trackSyncBlocks)(function (node) {
       return node.type.name === 'syncBlock';
     }, tr, state),
     syncBlockRemoved = _trackSyncBlocks2.removed,
@@ -186,7 +184,7 @@ var filterTransactionOffline = function filterTransactionOffline(_ref4) {
     errorFlag = _types.FLAG_ID.CANNOT_DELETE_WHEN_OFFLINE;
   } else if (bodiedSyncBlockAdded.length > 0 || syncBlockAdded.length > 0) {
     errorFlag = _types.FLAG_ID.CANNOT_CREATE_WHEN_OFFLINE;
-  } else if ((0, _trackSyncBlocks8.hasEditInSyncBlock)(tr, state)) {
+  } else if ((0, _trackSyncBlocks6.hasEditInSyncBlock)(tr, state)) {
     errorFlag = _types.FLAG_ID.CANNOT_EDIT_WHEN_OFFLINE;
   }
   if (errorFlag) {
@@ -240,17 +238,13 @@ var SyncedBlockPluginContext = /*#__PURE__*/function () {
   }]);
 }();
 var createPlugin = exports.createPlugin = function createPlugin(options, pmPluginFactoryParams, syncBlockStore, api) {
-  var _ctx$confirmationTran, _ctx$unpublishedFlagS, _ctx$extensionFlagSho;
   var _ref6 = options || {},
     _ref6$useLongPressSel = _ref6.useLongPressSelection,
     useLongPressSelection = _ref6$useLongPressSel === void 0 ? false : _ref6$useLongPressSel;
-  var ctx = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_5') ? new SyncedBlockPluginContext() : undefined;
-  var confirmationTransactionRef = (_ctx$confirmationTran = ctx === null || ctx === void 0 ? void 0 : ctx.confirmationTransactionRef) !== null && _ctx$confirmationTran !== void 0 ? _ctx$confirmationTran : {
-    current: undefined
-  };
-  var isCopyEvent = false;
-  var unpublishedFlagShown = (_ctx$unpublishedFlagS = ctx === null || ctx === void 0 ? void 0 : ctx.unpublishedFlagShown) !== null && _ctx$unpublishedFlagS !== void 0 ? _ctx$unpublishedFlagS : new Set();
-  var extensionFlagShown = (_ctx$extensionFlagSho = ctx === null || ctx === void 0 ? void 0 : ctx.extensionFlagShown) !== null && _ctx$extensionFlagSho !== void 0 ? _ctx$extensionFlagSho : new Set();
+  var ctx = new SyncedBlockPluginContext();
+  var confirmationTransactionRef = ctx.confirmationTransactionRef;
+  var unpublishedFlagShown = ctx.unpublishedFlagShown;
+  var extensionFlagShown = ctx.extensionFlagShown;
 
   // Set up callback to detect unpublished sync blocks when they're fetched
   syncBlockStore.referenceManager.setOnUnpublishedSyncBlockDetected(function (resourceId) {
@@ -282,7 +276,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           activeFlag: false,
           syncBlockStore: syncBlockStore,
           retryCreationPosMap: new Map(),
-          hasUnsavedBodiedSyncBlockChanges: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_5') ? syncBlockStore.sourceManager.hasUnsavedChanges() : undefined
+          hasUnsavedBodiedSyncBlockChanges: syncBlockStore.sourceManager.hasUnsavedChanges()
         };
       },
       apply: function apply(tr, currentPluginState, oldEditorState) {
@@ -292,11 +286,11 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           selectionDecorationSet = currentPluginState.selectionDecorationSet,
           bodiedSyncBlockDeletionStatus = currentPluginState.bodiedSyncBlockDeletionStatus,
           retryCreationPosMap = currentPluginState.retryCreationPosMap;
-        var newDecorationSet = (0, _platformFeatureFlags.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);
+        var newDecorationSet = tr.docChanged ? selectionDecorationSet.map(tr.mapping, tr.doc) // only map if document changed
+        : selectionDecorationSet;
         if (!tr.selection.eq(oldEditorState.selection)) {
           newDecorationSet = (0, _selectionDecorations.calculateDecorations)(tr.doc, tr.selection, tr.doc.type.schema);
-        } else if (tr.docChanged && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_5')) {
+        } else if (tr.docChanged) {
           var existingDecorationsLength = selectionDecorationSet.find().length;
           var newDecorationsLength = newDecorationSet.find().length;
 
@@ -315,7 +309,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           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: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_5') ? syncBlockStore.sourceManager.hasUnsavedChanges() : undefined
+          hasUnsavedBodiedSyncBlockChanges: syncBlockStore.sourceManager.hasUnsavedChanges()
         };
       }
     },
@@ -339,7 +333,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
             }).init()
           );
         },
-        bodiedSyncBlock: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_5') ? (0, _experiments.editorExperiment)('platform_synced_block_use_new_source_nodeview', true, {
+        bodiedSyncBlock: (0, _experiments.editorExperiment)('platform_synced_block_use_new_source_nodeview', true, {
           exposure: true
         }) ? (0, _bodiedSyncedBlock.bodiedSyncBlockNodeView)({
           pluginOptions: options,
@@ -351,10 +345,6 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           pmPluginFactoryParams: pmPluginFactoryParams,
           api: api,
           syncBlockStore: syncBlockStore
-        }) : (0, _bodiedLazySyncedBlock.lazyBodiedSyncBlockView)({
-          pluginOptions: options,
-          pmPluginFactoryParams: pmPluginFactoryParams,
-          api: api
         })
       },
       decorations: function decorations(state) {
@@ -365,7 +355,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
         var doc = state.doc;
         var isOffline = (0, _editorPluginConnectivity.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 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 isDragging = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_5') ? (api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent) === 'dragging' : undefined;
+        var isDragging = (api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent) === 'dragging';
         var offlineDecorations = [];
         var viewModeDecorations = [];
         var loadingDecorations = [];
@@ -388,7 +378,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           }
 
           // Show sync block border while the user is dragging
-          if (isDragging && (node.type.name === 'bodiedSyncBlock' || node.type.name === 'syncBlock') && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_5')) {
+          if (isDragging && (node.type.name === 'bodiedSyncBlock' || node.type.name === 'syncBlock')) {
             dragDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {
               class: _syncBlock.SyncBlockStateCssClassName.draggingClassName
             }));
@@ -416,11 +406,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           return (0, _ignoreDomEvent.shouldIgnoreDomEvent)(view, event, api);
         },
         copy: function copy() {
-          if (ctx) {
-            ctx.markCopyEvent();
-          } else {
-            isCopyEvent = true;
-          }
+          ctx.markCopyEvent();
           return false;
         }
       },
@@ -429,10 +415,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
         var pluginState = syncedBlockPluginKey.getState(state);
         var syncBlockStore = pluginState === null || pluginState === void 0 ? void 0 : pluginState.syncBlockStore;
         var schema = state.schema;
-        var isCopy = ctx ? ctx.consumeCopyEvent() : isCopyEvent;
-        if (!ctx) {
-          isCopyEvent = false;
-        }
+        var isCopy = ctx.consumeCopyEvent();
         if (!syncBlockStore || !isCopy) {
           return slice;
         }
@@ -471,7 +454,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
 
       // Track newly added reference sync blocks before processing the transaction
       if (tr.docChanged && !tr.getMeta('isRemote')) {
-        var _trackSyncBlocks3 = (0, _trackSyncBlocks8.trackSyncBlocks)(function (node) {
+        var _trackSyncBlocks3 = (0, _trackSyncBlocks6.trackSyncBlocks)(function (node) {
             return node.type.name === 'syncBlock';
           }, tr, state),
           added = _trackSyncBlocks3.added;
@@ -485,106 +468,26 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
       if (!tr.docChanged || Boolean(tr.getMeta('isRemote')) || !isOffline && isConfirmedSyncBlockDeletion) {
         return true;
       }
-      var _trackSyncBlocks4 = (0, _trackSyncBlocks8.trackSyncBlocks)(syncBlockStore.sourceManager.isSourceBlock, tr, state),
+      var _trackSyncBlocks4 = (0, _trackSyncBlocks6.trackSyncBlocks)(syncBlockStore.sourceManager.isSourceBlock, tr, state),
         bodiedSyncBlockRemoved = _trackSyncBlocks4.removed,
         bodiedSyncBlockAdded = _trackSyncBlocks4.added;
-      if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_5')) {
-        return isOffline ? filterTransactionOffline({
-          tr: tr,
-          state: state,
-          api: api,
-          isConfirmedSyncBlockDeletion: isConfirmedSyncBlockDeletion,
-          bodiedSyncBlockRemoved: bodiedSyncBlockRemoved,
-          bodiedSyncBlockAdded: bodiedSyncBlockAdded
-        }) : filterTransactionOnline({
-          tr: tr,
-          state: state,
-          syncBlockStore: syncBlockStore,
-          api: api,
-          confirmationTransactionRef: confirmationTransactionRef,
-          bodiedSyncBlockRemoved: bodiedSyncBlockRemoved,
-          bodiedSyncBlockAdded: bodiedSyncBlockAdded,
-          extensionFlagShown: extensionFlagShown
-        });
-      }
-      if (!isOffline) {
-        var _trackSyncBlocks5 = (0, _trackSyncBlocks8.trackSyncBlocks)(function (node) {
-            return node.type.name === 'syncBlock';
-          }, tr, state),
-          _syncBlockRemoved = _trackSyncBlocks5.removed,
-          _syncBlockAdded = _trackSyncBlocks5.added;
-        _syncBlockRemoved.forEach(function (syncBlock) {
-          var _api$analytics3;
-          api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || (_api$analytics3 = _api$analytics3.actions) === null || _api$analytics3 === void 0 || _api$analytics3.fireAnalyticsEvent({
-            action: _analytics.ACTION.DELETED,
-            actionSubject: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,
-            actionSubjectId: _analytics.ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_DELETE,
-            attributes: {
-              resourceId: syncBlock.attrs.resourceId,
-              blockInstanceId: syncBlock.attrs.localId
-            },
-            eventType: _analytics.EVENT_TYPE.OPERATIONAL
-          });
-        });
-        _syncBlockAdded.forEach(function (syncBlock) {
-          var _api$analytics4;
-          api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 || (_api$analytics4 = _api$analytics4.actions) === null || _api$analytics4 === void 0 || _api$analytics4.fireAnalyticsEvent({
-            action: _analytics.ACTION.INSERTED,
-            actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-            actionSubjectId: _analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK,
-            attributes: {
-              resourceId: syncBlock.attrs.resourceId,
-              blockInstanceId: syncBlock.attrs.localId
-            },
-            eventType: _analytics.EVENT_TYPE.TRACK
-          });
-        });
-        if (bodiedSyncBlockRemoved.length > 0) {
-          confirmationTransactionRef.current = tr;
-          return (0, _handleBodiedSyncBlockRemoval.handleBodiedSyncBlockRemoval)(bodiedSyncBlockRemoved, syncBlockStore, api, confirmationTransactionRef, getDeleteReason(tr));
-        }
-        if (bodiedSyncBlockAdded.length > 0) {
-          if (tr.getMeta(_utils.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;
-          }
-          (0, _handleBodiedSyncBlockCreation.handleBodiedSyncBlockCreation)(bodiedSyncBlockAdded, state, api);
-          return true;
-        }
-        showExtensionInSyncBlockWarningIfNeeded(tr, state, api, extensionFlagShown);
-        return true;
-      }
-      var _trackSyncBlocks6 = (0, _trackSyncBlocks8.trackSyncBlocks)(function (node) {
-          return node.type.name === 'syncBlock';
-        }, tr, state),
-        syncBlockRemoved = _trackSyncBlocks6.removed,
-        syncBlockAdded = _trackSyncBlocks6.added;
-      var 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 = _types.FLAG_ID.CANNOT_DELETE_WHEN_OFFLINE;
-      } else if (bodiedSyncBlockAdded.length > 0 || syncBlockAdded.length > 0) {
-        errorFlag = _types.FLAG_ID.CANNOT_CREATE_WHEN_OFFLINE;
-      } else if ((0, _trackSyncBlocks8.hasEditInSyncBlock)(tr, state)) {
-        errorFlag = _types.FLAG_ID.CANNOT_EDIT_WHEN_OFFLINE;
-      }
-      if (errorFlag) {
-        (0, _utils2.deferDispatch)(function () {
-          api === null || api === void 0 || api.core.actions.execute(function (_ref9) {
-            var tr = _ref9.tr;
-            return tr.setMeta(syncedBlockPluginKey, {
-              activeFlag: {
-                id: errorFlag
-              }
-            });
-          });
-        });
-        return false;
-      }
-      return true;
+      return isOffline ? filterTransactionOffline({
+        tr: tr,
+        state: state,
+        api: api,
+        isConfirmedSyncBlockDeletion: isConfirmedSyncBlockDeletion,
+        bodiedSyncBlockRemoved: bodiedSyncBlockRemoved,
+        bodiedSyncBlockAdded: bodiedSyncBlockAdded
+      }) : filterTransactionOnline({
+        tr: tr,
+        state: state,
+        syncBlockStore: syncBlockStore,
+        api: api,
+        confirmationTransactionRef: confirmationTransactionRef,
+        bodiedSyncBlockRemoved: bodiedSyncBlockRemoved,
+        bodiedSyncBlockAdded: bodiedSyncBlockAdded,
+        extensionFlagShown: extensionFlagShown
+      });
     },
     appendTransaction: function appendTransaction(trs, oldState, newState) {
       trs.filter(function (tr) {
@@ -600,8 +503,8 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
         var _loop = function _loop() {
             var tr = _step2.value;
             if (tr.getMeta(_utils.pmHistoryPluginKey)) {
-              var _trackSyncBlocks7 = (0, _trackSyncBlocks8.trackSyncBlocks)(syncBlockStore.sourceManager.isSourceBlock, tr, oldState),
-                added = _trackSyncBlocks7.added;
+              var _trackSyncBlocks5 = (0, _trackSyncBlocks6.trackSyncBlocks)(syncBlockStore.sourceManager.isSourceBlock, tr, oldState),
+                added = _trackSyncBlocks5.added;
               if (added.length > 0) {
                 // Delete bodiedSyncBlock if it's originated from history, i.e. redo creation
                 // See filterTransaction above for more details

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

@@ -11,6 +11,7 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _experiences = require("@atlaskit/editor-common/experiences");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("../types");
 var TIMEOUT_DURATION = 30000;
 var pluginKey = new _state.PluginKey('syncedBlockMenuAndToolbarExperience');
@@ -21,10 +22,13 @@ var getMenuAndToolbarExperiencesPlugin = exports.getMenuAndToolbarExperiencesPlu
   var refs = _ref.refs,
     dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
   var popupsTargetEl;
-  var editorViewEl;
+  var editorViewRef = {
+    current: undefined
+  };
   var getPopupsTarget = function getPopupsTarget() {
     if (!popupsTargetEl) {
-      popupsTargetEl = refs.popupsMountPoint || refs.wrapperElement || (0, _experiences.getPopupContainerFromEditorView)(editorViewEl);
+      var _editorViewRef$curren;
+      popupsTargetEl = refs.popupsMountPoint || refs.wrapperElement || (0, _experiences.getPopupContainerFromEditorView)(editorViewRef === null || editorViewRef === void 0 || (_editorViewRef$curren = editorViewRef.current) === null || _editorViewRef$curren === void 0 ? void 0 : _editorViewRef$curren.dom);
     }
     return popupsTargetEl;
   };
@@ -34,7 +38,7 @@ var getMenuAndToolbarExperiencesPlugin = exports.getMenuAndToolbarExperiencesPlu
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     checks: [new _experiences.ExperienceCheckTimeout({
       durationMs: TIMEOUT_DURATION
-    }), syncedBlockAddedToDomCheck(refs)]
+    }), syncedBlockAddedToDomCheck(refs, editorViewRef)]
   });
   var createSourceBlockMenuExperience = new _experiences.Experience(_experiences.EXPERIENCE_ID.MENU_ACTION, {
     action: _analytics.ACTION.SYNCED_BLOCK_CREATE,
@@ -42,7 +46,7 @@ var getMenuAndToolbarExperiencesPlugin = exports.getMenuAndToolbarExperiencesPlu
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     checks: [new _experiences.ExperienceCheckTimeout({
       durationMs: TIMEOUT_DURATION
-    }), syncedBlockAddedToDomCheck(refs)]
+    }), syncedBlockAddedToDomCheck(refs, editorViewRef)]
   });
   var createSourceQuickInsertMenuExperience = new _experiences.Experience(_experiences.EXPERIENCE_ID.MENU_ACTION, {
     action: _analytics.ACTION.SYNCED_BLOCK_CREATE,
@@ -50,7 +54,7 @@ var getMenuAndToolbarExperiencesPlugin = exports.getMenuAndToolbarExperiencesPlu
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     checks: [new _experiences.ExperienceCheckTimeout({
       durationMs: TIMEOUT_DURATION
-    }), syncedBlockAddedToDomCheck(refs)]
+    }), syncedBlockAddedToDomCheck(refs, editorViewRef)]
   });
   var deleteReferenceSyncedBlockExperience = new _experiences.Experience(_experiences.EXPERIENCE_ID.TOOLBAR_ACTION, {
     action: _analytics.ACTION.REFERENCE_SYNCED_BLOCK_DELETE,
@@ -58,7 +62,7 @@ var getMenuAndToolbarExperiencesPlugin = exports.getMenuAndToolbarExperiencesPlu
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     checks: [new _experiences.ExperienceCheckTimeout({
       durationMs: TIMEOUT_DURATION
-    }), referenceSyncBlockRemovedFromDomCheck(refs)]
+    }), referenceSyncBlockRemovedFromDomCheck(refs, editorViewRef)]
   });
   var unsyncReferenceSyncedBlockExperience = new _experiences.Experience(_experiences.EXPERIENCE_ID.TOOLBAR_ACTION, {
     action: _analytics.ACTION.REFERENCE_SYNCED_BLOCK_UNSYNC,
@@ -66,7 +70,7 @@ var getMenuAndToolbarExperiencesPlugin = exports.getMenuAndToolbarExperiencesPlu
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     checks: [new _experiences.ExperienceCheckTimeout({
       durationMs: TIMEOUT_DURATION
-    }), referenceSyncBlockRemovedFromDomCheck(refs)]
+    }), referenceSyncBlockRemovedFromDomCheck(refs, editorViewRef)]
   });
   var unsyncSourceSyncedBlockExperience = new _experiences.Experience(_experiences.EXPERIENCE_ID.TOOLBAR_ACTION, {
     action: _analytics.ACTION.SYNCED_BLOCK_UNSYNC,
@@ -74,7 +78,7 @@ var getMenuAndToolbarExperiencesPlugin = exports.getMenuAndToolbarExperiencesPlu
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     checks: [new _experiences.ExperienceCheckTimeout({
       durationMs: TIMEOUT_DURATION
-    }), syncBlockDeleteConfirmationModalAddedCheck(refs)]
+    }), syncBlockDeleteConfirmationModalAddedCheck()]
   });
   var deleteSourceSyncedBlockExperience = new _experiences.Experience(_experiences.EXPERIENCE_ID.TOOLBAR_ACTION, {
     action: _analytics.ACTION.SYNCED_BLOCK_DELETE,
@@ -82,7 +86,7 @@ var getMenuAndToolbarExperiencesPlugin = exports.getMenuAndToolbarExperiencesPlu
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     checks: [new _experiences.ExperienceCheckTimeout({
       durationMs: TIMEOUT_DURATION
-    }), syncBlockDeleteConfirmationModalAddedCheck(refs)]
+    }), syncBlockDeleteConfirmationModalAddedCheck()]
   });
   var syncedLocationsExperience = new _experiences.Experience(_experiences.EXPERIENCE_ID.TOOLBAR_ACTION, {
     action: _analytics.ACTION.SYNCED_BLOCK_VIEW_SYNCED_LOCATIONS,
@@ -90,7 +94,7 @@ var getMenuAndToolbarExperiencesPlugin = exports.getMenuAndToolbarExperiencesPlu
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
     checks: [new _experiences.ExperienceCheckTimeout({
       durationMs: TIMEOUT_DURATION
-    }), syncedLocationsDropdownOpenedCheck(refs)]
+    }), syncedLocationsDropdownOpenedCheck()]
   });
   var unbindClickListener = (0, _bindEventListener.bind)(document, {
     type: 'click',
@@ -135,11 +139,11 @@ var getMenuAndToolbarExperiencesPlugin = exports.getMenuAndToolbarExperiencesPlu
         if (!typeaheadPopup || !(typeaheadPopup instanceof HTMLElement)) {
           return;
         }
-        var firstItem = typeaheadPopup.querySelector('[role="option"]');
-        if (!firstItem || !(firstItem instanceof HTMLElement)) {
+        var targetElement = (0, _platformFeatureFlags.fg)('platform_synced_block_fix_experience_tracking') ? typeaheadPopup.querySelector('[role="option"][aria-selected="true"]') : typeaheadPopup.querySelector('[role="option"]');
+        if (!targetElement || !(targetElement instanceof HTMLElement)) {
           return;
         }
-        var testId = firstItem.dataset.testid;
+        var testId = targetElement.dataset.testid;
         if (testId === _types.SYNCED_BLOCK_BUTTON_TEST_ID.quickInsertCreate) {
           createSourceQuickInsertMenuExperience.start();
         }
@@ -151,8 +155,8 @@ var getMenuAndToolbarExperiencesPlugin = exports.getMenuAndToolbarExperiencesPlu
   });
   return new _safePlugin.SafePlugin({
     key: pluginKey,
-    view: function view(editorView) {
-      editorViewEl = editorView.dom;
+    view: function view(_view) {
+      editorViewRef.current = _view;
       return {
         destroy: function destroy() {
           createSourcePrimaryToolbarExperience.abort({
@@ -266,7 +270,7 @@ var getTarget = function getTarget(containerElement) {
   }
   return targetEl;
 };
-var syncedBlockAddedToDomCheck = function syncedBlockAddedToDomCheck(refs) {
+var syncedBlockAddedToDomCheck = function syncedBlockAddedToDomCheck(refs, editorViewRef) {
   return new _experiences.ExperienceCheckDomMutation({
     onDomMutation: function onDomMutation(_ref3) {
       var mutations = _ref3.mutations;
@@ -278,12 +282,19 @@ var syncedBlockAddedToDomCheck = function syncedBlockAddedToDomCheck(refs) {
       return undefined;
     },
     observeConfig: function observeConfig() {
-      return {
-        target: getTarget(refs.containerElement),
+      var _editorViewRef$curren2;
+      return [{
+        target: (0, _platformFeatureFlags.fg)('platform_synced_block_fix_experience_tracking') ? editorViewRef === null || editorViewRef === void 0 || (_editorViewRef$curren2 = editorViewRef.current) === null || _editorViewRef$curren2 === void 0 ? void 0 : _editorViewRef$curren2.dom : getTarget(refs.containerElement),
         options: {
           childList: true
         }
-      };
+      }].concat((0, _toConsumableArray2.default)((0, _platformFeatureFlags.fg)('platform_synced_block_fix_experience_tracking') ? [{
+        target: (0, _experiences.getSelectionAncestorDOM)(editorViewRef === null || editorViewRef === void 0 ? void 0 : editorViewRef.current),
+        options: {
+          childList: true,
+          subtree: true
+        }
+      }] : []));
     }
   });
 };
@@ -295,7 +306,7 @@ var isBodiedSyncBlockAddedInMutation = function isBodiedSyncBlockAddedInMutation
 var isBodiedSyncBlockWithinNode = function isBodiedSyncBlockWithinNode(node) {
   return (0, _experiences.getNodeQuery)('[data-prosemirror-node-name="bodiedSyncBlock"]')(node);
 };
-var referenceSyncBlockRemovedFromDomCheck = function referenceSyncBlockRemovedFromDomCheck(refs) {
+var referenceSyncBlockRemovedFromDomCheck = function referenceSyncBlockRemovedFromDomCheck(refs, editorViewRef) {
   return new _experiences.ExperienceCheckDomMutation({
     onDomMutation: function onDomMutation(_ref5) {
       var mutations = _ref5.mutations;
@@ -307,12 +318,19 @@ var referenceSyncBlockRemovedFromDomCheck = function referenceSyncBlockRemovedFr
       return undefined;
     },
     observeConfig: function observeConfig() {
-      return {
-        target: getTarget(refs.containerElement),
+      var _editorViewRef$curren3;
+      return [{
+        target: (0, _platformFeatureFlags.fg)('platform_synced_block_fix_experience_tracking') ? editorViewRef === null || editorViewRef === void 0 || (_editorViewRef$curren3 = editorViewRef.current) === null || _editorViewRef$curren3 === void 0 ? void 0 : _editorViewRef$curren3.dom : getTarget(refs.containerElement),
         options: {
           childList: true
         }
-      };
+      }].concat((0, _toConsumableArray2.default)((0, _platformFeatureFlags.fg)('platform_synced_block_fix_experience_tracking') ? [{
+        target: (0, _experiences.getSelectionAncestorDOM)(editorViewRef === null || editorViewRef === void 0 ? void 0 : editorViewRef.current),
+        options: {
+          childList: true,
+          subtree: true
+        }
+      }] : []));
     }
   });
 };
@@ -324,7 +342,7 @@ var isSyncBlockRemovedInMutation = function isSyncBlockRemovedInMutation(_ref6)
 var isSyncBlockWithinNode = function isSyncBlockWithinNode(node) {
   return (0, _experiences.getNodeQuery)('[data-prosemirror-node-name="syncBlock"]')(node);
 };
-var syncBlockDeleteConfirmationModalAddedCheck = function syncBlockDeleteConfirmationModalAddedCheck(refs) {
+var syncBlockDeleteConfirmationModalAddedCheck = function syncBlockDeleteConfirmationModalAddedCheck() {
   return new _experiences.ExperienceCheckDomMutation({
     onDomMutation: function onDomMutation(_ref7) {
       var mutations = _ref7.mutations;
@@ -354,7 +372,7 @@ var isDeleteConfirmationModalAddedInMutation = function isDeleteConfirmationModa
 var isDeleteConfirmationModalWithinNode = function isDeleteConfirmationModalWithinNode(node) {
   return (0, _experiences.getNodeQuery)('[data-testid="sync-block-delete-confirmation"]')(node);
 };
-var syncedLocationsDropdownOpenedCheck = function syncedLocationsDropdownOpenedCheck(refs) {
+var syncedLocationsDropdownOpenedCheck = function syncedLocationsDropdownOpenedCheck() {
   return new _experiences.ExperienceCheckDomMutation({
     onDomMutation: function onDomMutation(_ref9) {
       var mutations = _ref9.mutations;

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

@@ -8,18 +8,13 @@ var _selection = require("@atlaskit/editor-common/selection");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 /**
  * Defers a callback to the next microtask (when gated) or next macrotask via setTimeout(0).
  * Used to avoid re-entrant ProseMirror dispatch cycles.
  */
 var deferDispatch = exports.deferDispatch = function deferDispatch(fn) {
-  if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_5')) {
-    queueMicrotask(fn);
-  } else {
-    setTimeout(fn, 0);
-  }
+  queueMicrotask(fn);
 };
 var findSyncBlock = exports.findSyncBlock = function findSyncBlock(schema, selection) {
   var syncBlock = schema.nodes.syncBlock;

package/dist/cjs/syncedBlockPlugin.js

@@ -8,7 +8,6 @@ exports.syncedBlockPlugin = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _editorActions = require("./editor-actions");
 var _editorCommands = require("./editor-commands");
@@ -130,7 +129,7 @@ var syncedBlockPlugin = exports.syncedBlockPlugin = function syncedBlockPlugin(_
         syncBlockStore: currentSyncBlockStore,
         bodiedSyncBlockDeletionStatus: bodiedSyncBlockDeletionStatus,
         retryCreationPosMap: retryCreationPosMap,
-        hasUnsavedBodiedSyncBlockChanges: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_5') ? hasUnsavedBodiedSyncBlockChanges : undefined
+        hasUnsavedBodiedSyncBlockChanges: hasUnsavedBodiedSyncBlockChanges
       };
     }
   };

package/dist/cjs/ui/SyncBlockRefresher.js

@@ -3,12 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SyncBlockRefresher = exports.SYNC_BLOCK_FETCH_INTERVAL = void 0;
+exports.SyncBlockRefresher = void 0;
 var _react = require("react");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
-var SYNC_BLOCK_FETCH_INTERVAL = exports.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.
@@ -27,19 +25,5 @@ var SyncBlockRefresher = exports.SyncBlockRefresher = function SyncBlockRefreshe
     var useRealTimeSubscriptions = isOnline;
     syncBlockStoreManager.referenceManager.setRealTimeSubscriptionsEnabled(useRealTimeSubscriptions);
   }, [syncBlockStoreManager, isOnline]);
-  (0, _react.useEffect)(function () {
-    if (isOnline) {
-      return;
-    }
-    var interval = window.setInterval(function () {
-      var _document;
-      if (((_document = document) === null || _document === void 0 ? void 0 : _document.visibilityState) === 'visible') {
-        syncBlockStoreManager.referenceManager.refreshSubscriptions();
-      }
-    }, SYNC_BLOCK_FETCH_INTERVAL);
-    return function () {
-      window.clearInterval(interval);
-    };
-  }, [syncBlockStoreManager, isOnline]);
   return null;
 };

package/dist/es2019/nodeviews/bodiedSyncedBlock.js

@@ -5,7 +5,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';
 const toDOMOld = () => ['div', {
@@ -87,7 +86,7 @@ class BodiedSyncBlockOld extends ReactNodeView {
       contentDOM
     } = DOMSerializer.renderSpec(document, toDOMOld());
     // 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
       });