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

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

@@ -19,7 +19,7 @@ import { handleBodiedSyncBlockRemoval } from './utils/handle-bodied-sync-block-r
 import { shouldIgnoreDomEvent } from './utils/ignore-dom-event';
 import { calculateDecorations } from './utils/selection-decorations';
 import { hasEditInSyncBlock, trackSyncBlocks } from './utils/track-sync-blocks';
-import { deferDispatch, wasInlineExtensionInsertedInBodiedSyncBlock, sliceFullyContainsNode } from './utils/utils';
+import { deferDispatch, wasExtensionInsertedInBodiedSyncBlock, sliceFullyContainsNode } from './utils/utils';
 export const syncedBlockPluginKey = new PluginKey('syncedBlockPlugin');
 const mapRetryCreationPosMap = (oldMap, newRetryCreationPos, mapPos) => {
   const resourceId = newRetryCreationPos === null || newRetryCreationPos === void 0 ? void 0 : newRetryCreationPos.resourceId;
@@ -56,24 +56,23 @@ const showCopiedFlag = api => {
     }));
   });
 };
-const showInlineExtensionInSyncBlockWarningIfNeeded = (tr, state, api, inlineExtensionFlagShown) => {
+const showExtensionInSyncBlockWarningIfNeeded = (tr, state, api, extensionFlagShown) => {
   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;
   }
-  const resourceId = wasInlineExtensionInsertedInBodiedSyncBlock(tr, state);
+  const resourceId = wasExtensionInsertedInBodiedSyncBlock(tr, state);
   // Only show the flag on the first instance per sync block (same as UNPUBLISHED_SYNC_BLOCK_PASTED)
-  if (resourceId && !inlineExtensionFlagShown.has(resourceId)) {
-    inlineExtensionFlagShown.add(resourceId);
+  if (resourceId && !extensionFlagShown.has(resourceId)) {
+    extensionFlagShown.add(resourceId);
     deferDispatch(() => {
       api === null || api === void 0 ? void 0 : api.core.actions.execute(({
         tr
       }) => tr.setMeta(syncedBlockPluginKey, {
         activeFlag: {
-          id: FLAG_ID.INLINE_EXTENSION_IN_SYNC_BLOCK
+          id: editorExperiment('platform_synced_block_patch_6', true, {
+            exposure: true
+          }) ? FLAG_ID.EXTENSION_IN_SYNC_BLOCK : FLAG_ID.INLINE_EXTENSION_IN_SYNC_BLOCK
         }
       }));
     });
@@ -94,7 +93,7 @@ const filterTransactionOnline = ({
   confirmationTransactionRef,
   bodiedSyncBlockRemoved,
   bodiedSyncBlockAdded,
-  inlineExtensionFlagShown
+  extensionFlagShown
 }) => {
   const {
     removed: syncBlockRemoved,
@@ -114,31 +113,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
@@ -155,7 +140,7 @@ const filterTransactionOnline = ({
     handleBodiedSyncBlockCreation(bodiedSyncBlockAdded, state, api);
     return true;
   }
-  showInlineExtensionInSyncBlockWarningIfNeeded(tr, state, api, inlineExtensionFlagShown);
+  showExtensionInSyncBlockWarningIfNeeded(tr, state, api, extensionFlagShown);
   return true;
 };
 const filterTransactionOffline = ({
@@ -205,7 +190,7 @@ class SyncedBlockPluginContext {
     });
     _defineProperty(this, "_isCopyEvent", false);
     _defineProperty(this, "unpublishedFlagShown", new Set());
-    _defineProperty(this, "inlineExtensionFlagShown", new Set());
+    _defineProperty(this, "extensionFlagShown", new Set());
   }
   get isCopyEvent() {
     return this._isCopyEvent;
@@ -220,7 +205,7 @@ class SyncedBlockPluginContext {
   }
 }
 export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api) => {
-  var _ctx$confirmationTran, _ctx$unpublishedFlagS, _ctx$inlineExtensionF;
+  var _ctx$confirmationTran, _ctx$unpublishedFlagS, _ctx$extensionFlagSho;
   const {
     useLongPressSelection = false
   } = options || {};
@@ -230,7 +215,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
   };
   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 inlineExtensionFlagShown = (_ctx$inlineExtensionF = ctx === null || ctx === void 0 ? void 0 : ctx.inlineExtensionFlagShown) !== null && _ctx$inlineExtensionF !== void 0 ? _ctx$inlineExtensionF : new Set();
+  const extensionFlagShown = (_ctx$extensionFlagSho = ctx === null || ctx === void 0 ? void 0 : ctx.extensionFlagShown) !== null && _ctx$extensionFlagSho !== void 0 ? _ctx$extensionFlagSho : new Set();
 
   // Set up callback to detect unpublished sync blocks when they're fetched
   syncBlockStore.referenceManager.setOnUnpublishedSyncBlockDetected(resourceId => {
@@ -484,7 +469,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           confirmationTransactionRef,
           bodiedSyncBlockRemoved,
           bodiedSyncBlockAdded,
-          inlineExtensionFlagShown
+          extensionFlagShown
         });
       }
       if (!isOffline) {
@@ -493,8 +478,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 +491,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;
@@ -546,7 +517,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           handleBodiedSyncBlockCreation(bodiedSyncBlockAdded, state, api);
           return true;
         }
-        showInlineExtensionInSyncBlockWarningIfNeeded(tr, state, api, inlineExtensionFlagShown);
+        showExtensionInSyncBlockWarningIfNeeded(tr, state, api, extensionFlagShown);
         return true;
       }
       const {

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/pm-plugins/utils/utils.js

@@ -3,6 +3,7 @@ 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';
 
 /**
  * Defers a callback to the next microtask (when gated) or next macrotask via setTimeout(0).
@@ -91,29 +92,34 @@ export const sliceFullyContainsNode = (slice, node) => {
   }
   return true;
 };
-const fragmentContainsInlineExtension = fragment => {
+
+// even though extension and bodiedExtension are explicitly not allowed by the schema, they can still be inserted nested inside other nodes e.g. layouts
+const EXTENSION_NODES = new Set(['inlineExtension', 'extension', 'bodiedExtension']);
+const fragmentContainsExtension = fragment => {
   let found = false;
   fragment.forEach(node => {
     if (found) {
       return;
     }
-    if (node.type.name === 'inlineExtension') {
+    if (editorExperiment('platform_synced_block_patch_6', true, {
+      exposure: true
+    }) ? EXTENSION_NODES.has(node.type.name) : node.type.name === 'inlineExtension') {
       found = true;
     } else if (node.content.size) {
-      if (fragmentContainsInlineExtension(node.content)) {
+      if (fragmentContainsExtension(node.content)) {
         found = true;
       }
     }
   });
   return found;
 };
-const sliceContainsInlineExtension = slice => fragmentContainsInlineExtension(slice.content);
+const sliceContainsExtension = slice => fragmentContainsExtension(slice.content);
 
 /**
  * Returns the resourceId of the bodied sync block where an inline extension was inserted, or undefined.
  * Used to show a warning flag only on the first instance per sync block.
  */
-export const wasInlineExtensionInsertedInBodiedSyncBlock = (tr, state) => {
+export const wasExtensionInsertedInBodiedSyncBlock = (tr, state) => {
   if (!tr.docChanged || tr.getMeta('isRemote')) {
     return undefined;
   }
@@ -135,7 +141,7 @@ export const wasInlineExtensionInsertedInBodiedSyncBlock = (tr, state) => {
         continue;
       }
       const replaceStep = step;
-      if (!sliceContainsInlineExtension(replaceStep.slice)) {
+      if (!sliceContainsExtension(replaceStep.slice)) {
         continue;
       }
       const docAfterStep = (_docs = docs[i + 1]) !== null && _docs !== void 0 ? _docs : tr.doc;
@@ -158,13 +164,17 @@ export const wasInlineExtensionInsertedInBodiedSyncBlock = (tr, state) => {
     if (resourceId !== undefined) {
       return false;
     }
-    if (node.type.name === 'inlineExtension') {
+    if (editorExperiment('platform_synced_block_patch_6', true, {
+      exposure: true
+    }) ? EXTENSION_NODES.has(node.type.name) : node.type.name === 'inlineExtension') {
       const $pos = tr.doc.resolve(pos);
       const parent = findParentNodeOfTypeClosestToPos($pos, bodiedSyncBlock);
       if (parent !== null && parent !== void 0 && parent.node.attrs.resourceId) {
         const mappedPos = tr.mapping.invert().map(pos);
         const nodeBefore = state.doc.nodeAt(mappedPos);
-        if (!nodeBefore || nodeBefore.type.name !== 'inlineExtension') {
+        if (!nodeBefore || (editorExperiment('platform_synced_block_patch_6', true, {
+          exposure: true
+        }) ? EXTENSION_NODES.has(nodeBefore.type.name) : nodeBefore.type.name !== 'inlineExtension')) {
           resourceId = parent.node.attrs.resourceId;
           return false;
         }

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/types/index.js

@@ -7,6 +7,7 @@ export let FLAG_ID = /*#__PURE__*/function (FLAG_ID) {
   FLAG_ID["UNPUBLISHED_SYNC_BLOCK_PASTED"] = "unpublished-sync-block-pasted";
   FLAG_ID["CANNOT_CREATE_SYNC_BLOCK"] = "cannot-create-sync-block";
   FLAG_ID["INLINE_EXTENSION_IN_SYNC_BLOCK"] = "inline-extension-in-sync-block";
+  FLAG_ID["EXTENSION_IN_SYNC_BLOCK"] = "extension-in-sync-block";
   return FLAG_ID;
 }({});
 export const SYNCED_BLOCK_BUTTON_TEST_ID = {

package/dist/es2019/ui/Flag.js

@@ -44,6 +44,11 @@ const flagMap = {
     description: messages.CannotCreateSyncBlockDescription,
     type: 'error'
   },
+  [FLAG_ID.EXTENSION_IN_SYNC_BLOCK]: {
+    title: messages.extensionInSyncBlockTitle,
+    description: messages.extensionInSyncBlockDescription,
+    type: 'error'
+  },
   [FLAG_ID.INLINE_EXTENSION_IN_SYNC_BLOCK]: {
     title: messages.inlineExtensionInSyncBlockTitle,
     description: messages.inlineExtensionInSyncBlockDescription,

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) {