@atlaskit/editor-plugin-synced-block 8.3.3 → 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,13 @@
 # @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

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/DeleteConfirmationModal.js

@@ -20,36 +20,12 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
 var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _spinner = _interopRequireDefault(require("@atlaskit/spinner"));
 var _main = require("../pm-plugins/main");
 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 modalContentMapOld = {
-  'source-block-deleted': {
-    titleMultiple: _messages.syncBlockMessages.deleteConfirmationModalTitleMultiple,
-    titleSingle: _messages.syncBlockMessages.deletionConfirmationModalTitleSingle,
-    descriptionSingle: _messages.syncBlockMessages.deletionConfirmationModalDescriptionNoRef,
-    descriptionMultiple: _messages.syncBlockMessages.deletionConfirmationModalDescription,
-    confirmButtonLabel: _messages.syncBlockMessages.deleteConfirmationModalDeleteButton
-  },
-  'source-block-unpublished': {
-    titleMultiple: _messages.syncBlockMessages.deleteConfirmationModalTitleMultiple,
-    titleSingle: _messages.syncBlockMessages.deletionConfirmationModalTitleSingle,
-    descriptionSingle: _messages.syncBlockMessages.deletionConfirmationModalDescriptionNoRef,
-    descriptionMultiple: _messages.syncBlockMessages.deletionConfirmationModalDescription,
-    confirmButtonLabel: _messages.syncBlockMessages.deleteConfirmationModalDeleteButton
-  },
-  'source-block-unsynced': {
-    titleMultiple: _messages.syncBlockMessages.unsyncConfirmationModalTitle,
-    titleSingle: _messages.syncBlockMessages.unsyncConfirmationModalTitle,
-    descriptionSingle: _messages.syncBlockMessages.unsyncConfirmModalDescriptionSingle,
-    descriptionMultiple: _messages.syncBlockMessages.unsyncConfirmModalDescriptionMultiple,
-    confirmButtonLabel: _messages.syncBlockMessages.deleteConfirmationModalUnsyncButton
-  }
-};
 var modalContentMap = {
   'source-block-deleted': {
     titleMultiple: _messages.syncBlockMessages.deleteConfirmationModalTitleMultiple,
@@ -111,10 +87,9 @@ var DeleteConfirmationModal = exports.DeleteConfirmationModal = function DeleteC
     formatMessage = _useIntl.formatMessage;
   var resolverRef = _react.default.useRef(undefined);
 
-  // When platform_synced_block_patch_9 is on and a source block with no references is deleted,
-  // the modal is never shown but onDeleteCompleted still sets bodiedSyncBlockDeletionStatus to
-  // 'completed'. This ref signals the useEffect to silently reset the status without trying to
-  // close the modal (which was never open).
+  // When a source block with no references is deleted, the modal is never shown but
+  // onDeleteCompleted still sets bodiedSyncBlockDeletionStatus to 'completed'. This ref signals
+  // the useEffect to silently reset the status without trying to close the modal (which was never open).
   var skipModalOnCompletedRef = _react.default.useRef(false);
   var handleClick = (0, _react.useCallback)(function (confirm) {
     return function () {
@@ -206,24 +181,20 @@ var DeleteConfirmationModal = exports.DeleteConfirmationModal = function DeleteC
       return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            if (!(0, _platformFeatureFlags.fg)('platform_synced_block_patch_9')) {
-              _context3.next = 15;
-              break;
-            }
-            _context3.prev = 1;
-            _context3.next = 4;
+            _context3.prev = 0;
+            _context3.next = 3;
             return fetchReferenceCountRef.current(syncBlockIds);
-          case 4:
+          case 3:
             count = _context3.sent;
-            _context3.next = 10;
+            _context3.next = 9;
             break;
-          case 7:
-            _context3.prev = 7;
-            _context3.t0 = _context3["catch"](1);
+          case 6:
+            _context3.prev = 6;
+            _context3.t0 = _context3["catch"](0);
             count = 1;
-          case 10:
+          case 9:
             if (!(count === 0)) {
-              _context3.next = 14;
+              _context3.next = 13;
               break;
             }
             // No references — auto-confirm without showing the modal.
@@ -240,9 +211,8 @@ var DeleteConfirmationModal = exports.DeleteConfirmationModal = function DeleteC
               } : {}));
             });
             return _context3.abrupt("return", true);
-          case 14:
+          case 13:
             setReferenceCount(count);
-          case 15:
             setIsOpen(true);
             setSyncBlockIds(syncBlockIds);
             if (deleteReason) {
@@ -261,11 +231,11 @@ var DeleteConfirmationModal = exports.DeleteConfirmationModal = function DeleteC
               });
             }
             return _context3.abrupt("return", confirmedPromise);
