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

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @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

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

@@ -81,21 +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 (!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
           }
         });
       });
@@ -117,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),
@@ -164,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) {
@@ -216,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",
@@ -238,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;
@@ -248,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) {
@@ -502,7 +504,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           confirmationTransactionRef: confirmationTransactionRef,
           bodiedSyncBlockRemoved: bodiedSyncBlockRemoved,
           bodiedSyncBlockAdded: bodiedSyncBlockAdded,
-          inlineExtensionFlagShown: inlineExtensionFlagShown
+          extensionFlagShown: extensionFlagShown
         });
       }
       if (!isOffline) {
@@ -551,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/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/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/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,21 +56,23 @@ const showCopiedFlag = api => {
     }));
   });
 };
-const showInlineExtensionInSyncBlockWarningIfNeeded = (tr, state, api, inlineExtensionFlagShown) => {
+const showExtensionInSyncBlockWarningIfNeeded = (tr, state, api, extensionFlagShown) => {
   var _api$connectivity, _api$connectivity$sha;
   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
         }
       }));
     });
@@ -91,7 +93,7 @@ const filterTransactionOnline = ({
   confirmationTransactionRef,
   bodiedSyncBlockRemoved,
   bodiedSyncBlockAdded,
-  inlineExtensionFlagShown
+  extensionFlagShown
 }) => {
   const {
     removed: syncBlockRemoved,
@@ -138,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 = ({
@@ -188,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;
@@ -203,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 || {};
@@ -213,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 => {
@@ -467,7 +469,7 @@ export const createPlugin = (options, pmPluginFactoryParams, syncBlockStore, api
           confirmationTransactionRef,
           bodiedSyncBlockRemoved,
           bodiedSyncBlockAdded,
-          inlineExtensionFlagShown
+          extensionFlagShown
         });
       }
       if (!isOffline) {
@@ -515,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/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/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/esm/pm-plugins/main.js

@@ -27,7 +27,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 var syncedBlockPluginKey = new PluginKey('syncedBlockPlugin');
 var mapRetryCreationPosMap = function mapRetryCreationPosMap(oldMap, newRetryCreationPos, mapPos) {
   var resourceId = newRetryCreationPos === null || newRetryCreationPos === void 0 ? void 0 : newRetryCreationPos.resourceId;
@@ -74,21 +74,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 (!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;
   }
-  var resourceId = wasInlineExtensionInsertedInBodiedSyncBlock(tr, state);
+  var 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(function () {
       api === null || api === void 0 || api.core.actions.execute(function (_ref2) {
         var tr = _ref2.tr;
         return 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
           }
         });
       });
@@ -110,7 +112,7 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
     confirmationTransactionRef = _ref3.confirmationTransactionRef,
     bodiedSyncBlockRemoved = _ref3.bodiedSyncBlockRemoved,
     bodiedSyncBlockAdded = _ref3.bodiedSyncBlockAdded,
-    inlineExtensionFlagShown = _ref3.inlineExtensionFlagShown;
+    extensionFlagShown = _ref3.extensionFlagShown;
   var _trackSyncBlocks = trackSyncBlocks(function (node) {
       return node.type.name === 'syncBlock';
     }, tr, state),
@@ -157,7 +159,7 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
     handleBodiedSyncBlockCreation(bodiedSyncBlockAdded, state, api);
     return true;
   }
-  showInlineExtensionInSyncBlockWarningIfNeeded(tr, state, api, inlineExtensionFlagShown);
+  showExtensionInSyncBlockWarningIfNeeded(tr, state, api, extensionFlagShown);
   return true;
 };
 var filterTransactionOffline = function filterTransactionOffline(_ref4) {
@@ -209,7 +211,7 @@ var SyncedBlockPluginContext = /*#__PURE__*/function () {
     });
     _defineProperty(this, "_isCopyEvent", false);
     _defineProperty(this, "unpublishedFlagShown", new Set());
-    _defineProperty(this, "inlineExtensionFlagShown", new Set());
+    _defineProperty(this, "extensionFlagShown", new Set());
   }
   return _createClass(SyncedBlockPluginContext, [{
     key: "isCopyEvent",
@@ -231,7 +233,7 @@ var SyncedBlockPluginContext = /*#__PURE__*/function () {
   }]);
 }();
 export var 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;
@@ -241,7 +243,7 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
   };
   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) {
@@ -495,7 +497,7 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
           confirmationTransactionRef: confirmationTransactionRef,
           bodiedSyncBlockRemoved: bodiedSyncBlockRemoved,
           bodiedSyncBlockAdded: bodiedSyncBlockAdded,
-          inlineExtensionFlagShown: inlineExtensionFlagShown
+          extensionFlagShown: extensionFlagShown
         });
       }
       if (!isOffline) {
@@ -544,7 +546,7 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
           handleBodiedSyncBlockCreation(bodiedSyncBlockAdded, state, api);
           return true;
         }
