@atlaskit/editor-plugin-synced-block 8.3.2 → 8.3.4

package/AGENTS.md

@@ -35,8 +35,7 @@ src/
 ├── nodeviews/
 │   ├── syncedBlock.tsx         # NodeView for reference (syncBlock) — read-only, fetches from BE
 │   ├── lazySyncedBlock.tsx     # Lazy-loaded wrapper for syncedBlock (EDITOR-6928)
-│   ├── bodiedSyncedBlock.tsx   # NodeView for source (bodiedSyncBlock) — nested editor with content
-│   └── bodiedSyncBlockNodeWithToDOMFixed.ts # DOM serialization fix variant (experiment-gated)
+│   └── bodiedSyncedBlock.tsx   # NodeView for source (bodiedSyncBlock) — nested editor with content
 ├── pm-plugins/
 │   ├── main.ts                 # Core state machine: lifecycle, creation, deletion, cache,
 │   │                             status decoration apply path (gated by editor_synced_block_perf)

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @atlaskit/editor-plugin-synced-block
 
+## 8.3.4
+
+### Patch Changes
+
+- [`4c459a2718b67`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4c459a2718b67) -
+  Clean up synced block feature gates
+- Updated dependencies
+
+## 8.3.3
+
+### Patch Changes
+
+- [`434b508cc2368`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/434b508cc2368) -
+  EDITOR-7104: Add `featured-section` placement to block menu selection extension API
+  - Add `featured-section` to `BlockMenuPlacement` type which registers a top-level section with a
+    separator
+  - Add `BLOCK_ACTIONS_TEMPLATE_SECTION` and `BLOCK_ACTIONS_FEATURED_EXTENSION_SECTION_KEYS`
+    constants to `editor-common`
+  - Render lozenge inline next to label text (not pushed to far right) for dropdown and nested
+    dropdown items
+  - Move "New" lozenge next to label for synced block dropdown items
+  - Block template/menu behaviour gated behind `platform_editor_block_menu_v2_patch_2`; synced-block
+    lozenge placement behaviour gated behind `platform_synced_block_patch_12`
+
+- Updated dependencies
+
 ## 8.3.2
 
 ### Patch Changes

package/dist/cjs/nodeviews/bodiedSyncedBlock.js

@@ -17,7 +17,6 @@ var _reactNodeView = _interopRequireDefault(require("@atlaskit/editor-common/rea
 var _syncBlock = require("@atlaskit/editor-common/sync-block");
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _model = require("@atlaskit/editor-prosemirror/model");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _BodiedSyncBlockWrapper = require("../ui/BodiedSyncBlockWrapper");
 var _SyncBlockLabel = require("../ui/SyncBlockLabel");
 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)); }
