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

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,24 +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 (!fg('platform_synced_block_patch_3')) {
-    return;
-  }
   if (!tr.docChanged || tr.getMeta('isRemote') || Boolean(tr.getMeta(pmHistoryPluginKey)) || isOfflineMode(api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode)) {
     return;
   }
-  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
           }
         });
       });
@@ -113,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),
@@ -133,31 +132,17 @@ var filterTransactionOnline = function filterTransactionOnline(_ref3) {
     });
   });
   syncBlockAdded.forEach(function (syncBlock) {
-    if (fg('platform_synced_block_patch_3')) {
-      var _api$analytics2;
-      api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.fireAnalyticsEvent({
-        action: ACTION.INSERTED,
-        actionSubject: ACTION_SUBJECT.DOCUMENT,
-        actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK,
-        attributes: {
-          resourceId: syncBlock.attrs.resourceId,
-          blockInstanceId: syncBlock.attrs.localId
-        },
-        eventType: EVENT_TYPE.TRACK
-      });
-    } else {
-      var _api$analytics3;
-      api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || (_api$analytics3 = _api$analytics3.actions) === null || _api$analytics3 === void 0 || _api$analytics3.fireAnalyticsEvent({
-        action: ACTION.INSERTED,
-        actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-        actionSubjectId: ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_CREATE,
-        attributes: {
-          resourceId: syncBlock.attrs.resourceId,
-          blockInstanceId: syncBlock.attrs.localId
-        },
-        eventType: EVENT_TYPE.OPERATIONAL
-      });
-    }
+    var _api$analytics2;
+    api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.fireAnalyticsEvent({
+      action: ACTION.INSERTED,
+      actionSubject: ACTION_SUBJECT.DOCUMENT,
+      actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK,
+      attributes: {
+        resourceId: syncBlock.attrs.resourceId,
+        blockInstanceId: syncBlock.attrs.localId
+      },
+      eventType: EVENT_TYPE.TRACK
+    });
   });
   if (bodiedSyncBlockRemoved.length > 0) {
     // eslint-disable-next-line no-param-reassign
@@ -174,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) {
@@ -226,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",
@@ -248,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;
@@ -258,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) {
@@ -512,7 +497,7 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
           confirmationTransactionRef: confirmationTransactionRef,
           bodiedSyncBlockRemoved: bodiedSyncBlockRemoved,
           bodiedSyncBlockAdded: bodiedSyncBlockAdded,
-          inlineExtensionFlagShown: inlineExtensionFlagShown
+          extensionFlagShown: extensionFlagShown
         });
       }
       if (!isOffline) {
@@ -522,8 +507,8 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
           _syncBlockRemoved = _trackSyncBlocks5.removed,
           _syncBlockAdded = _trackSyncBlocks5.added;
         _syncBlockRemoved.forEach(function (syncBlock) {
-          var _api$analytics4;
-          api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 || (_api$analytics4 = _api$analytics4.actions) === null || _api$analytics4 === void 0 || _api$analytics4.fireAnalyticsEvent({
+          var _api$analytics3;
+          api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || (_api$analytics3 = _api$analytics3.actions) === null || _api$analytics3 === void 0 || _api$analytics3.fireAnalyticsEvent({
             action: ACTION.DELETED,
             actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
             actionSubjectId: ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_DELETE,
@@ -535,31 +520,17 @@ export var createPlugin = function createPlugin(options, pmPluginFactoryParams,
           });
         });
         _syncBlockAdded.forEach(function (syncBlock) {
-          if (fg('platform_synced_block_patch_3')) {
-            var _api$analytics5;
-            api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 || (_api$analytics5 = _api$analytics5.actions) === null || _api$analytics5 === void 0 || _api$analytics5.fireAnalyticsEvent({
-              action: ACTION.INSERTED,
-              actionSubject: ACTION_SUBJECT.DOCUMENT,
-              actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK,
-              attributes: {
-                resourceId: syncBlock.attrs.resourceId,
-                blockInstanceId: syncBlock.attrs.localId
-              },
-              eventType: EVENT_TYPE.TRACK
-            });
-          } else {
-            var _api$analytics6;
-            api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 || (_api$analytics6 = _api$analytics6.actions) === null || _api$analytics6 === void 0 || _api$analytics6.fireAnalyticsEvent({
-              action: ACTION.INSERTED,
-              actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
-              actionSubjectId: ACTION_SUBJECT_ID.REFERENCE_SYNCED_BLOCK_CREATE,
-              attributes: {
-                resourceId: syncBlock.attrs.resourceId,
-                blockInstanceId: syncBlock.attrs.localId
-              },
-              eventType: EVENT_TYPE.OPERATIONAL
-            });
-          }
+          var _api$analytics4;
+          api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 || (_api$analytics4 = _api$analytics4.actions) === null || _api$analytics4 === void 0 || _api$analytics4.fireAnalyticsEvent({
+            action: ACTION.INSERTED,
+            actionSubject: ACTION_SUBJECT.DOCUMENT,
+            actionSubjectId: ACTION_SUBJECT_ID.SYNCED_BLOCK,
+            attributes: {
+              resourceId: syncBlock.attrs.resourceId,
+              blockInstanceId: syncBlock.attrs.localId
+            },
+            eventType: EVENT_TYPE.TRACK
+          });
         });
         if (bodiedSyncBlockRemoved.length > 0) {
           confirmationTransactionRef.current = tr;
@@ -575,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/track-sync-blocks.js

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

package/dist/esm/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/syncedBlockPlugin.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { bodiedSyncBlock, syncBlock } from '@atlaskit/adf-schema';
+import { syncBlock, bodiedSyncBlock } from '@atlaskit/adf-schema';
 import { SyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -32,9 +32,7 @@ export var syncedBlockPlugin = function syncedBlockPlugin(_ref) {
         node: syncBlock
       }, {
         name: 'bodiedSyncBlock',
-        node:
-        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        fg('platform_synced_block_patch_3') && !editorExperiment('platform_synced_block_patch_6', true, {
+        node: !editorExperiment('platform_synced_block_patch_6', true, {
           exposure: true
         }) ?
         // delete bodiedSyncBlockNodeWithToDOMFixed when cleaning up platform_synced_block_patch_6

package/dist/esm/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/esm/ui/SyncedLocationDropdown.js

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

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

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

package/dist/types/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/nodeviews/syncedBlock.d.ts

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

package/dist/types-ts4.5/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;