@atlaskit/editor-plugin-synced-block 5.4.5 → 5.4.6

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 5.4.6
+
+### Patch Changes
+
+- [`2e6129d5b39bc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2e6129d5b39bc) -
+  EDITOR-5529 clean up platform_synced_block_patch_3 and platform_synced_block_patch_4
+- [`b853527230a60`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b853527230a60) -
+  [EDITOR-5520] Fix reference sync block shows old page data when transitioning between live pages
+- Updated dependencies
+
 ## 5.4.5
 
 ### Patch Changes

package/dist/cjs/nodeviews/syncedBlock.js

@@ -17,6 +17,7 @@ var _errorBoundary = require("@atlaskit/editor-common/error-boundary");
 var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/react-node-view"));
 var _syncBlock = require("@atlaskit/editor-common/sync-block");
 var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _editorCommands = require("../editor-commands");
 var _SyncBlockRendererWrapper = require("../ui/SyncBlockRendererWrapper");
 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)); }
@@ -40,6 +41,20 @@ var SyncBlock = exports.SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
       domRef.classList.add(_syncBlock.SyncBlockSharedCssClassName.prefix);
       return domRef;
     }
+  }, {
+    key: "validUpdate",
+    value: function validUpdate(currentNode, newNode) {
+      // Only consider as the valid update if the localId and resourceId are the same
+      // This prevents PM reusing the same node view for different sync block node in live page transition
+      return currentNode.attrs.localId === newNode.attrs.localId && currentNode.attrs.resourceId === newNode.attrs.resourceId;
+    }
+  }, {
+    key: "update",
+    value: function update(node, decorations, innerDecorations) {
+      return _superPropGet(SyncBlock, "update", this, 3)([node, decorations, innerDecorations, (0, _experiments.editorExperiment)('platform_synced_block_patch_6', true, {
+        exposure: true
+      }) ? this.validUpdate : undefined]);
+    }
   }, {
     key: "render",
     value: function render(_ref) {

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

@@ -83,9 +83,6 @@ var showCopiedFlag = function showCopiedFlag(api) {
 };
 var showInlineExtensionInSyncBlockWarningIfNeeded = function showInlineExtensionInSyncBlockWarningIfNeeded(tr, state, api, inlineExtensionFlagShown) {
   var _api$connectivity;
-  if (!(0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
-    return;
-  }
   if (!tr.docChanged || tr.getMeta('isRemote') || Boolean(tr.getMeta(_utils.pmHistoryPluginKey)) || (0, _editorPluginConnectivity.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)) {
     return;
   }
@@ -140,31 +137,17 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
     });
   });
   syncBlockAdded.forEach(function (syncBlock) {
-    if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
-      var _api$analytics2;
-      api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.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
-      });
-    } else {
-      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.INSERTED,
-        actionSubject: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_CREATE,
-        attributes: {
-          resourceId: syncBlock.attrs.resourceId,
-          blockInstanceId: syncBlock.attrs.localId
-        },
-        eventType: _analytics.EVENT_TYPE.OPERATIONAL
-      });
-    }
+    var _api$analytics2;
+    api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.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) {
     // eslint-disable-next-line no-param-reassign
@@ -529,8 +512,8 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           _syncBlockRemoved = _trackSyncBlocks5.removed,
           _syncBlockAdded = _trackSyncBlocks5.added;
         _syncBlockRemoved.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({
+          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,
@@ -542,31 +525,17 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           });
         });
         _syncBlockAdded.forEach(function (syncBlock) {
-          if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
-            var _api$analytics5;
-            api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 || (_api$analytics5 = _api$analytics5.actions) === null || _api$analytics5 === void 0 || _api$analytics5.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
-            });
-          } else {
-            var _api$analytics6;
-            api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 || (_api$analytics6 = _api$analytics6.actions) === null || _api$analytics6 === void 0 || _api$analytics6.fireAnalyticsEvent({
-              action: _analytics.ACTION.INSERTED,
-              actionSubject: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,
-              actionSubjectId: _analytics.ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_CREATE,
-              attributes: {
-                resourceId: syncBlock.attrs.resourceId,
-                blockInstanceId: syncBlock.attrs.localId
-              },
-              eventType: _analytics.EVENT_TYPE.OPERATIONAL
-            });
-          }
+          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;

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

@@ -6,10 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.trackSyncBlocks = exports.hasEditInSyncBlock = void 0;
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-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; }
 var trackSyncBlocks = exports.trackSyncBlocks = function trackSyncBlocks(predicate, tr, state) {
   var removed = {};
   var added = {};
@@ -26,10 +22,10 @@ var trackSyncBlocks = exports.trackSyncBlocks = function trackSyncBlocks(predica
   });
 
   // this is a quick check to see if any insertion/deletion of bodiedSyncBlock happened
-  var hasBodiedSyncBlockChanges = replaceSteps.some(function (step, idx) {
+  var hasBodiedSyncBlockChanges = replaceSteps.some(function (step) {
     var from = step.from,
       to = step.to;
-    var docAtStep = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? tr.docs[tr.steps.indexOf(step)] : tr.docs[idx];
+    var docAtStep = tr.docs[tr.steps.indexOf(step)];
     var hasChange = false;
     if (from !== to) {
       step.getMap().forEach(function (oldStart, oldEnd) {
@@ -109,70 +105,32 @@ var trackSyncBlocks = exports.trackSyncBlocks = function trackSyncBlocks(predica
  */
 var hasEditInSyncBlock = exports.hasEditInSyncBlock = function hasEditInSyncBlock(tr, state) {
   var bodiedSyncBlock = state.schema.nodes.bodiedSyncBlock;
-  if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
-    for (var i = 0; i < tr.steps.length; i++) {
-      var _tr$docs;
-      var step = tr.steps[i];
-      var map = step.getMap();
-      var docAfterStep = (_tr$docs = tr.docs[i + 1]) !== null && _tr$docs !== void 0 ? _tr$docs : tr.doc;
-      var positions = [];
+  for (var i = 0; i < tr.steps.length; i++) {
+    var _tr$docs;
+    var step = tr.steps[i];
+    var map = step.getMap();
+    var docAfterStep = (_tr$docs = tr.docs[i + 1]) !== null && _tr$docs !== void 0 ? _tr$docs : tr.doc;
+    var positions = [];
 
-      // Extract positions from steps dynamically based on applicable properties
-      if ('from' in step && typeof step.from === 'number' && 'to' in step && typeof step.to === 'number') {
-        var _ref = step,
-          from = _ref.from,
-          to = _ref.to;
-        positions.push(from, to);
-      } else if ('pos' in step && typeof step.pos === 'number') {
-        var _ref2 = step,
-          pos = _ref2.pos;
-        positions.push(pos);
-      }
-      for (var _i = 0, _positions = positions; _i < _positions.length; _i++) {
-        var _pos = _positions[_i];
-        var newPos = map.map(_pos);
-        if (newPos >= 0 && newPos <= docAfterStep.content.size) {
-          if ((0, _utils.findParentNodeOfTypeClosestToPos)(docAfterStep.resolve(newPos), bodiedSyncBlock)) {
-            return true;
-          }
-        }
-      }
+    // Extract positions from steps dynamically based on applicable properties
+    if ('from' in step && typeof step.from === 'number' && 'to' in step && typeof step.to === 'number') {
+      var _ref = step,
+        from = _ref.from,
+        to = _ref.to;
+      positions.push(from, to);
+    } else if ('pos' in step && typeof step.pos === 'number') {
+      var _ref2 = step,
+        pos = _ref2.pos;
+      positions.push(pos);
     }
-  } else {
-    var _iterator = _createForOfIteratorHelper(tr.steps),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var _step2 = _step.value;
-        var _map = _step2.getMap();
-        var doc = tr.doc;
-        var _positions2 = [];
-
-        // Extract positions from steps dynamically based on applicable properties
-        if ('from' in _step2 && typeof _step2.from === 'number' && 'to' in _step2 && typeof _step2.to === 'number') {
-          var _ref3 = _step2,
-            _from = _ref3.from,
-            _to = _ref3.to;
-          _positions2.push(_from, _to);
-        } else if ('pos' in _step2 && typeof _step2.pos === 'number') {
-          var _ref4 = _step2,
-            _pos2 = _ref4.pos;
-          _positions2.push(_pos2);
-        }
-        for (var _i2 = 0, _positions3 = _positions2; _i2 < _positions3.length; _i2++) {
-          var _pos3 = _positions3[_i2];
-          var _newPos = _map.map(_pos3);
-          if (_newPos >= 0 && _newPos <= doc.content.size) {
-            if ((0, _utils.findParentNodeOfTypeClosestToPos)(doc.resolve(_newPos), bodiedSyncBlock)) {
-              return true;
-            }
-          }
+    for (var _i = 0, _positions = positions; _i < _positions.length; _i++) {
+      var _pos = _positions[_i];
+      var newPos = map.map(_pos);
+      if (newPos >= 0 && newPos <= docAfterStep.content.size) {
+        if ((0, _utils.findParentNodeOfTypeClosestToPos)(docAfterStep.resolve(newPos), bodiedSyncBlock)) {
+          return true;
         }
       }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
     }
   }
   return false;

package/dist/cjs/syncedBlockPlugin.js

@@ -39,9 +39,7 @@ var syncedBlockPlugin = exports.syncedBlockPlugin = function syncedBlockPlugin(_
         node: _adfSchema.syncBlock
       }, {
         name: 'bodiedSyncBlock',
-        node:
-        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') && !(0, _experiments.editorExperiment)('platform_synced_block_patch_6', true, {
+        node: !(0, _experiments.editorExperiment)('platform_synced_block_patch_6', true, {
           exposure: true
         }) ?
         // delete bodiedSyncBlockNodeWithToDOMFixed when cleaning up platform_synced_block_patch_6

package/dist/cjs/ui/SyncedLocationDropdown.js

@@ -31,7 +31,6 @@ var _quotationMark = _interopRequireDefault(require("@atlaskit/icon/core/quotati
 var _statusError = _interopRequireDefault(require("@atlaskit/icon/core/status-error"));
 var _logo = require("@atlaskit/logo");
 var _lozenge = _interopRequireDefault(require("@atlaskit/lozenge"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _spinner = _interopRequireDefault(require("@atlaskit/spinner"));
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
@@ -89,31 +88,23 @@ var productIconMap = {
   'jira-work-item': _logo.JiraIcon
 };
 var subTypeIconMap = {
-  live: _pageLiveDoc.default,
-  page: _page.default,
-  blogpost: _quotationMark.default
-};
-var subTypeIconMapNew = {
   live: _pageLiveDoc.default,
   page: _page.default
 };
 var getConfluenceSubTypeIcon = function getConfluenceSubTypeIcon(sourceAri, subType) {
-  if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
-    try {
-      var _getPageIdAndTypeFrom = (0, _editorSyncedBlockProvider.getPageIdAndTypeFromConfluencePageAri)({
-          ari: sourceAri
-        }),
-        pageType = _getPageIdAndTypeFrom.type;
-      if (pageType === 'blogpost') {
-        return _quotationMark.default;
-      } else {
-        return subType && subType in subTypeIconMapNew ? subTypeIconMapNew[subType] : _page.default;
-      }
-    } catch (_unused) {
-      return _page.default;
+  try {
+    var _getPageIdAndTypeFrom = (0, _editorSyncedBlockProvider.getPageIdAndTypeFromConfluencePageAri)({
+        ari: sourceAri
+      }),
+      pageType = _getPageIdAndTypeFrom.type;
+    if (pageType === 'blogpost') {
+      return _quotationMark.default;
+    } else {
+      return subType && subType in subTypeIconMap ? subTypeIconMap[subType] : _page.default;
     }
+  } catch (_unused) {
+    return _page.default;
   }
-  return subType && subType in subTypeIconMap ? subTypeIconMap[subType] : _page.default;
 };
 var ProductIcon = function ProductIcon(_ref2) {
   var _productIconMap$produ;

package/dist/es2019/nodeviews/syncedBlock.js

@@ -4,6 +4,7 @@ import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { SyncBlockSharedCssClassName, SyncBlockActionsProvider } from '@atlaskit/editor-common/sync-block';
 import { useFetchSyncBlockData, useFetchSyncBlockTitle } from '@atlaskit/editor-synced-block-provider';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { removeSyncedBlockAtPos } from '../editor-commands';
 import { SyncBlockRendererWrapper } from '../ui/SyncBlockRendererWrapper';
 export class SyncBlock extends ReactNodeView {
@@ -18,6 +19,16 @@ export class SyncBlock extends ReactNodeView {
     domRef.classList.add(SyncBlockSharedCssClassName.prefix);
     return domRef;
   }
+  validUpdate(currentNode, newNode) {
+    // Only consider as the valid update if the localId and resourceId are the same
+    // This prevents PM reusing the same node view for different sync block node in live page transition
+    return currentNode.attrs.localId === newNode.attrs.localId && currentNode.attrs.resourceId === newNode.attrs.resourceId;
+  }
+  update(node, decorations, innerDecorations) {
+    return super.update(node, decorations, innerDecorations, editorExperiment('platform_synced_block_patch_6', true, {
+      exposure: true
+    }) ? this.validUpdate : undefined);
+  }
   render({
     getPos
   }) {

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

@@ -58,9 +58,6 @@ const showCopiedFlag = api => {
 };
 const showInlineExtensionInSyncBlockWarningIfNeeded = (tr, state, api, inlineExtensionFlagShown) => {
   var _api$connectivity, _api$connectivity$sha;
-  if (!fg('platform_synced_block_patch_3')) {
-    return;
-  }
   if (!tr.docChanged || tr.getMeta('isRemote') || Boolean(tr.getMeta(pmHistoryPluginKey)) || isOfflineMode(api === null || api === void 0 ? void 0 : (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 ? void 0 : (_api$connectivity$sha = _api$connectivity.sharedState.currentState()) === null || _api$connectivity$sha === void 0 ? void 0 : _api$connectivity$sha.mode)) {
     return;
   }
@@ -114,31 +111,17 @@ const filterTransactionOnline = ({
     });
   });
   syncBlockAdded.forEach(syncBlock => {
-    if (fg('platform_synced_block_patch_3')) {
-      var _api$analytics2, _api$analytics2$actio;
-      api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : (_api$analytics2$actio = _api$analytics2.actions) === null || _api$analytics2$actio === void 0 ? void 0 : _api$analytics2$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
-      });
-    } else {
-      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.INSERTED,
-        actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-        actionSubjectId: ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_CREATE,
-        attributes: {
-          resourceId: syncBlock.attrs.resourceId,
-          blockInstanceId: syncBlock.attrs.localId
-        },
-        eventType: EVENT_TYPE.OPERATIONAL
-      });
-    }
+    var _api$analytics2, _api$analytics2$actio;
+    api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : (_api$analytics2$actio = _api$analytics2.actions) === null || _api$analytics2$actio === void 0 ? void 0 : _api$analytics2$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) {
     // eslint-disable-next-line no-param-reassign
@@ -493,8 +476,8 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           added: syncBlockAdded
         } = trackSyncBlocks(node => node.type.name === 'syncBlock', tr, state);
         syncBlockRemoved.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({
+          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,
@@ -506,31 +489,17 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           });
         });
         syncBlockAdded.forEach(syncBlock => {
-          if (fg('platform_synced_block_patch_3')) {
-            var _api$analytics5, _api$analytics5$actio;
-            api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : (_api$analytics5$actio = _api$analytics5.actions) === null || _api$analytics5$actio === void 0 ? void 0 : _api$analytics5$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
-            });
-          } else {
-            var _api$analytics6, _api$analytics6$actio;
-            api === null || api === void 0 ? void 0 : (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : (_api$analytics6$actio = _api$analytics6.actions) === null || _api$analytics6$actio === void 0 ? void 0 : _api$analytics6$actio.fireAnalyticsEvent({
-              action: ACTION.INSERTED,
-              actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-              actionSubjectId: ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_CREATE,
-              attributes: {
-                resourceId: syncBlock.attrs.resourceId,
-                blockInstanceId: syncBlock.attrs.localId
-              },
-              eventType: EVENT_TYPE.OPERATIONAL
-            });
-          }
+          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;

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

@@ -1,6 +1,5 @@
 import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 export const trackSyncBlocks = (predicate, tr, state) => {
   const removed = {};
   const added = {};
@@ -15,12 +14,12 @@ export const trackSyncBlocks = (predicate, tr, state) => {
   const replaceSteps = tr.steps.filter(step => step instanceof ReplaceStep || step instanceof ReplaceAroundStep);
 
   // this is a quick check to see if any insertion/deletion of bodiedSyncBlock happened
-  const hasBodiedSyncBlockChanges = replaceSteps.some((step, idx) => {
+  const hasBodiedSyncBlockChanges = replaceSteps.some(step => {
     const {
       from,
       to
     } = step;
-    const docAtStep = fg('platform_synced_block_patch_3') ? tr.docs[tr.steps.indexOf(step)] : tr.docs[idx];
+    const docAtStep = tr.docs[tr.steps.indexOf(step)];
     let hasChange = false;
     if (from !== to) {
       step.getMap().forEach((oldStart, oldEnd) => {
@@ -102,63 +101,31 @@ export const hasEditInSyncBlock = (tr, state) => {
   const {
     bodiedSyncBlock
   } = state.schema.nodes;
-  if (fg('platform_synced_block_patch_3')) {
-    for (let i = 0; i < tr.steps.length; i++) {
-      var _tr$docs;
-      const step = tr.steps[i];
-      const map = step.getMap();
-      const docAfterStep = (_tr$docs = tr.docs[i + 1]) !== null && _tr$docs !== void 0 ? _tr$docs : tr.doc;
-      const positions = [];
+  for (let i = 0; i < tr.steps.length; i++) {
+    var _tr$docs;
+    const step = tr.steps[i];
+    const map = step.getMap();
+    const docAfterStep = (_tr$docs = tr.docs[i + 1]) !== null && _tr$docs !== void 0 ? _tr$docs : tr.doc;
+    const positions = [];
 
-      // Extract positions from steps dynamically based on applicable properties
-      if ('from' in step && typeof step.from === 'number' && 'to' in step && typeof step.to === 'number') {
-        const {
-          from,
-          to
-        } = step;
-        positions.push(from, to);
-      } else if ('pos' in step && typeof step.pos === 'number') {
-        const {
-          pos
-        } = step;
-        positions.push(pos);
-      }
-      for (const pos of positions) {
-        const newPos = map.map(pos);
-        if (newPos >= 0 && newPos <= docAfterStep.content.size) {
-          if (findParentNodeOfTypeClosestToPos(docAfterStep.resolve(newPos), bodiedSyncBlock)) {
-            return true;
-          }
-        }
-      }
-    }
-  } else {
-    for (const step of tr.steps) {
-      const map = step.getMap();
+    // Extract positions from steps dynamically based on applicable properties
+    if ('from' in step && typeof step.from === 'number' && 'to' in step && typeof step.to === 'number') {
       const {
-        doc
-      } = tr;
-      const positions = [];
-
-      // Extract positions from steps dynamically based on applicable properties
-      if ('from' in step && typeof step.from === 'number' && 'to' in step && typeof step.to === 'number') {
-        const {
-          from,
-          to
-        } = step;
-        positions.push(from, to);
-      } else if ('pos' in step && typeof step.pos === 'number') {
-        const {
-          pos
-        } = step;
-        positions.push(pos);
-      }
-      for (const pos of positions) {
-        const newPos = map.map(pos);
-        if (newPos >= 0 && newPos <= doc.content.size) {
-          if (findParentNodeOfTypeClosestToPos(doc.resolve(newPos), bodiedSyncBlock)) {
-            return true;
-          }
+        from,
+        to
+      } = step;
+      positions.push(from, to);
+    } else if ('pos' in step && typeof step.pos === 'number') {
+      const {
+        pos
+      } = step;
+      positions.push(pos);
+    }
+    for (const pos of positions) {
+      const newPos = map.map(pos);
+      if (newPos >= 0 && newPos <= docAfterStep.content.size) {
+        if (findParentNodeOfTypeClosestToPos(docAfterStep.resolve(newPos), bodiedSyncBlock)) {
+          return true;
         }
       }
     }

package/dist/es2019/syncedBlockPlugin.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { bodiedSyncBlock, syncBlock } from '@atlaskit/adf-schema';
+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';
@@ -33,9 +33,7 @@ export const syncedBlockPlugin = ({
         node: syncBlock
       }, {
         name: 'bodiedSyncBlock',
-        node:
-        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        fg('platform_synced_block_patch_3') && !editorExperiment('platform_synced_block_patch_6', true, {
+        node: !editorExperiment('platform_synced_block_patch_6', true, {
           exposure: true
         }) ?
         // delete bodiedSyncBlockNodeWithToDOMFixed when cleaning up platform_synced_block_patch_6

package/dist/es2019/ui/SyncedLocationDropdown.js

@@ -19,7 +19,6 @@ import QuotationMarkIcon from '@atlaskit/icon/core/quotation-mark';
 import StatusErrorIcon from '@atlaskit/icon/core/status-error';
 import { ConfluenceIcon, JiraIcon, AtlassianIcon } from '@atlaskit/logo';
 import Lozenge from '@atlaskit/lozenge';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, Text, Inline, Anchor, Stack } from '@atlaskit/primitives/compiled';
 import Spinner from '@atlaskit/spinner';
 import Tooltip from '@atlaskit/tooltip';
@@ -73,32 +72,24 @@ const productIconMap = {
   'jira-work-item': JiraIcon
 };
 const subTypeIconMap = {
-  live: PageLiveDocIcon,
-  page: PageIcon,
-  blogpost: QuotationMarkIcon
-};
-const subTypeIconMapNew = {
   live: PageLiveDocIcon,
   page: PageIcon
 };
 const getConfluenceSubTypeIcon = (sourceAri, subType) => {
-  if (fg('platform_synced_block_patch_3')) {
-    try {
-      const {
-        type: pageType
-      } = getPageIdAndTypeFromConfluencePageAri({
-        ari: sourceAri
-      });
-      if (pageType === 'blogpost') {
-        return QuotationMarkIcon;
-      } else {
-        return subType && subType in subTypeIconMapNew ? subTypeIconMapNew[subType] : PageIcon;
-      }
-    } catch {
-      return PageIcon;
+  try {
+    const {
+      type: pageType
+    } = getPageIdAndTypeFromConfluencePageAri({
+      ari: sourceAri
+    });
+    if (pageType === 'blogpost') {
+      return QuotationMarkIcon;
+    } else {
+      return subType && subType in subTypeIconMap ? subTypeIconMap[subType] : PageIcon;
     }
+  } catch {
+    return PageIcon;
   }
-  return subType && subType in subTypeIconMap ? subTypeIconMap[subType] : PageIcon;
 };
 const ProductIcon = ({
   product

package/dist/esm/nodeviews/syncedBlock.js

@@ -13,6 +13,7 @@ import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
 import ReactNodeView from '@atlaskit/editor-common/react-node-view';
 import { SyncBlockSharedCssClassName, SyncBlockActionsProvider } from '@atlaskit/editor-common/sync-block';
 import { useFetchSyncBlockData as _useFetchSyncBlockData, useFetchSyncBlockTitle as _useFetchSyncBlockTitle } from '@atlaskit/editor-synced-block-provider';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { removeSyncedBlockAtPos } from '../editor-commands';
 import { SyncBlockRendererWrapper } from '../ui/SyncBlockRendererWrapper';
 export var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
@@ -33,6 +34,20 @@ export var SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
       domRef.classList.add(SyncBlockSharedCssClassName.prefix);
       return domRef;
     }
+  }, {
+    key: "validUpdate",
+    value: function validUpdate(currentNode, newNode) {
+      // Only consider as the valid update if the localId and resourceId are the same
+      // This prevents PM reusing the same node view for different sync block node in live page transition
+      return currentNode.attrs.localId === newNode.attrs.localId && currentNode.attrs.resourceId === newNode.attrs.resourceId;
+    }
+  }, {
+    key: "update",
+    value: function update(node, decorations, innerDecorations) {
+      return _superPropGet(SyncBlock, "update", this, 3)([node, decorations, innerDecorations, editorExperiment('platform_synced_block_patch_6', true, {
+        exposure: true
+      }) ? this.validUpdate : undefined]);
+    }
   }, {
     key: "render",
     value: function render(_ref) {

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

@@ -76,9 +76,6 @@ var showCopiedFlag = function showCopiedFlag(api) {
 };
 var showInlineExtensionInSyncBlockWarningIfNeeded = function showInlineExtensionInSyncBlockWarningIfNeeded(tr, state, api, inlineExtensionFlagShown) {
   var _api$connectivity;
-  if (!fg('platform_synced_block_patch_3')) {
-    return;
-  }
   if (!tr.docChanged || tr.getMeta('isRemote') || Boolean(tr.getMeta(pmHistoryPluginKey)) || 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)) {
     return;
   }
@@ -133,31 +130,17 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
     });
   });
   syncBlockAdded.forEach(function (syncBlock) {
-    if (fg('platform_synced_block_patch_3')) {
-      var _api$analytics2;
-      api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.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
-      });
-    } else {
-      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: ACTION.INSERTED,
-        actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-        actionSubjectId: ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_CREATE,
-        attributes: {
-          resourceId: syncBlock.attrs.resourceId,
-          blockInstanceId: syncBlock.attrs.localId
-        },
-        eventType: EVENT_TYPE.OPERATIONAL
-      });
-    }
+    var _api$analytics2;
+    api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.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) {
     // eslint-disable-next-line no-param-reassign
@@ -522,8 +505,8 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
           _syncBlockRemoved = _trackSyncBlocks5.removed,
           _syncBlockAdded = _trackSyncBlocks5.added;
         _syncBlockRemoved.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({
+          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: ACTION.DELETED,
             actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
             actionSubjectId: ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_DELETE,
@@ -535,31 +518,17 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
           });
         });
         _syncBlockAdded.forEach(function (syncBlock) {
-          if (fg('platform_synced_block_patch_3')) {
-            var _api$analytics5;
-            api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 || (_api$analytics5 = _api$analytics5.actions) === null || _api$analytics5 === void 0 || _api$analytics5.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
-            });
-          } else {
-            var _api$analytics6;
-            api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 || (_api$analytics6 = _api$analytics6.actions) === null || _api$analytics6 === void 0 || _api$analytics6.fireAnalyticsEvent({
-              action: ACTION.INSERTED,
-              actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-              actionSubjectId: ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_CREATE,
-              attributes: {
-                resourceId: syncBlock.attrs.resourceId,
-                blockInstanceId: syncBlock.attrs.localId
-              },
-              eventType: EVENT_TYPE.OPERATIONAL
-            });
-          }
+          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: 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;

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

@@ -1,9 +1,5 @@
-function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { ReplaceAroundStep, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
 import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 export var trackSyncBlocks = function trackSyncBlocks(predicate, tr, state) {
   var removed = {};
   var added = {};
@@ -20,10 +16,10 @@ export var trackSyncBlocks = function trackSyncBlocks(predicate, tr, state) {
   });
 
   // this is a quick check to see if any insertion/deletion of bodiedSyncBlock happened
-  var hasBodiedSyncBlockChanges = replaceSteps.some(function (step, idx) {
+  var hasBodiedSyncBlockChanges = replaceSteps.some(function (step) {
     var from = step.from,
       to = step.to;
-    var docAtStep = fg('platform_synced_block_patch_3') ? tr.docs[tr.steps.indexOf(step)] : tr.docs[idx];
+    var docAtStep = tr.docs[tr.steps.indexOf(step)];
     var hasChange = false;
     if (from !== to) {
       step.getMap().forEach(function (oldStart, oldEnd) {
@@ -103,70 +99,32 @@ export var trackSyncBlocks = function trackSyncBlocks(predicate, tr, state) {
  */
 export var hasEditInSyncBlock = function hasEditInSyncBlock(tr, state) {
   var bodiedSyncBlock = state.schema.nodes.bodiedSyncBlock;
-  if (fg('platform_synced_block_patch_3')) {
-    for (var i = 0; i < tr.steps.length; i++) {
-      var _tr$docs;
-      var step = tr.steps[i];
-      var map = step.getMap();
-      var docAfterStep = (_tr$docs = tr.docs[i + 1]) !== null && _tr$docs !== void 0 ? _tr$docs : tr.doc;
-      var positions = [];
+  for (var i = 0; i < tr.steps.length; i++) {
+    var _tr$docs;
+    var step = tr.steps[i];
+    var map = step.getMap();
+    var docAfterStep = (_tr$docs = tr.docs[i + 1]) !== null && _tr$docs !== void 0 ? _tr$docs : tr.doc;
+    var positions = [];
 
-      // Extract positions from steps dynamically based on applicable properties
-      if ('from' in step && typeof step.from === 'number' && 'to' in step && typeof step.to === 'number') {
-        var _ref = step,
-          from = _ref.from,
-          to = _ref.to;
-        positions.push(from, to);
-      } else if ('pos' in step && typeof step.pos === 'number') {
-        var _ref2 = step,
-          pos = _ref2.pos;
-        positions.push(pos);
-      }
-      for (var _i = 0, _positions = positions; _i < _positions.length; _i++) {
-        var _pos = _positions[_i];
-        var newPos = map.map(_pos);
-        if (newPos >= 0 && newPos <= docAfterStep.content.size) {
-          if (findParentNodeOfTypeClosestToPos(docAfterStep.resolve(newPos), bodiedSyncBlock)) {
-            return true;
-          }
-        }
-      }
+    // Extract positions from steps dynamically based on applicable properties
+    if ('from' in step && typeof step.from === 'number' && 'to' in step && typeof step.to === 'number') {
+      var _ref = step,
+        from = _ref.from,
+        to = _ref.to;
+      positions.push(from, to);
+    } else if ('pos' in step && typeof step.pos === 'number') {
+      var _ref2 = step,
+        pos = _ref2.pos;
+      positions.push(pos);
     }
-  } else {
-    var _iterator = _createForOfIteratorHelper(tr.steps),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var _step2 = _step.value;
-        var _map = _step2.getMap();
-        var doc = tr.doc;
-        var _positions2 = [];
-
-        // Extract positions from steps dynamically based on applicable properties
-        if ('from' in _step2 && typeof _step2.from === 'number' && 'to' in _step2 && typeof _step2.to === 'number') {
-          var _ref3 = _step2,
-            _from = _ref3.from,
-            _to = _ref3.to;
-          _positions2.push(_from, _to);
-        } else if ('pos' in _step2 && typeof _step2.pos === 'number') {
-          var _ref4 = _step2,
-            _pos2 = _ref4.pos;
-          _positions2.push(_pos2);
-        }
-        for (var _i2 = 0, _positions3 = _positions2; _i2 < _positions3.length; _i2++) {
-          var _pos3 = _positions3[_i2];
-          var _newPos = _map.map(_pos3);
-          if (_newPos >= 0 && _newPos <= doc.content.size) {
-            if (findParentNodeOfTypeClosestToPos(doc.resolve(_newPos), bodiedSyncBlock)) {
-              return true;
-            }
-          }
+    for (var _i = 0, _positions = positions; _i < _positions.length; _i++) {
+      var _pos = _positions[_i];
+      var newPos = map.map(_pos);
+      if (newPos >= 0 && newPos <= docAfterStep.content.size) {
+        if (findParentNodeOfTypeClosestToPos(docAfterStep.resolve(newPos), bodiedSyncBlock)) {
+          return true;
         }
       }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
     }
   }
   return false;

package/dist/esm/syncedBlockPlugin.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { bodiedSyncBlock, syncBlock } from '@atlaskit/adf-schema';
+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';
@@ -32,9 +32,7 @@ export var syncedBlockPlugin = function syncedBlockPlugin(_ref) {
         node: syncBlock
       }, {
         name: 'bodiedSyncBlock',
-        node:
-        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        fg('platform_synced_block_patch_3') && !editorExperiment('platform_synced_block_patch_6', true, {
+        node: !editorExperiment('platform_synced_block_patch_6', true, {
           exposure: true
         }) ?
         // delete bodiedSyncBlockNodeWithToDOMFixed when cleaning up platform_synced_block_patch_6

package/dist/esm/ui/SyncedLocationDropdown.js

@@ -27,7 +27,6 @@ import QuotationMarkIcon from '@atlaskit/icon/core/quotation-mark';
 import StatusErrorIcon from '@atlaskit/icon/core/status-error';
 import { ConfluenceIcon, JiraIcon, AtlassianIcon } from '@atlaskit/logo';
 import Lozenge from '@atlaskit/lozenge';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, Text, Inline, Anchor, Stack } from '@atlaskit/primitives/compiled';
 import Spinner from '@atlaskit/spinner';
 import Tooltip from '@atlaskit/tooltip';
@@ -80,31 +79,23 @@ var productIconMap = {
   'jira-work-item': JiraIcon
 };
 var subTypeIconMap = {
-  live: PageLiveDocIcon,
-  page: PageIcon,
-  blogpost: QuotationMarkIcon
-};
-var subTypeIconMapNew = {
   live: PageLiveDocIcon,
   page: PageIcon
 };
 var getConfluenceSubTypeIcon = function getConfluenceSubTypeIcon(sourceAri, subType) {
-  if (fg('platform_synced_block_patch_3')) {
-    try {
-      var _getPageIdAndTypeFrom = getPageIdAndTypeFromConfluencePageAri({
-          ari: sourceAri
-        }),
-        pageType = _getPageIdAndTypeFrom.type;
-      if (pageType === 'blogpost') {
-        return QuotationMarkIcon;
-      } else {
-        return subType && subType in subTypeIconMapNew ? subTypeIconMapNew[subType] : PageIcon;
-      }
-    } catch (_unused) {
-      return PageIcon;
+  try {
+    var _getPageIdAndTypeFrom = getPageIdAndTypeFromConfluencePageAri({
+        ari: sourceAri
+      }),
+      pageType = _getPageIdAndTypeFrom.type;
+    if (pageType === 'blogpost') {
+      return QuotationMarkIcon;
+    } else {
+      return subType && subType in subTypeIconMap ? subTypeIconMap[subType] : PageIcon;
     }
+  } catch (_unused) {
+    return PageIcon;
   }
-  return subType && subType in subTypeIconMap ? subTypeIconMap[subType] : PageIcon;
 };
 var ProductIcon = function ProductIcon(_ref2) {
   var _productIconMap$produ;

package/dist/types/nodeviews/syncedBlock.d.ts

@@ -5,7 +5,7 @@ import ReactNodeView, { type getPosHandler } from '@atlaskit/editor-common/react
 import type { ReactComponentProps } from '@atlaskit/editor-common/react-node-view';
 import type { ExtractInjectionAPI, getPosHandlerNode, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { EditorView, Decoration, DecorationSource } from '@atlaskit/editor-prosemirror/view';
 import { type SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
 import type { SyncedBlockPlugin, SyncedBlockPluginOptions } from '../syncedBlockPluginType';
 export interface SyncBlockNodeViewProps extends ReactComponentProps {
@@ -26,6 +26,8 @@ export declare class SyncBlock extends ReactNodeView<SyncBlockNodeViewProps> {
     constructor(props: SyncBlockNodeViewProps);
     unsubscribe: (() => void) | undefined;
     createDomRef(): HTMLElement;
+    validUpdate(currentNode: PMNode, newNode: PMNode): boolean;
+    update(node: PMNode, decorations: ReadonlyArray<Decoration>, innerDecorations?: DecorationSource): boolean;
     render({ getPos }: SyncBlockNodeViewProps): React.JSX.Element | null;
     destroy(): void;
 }

package/dist/types-ts4.5/nodeviews/syncedBlock.d.ts

@@ -5,7 +5,7 @@ import ReactNodeView, { type getPosHandler } from '@atlaskit/editor-common/react
 import type { ReactComponentProps } from '@atlaskit/editor-common/react-node-view';
 import type { ExtractInjectionAPI, getPosHandlerNode, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { EditorView, Decoration, DecorationSource } from '@atlaskit/editor-prosemirror/view';
 import { type SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
 import type { SyncedBlockPlugin, SyncedBlockPluginOptions } from '../syncedBlockPluginType';
 export interface SyncBlockNodeViewProps extends ReactComponentProps {
@@ -26,6 +26,8 @@ export declare class SyncBlock extends ReactNodeView<SyncBlockNodeViewProps> {
     constructor(props: SyncBlockNodeViewProps);
     unsubscribe: (() => void) | undefined;
     createDomRef(): HTMLElement;
+    validUpdate(currentNode: PMNode, newNode: PMNode): boolean;
+    update(node: PMNode, decorations: ReadonlyArray<Decoration>, innerDecorations?: DecorationSource): boolean;
     render({ getPos }: SyncBlockNodeViewProps): React.JSX.Element | null;
     destroy(): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "5.4.5",
+	"version": "5.4.6",
 	"description": "SyncedBlock plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -54,7 +54,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^18.0.0",
 		"@atlaskit/spinner": "19.0.11",
-		"@atlaskit/tmp-editor-statsig": "^34.1.0",
+		"@atlaskit/tmp-editor-statsig": "^34.2.0",
 		"@atlaskit/tokens": "11.0.2",
 		"@atlaskit/tooltip": "^20.14.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
@@ -108,9 +108,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform_synced_block_patch_3": {
-			"type": "boolean"
-		},
 		"platform_synced_block_patch_5": {
 			"type": "boolean"
 		},