@@ -172,14 +171,13 @@ var toDOM = function toDOM(node) {
   }, 0]];
 };
 var BodiedSyncBlock = exports.BodiedSyncBlock = /*#__PURE__*/function () {
-  function BodiedSyncBlock(node, view, getPos, api, nodeViewPortalProviderAPI, syncBlockStore) {
+  function BodiedSyncBlock(node, view, getPos, api, nodeViewPortalProviderAPI) {
     var _this4 = this;
     (0, _classCallCheck2.default)(this, BodiedSyncBlock);
     this.node = node;
     this.view = view;
     this.getPos = getPos;
     this.api = api;
-    this.syncBlockStore = syncBlockStore;
     this.nodeViewPortalProviderAPI = nodeViewPortalProviderAPI;
     var _DOMSerializer$render2 = _model.DOMSerializer.renderSpec(document, toDOM(this.node)),
       dom = _DOMSerializer$render2.dom,
@@ -205,12 +203,8 @@ var BodiedSyncBlock = exports.BodiedSyncBlock = /*#__PURE__*/function () {
     this.handleConnectivityModeChange();
     this.handleViewModeChange();
 
-    // update sync block data on initial creation
-    // When fg is ON, cache is populated in state.init() and updated in appendTransaction
-    if (!(0, _platformFeatureFlags.fg)('platform_synced_block_update_refactor')) {
-      var _this$syncedBlockStor;
-      (_this$syncedBlockStor = this.syncedBlockStore) === null || _this$syncedBlockStor === void 0 || _this$syncedBlockStor.sourceManager.updateSyncBlockData(node, false);
-    }
+    // Cache is populated in state.init() and updated in appendTransaction,
+    // so no additional updateSyncBlockData call is needed here.
   }
   return (0, _createClass2.default)(BodiedSyncBlock, [{
     key: "updateContentEditable",
@@ -253,26 +247,15 @@ var BodiedSyncBlock = exports.BodiedSyncBlock = /*#__PURE__*/function () {
         });
       }
     }
-  }, {
-    key: "syncedBlockStore",
-    get: function get() {
-      var _this$api$syncedBlock2, _this$api1;
-      return (_this$api$syncedBlock2 = (_this$api1 = this.api) === null || _this$api1 === void 0 || (_this$api1 = _this$api1.syncedBlock.sharedState) === null || _this$api1 === void 0 || (_this$api1 = _this$api1.currentState()) === null || _this$api1 === void 0 ? void 0 : _this$api1.syncBlockStore) !== null && _this$api$syncedBlock2 !== void 0 ? _this$api$syncedBlock2 : this.syncBlockStore;
-    }
   }, {
     key: "update",
     value: function update(node) {
       if (this.node.type !== node.type) {
         return false;
       }
-      if (node !== this.node) {
-        // When fg is ON, cache updates are handled in appendTransaction where we can
-        // filter out non-user changes (remote collab, table auto-scale, etc.)
-        if (!(0, _platformFeatureFlags.fg)('platform_synced_block_update_refactor')) {
-          var _this$syncedBlockStor2;
-          (_this$syncedBlockStor2 = this.syncedBlockStore) === null || _this$syncedBlockStor2 === void 0 || _this$syncedBlockStor2.sourceManager.updateSyncBlockData(node, false);
-        }
-      }
+
+      // Cache updates are handled in appendTransaction where we can
+      // filter out non-user changes (remote collab, table auto-scale, etc.)
       this.node = node;
       return true;
     }
@@ -296,9 +279,8 @@ var BodiedSyncBlock = exports.BodiedSyncBlock = /*#__PURE__*/function () {
 }();
 var bodiedSyncBlockNodeView = exports.bodiedSyncBlockNodeView = function bodiedSyncBlockNodeView(props) {
   var api = props.api,
-    syncBlockStore = props.syncBlockStore,
     nodeViewPortalProviderAPI = props.pmPluginFactoryParams.nodeViewPortalProviderAPI;
   return function (node, view, getPos) {
-    return new BodiedSyncBlock(node, view, getPos, api, nodeViewPortalProviderAPI, syncBlockStore);
+    return new BodiedSyncBlock(node, view, getPos, api, nodeViewPortalProviderAPI);
   };
 };

package/dist/cjs/nodeviews/syncedBlock.js

@@ -18,7 +18,6 @@ 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 _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
-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)); }
@@ -68,9 +67,7 @@ var SyncBlock = exports.SyncBlock = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     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]);
+      return _superPropGet(SyncBlock, "update", this, 3)([node, decorations, innerDecorations, this.validUpdate]);
     }
   }, {
     key: "render",

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

@@ -369,18 +369,14 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
 
           // Populate source sync block cache from initial document
           // When fg is ON, this replaces the constructor call in the nodeview
-          if ((0, _platformFeatureFlags.fg)('platform_synced_block_update_refactor')) {
-            instance.doc.forEach(function (node) {
-              if (syncBlockStore.sourceManager.isSourceBlock(node)) {
-                syncBlockStore.sourceManager.updateSyncBlockData(node, false);
-              }
-            });
-
-            // Fetch statuses from the backend so we can identify unpublished blocks on cancel
-            if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_10')) {
-              syncBlockStore.sourceManager.fetchAndCacheStatuses();
+          instance.doc.forEach(function (node) {
+            if (syncBlockStore.sourceManager.isSourceBlock(node)) {
+              syncBlockStore.sourceManager.updateSyncBlockData(node, false);
             }
-          }
+          });
+
+          // Fetch statuses from the backend so we can identify unpublished blocks on cancel
+          syncBlockStore.sourceManager.fetchAndCacheStatuses();
         }
 
         // Read initial shared-state signals for status decorations