-        showInlineExtensionInSyncBlockWarningIfNeeded(tr, state, api, inlineExtensionFlagShown);
+        showExtensionInSyncBlockWarningIfNeeded(tr, state, api, extensionFlagShown);
         return true;
       }
       var _trackSyncBlocks6 = trackSyncBlocks(function (node) {

package/dist/esm/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).
@@ -92,31 +93,36 @@ export var sliceFullyContainsNode = function sliceFullyContainsNode(slice, node)
   }
   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 (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.
  */
-export var wasInlineExtensionInsertedInBodiedSyncBlock = function wasInlineExtensionInsertedInBodiedSyncBlock(tr, state) {
+export var wasExtensionInsertedInBodiedSyncBlock = function wasExtensionInsertedInBodiedSyncBlock(tr, state) {
   if (!tr.docChanged || tr.getMeta('isRemote')) {
     return undefined;
   }
@@ -136,7 +142,7 @@ export var wasInlineExtensionInsertedInBodiedSyncBlock = function wasInlineExten
         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;
@@ -159,13 +165,17 @@ export var wasInlineExtensionInsertedInBodiedSyncBlock = function wasInlineExten
     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') {
       var _$pos = tr.doc.resolve(pos);
       var _parent = 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 || (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/esm/types/index.js

@@ -7,6 +7,7 @@ export var 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 var SYNCED_BLOCK_BUTTON_TEST_ID = {

package/dist/esm/ui/Flag.js

@@ -12,7 +12,7 @@ import StatusSuccessIcon from '@atlaskit/icon/core/status-success';
 import StatusWarningIcon from '@atlaskit/icon/core/status-warning';
 import { syncedBlockPluginKey } from '../pm-plugins/main';
 import { FLAG_ID } from '../types';
-var flagMap = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, FLAG_ID.CANNOT_DELETE_WHEN_OFFLINE, {
+var flagMap = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, FLAG_ID.CANNOT_DELETE_WHEN_OFFLINE, {
   title: messages.failToDeleteTitle,
   description: messages.failToDeleteWhenOfflineDescription,
   type: 'error'
@@ -39,6 +39,10 @@ var flagMap = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_d
   title: messages.cannotCreateSyncBlockTitle,
   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/types/pm-plugins/utils/utils.d.ts

@@ -30,4 +30,4 @@ export declare const sliceFullyContainsNode: (slice: Slice, node: PMNode) => boo
  * 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 declare const wasInlineExtensionInsertedInBodiedSyncBlock: (tr: Transaction, state: EditorState) => string | undefined;
+export declare const wasExtensionInsertedInBodiedSyncBlock: (tr: Transaction, state: EditorState) => string | undefined;

package/dist/types/types/index.d.ts

@@ -9,7 +9,8 @@ export declare enum FLAG_ID {
     SYNC_BLOCK_COPIED = "sync-block-copied",
     UNPUBLISHED_SYNC_BLOCK_PASTED = "unpublished-sync-block-pasted",
     CANNOT_CREATE_SYNC_BLOCK = "cannot-create-sync-block",
-    INLINE_EXTENSION_IN_SYNC_BLOCK = "inline-extension-in-sync-block"
+    INLINE_EXTENSION_IN_SYNC_BLOCK = "inline-extension-in-sync-block",
+    EXTENSION_IN_SYNC_BLOCK = "extension-in-sync-block"
 }
 type FlagConfig = {
     id: FLAG_ID;
@@ -36,6 +37,10 @@ export type SyncedBlockSharedState = {
      * Whether the plugin is currently saving bodiedSyncBlock deletion to backend
      */
     bodiedSyncBlockDeletionStatus?: BodiedSyncBlockDeletionStatus;
+    /**
+     * Whether there are unsaved bodiedSyncBlock changes in the cache
+     */
+    hasUnsavedBodiedSyncBlockChanges: boolean;
     /**
      * Positions of pending creations keyed by resourceId, used for retry/revert flow.
      * When a new bodiedSyncBlock is added, a new entry is added to map for mapping. The entry is removed when creation succeeds or retry option is dismissed.
@@ -46,10 +51,6 @@ export type SyncedBlockSharedState = {
      * The current sync block store manager, used to manage fetching and updating sync block data
      */
     syncBlockStore: SyncBlockStoreManager;
-    /**
-     * Whether there are unsaved bodiedSyncBlock changes in the cache
-     */
-    hasUnsavedBodiedSyncBlockChanges: boolean;
 };
 export type SyncBlockAttrs = {
     localId: string;

package/dist/types-ts4.5/pm-plugins/utils/utils.d.ts

@@ -30,4 +30,4 @@ export declare const sliceFullyContainsNode: (slice: Slice, node: PMNode) => boo
  * 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 declare const wasInlineExtensionInsertedInBodiedSyncBlock: (tr: Transaction, state: EditorState) => string | undefined;
+export declare const wasExtensionInsertedInBodiedSyncBlock: (tr: Transaction, state: EditorState) => string | undefined;

package/dist/types-ts4.5/types/index.d.ts

@@ -9,7 +9,8 @@ export declare enum FLAG_ID {
     SYNC_BLOCK_COPIED = "sync-block-copied",
     UNPUBLISHED_SYNC_BLOCK_PASTED = "unpublished-sync-block-pasted",
     CANNOT_CREATE_SYNC_BLOCK = "cannot-create-sync-block",
-    INLINE_EXTENSION_IN_SYNC_BLOCK = "inline-extension-in-sync-block"
+    INLINE_EXTENSION_IN_SYNC_BLOCK = "inline-extension-in-sync-block",
+    EXTENSION_IN_SYNC_BLOCK = "extension-in-sync-block"
 }
 type FlagConfig = {
     id: FLAG_ID;
@@ -36,6 +37,10 @@ export type SyncedBlockSharedState = {
      * Whether the plugin is currently saving bodiedSyncBlock deletion to backend
      */
     bodiedSyncBlockDeletionStatus?: BodiedSyncBlockDeletionStatus;
+    /**
+     * Whether there are unsaved bodiedSyncBlock changes in the cache
+     */
+    hasUnsavedBodiedSyncBlockChanges: boolean;
     /**
      * Positions of pending creations keyed by resourceId, used for retry/revert flow.
      * When a new bodiedSyncBlock is added, a new entry is added to map for mapping. The entry is removed when creation succeeds or retry option is dismissed.
@@ -46,10 +51,6 @@ export type SyncedBlockSharedState = {
      * The current sync block store manager, used to manage fetching and updating sync block data
      */
     syncBlockStore: SyncBlockStoreManager;
-    /**
-     * Whether there are unsaved bodiedSyncBlock changes in the cache
-     */
-    hasUnsavedBodiedSyncBlockChanges: boolean;
 };
 export type SyncBlockAttrs = {
     localId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-synced-block",
-	"version": "5.4.6",
+	"version": "5.4.7",
 	"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.2.0",
+		"@atlaskit/tmp-editor-statsig": "^34.3.0",
 		"@atlaskit/tokens": "11.0.2",
 		"@atlaskit/tooltip": "^20.14.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
@@ -65,7 +65,7 @@
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.28.0",
+		"@atlaskit/editor-common": "^111.29.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {