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

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 5.4.7
+
+### Patch Changes
+
+- [`dc717554783a6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/dc717554783a6) -
+  [ux] EDITOR-5556 show warning flag when extensions are added inside synced blocks
+- Updated dependencies
+
+## 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

@@ -81,24 +81,23 @@ var showCopiedFlag = function showCopiedFlag(api) {
     });
   });
 };
-var showInlineExtensionInSyncBlockWarningIfNeeded = function showInlineExtensionInSyncBlockWarningIfNeeded(tr, state, api, inlineExtensionFlagShown) {
+var showExtensionInSyncBlockWarningIfNeeded = function showExtensionInSyncBlockWarningIfNeeded(tr, state, api, extensionFlagShown) {
   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;
   }
-  var resourceId = (0, _utils2.wasInlineExtensionInsertedInBodiedSyncBlock)(tr, state);
+  var resourceId = (0, _utils2.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);
     (0, _utils2.deferDispatch)(function () {
       api === null || api === void 0 || api.core.actions.execute(function (_ref2) {
         var tr = _ref2.tr;
         return tr.setMeta(syncedBlockPluginKey, {
           activeFlag: {
-            id: _types.FLAG_ID.INLINE_EXTENSION_IN_SYNC_BLOCK
+            id: (0, _experiments.editorExperiment)('platform_synced_block_patch_6', true, {
+              exposure: true
+            }) ? _types.FLAG_ID.EXTENSION_IN_SYNC_BLOCK : _types.FLAG_ID.INLINE_EXTENSION_IN_SYNC_BLOCK
           }
         });
       });
@@ -120,7 +119,7 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
     confirmationTransactionRef = _ref3.confirmationTransactionRef,
     bodiedSyncBlockRemoved = _ref3.bodiedSyncBlockRemoved,
     bodiedSyncBlockAdded = _ref3.bodiedSyncBlockAdded,
-    inlineExtensionFlagShown = _ref3.inlineExtensionFlagShown;
+    extensionFlagShown = _ref3.extensionFlagShown;
   var _trackSyncBlocks = (0, _trackSyncBlocks8.trackSyncBlocks)(function (node) {
       return node.type.name === 'syncBlock';
     }, tr, state),
@@ -140,31 +139,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
@@ -181,7 +166,7 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
     (0, _handleBodiedSyncBlockCreation.handleBodiedSyncBlockCreation)(bodiedSyncBlockAdded, state, api);
     return true;
   }
-  showInlineExtensionInSyncBlockWarningIfNeeded(tr, state, api, inlineExtensionFlagShown);
+  showExtensionInSyncBlockWarningIfNeeded(tr, state, api, extensionFlagShown);
   return true;
 };
 var filterTransactionOffline = function filterTransactionOffline(_ref4) {
@@ -233,7 +218,7 @@ var SyncedBlockPluginContext = /*#__PURE__*/function () {
     });
     (0, _defineProperty2.default)(this, "_isCopyEvent", false);
     (0, _defineProperty2.default)(this, "unpublishedFlagShown", new Set());
-    (0, _defineProperty2.default)(this, "inlineExtensionFlagShown", new Set());
+    (0, _defineProperty2.default)(this, "extensionFlagShown", new Set());
   }
   return (0, _createClass2.default)(SyncedBlockPluginContext, [{
     key: "isCopyEvent",
@@ -255,7 +240,7 @@ var SyncedBlockPluginContext = /*#__PURE__*/function () {
   }]);
 }();
 var createPlugin = exports.createPlugin = function createPlugin(options, pmPluginFactoryParams, syncBlockStore, api) {
-  var _ctx$confirmationTran, _ctx$unpublishedFlagS, _ctx$inlineExtensionF;
+  var _ctx$confirmationTran, _ctx$unpublishedFlagS, _ctx$extensionFlagSho;
   var _ref6 = options || {},
     _ref6$useLongPressSel = _ref6.useLongPressSelection,
     useLongPressSelection = _ref6$useLongPressSel === void 0 ? false : _ref6$useLongPressSel;
@@ -265,7 +250,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
   };
   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 inlineExtensionFlagShown = (_ctx$inlineExtensionF = ctx === null || ctx === void 0 ? void 0 : ctx.inlineExtensionFlagShown) !== null && _ctx$inlineExtensionF !== void 0 ? _ctx$inlineExtensionF : new Set();
+  var 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(function (resourceId) {
@@ -519,7 +504,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           confirmationTransactionRef: confirmationTransactionRef,
           bodiedSyncBlockRemoved: bodiedSyncBlockRemoved,
           bodiedSyncBlockAdded: bodiedSyncBlockAdded,
-          inlineExtensionFlagShown: inlineExtensionFlagShown
+          extensionFlagShown: extensionFlagShown
         });
       }
       if (!isOffline) {
@@ -529,8 +514,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 +527,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;
@@ -582,7 +553,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           (0, _handleBodiedSyncBlockCreation.handleBodiedSyncBlockCreation)(bodiedSyncBlockAdded, state, api);
           return true;
         }
-        showInlineExtensionInSyncBlockWarningIfNeeded(tr, state, api, inlineExtensionFlagShown);
+        showExtensionInSyncBlockWarningIfNeeded(tr, state, api, extensionFlagShown);
         return true;
       }
       var _trackSyncBlocks6 = (0, _trackSyncBlocks8.trackSyncBlocks)(function (node) {

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

@@ -3,12 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.wasInlineExtensionInsertedInBodiedSyncBlock = exports.sliceFullyContainsNode = exports.isBodiedSyncBlockNode = exports.findSyncBlockOrBodiedSyncBlock = exports.findSyncBlock = exports.findBodiedSyncBlock = exports.deferDispatch = exports.canBeConvertedToSyncBlock = void 0;
+exports.wasExtensionInsertedInBodiedSyncBlock = exports.sliceFullyContainsNode = exports.isBodiedSyncBlockNode = exports.findSyncBlockOrBodiedSyncBlock = exports.findSyncBlock = exports.findBodiedSyncBlock = exports.deferDispatch = exports.canBeConvertedToSyncBlock = void 0;
 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.
@@ -97,31 +98,36 @@ var sliceFullyContainsNode = exports.sliceFullyContainsNode = function sliceFull
   }
   return true;
 };
-var _fragmentContainsInlineExtension = function 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
+var EXTENSION_NODES = new Set(['inlineExtension', 'extension', 'bodiedExtension']);
+var _fragmentContainsExtension = function fragmentContainsExtension(fragment) {
   var found = false;
   fragment.forEach(function (node) {
     if (found) {
       return;
     }
-    if (node.type.name === 'inlineExtension') {
+    if ((0, _experiments.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;
 };
-var sliceContainsInlineExtension = function sliceContainsInlineExtension(slice) {
-  return _fragmentContainsInlineExtension(slice.content);
+var sliceContainsExtension = function sliceContainsExtension(slice) {
+  return _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.
  */
-var wasInlineExtensionInsertedInBodiedSyncBlock = exports.wasInlineExtensionInsertedInBodiedSyncBlock = function wasInlineExtensionInsertedInBodiedSyncBlock(tr, state) {
+var wasExtensionInsertedInBodiedSyncBlock = exports.wasExtensionInsertedInBodiedSyncBlock = function wasExtensionInsertedInBodiedSyncBlock(tr, state) {
   if (!tr.docChanged || tr.getMeta('isRemote')) {
     return undefined;
   }
@@ -141,7 +147,7 @@ var wasInlineExtensionInsertedInBodiedSyncBlock = exports.wasInlineExtensionInse
         continue;
       }
       var replaceStep = step;
-      if (!sliceContainsInlineExtension(replaceStep.slice)) {
+      if (!sliceContainsExtension(replaceStep.slice)) {
         continue;
       }
       var docAfterStep = (_docs = docs[i + 1]) !== null && _docs !== void 0 ? _docs : tr.doc;
@@ -164,13 +170,17 @@ var wasInlineExtensionInsertedInBodiedSyncBlock = exports.wasInlineExtensionInse
     if (resourceId !== undefined) {
       return false;
     }
-    if (node.type.name === 'inlineExtension') {
+    if ((0, _experiments.editorExperiment)('platform_synced_block_patch_6', true, {
+      exposure: true
+    }) ? EXTENSION_NODES.has(node.type.name) : node.type.name === 'inlineExtension') {
       var _$pos = tr.doc.resolve(pos);
       var _parent = (0, _utils.findParentNodeOfTypeClosestToPos)(_$pos, bodiedSyncBlock);
       if (_parent !== null && _parent !== void 0 && _parent.node.attrs.resourceId) {
         var mappedPos = tr.mapping.invert().map(pos);
         var nodeBefore = state.doc.nodeAt(mappedPos);
-        if (!nodeBefore || nodeBefore.type.name !== 'inlineExtension') {
+        if (!nodeBefore || ((0, _experiments.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/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/types/index.js

@@ -13,6 +13,7 @@ var FLAG_ID = exports.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;
 }({});
 var SYNCED_BLOCK_BUTTON_TEST_ID = exports.SYNCED_BLOCK_BUTTON_TEST_ID = {

package/dist/cjs/ui/Flag.js

@@ -21,7 +21,7 @@ var _types = require("../types");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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; }
-var flagMap = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.FLAG_ID.CANNOT_DELETE_WHEN_OFFLINE, {
+var flagMap = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.FLAG_ID.CANNOT_DELETE_WHEN_OFFLINE, {
   title: _messages.syncBlockMessages.failToDeleteTitle,
   description: _messages.syncBlockMessages.failToDeleteWhenOfflineDescription,
   type: 'error'
@@ -48,6 +48,10 @@ var flagMap = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _d
   title: _messages.syncBlockMessages.cannotCreateSyncBlockTitle,
   description: _messages.syncBlockMessages.CannotCreateSyncBlockDescription,
   type: 'error'
+}), _types.FLAG_ID.EXTENSION_IN_SYNC_BLOCK, {
+  title: _messages.syncBlockMessages.extensionInSyncBlockTitle,
+  description: _messages.syncBlockMessages.extensionInSyncBlockDescription,
+  type: 'error'
 }), _types.FLAG_ID.INLINE_EXTENSION_IN_SYNC_BLOCK, {
   title: _messages.syncBlockMessages.inlineExtensionInSyncBlockTitle,
   description: _messages.syncBlockMessages.inlineExtensionInSyncBlockDescription,

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