@@ -693,7 +689,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
         }
       }
       var viewMode = api === null || api === void 0 || (_api$editorViewMode4 = api.editorViewMode) === null || _api$editorViewMode4 === void 0 || (_api$editorViewMode4 = _api$editorViewMode4.sharedState.currentState()) === null || _api$editorViewMode4 === void 0 ? void 0 : _api$editorViewMode4.mode;
-      if (viewMode === 'view' && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_8')) {
+      if (viewMode === 'view') {
         return true;
       }
       var isOffline = (0, _editorPluginConnectivity.isOfflineMode)(api === null || api === void 0 || (_api$connectivity5 = api.connectivity) === null || _api$connectivity5 === void 0 || (_api$connectivity5 = _api$connectivity5.sharedState.currentState()) === null || _api$connectivity5 === void 0 ? void 0 : _api$connectivity5.mode);
@@ -710,40 +706,39 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
           }
         });
       }
-      if ((0, _platformFeatureFlags.fg)('platform_synced_block_update_refactor')) {
-        // if doc changed and it's a remote transaction, check if any synced block were added,
-        // and if so, for source synced blocks, ensure we update the cache with them
-        // and for reference synced blocks, ensure we fetch the data from the server
-        if (tr.docChanged && tr.getMeta('isRemote')) {
-          var _trackSyncBlocks4 = (0, _trackSyncBlocks7.trackSyncBlocks)(function (node) {
-              return syncBlockStore.isSyncBlock(node);
-            }, tr, state),
-            _added = _trackSyncBlocks4.added;
-          var sourceSyncBlockNodes = _added.filter(function (nodeInfo) {
-            return nodeInfo.node && syncBlockStore.sourceManager.isSourceBlock(nodeInfo.node);
-          });
-          var referenceSyncBlockNodes = _added.filter(function (nodeInfo) {
-            return nodeInfo.node && syncBlockStore.referenceManager.isReferenceBlock(nodeInfo.node);
-          });
-          sourceSyncBlockNodes.forEach(function (nodeInfo) {
-            var _nodeInfo$attrs2;
-            if ((_nodeInfo$attrs2 = nodeInfo.attrs) !== null && _nodeInfo$attrs2 !== void 0 && _nodeInfo$attrs2.resourceId && nodeInfo.node) {
-              syncBlockStore.sourceManager.updateSyncBlockData(nodeInfo.node, tr.getMeta('isRemote'));
-            }
-          });
 
-          // Fetch statuses for remotely-added source sync blocks
-          // so we can identify unpublished blocks on cancel
-          if (sourceSyncBlockNodes.length > 0 && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_10')) {
-            syncBlockStore.sourceManager.fetchAndCacheStatuses();
+      // if doc changed and it's a remote transaction, check if any synced block were added,
+      // and if so, for source synced blocks, ensure we update the cache with them
+      // and for reference synced blocks, ensure we fetch the data from the server
+      if (tr.docChanged && tr.getMeta('isRemote')) {
+        var _trackSyncBlocks4 = (0, _trackSyncBlocks7.trackSyncBlocks)(function (node) {
+            return syncBlockStore.isSyncBlock(node);
+          }, tr, state),
+          _added = _trackSyncBlocks4.added;
+        var sourceSyncBlockNodes = _added.filter(function (nodeInfo) {
+          return nodeInfo.node && syncBlockStore.sourceManager.isSourceBlock(nodeInfo.node);
+        });
+        var referenceSyncBlockNodes = _added.filter(function (nodeInfo) {
+          return nodeInfo.node && syncBlockStore.referenceManager.isReferenceBlock(nodeInfo.node);
+        });
+        sourceSyncBlockNodes.forEach(function (nodeInfo) {
+          var _nodeInfo$attrs2;
+          if ((_nodeInfo$attrs2 = nodeInfo.attrs) !== null && _nodeInfo$attrs2 !== void 0 && _nodeInfo$attrs2.resourceId && nodeInfo.node) {
+            syncBlockStore.sourceManager.updateSyncBlockData(nodeInfo.node, tr.getMeta('isRemote'));
           }
-          var syncBlockNodes = referenceSyncBlockNodes.map(function (nodeInfo) {
-            return nodeInfo.node;
-          }).filter(function (node) {
-            return node !== undefined;
-          });
-          syncBlockStore.referenceManager.fetchSyncBlocksData((0, _editorSyncedBlockProvider.convertPMNodesToSyncBlockNodes)(syncBlockNodes));
+        });
+
+        // Fetch statuses for remotely-added source sync blocks
+        // so we can identify unpublished blocks on cancel
+        if (sourceSyncBlockNodes.length > 0) {
+          syncBlockStore.sourceManager.fetchAndCacheStatuses();
         }
+        var syncBlockNodes = referenceSyncBlockNodes.map(function (nodeInfo) {
+          return nodeInfo.node;
+        }).filter(function (node) {
+          return node !== undefined;
+        });
+        syncBlockStore.referenceManager.fetchSyncBlocksData((0, _editorSyncedBlockProvider.convertPMNodesToSyncBlockNodes)(syncBlockNodes));
       }
       if (!tr.docChanged || Boolean(tr.getMeta('isRemote')) || !isOffline && isConfirmedSyncBlockDeletion) {
         return true;
@@ -785,26 +780,25 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
         }
       }
       var viewMode = api === null || api === void 0 || (_api$editorViewMode5 = api.editorViewMode) === null || _api$editorViewMode5 === void 0 || (_api$editorViewMode5 = _api$editorViewMode5.sharedState.currentState()) === null || _api$editorViewMode5 === void 0 ? void 0 : _api$editorViewMode5.mode;
-      if (viewMode === 'view' && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_8')) {
+      if (viewMode === 'view') {
         return null;
       }
 
-      // Update source sync block cache for user-initiated changes only
-      // When fg is ON, cache updates are handled here instead of in the nodeview update()
-      if ((0, _platformFeatureFlags.fg)('platform_synced_block_update_refactor')) {
-        var isUserChange = function isUserChange(tr) {
-          return tr.docChanged && !(0, _collab.isDirtyTransaction)(tr) && !tr.getMeta('isRemote');
-        };
-        var hasSourceBlockEdit = trs.some(function (tr) {
-          return isUserChange(tr) && (0, _trackSyncBlocks7.hasEditInSyncBlock)(tr, oldState);
+      // Update source sync block cache for user-initiated changes only.
+      // Cache updates are handled here instead of in the nodeview update() so we
+      // can filter out non-user changes (remote collab, dirty programmatic txns).
+      var isUserChange = function isUserChange(tr) {
+        return tr.docChanged && !(0, _collab.isDirtyTransaction)(tr) && !tr.getMeta('isRemote');
+      };
+      var hasSourceBlockEdit = trs.some(function (tr) {
+        return isUserChange(tr) && (0, _trackSyncBlocks7.hasEditInSyncBlock)(tr, oldState);
+      });
+      if (hasSourceBlockEdit) {
+        newState.doc.forEach(function (node) {
+          if (syncBlockStore.sourceManager.isSourceBlock(node)) {
+            syncBlockStore.sourceManager.updateSyncBlockData(node, false);
+          }
         });
-        if (hasSourceBlockEdit) {
-          newState.doc.forEach(function (node) {
-            if (syncBlockStore.sourceManager.isSourceBlock(node)) {
-              syncBlockStore.sourceManager.updateSyncBlockData(node, false);
-            }
-          });
-        }
       }
       trs.filter(function (tr) {
         return tr.docChanged;
@@ -855,7 +849,7 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pmPlugi
       }
       if (trs.some(function (tr) {
         return tr.docChanged && !tr.getMeta('isRemote');
-      }) && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_8')) {
+      })) {
         // Quick check: only walk the full document when at least one
         // transaction inserted a source synced block. This avoids an
         // expensive descendants() traversal on every local edit.

package/dist/cjs/pm-plugins/menu-and-toolbar-experiences.js

@@ -11,7 +11,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _experiences = require("@atlaskit/editor-common/experiences");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _types = require("../types");
 var _main = require("./main");
@@ -19,7 +18,6 @@ var TIMEOUT_DURATION = 30000;
 var pluginKey = new _state.PluginKey('syncedBlockMenuAndToolbarExperience');
 var SYNCED_BLOCK_BUTTON_TEST_IDS = Object.values(_types.SYNCED_BLOCK_BUTTON_TEST_ID);
 var syncedBlockButtonIds = new Set(SYNCED_BLOCK_BUTTON_TEST_IDS);
-var targetEl;
 var getMenuAndToolbarExperiencesPlugin = exports.getMenuAndToolbarExperiencesPlugin = function getMenuAndToolbarExperiencesPlugin(_ref) {
   var refs = _ref.refs,
     dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent;
@@ -146,7 +144,7 @@ var getMenuAndToolbarExperiencesPlugin = exports.getMenuAndToolbarExperiencesPlu
           if (!typeaheadPopup || !(typeaheadPopup instanceof HTMLElement)) {
             return;
           }
-          var targetElement = (0, _platformFeatureFlags.fg)('platform_synced_block_fix_experience_tracking') ? typeaheadPopup.querySelector('[role="option"][aria-selected="true"]') : typeaheadPopup.querySelector('[role="option"]');
+          var targetElement = typeaheadPopup.querySelector('[role="option"][aria-selected="true"]');
           if (!targetElement || !(targetElement instanceof HTMLElement)) {
             return;
           }
@@ -303,16 +301,6 @@ var handleButtonClick = function handleButtonClick(_ref2) {
 var isEnterKey = function isEnterKey(key) {
   return key === 'Enter';
 };
-var getTarget = function getTarget(containerElement) {
-  if (!targetEl) {
-    var element = containerElement === null || containerElement === void 0 ? void 0 : containerElement.querySelector('.ProseMirror');
-    if (!element || !(element instanceof HTMLElement)) {
-      return null;
-    }
-    targetEl = element;
-  }
-  return targetEl;
-};
 var syncedBlockAddedToDomCheck = function syncedBlockAddedToDomCheck(refs, editorViewRef) {
   return new _experiences.ExperienceCheckDomMutation({
     onDomMutation: function onDomMutation(_ref3) {
@@ -327,17 +315,20 @@ var syncedBlockAddedToDomCheck = function syncedBlockAddedToDomCheck(refs, edito
     observeConfig: function observeConfig() {
       var _editorViewRef$curren2;
       return [{
-        target: (0, _platformFeatureFlags.fg)('platform_synced_block_fix_experience_tracking') ? editorViewRef === null || editorViewRef === void 0 || (_editorViewRef$curren2 = editorViewRef.current) === null || _editorViewRef$curren2 === void 0 ? void 0 : _editorViewRef$curren2.dom : getTarget(refs.containerElement),
+        target: editorViewRef === null || editorViewRef === void 0 || (_editorViewRef$curren2 = editorViewRef.current) === null || _editorViewRef$curren2 === void 0 ? void 0 : _editorViewRef$curren2.dom,
         options: {
           childList: true
         }
-      }].concat((0, _toConsumableArray2.default)((0, _platformFeatureFlags.fg)('platform_synced_block_fix_experience_tracking') ? [{
+      },
+      // When wrapping a node with breakout mark with sync block, breakout dom is reused
+      // hence we need to observe subtree to catch sync block mutation
+      {
         target: (0, _experiences.getSelectionAncestorDOM)(editorViewRef === null || editorViewRef === void 0 ? void 0 : editorViewRef.current),
         options: {
           childList: true,
           subtree: true
         }
-      }] : []));
+      }];
     }
   });
 };
@@ -363,17 +354,17 @@ var referenceSyncBlockRemovedFromDomCheck = function referenceSyncBlockRemovedFr
     observeConfig: function observeConfig() {
       var _editorViewRef$curren3;
       return [{
-        target: (0, _platformFeatureFlags.fg)('platform_synced_block_fix_experience_tracking') ? editorViewRef === null || editorViewRef === void 0 || (_editorViewRef$curren3 = editorViewRef.current) === null || _editorViewRef$curren3 === void 0 ? void 0 : _editorViewRef$curren3.dom : getTarget(refs.containerElement),
+        target: editorViewRef === null || editorViewRef === void 0 || (_editorViewRef$curren3 = editorViewRef.current) === null || _editorViewRef$curren3 === void 0 ? void 0 : _editorViewRef$curren3.dom,
         options: {
           childList: true
         }
-      }].concat((0, _toConsumableArray2.default)((0, _platformFeatureFlags.fg)('platform_synced_block_fix_experience_tracking') ? [{
+      }, {
         target: (0, _experiences.getSelectionAncestorDOM)(editorViewRef === null || editorViewRef === void 0 ? void 0 : editorViewRef.current),
         options: {
           childList: true,
           subtree: true
         }
-      }] : []));
+      }];
     }
   });
 };

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

@@ -8,7 +8,6 @@ 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 _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.
@@ -102,9 +101,7 @@ var _fragmentContainsExtension = function fragmentContainsExtension(fragment) {
     if (found) {
       return;
     }
-    if ((0, _experiments.editorExperiment)('platform_synced_block_patch_6', true, {
-      exposure: true
-    }) ? EXTENSION_NODES.has(node.type.name) : node.type.name === 'inlineExtension') {
+    if (EXTENSION_NODES.has(node.type.name)) {
       found = true;
     } else if (node.content.size) {
       if (_fragmentContainsExtension(node.content)) {
@@ -165,17 +162,13 @@ var wasExtensionInsertedInBodiedSyncBlock = exports.wasExtensionInsertedInBodied
     if (resourceId !== undefined) {
       return false;
     }
-    if ((0, _experiments.editorExperiment)('platform_synced_block_patch_6', true, {
-      exposure: true
-    }) ? EXTENSION_NODES.has(node.type.name) : node.type.name === 'inlineExtension') {
+    if (EXTENSION_NODES.has(node.type.name)) {
       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 || ((0, _experiments.editorExperiment)('platform_synced_block_patch_6', true, {
-          exposure: true
-        }) ? EXTENSION_NODES.has(nodeBefore.type.name) : nodeBefore.type.name !== 'inlineExtension')) {
+        if (!nodeBefore || EXTENSION_NODES.has(nodeBefore.type.name)) {
           resourceId = _parent.node.attrs.resourceId;
           return false;
         }

package/dist/cjs/syncedBlockPlugin.js

@@ -11,10 +11,8 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _editorActions = require("./editor-actions");
 var _editorCommands = require("./editor-commands");
-var _bodiedSyncBlockNodeWithToDOMFixed = require("./nodeviews/bodiedSyncBlockNodeWithToDOMFixed");
 var _main = require("./pm-plugins/main");
 var _menuAndToolbarExperiences = require("./pm-plugins/menu-and-toolbar-experiences");
 var _blockMenuComponents = require("./ui/block-menu-components");
@@ -82,11 +80,7 @@ var syncedBlockPlugin = exports.syncedBlockPlugin = function syncedBlockPlugin(_
         node: _adfSchema.syncBlock
       }, {
         name: 'bodiedSyncBlock',
-        node: !(0, _experiments.editorExperiment)('platform_synced_block_patch_6', true, {
-          exposure: true
-        }) ?
-        // delete bodiedSyncBlockNodeWithToDOMFixed when cleaning up platform_synced_block_patch_6
-        (0, _bodiedSyncBlockNodeWithToDOMFixed.bodiedSyncBlockNodeWithToDOMFixed)() : _adfSchema.bodiedSyncBlock
+        node: _adfSchema.bodiedSyncBlock
       }];
     },
     pmPlugins: function pmPlugins() {

package/dist/cjs/ui/CreateSyncedBlockDropdownItem.js

@@ -18,8 +18,14 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _utils = require("../pm-plugins/utils/utils");
 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); }
-var CreateSyncedBlockDropdownItem = function CreateSyncedBlockDropdownItem(_ref) {
-  var api = _ref.api;
+var SyncedBlockNewLozenge = function SyncedBlockNewLozenge(_ref) {
+  var label = _ref.label;
+  return /*#__PURE__*/_react.default.createElement(_lozenge.default, {
+    appearance: (0, _platformFeatureFlags.fg)('confluence_fronend_labels_categorization_migration') ? 'discovery' : 'new'
+  }, label);
+};
+var CreateSyncedBlockDropdownItem = function CreateSyncedBlockDropdownItem(_ref2) {
+  var api = _ref2.api;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['selection', 'blockControls', 'connectivity'], function (states) {
@@ -48,6 +54,9 @@ var CreateSyncedBlockDropdownItem = function CreateSyncedBlockDropdownItem(_ref)
     }));
   };
   var isOffline = (0, _editorPluginConnectivity.isOfflineMode)(mode);
+  var lozenge = /*#__PURE__*/_react.default.createElement(SyncedBlockNewLozenge, {
+    label: formatMessage(_messages.blockMenuMessages.newLozenge)
+  });
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.SyncBlocksIcon, {
       label: "",
@@ -56,13 +65,12 @@ var CreateSyncedBlockDropdownItem = function CreateSyncedBlockDropdownItem(_ref)
     onClick: onClick,
     isDisabled: isOffline,
     testId: _types.SYNCED_BLOCK_BUTTON_TEST_ID.blockMenuCreate,
-    elemAfter: /*#__PURE__*/_react.default.createElement(_lozenge.default, {
-      appearance: (0, _platformFeatureFlags.fg)('confluence_fronend_labels_categorization_migration') ? 'discovery' : 'new'
-    }, formatMessage(_messages.blockMenuMessages.newLozenge))
+    elemAfter: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_12') ? undefined : lozenge,
+    elemAfterText: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_12') ? lozenge : undefined
   }, formatMessage(_messages.blockMenuMessages.syncBlock));
 };
-var CopySyncedBlockDropdownItem = function CopySyncedBlockDropdownItem(_ref2) {
-  var api = _ref2.api;
+var CopySyncedBlockDropdownItem = function CopySyncedBlockDropdownItem(_ref3) {
+  var api = _ref3.api;
   var _useIntl2 = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl2.formatMessage;
   var _useSharedPluginState2 = (0, _hooks.useSharedPluginStateWithSelector)(api, ['connectivity'], function (states) {
@@ -79,6 +87,9 @@ var CopySyncedBlockDropdownItem = function CopySyncedBlockDropdownItem(_ref2) {
       closeMenu: true
     }));
   };
+  var lozenge = /*#__PURE__*/_react.default.createElement(SyncedBlockNewLozenge, {
+    label: formatMessage(_messages.blockMenuMessages.newLozenge)
+  });
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.SyncBlocksIcon, {
       label: "",
@@ -86,14 +97,13 @@ var CopySyncedBlockDropdownItem = function CopySyncedBlockDropdownItem(_ref2) {
     }),
     onClick: onClick,
     isDisabled: (0, _editorPluginConnectivity.isOfflineMode)(mode),
-    elemAfter: /*#__PURE__*/_react.default.createElement(_lozenge.default, {
-      appearance: (0, _platformFeatureFlags.fg)('confluence_fronend_labels_categorization_migration') ? 'discovery' : 'new'
-    }, formatMessage(_messages.blockMenuMessages.newLozenge))
+    elemAfter: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_12') ? undefined : lozenge,
+    elemAfterText: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_12') ? lozenge : undefined
   }, formatMessage(_messages.blockMenuMessages.copySyncedBlock));
 };
-var CreateOrCopySyncedBlockDropdownItem = exports.CreateOrCopySyncedBlockDropdownItem = function CreateOrCopySyncedBlockDropdownItem(_ref3) {
-  var api = _ref3.api,
-    enableSourceSyncedBlockCreation = _ref3.enableSourceSyncedBlockCreation;
+var CreateOrCopySyncedBlockDropdownItem = exports.CreateOrCopySyncedBlockDropdownItem = function CreateOrCopySyncedBlockDropdownItem(_ref4) {
+  var api = _ref4.api,
+    enableSourceSyncedBlockCreation = _ref4.enableSourceSyncedBlockCreation;
   var _useSharedPluginState3 = (0, _hooks.useSharedPluginStateWithSelector)(api, ['blockControls'], function (states) {
       var _states$blockControls3, _states$blockControls4;
       return {