-          case 21:
+          case 20:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[1, 7]]);
+      }, _callee3, null, [[0, 6]]);
     }));
     return function (_x3, _x4) {
       return _ref5.apply(this, arguments);
@@ -282,7 +252,7 @@ var DeleteConfirmationModal = exports.DeleteConfirmationModal = function DeleteC
     };
   }, [syncBlockStoreManager, confirmationCallback]);
   (0, _react.useEffect)(function () {
-    if (skipModalOnCompletedRef.current && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_9')) {
+    if (skipModalOnCompletedRef.current) {
       if (bodiedSyncBlockDeletionStatus === 'completed') {
         var _api$core6;
         // Deletion was auto-confirmed without showing the modal (no references).
@@ -317,44 +287,10 @@ var DeleteConfirmationModal = exports.DeleteConfirmationModal = function DeleteC
       });
     }
   }, [api === null || api === void 0 || (_api$core8 = api.core) === null || _api$core8 === void 0 ? void 0 : _api$core8.actions, bodiedSyncBlockDeletionStatus, isOpen]);
-  (0, _react.useEffect)(function () {
-    // When the flag is off, fetch references after the modal opens (original behaviour).
-    // When the flag is on, references are fetched and set before the modal opens in
-    // confirmationCallback, so this useEffect is skipped to avoid a duplicate fetch.
-    if (isOpen && syncBlockIds !== undefined && !(0, _platformFeatureFlags.fg)('platform_synced_block_patch_9')) {
-      var fetchReferences = /*#__PURE__*/function () {
-        var _ref0 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
-          var totalCount;
-          return _regenerator.default.wrap(function _callee4$(_context4) {
-            while (1) switch (_context4.prev = _context4.next) {
-              case 0:
-                _context4.prev = 0;
-                _context4.next = 3;
-                return fetchReferenceCountRef.current(syncBlockIds);
-              case 3:
-                totalCount = _context4.sent;
-                setReferenceCount(totalCount);
-                _context4.next = 10;
-                break;
-              case 7:
-                _context4.prev = 7;
-                _context4.t0 = _context4["catch"](0);
-                setReferenceCount(0);
-              case 10:
-              case "end":
-                return _context4.stop();
-            }
-          }, _callee4, null, [[0, 7]]);
-        }));
-        return function fetchReferences() {
-          return _ref0.apply(this, arguments);
-        };
-      }();
 
-      // eslint-disable-next-line @atlassian/perf-linting/no-chain-state-updates -- Ignored via go/ees017 (to be fixed)
-      fetchReferences();
-    }
-  }, [isOpen, syncBlockIds]);
+  // References are fetched and set before the modal opens in
+  // confirmationCallback, so no additional fetch is needed here.
+
   return /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTransition, null, isOpen && /*#__PURE__*/_react.default.createElement(_modalDialog.default, {
     onClose: handleClick(false),
     testId: "sync-block-delete-confirmation",
@@ -364,7 +300,7 @@ var DeleteConfirmationModal = exports.DeleteConfirmationModal = function DeleteC
   }, /*#__PURE__*/_react.default.createElement(_spinner.default, {
     size: "large"
   })) : /*#__PURE__*/_react.default.createElement(ModalContent, {
-    content: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_8') ? modalContentMap[deleteReason] : modalContentMapOld[deleteReason],
+    content: modalContentMap[deleteReason],
     referenceCount: referenceCount,
     handleClick: handleClick,
     formatMessage: formatMessage,
@@ -374,15 +310,15 @@ var DeleteConfirmationModal = exports.DeleteConfirmationModal = function DeleteC
     sourceCount: (syncBlockIds === null || syncBlockIds === void 0 ? void 0 : syncBlockIds.length) || 0
   }))));
 };
-var ModalContent = function ModalContent(_ref1) {
-  var content = _ref1.content,
-    referenceCount = _ref1.referenceCount,
-    handleClick = _ref1.handleClick,
-    formatMessage = _ref1.formatMessage,
-    isDeleting = _ref1.isDeleting,
-    isDisabled = _ref1.isDisabled,
-    deleteReason = _ref1.deleteReason,
-    sourceCount = _ref1.sourceCount;
+var ModalContent = function ModalContent(_ref0) {
+  var content = _ref0.content,
+    referenceCount = _ref0.referenceCount,
+    handleClick = _ref0.handleClick,
+    formatMessage = _ref0.formatMessage,
+    isDeleting = _ref0.isDeleting,
+    isDisabled = _ref0.isDisabled,
+    deleteReason = _ref0.deleteReason,
+    sourceCount = _ref0.sourceCount;
   var titleMultiple = content.titleMultiple,
     titleSingle = content.titleSingle,
     descriptionSingle = content.descriptionSingle,