@atlaskit/editor-plugin-block-controls 20.0.0 → 20.0.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 20.0.2
+
+### Patch Changes
+
+- [`4acfc5de0ce75`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4acfc5de0ce75) -
+  Stop registering the `firstNodeDec` ProseMirror plugin when
+  the`platform_editor_block_control_migration` experiment is enabled. It is no longer needed after
+  migration, and causing issues with diffing margins.
+- Updated dependencies
+
+## 20.0.1
+
+### Patch Changes
+
+- [`8d37dc7e55d62`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8d37dc7e55d62) -
+  Clean up shipped experiment `platform_editor_block_menu`
+- Updated dependencies
+
 ## 20.0.0
 
 ### Patch Changes

package/dist/cjs/blockControlsPlugin.js

@@ -15,8 +15,8 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _handleKeyDownWithPreservedSelection = require("./editor-commands/handle-key-down-with-preserved-selection");
 var _mapPreservedSelection2 = require("./editor-commands/map-preserved-selection");
 var _moveNode = require("./editor-commands/move-node");
@@ -153,15 +153,17 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
           }
         });
       }
-      if ((0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
-        pmPlugins.push({
-          name: 'blockControlsSelectionPreservationPlugin',
-          plugin: (0, _pmPlugin2.createSelectionPreservationPlugin)(api)
-        });
-      }
+      pmPlugins.push({
+        name: 'blockControlsSelectionPreservationPlugin',
+        plugin: (0, _pmPlugin2.createSelectionPreservationPlugin)(api)
+      });
 
       // platform_editor_controls note: quick insert rendering fixes
-      if ((0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(api === null || api === void 0 ? void 0 : api.toolbar))) {
+      //
+      // Not registered under the registry migration: the decoration puts an inline
+      // `margin-top: 0` on the first document node, which fights features that render their own
+      // content above it — a leading show-diff widget is left flush against the node below.
+      if ((0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) && legacyBlockControlsEnabled) {
         pmPlugins.push({
           name: 'firstNodeDec',
           plugin: _firstNodeDecPlugin.firstNodeDecPlugin
@@ -212,9 +214,6 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
         return function (_ref6) {
           var _api$userIntent, _api$blockControls2, _options$anchorName, _api$blockControls3;
           var tr = _ref6.tr;
-          if (!(0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
-            return tr;
-          }
           var currMeta = tr.getMeta(_main.key);
           var currentUserIntent = api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent;
           var isMenuCurrentlyOpen = api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.sharedState.currentState()) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.isMenuOpen;
@@ -425,7 +424,7 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
       }
     },
     getSharedState: function getSharedState(editorState) {
-      var _key$getState$isMenuO, _key$getState, _key$getState$menuTri, _key$getState2, _key$getState$menuTri2, _key$getState3, _key$getState$blockMe, _key$getState4, _key$getState$activeN, _key$getState5, _key$getState$activeD, _key$getState6, _key$getState$isDragg, _key$getState7, _key$getState$isPMDra, _key$getState8, _key$getState$multiSe, _key$getState9, _key$getState$isShift, _key$getState0, _key$getState$lastDra, _key$getState1, _interactionTrackingP, _key$getState$isSelec, _key$getState10;
+      var _key$getState$isMenuO, _key$getState, _key$getState$menuTri, _key$getState2, _key$getState$menuTri2, _key$getState3, _key$getState$blockMe, _key$getState4, _key$getState$activeN, _key$getState5, _key$getState$activeD, _key$getState6, _key$getState$isDragg, _key$getState7, _key$getState$isPMDra, _key$getState8, _key$getState$multiSe, _key$getState9, _key$getState$isShift, _key$getState0, _key$getState$lastDra, _key$getState1, _interactionTrackingP, _key$getState$isSelec, _key$getState10, _selectionPreservatio;
       if (!editorState) {
         return undefined;
       }
@@ -455,10 +454,7 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
         sharedState.rightSideControlsEnabled = rightSideControlsEnabled;
         sharedState.hoverSide = rightSideControlsEnabled ? (_interactionTrackingP4 = _pmPlugin.interactionTrackingPluginKey.getState(editorState)) === null || _interactionTrackingP4 === void 0 ? void 0 : _interactionTrackingP4.hoverSide : undefined;
       }
-      if ((0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
-        var _selectionPreservatio;
-        sharedState.preservedSelection = (_selectionPreservatio = _pluginKey.selectionPreservationPluginKey.getState(editorState)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
-      }
+      sharedState.preservedSelection = (_selectionPreservatio = _pluginKey.selectionPreservationPluginKey.getState(editorState)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
       return sharedState;
     },
     contentComponent: function contentComponent(_ref0) {

package/dist/cjs/editor-commands/move-node-with-block-menu.js

@@ -8,7 +8,6 @@ exports.moveNodeWithBlockMenu = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _types = require("@atlaskit/editor-common/types");
-var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _main = require("../pm-plugins/main");
 var _selection = require("../pm-plugins/utils/selection");
 var _moveNode = require("./move-node");
@@ -30,9 +29,6 @@ var moveNodeWithBlockMenu = exports.moveNodeWithBlockMenu = function moveNodeWit
   return function (_ref) {
     var _api$blockControls$sh;
     var tr = _ref.tr;
-    if (!(0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
-      return tr;
-    }
     var preservedSelection = api === null || api === void 0 || (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.preservedSelection;
     var selection = preservedSelection !== null && preservedSelection !== void 0 ? preservedSelection : tr.selection;
 

package/dist/cjs/editor-commands/move-node.js

@@ -380,7 +380,7 @@ var moveNode = exports.moveNode = function moveNode(api) {
           tr: tr
         });
       }
-      var preservedSelection = (0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true) ? api === null || api === void 0 || (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.preservedSelection : undefined;
+      var preservedSelection = api === null || api === void 0 || (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.preservedSelection;
       if (preservedSelection) {
         var $from = tr.doc.resolve(Math.min(start, preservedSelection.from));
         var expandedRange = $from.blockRange(preservedSelection.$to);
@@ -484,7 +484,7 @@ var moveNode = exports.moveNode = function moveNode(api) {
       }));
       if (
       // when move node via block menu, we need to keep the focus on block menu popup, so don't move focus to editor in this scenario
-      !(inputMethod === _analytics.INPUT_METHOD.BLOCK_MENU && (0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true))) {
+      inputMethod !== _analytics.INPUT_METHOD.BLOCK_MENU) {
         api === null || api === void 0 || api.core.actions.focus();
       }
       var $mappedTo = tr.doc.resolve(mappedTo);

package/dist/cjs/editor-commands/utils/move-node-utils.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.getShouldMoveNode = exports.getPosWhenMoveNodeUp = exports.getPosWhenMoveNodeDown = exports.getNodeBoundsFromSelection = exports.canMoveNodeUpOrDown = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-tables/utils");
-var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _selection = require("../../pm-plugins/utils/selection");
 /**
  * Gets the current node position and bounds from the selection using the preserved selection logic.
@@ -33,7 +32,7 @@ var getNodeBoundsFromSelection = exports.getNodeBoundsFromSelection = function g
   // Special case: if a media node (file) is selected, we need to get the parent mediaGroup
   // This handles the case where clicking on a file creates a NodeSelection of the media node
   // but we want to move the entire mediaGroup that wraps it
-  if (selection instanceof _state.NodeSelection && selection.node.type.name === 'media' && selection.node.attrs.type === 'file' && (0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
+  if (selection instanceof _state.NodeSelection && selection.node.type.name === 'media' && selection.node.attrs.type === 'file') {
     // The media node is wrapped in a mediaGroup, so we need to get the parent position
     var mediaGroupPos = selection.$from.pos - 1;
     var mediaGroupNode = selection.$from.doc.nodeAt(mediaGroupPos);
@@ -58,7 +57,7 @@ var getNodeBoundsFromSelection = exports.getNodeBoundsFromSelection = function g
 var getPosWhenMoveNodeUp = exports.getPosWhenMoveNodeUp = function getPosWhenMoveNodeUp($currentNodePos, currentNodePos) {
   var nodeIndex = $currentNodePos.index();
   var nodeBefore = $currentNodePos.depth > 1 && nodeIndex === 0 ? $currentNodePos.node($currentNodePos.depth) : $currentNodePos.nodeBefore;
-  if ((nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type.name) === 'layoutColumn' && (0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
+  if ((nodeBefore === null || nodeBefore === void 0 ? void 0 : nodeBefore.type.name) === 'layoutColumn') {
     return -1;
   }
   return nodeBefore ? currentNodePos - nodeBefore.nodeSize : -1;
@@ -72,12 +71,10 @@ var getPosWhenMoveNodeDown = exports.getPosWhenMoveNodeDown = function getPosWhe
     return -1;
   }
   var nodeAfter = tr.doc.nodeAt(nodeAfterPos);
-  if ((0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
-    var nodeAtCurrentPos = tr.doc.nodeAt($currentNodePos.pos);
-    // if move empty line down to another empty line, move to the position of the next empty line
-    if ((nodeAtCurrentPos === null || nodeAtCurrentPos === void 0 ? void 0 : nodeAtCurrentPos.content.size) === 0 && nodeAtCurrentPos.type.name !== 'extension' && (nodeAfter === null || nodeAfter === void 0 ? void 0 : nodeAfter.content.size) === 0 && nodeAfter.type.name !== 'extension') {
-      return nodeAfterPos;
-    }
+  var nodeAtCurrentPos = tr.doc.nodeAt($currentNodePos.pos);
+  // if move empty line down to another empty line, move to the position of the next empty line
+  if ((nodeAtCurrentPos === null || nodeAtCurrentPos === void 0 ? void 0 : nodeAtCurrentPos.content.size) === 0 && nodeAtCurrentPos.type.name !== 'extension' && (nodeAfter === null || nodeAfter === void 0 ? void 0 : nodeAfter.content.size) === 0 && nodeAfter.type.name !== 'extension') {
+    return nodeAfterPos;
   }
 
   // if not the last node, move to the end of the next node

package/dist/cjs/pm-plugins/handle-mouse-down.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.handleMouseDown = void 0;
 var _styles = require("@atlaskit/editor-common/styles");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var handleMouseDown = exports.handleMouseDown = function handleMouseDown(api) {
   return function (view, event) {
     if (!(event.target instanceof HTMLElement)) {
@@ -34,7 +33,7 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(api) {
         api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.showDragHandleAt(rootPos, '', (_rootNode$type$name3 = rootNode.type.name) !== null && _rootNode$type$name3 !== void 0 ? _rootNode$type$name3 : '', undefined, rootPos, '', (_rootNode$type$name4 = rootNode.type.name) !== null && _rootNode$type$name4 !== void 0 ? _rootNode$type$name4 : ''));
       }
     } else {
-      var isDragHandle = event.target.closest((0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true) ? _styles.DRAG_HANDLE_SELECTOR : '[data-editor-block-ctrl-drag-handle]') !== null;
+      var isDragHandle = event.target.closest(_styles.DRAG_HANDLE_SELECTOR) !== null;
       api === null || api === void 0 || api.core.actions.execute(function (_ref) {
         var tr = _ref.tr;
         api === null || api === void 0 || api.blockControls.commands.setSelectedViaDragHandle(isDragHandle)({
@@ -44,17 +43,10 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(api) {
          * When block menu is enabled, reset intent back to 'default' as editor-plugin-block-menu sets the user intent to 'blockMenuOpen', and setting here
          * causes flickering as this runs before editor-plugin-block-menu.
          */
-        if ((0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
-          // if target is drag handle, block menu will be opened
-          if (!isDragHandle) {
-            var _api$userIntent;
-            api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || _api$userIntent.commands.setCurrentUserIntent('default')({
-              tr: tr
-            });
-          }
-        } else {
-          var _api$userIntent2;
-          (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 || _api$userIntent2.commands.setCurrentUserIntent(isDragHandle ? 'dragHandleSelected' : 'default')({
+        // if target is drag handle, block menu will be opened
+        if (!isDragHandle) {
+          var _api$userIntent;
+          api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || _api$userIntent.commands.setCurrentUserIntent('default')({
             tr: tr
           });
         }

package/dist/cjs/pm-plugins/handle-mouse-over.js

@@ -127,9 +127,7 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
   }
 
   // If the editor view is not in focus when the block menu is open, do not update the drag handle
-  if (!view.hasFocus() && isMenuOpen && (0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true, {
-    exposure: true
-  })) {
+  if (!view.hasFocus() && isMenuOpen) {
     return false;
   }
 
@@ -279,35 +277,28 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
     var nodeType = isNativeAnchorSupported ? (0, _domAttrName.getTypeNameFromDom)(rootElement) : // Fallback for table nodes: tr has data-prosemirror-node-name but not data-drag-handler-node-type.
     (_rootElement$getAttri2 = rootElement.getAttribute('data-drag-handler-node-type')) !== null && _rootElement$getAttri2 !== void 0 ? _rootElement$getAttri2 : (0, _domAttrName.getTypeNameFromDom)(rootElement);
     if (nodeType) {
+      var _api$userIntent2;
       // platform_editor_controls note: enables quick insert
       if (toolbarFlagsEnabled) {
-        if ((0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
-          var _selectionPreservatio;
-          var preservedSelection = (_selectionPreservatio = _pluginKey.selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
-          var selection = preservedSelection || view.state.selection;
-          var isMultipleSelected = selection && (0, _selection.isMultiBlockSelection)(selection);
+        var _selectionPreservatio;
+        var preservedSelection = (_selectionPreservatio = _pluginKey.selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
+        var selection = preservedSelection || view.state.selection;
+        var isMultipleSelected = selection && (0, _selection.isMultiBlockSelection)(selection);
 
-          // Only execute when selection is not a multi-selection, block menu is open, and menu is opened via keyboard
-          // as when it is a multi-selection, the showDragHandleAt command interfere with selection
-          // sometimes makes the multi-selection not continous after block menu is opened with keyboard
-          if (!(isMultipleSelected && isMenuOpen && blockMenuOptions !== null && blockMenuOptions !== void 0 && blockMenuOptions.openedViaKeyboard)) {
-            var _api$core, _api$blockControls3;
-            api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.showDragHandleAt(targetPos, anchorName, nodeType, undefined, rootPos !== null && rootPos !== void 0 ? rootPos : targetPos, rootAnchorName !== null && rootAnchorName !== void 0 ? rootAnchorName : anchorName, rootNodeType !== null && rootNodeType !== void 0 ? rootNodeType : nodeType));
-          }
-        } else {
-          var _api$core2, _api$blockControls4;
-          api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.commands.showDragHandleAt(targetPos, anchorName, nodeType, undefined, rootPos !== null && rootPos !== void 0 ? rootPos : targetPos, rootAnchorName !== null && rootAnchorName !== void 0 ? rootAnchorName : anchorName, rootNodeType !== null && rootNodeType !== void 0 ? rootNodeType : nodeType));
+        // Only execute when selection is not a multi-selection, block menu is open, and menu is opened via keyboard
+        // as when it is a multi-selection, the showDragHandleAt command interfere with selection
+        // sometimes makes the multi-selection not continous after block menu is opened with keyboard
+        if (!(isMultipleSelected && isMenuOpen && blockMenuOptions !== null && blockMenuOptions !== void 0 && blockMenuOptions.openedViaKeyboard)) {
+          var _api$core, _api$blockControls3;
+          api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.showDragHandleAt(targetPos, anchorName, nodeType, undefined, rootPos !== null && rootPos !== void 0 ? rootPos : targetPos, rootAnchorName !== null && rootAnchorName !== void 0 ? rootAnchorName : anchorName, rootNodeType !== null && rootNodeType !== void 0 ? rootNodeType : nodeType));
         }
       } else {
-        var _api$core3, _api$blockControls5;
-        api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(api === null || api === void 0 || (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 ? void 0 : _api$blockControls5.commands.showDragHandleAt(targetPos, anchorName, nodeType));
+        var _api$core2, _api$blockControls4;
+        api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.commands.showDragHandleAt(targetPos, anchorName, nodeType));
       }
-      if ((0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
-        var _api$userIntent2;
-        if (isMenuOpen && originalAnchorName && (api === null || api === void 0 || (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 || (_api$userIntent2 = _api$userIntent2.sharedState.currentState()) === null || _api$userIntent2 === void 0 ? void 0 : _api$userIntent2.currentUserIntent) === 'blockMenuOpen') {
-          var _api$core4, _api$blockControls6;
-          api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.execute(api === null || api === void 0 || (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 ? void 0 : _api$blockControls6.commands.toggleBlockMenu());
-        }
+      if (isMenuOpen && originalAnchorName && (api === null || api === void 0 || (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 || (_api$userIntent2 = _api$userIntent2.sharedState.currentState()) === null || _api$userIntent2 === void 0 ? void 0 : _api$userIntent2.currentUserIntent) === 'blockMenuOpen') {
+        var _api$core3, _api$blockControls5;
+        api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(api === null || api === void 0 || (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 ? void 0 : _api$blockControls5.commands.toggleBlockMenu());
       }
     }
   }

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

@@ -388,7 +388,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
         // Which caused the drag handle onClick event not firing, then block menu wouldn't be opened
         // This is caused by the mappedPos.deletedAfter sometimes returning true in webkit browsers even though the active node still exists
         // This is likely a prosemirror and safari integration bug, but to unblock the issue, we are going to use mappedPos.deleted in safari for now
-        if (browser.webkit && (0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
+        if (browser.webkit) {
           _mappedPos = tr.mapping.mapResult(activeNode.pos);
           isActiveNodeDeleted = _mappedPos.deleted;
         } else {
@@ -903,7 +903,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
     // handle - so findHandleDec is always empty. Don't clear activeNode in that case.
     var hasHandleOrViewModeControls = !flags.legacyDragHandleEnabled || isViewMode && rightSideControlsEnabled || (0, _decorationsDragHandle.findHandleDec)(decorations, (_latestActiveNode11 = latestActiveNode) === null || _latestActiveNode11 === void 0 ? void 0 : _latestActiveNode11.pos, (_latestActiveNode12 = latestActiveNode) === null || _latestActiveNode12 === void 0 ? void 0 : _latestActiveNode12.pos).length > 0;
     // Keep the registry surface mounted while its Block Menu owns focus.
-    var keepActiveNodeForOpenBlockMenu = !flags.legacyDragHandleEnabled && isMenuOpen && (0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true);
+    var keepActiveNodeForOpenBlockMenu = !flags.legacyDragHandleEnabled && isMenuOpen;
     newActiveNode = meta !== null && meta !== void 0 && meta.editorBlurred && !keepActiveNodeForOpenBlockMenu || !(meta !== null && meta !== void 0 && meta.activeNode) && !hasHandleOrViewModeControls ? null : latestActiveNode;
   } else {
     var _latestActiveNode13, _latestActiveNode14;
@@ -922,15 +922,11 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
     });
   }
   var isMenuOpenNew = isMenuOpen;
-  if ((0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
-    if (meta !== null && meta !== void 0 && meta.closeMenu) {
-      isMenuOpenNew = false;
-    } else if (meta !== null && meta !== void 0 && meta.toggleMenu) {
-      var isSameAnchor = (meta === null || meta === void 0 ? void 0 : meta.toggleMenu.anchorName) === menuTriggerBy;
-      isMenuOpenNew = menuTriggerBy === undefined || isSameAnchor || !isMenuOpen && !isSameAnchor ? !isMenuOpen : isMenuOpen;
-    }
+  if (meta !== null && meta !== void 0 && meta.closeMenu) {
+    isMenuOpenNew = false;
   } else if (meta !== null && meta !== void 0 && meta.toggleMenu) {
-    isMenuOpenNew = !isMenuOpen;
+    var isSameAnchor = (meta === null || meta === void 0 ? void 0 : meta.toggleMenu.anchorName) === menuTriggerBy;
+    isMenuOpenNew = menuTriggerBy === undefined || isSameAnchor || !isMenuOpen && !isSameAnchor ? !isMenuOpen : isMenuOpen;
   }
   var isSelectedViaDragHandleNew;
   if (flags.toolbarFlagsEnabled) {
@@ -945,13 +941,13 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
     activeDropTargetNode: currentActiveDropTargetNode,
     isDragging: (_meta$isDragging3 = meta === null || meta === void 0 ? void 0 : meta.isDragging) !== null && _meta$isDragging3 !== void 0 ? _meta$isDragging3 : isDragging,
     isMenuOpen: isMenuOpenNew,
-    menuTriggerBy: flags.toolbarFlagsEnabled || (0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true) ? (meta === null || meta === void 0 || (_meta$toggleMenu = meta.toggleMenu) === null || _meta$toggleMenu === void 0 ? void 0 : _meta$toggleMenu.anchorName) || menuTriggerBy : undefined,
+    menuTriggerBy: (meta === null || meta === void 0 || (_meta$toggleMenu = meta.toggleMenu) === null || _meta$toggleMenu === void 0 ? void 0 : _meta$toggleMenu.anchorName) || menuTriggerBy,
     menuTriggerByNode: (meta === null || meta === void 0 || (_meta$toggleMenu2 = meta.toggleMenu) === null || _meta$toggleMenu2 === void 0 ? void 0 : _meta$toggleMenu2.triggerByNode) || menuTriggerByNode,
-    blockMenuOptions: (0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true) ? {
+    blockMenuOptions: {
       canMoveUp: (meta === null || meta === void 0 || (_meta$toggleMenu3 = meta.toggleMenu) === null || _meta$toggleMenu3 === void 0 ? void 0 : _meta$toggleMenu3.moveUp) !== undefined ? meta === null || meta === void 0 || (_meta$toggleMenu4 = meta.toggleMenu) === null || _meta$toggleMenu4 === void 0 ? void 0 : _meta$toggleMenu4.moveUp : blockMenuOptions === null || blockMenuOptions === void 0 ? void 0 : blockMenuOptions.canMoveUp,
       canMoveDown: (meta === null || meta === void 0 || (_meta$toggleMenu5 = meta.toggleMenu) === null || _meta$toggleMenu5 === void 0 ? void 0 : _meta$toggleMenu5.moveDown) !== undefined ? meta === null || meta === void 0 || (_meta$toggleMenu6 = meta.toggleMenu) === null || _meta$toggleMenu6 === void 0 ? void 0 : _meta$toggleMenu6.moveDown : blockMenuOptions === null || blockMenuOptions === void 0 ? void 0 : blockMenuOptions.canMoveDown,
       openedViaKeyboard: (meta === null || meta === void 0 || (_meta$toggleMenu7 = meta.toggleMenu) === null || _meta$toggleMenu7 === void 0 ? void 0 : _meta$toggleMenu7.openedViaKeyboard) !== undefined ? meta === null || meta === void 0 || (_meta$toggleMenu8 = meta.toggleMenu) === null || _meta$toggleMenu8 === void 0 ? void 0 : _meta$toggleMenu8.openedViaKeyboard : blockMenuOptions === null || blockMenuOptions === void 0 ? void 0 : blockMenuOptions.openedViaKeyboard
-    } : undefined,
+    },
     editorHeight: (_meta$editorHeight = meta === null || meta === void 0 ? void 0 : meta.editorHeight) !== null && _meta$editorHeight !== void 0 ? _meta$editorHeight : editorHeight,
     editorWidthLeft: (_meta$editorWidthLeft = meta === null || meta === void 0 ? void 0 : meta.editorWidthLeft) !== null && _meta$editorWidthLeft !== void 0 ? _meta$editorWidthLeft : editorWidthLeft,
     editorWidthRight: (_meta$editorWidthRigh = meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== null && _meta$editorWidthRigh !== void 0 ? _meta$editorWidthRigh : editorWidthRight,
@@ -1196,12 +1192,12 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
             }
           }
           if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1')) {
-            var isDragHandle = event.target.closest((0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true) ? _styles.DRAG_HANDLE_SELECTOR : '[data-editor-block-ctrl-drag-handle="true"]') !== null;
+            var isDragHandle = event.target.closest(_styles.DRAG_HANDLE_SELECTOR) !== null;
             api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(isDragHandle));
           }
           if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.key === 'ArrowDown' || event.key === 'ArrowUp') && (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1')) {
             var _api$blockControls$sh2, _api$blockControls$sh3;
-            var isBlockMenuOpen = (api === null || api === void 0 || (_api$blockControls$sh2 = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh2 === void 0 ? void 0 : _api$blockControls$sh2.isMenuOpen) && (0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true);
+            var isBlockMenuOpen = api === null || api === void 0 || (_api$blockControls$sh2 = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh2 === void 0 ? void 0 : _api$blockControls$sh2.isMenuOpen;
             // when block menu is just open, and we press arrow keys, we want to use the arrow keys to navigate the block menu
             // in this scenario, isSelectedViaDragHandle should not be set to false
             if (api !== null && api !== void 0 && (_api$blockControls$sh3 = api.blockControls.sharedState.currentState()) !== null && _api$blockControls$sh3 !== void 0 && _api$blockControls$sh3.isSelectedViaDragHandle && !isBlockMenuOpen) {

package/dist/cjs/pm-plugins/utils/expand-and-update-selection.js

@@ -6,11 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.expandAndUpdateSelection = void 0;
 var _nodeSelection = require("@atlaskit/editor-common/node-selection");
 var _selection = require("@atlaskit/editor-common/selection");
-var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-tables/utils");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _getSelection = require("./getSelection");
 var _selection2 = require("./selection");
 var isPosWithinRange = function isPosWithinRange(pos, range) {
@@ -64,9 +62,7 @@ var expandAndUpdateSelection = exports.expandAndUpdateSelection = function expan
   if (expandedRange.range && isPosWithinRange(startPos, expandedRange.range) && (0, _selection.isMultiBlockRange)(expandedRange.range)) {
     // Then create a selection from the start of the first node to the end of the last node
     tr.setSelection(_state.TextSelection.create(tr.doc, Math.min(selection.from, expandedRange.$from.pos), Math.max(selection.to, expandedRange.$to.pos)));
-  } else if (
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  (0, _fg.fg)('platform_editor_maui_jira_updates') && ((0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) || (0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true))) {
+  } else if ((0, _fg.fg)('platform_editor_maui_jira_updates')) {
     // Under the gate (and when on the simplified newGetSelection path), use
     // the platform-level composer — same path as open-remix-modal, no drift.
     (0, _nodeSelection.selectNodeAtPos)(tr, startPos, nodeType);

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

@@ -11,7 +11,6 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _utils2 = require("@atlaskit/editor-tables/utils");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var getInlineNodePos = exports.getInlineNodePos = function getInlineNodePos(doc, start, nodeSize) {
   var $startPos = doc.resolve(start);
   // To trigger the annotation floating toolbar for non-selectable node, we need to select inline nodes
@@ -44,45 +43,6 @@ var isNodeWithCodeBlock = exports.isNodeWithCodeBlock = function isNodeWithCodeB
   });
   return hasCodeBlock;
 };
-var isNodeWithMediaOrExtension = function isNodeWithMediaOrExtension(doc, start, nodeSize) {
-  var $startPos = doc.resolve(start);
-  var hasMediaOrExtension = false;
-  doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, function (n) {
-    if (['media', 'extension'].includes(n.type.name)) {
-      hasMediaOrExtension = true;
-    }
-  });
-  return hasMediaOrExtension;
-};
-var oldGetSelection = function oldGetSelection(tr, start) {
-  var node = tr.doc.nodeAt(start);
-  var isNodeSelection = node && _state.NodeSelection.isSelectable(node);
-  var nodeSize = node ? node.nodeSize : 1;
-  var $startPos = tr.doc.resolve(start);
-  var nodeName = node === null || node === void 0 ? void 0 : node.type.name;
-  var isBlockQuoteWithMediaOrExtension = nodeName === 'blockquote' && isNodeWithMediaOrExtension(tr.doc, start, nodeSize);
-  var isListWithMediaOrExtension = nodeName === 'bulletList' && isNodeWithMediaOrExtension(tr.doc, start, nodeSize) || nodeName === 'orderedList' && isNodeWithMediaOrExtension(tr.doc, start, nodeSize);
-  if (isNodeSelection && nodeName !== 'blockquote' || isListWithMediaOrExtension || isBlockQuoteWithMediaOrExtension ||
-  // decisionList/layoutColumn node is not selectable, but we want to select the whole node not just text
-  ['decisionList', 'layoutColumn'].includes(nodeName || '')) {
-    return new _state.NodeSelection($startPos);
-  } else if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
-    var $mediaStartPos = tr.doc.resolve(start + 1);
-    return new _state.NodeSelection($mediaStartPos);
-  } else if (
-  // Even though mediaGroup is not selectable,
-  // we need a quick way to make all child media nodes appear as selected without the need for a custom selection
-  nodeName === 'mediaGroup') {
-    return new _state.NodeSelection($startPos);
-  } else if (nodeName === 'taskList') {
-    return _state.TextSelection.create(tr.doc, start, start + nodeSize);
-  } else {
-    var _getInlineNodePos = getInlineNodePos(tr.doc, start, nodeSize),
-      inlineNodePos = _getInlineNodePos.inlineNodePos,
-      inlineNodeEndPos = _getInlineNodePos.inlineNodeEndPos;
-    return new _state.TextSelection(tr.doc.resolve(inlineNodePos), tr.doc.resolve(inlineNodeEndPos));
-  }
-};
 
 /**
  * Gets the appropriate selection for the node at the given start position.
@@ -93,75 +53,31 @@ var oldGetSelection = function oldGetSelection(tr, start) {
  * @returns The appropriate selection for the node.
  */
 var newGetSelection = exports.newGetSelection = function newGetSelection(doc, selectionEmpty, start) {
-  // Under the gate, delegate to getNodeSelectionForPos only when
-  // platform_editor_block_menu is on — getNodeSelectionForPos matches that
-  // simplified path (NodeSelection for all nodes). When block_menu is off,
-  // fall through to the oldGetSelection branch which handles expand/taskList/
-  // inline nodes correctly with TextSelection.
-  if (
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  (0, _fg.fg)('platform_editor_maui_jira_updates') && (0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
+  if ((0, _fg.fg)('platform_editor_maui_jira_updates')) {
     return (0, _nodeSelection.getNodeSelectionForPos)(doc, start) || false;
   }
   var node = doc.nodeAt(start);
-  var isNodeSelection = node && _state.NodeSelection.isSelectable(node);
-  var nodeSize = node ? node.nodeSize : 1;
   var nodeName = node === null || node === void 0 ? void 0 : node.type.name;
-  if ((0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
-    // if mediaGroup only has a single child, we want to select the child
-    if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
-      var $mediaStartPos = doc.resolve(start + 1);
-      return new _state.NodeSelection($mediaStartPos);
-    }
-    return new _state.NodeSelection(doc.resolve(start));
-  }
-
-  // this is a fix for empty paragraph selection - put first to avoid any extra work
-  if (nodeName === 'paragraph' && selectionEmpty && (node === null || node === void 0 ? void 0 : node.childCount) === 0) {
-    return false;
-  }
-  var isBlockQuoteWithMediaOrExtension = nodeName === 'blockquote' && isNodeWithMediaOrExtension(doc, start, nodeSize);
-  var isListWithMediaOrExtension = nodeName === 'bulletList' && isNodeWithMediaOrExtension(doc, start, nodeSize) || nodeName === 'orderedList' && isNodeWithMediaOrExtension(doc, start, nodeSize);
-  if (isNodeSelection && nodeName !== 'blockquote' || isListWithMediaOrExtension || isBlockQuoteWithMediaOrExtension ||
-  // decisionList/layoutColumn node is not selectable, but we want to select the whole node not just text
-  ['decisionList', 'layoutColumn'].includes(nodeName || '') || nodeName === 'mediaGroup' && typeof (node === null || node === void 0 ? void 0 : node.childCount) === 'number' && (node === null || node === void 0 ? void 0 : node.childCount) > 1) {
-    return new _state.NodeSelection(doc.resolve(start));
-  }
 
   // if mediaGroup only has a single child, we want to select the child
-  if (nodeName === 'mediaGroup') {
-    var _$mediaStartPos = doc.resolve(start + 1);
-    return new _state.NodeSelection(_$mediaStartPos);
-  }
-  if (nodeName === 'taskList') {
-    return _state.TextSelection.create(doc, start, start + nodeSize);
+  if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
+    var $mediaStartPos = doc.resolve(start + 1);
+    return new _state.NodeSelection($mediaStartPos);
   }
-  var _getInlineNodePos2 = getInlineNodePos(doc, start, nodeSize),
-    inlineNodePos = _getInlineNodePos2.inlineNodePos,
-    inlineNodeEndPos = _getInlineNodePos2.inlineNodeEndPos;
-  return new _state.TextSelection(doc.resolve(inlineNodePos), doc.resolve(inlineNodeEndPos));
+  return new _state.NodeSelection(doc.resolve(start));
 };
-var getSelection = exports.getSelection = function getSelection(tr, start, api) {
-  if ((0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) || (0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
-    return newGetSelection(tr.doc, tr.selection.empty, start);
-  }
-  return oldGetSelection(tr, start);
+var getSelection = exports.getSelection = function getSelection(tr, start) {
+  return newGetSelection(tr.doc, tr.selection.empty, start);
 };
 var selectNode = exports.selectNode = function selectNode(tr, start, nodeType, api) {
-  // Only use the platform path when already on the simplified newGetSelection
-  // branch — i.e. when platform_editor_block_menu is on or toolbar flags are
-  // enabled. This preserves oldGetSelection behaviour (e.g. taskList →
-  // TextSelection) in legacy contexts where those flags are off.
-  if (
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  (0, _fg.fg)('platform_editor_maui_jira_updates') && (0, _editorExperiment.editorExperiment)('platform_editor_block_menu', true)) {
+  if ((0, _fg.fg)('platform_editor_maui_jira_updates')) {
     return (0, _nodeSelection.selectNodeAtPos)(tr, start, nodeType);
   }
   if (nodeType === 'table') {
     tr = (0, _utils2.selectTableClosestToPos)(tr, tr.doc.resolve(start + 1));
     return tr;
   }
-  var selection = getSelection(tr, start, api);
+  var selection = getSelection(tr, start);
   if (selection) {
     tr.setSelection(selection);
   }
@@ -186,8 +102,8 @@ var setCursorPositionAtMovedNode = exports.setCursorPositionAtMovedNode = functi
     tr.setSelection(_selection);
     return tr;
   }
-  var _getInlineNodePos3 = getInlineNodePos(tr.doc, start, nodeSize),
-    inlineNodeEndPos = _getInlineNodePos3.inlineNodeEndPos;
+  var _getInlineNodePos = getInlineNodePos(tr.doc, start, nodeSize),
+    inlineNodeEndPos = _getInlineNodePos.inlineNodeEndPos;
   selection = new _state.TextSelection(tr.doc.resolve(inlineNodeEndPos));
   tr.setSelection(selection);
   return tr;