@atlaskit/editor-plugin-block-controls 23.0.3 → 23.0.4

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 23.0.4
+
+### Patch Changes
+
+- [`a4fe8636fa0ec`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a4fe8636fa0ec) -
+  Clean up the fully rolled out `platform_editor_layout_column_menu` experiment and the
+  `platform_editor_layout_column_menu_kill_switch_1` feature gate, retaining their shipped behavior.
+  Consumers must remove any direct `@atlaskit/tmp-editor-statsig` experiment override for
+  `platform_editor_layout_column_menu`.
+- [`618d89a102880`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/618d89a102880) -
+  Clean up experiment `remix_iw_block_menu_table_calc_fix`
+- Updated dependencies
+
 ## 23.0.3
 
 ### Patch Changes

package/dist/cjs/blockControlsPlugin.js

@@ -16,7 +16,6 @@ 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 _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");
@@ -87,7 +86,7 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
           // so that adjacent cells are not fused (e.g. 'hello world' + 'foo' must not
           // become 'hello worldfoo'). Intl.Segmenter word-counting requires correct
           // word boundaries, which raw textContent fusion breaks.
-          if (preservedSelection instanceof _cellSelection.CellSelection && (0, _expValEquals.expValEquals)('remix_iw_block_menu_table_calc_fix', 'isEnabled', true)) {
+          if (preservedSelection instanceof _cellSelection.CellSelection) {
             // Use node(1) to reliably target the table node regardless of $anchorCell depth.
             // node(-1) would return tableRow if $anchorCell is at tableCell depth.
             var tableNode = preservedSelection.$anchorCell.node(1);

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

@@ -250,11 +250,6 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
     } else {
       pos = view.posAtDOM(rootElement, 0);
     }
-    if (parentRootElement && parentRootElement.getAttribute('data-layout-section') === 'true' && parentRootElement.querySelectorAll('[data-layout-column]').length === 1 && (0, _editorExperiment.editorExperiment)('advanced_layouts', true) && !(0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true)) {
-      // Don't show drag handle for layout column in a single column layout,
-      // unless the layout column menu is enabled (menu needs the handle to be accessible).
-      return false;
-    }
     var targetPos = view.state.doc.resolve(pos).pos;
     var rootAnchorName;
     var rootNodeType;

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.handleSparseMouseOver = void 0;
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _decorationsCommon = require("./decorations-common");
 var OPAQUE_BLOCKS = new Set(['table', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'mediaSingle']);
@@ -109,9 +108,6 @@ var handleSparseMouseOver = exports.handleSparseMouseOver = function handleSpars
   if (isPanelNodeTypeName(parentNode.type.name) && !(parentDOM instanceof HTMLElement && parentDOM.classList.contains('ak-editor-panel__no-icon')) && $target.index() === 0) {
     return false;
   }
-  if (node.type.name === 'layoutColumn' && parentNode.type.name === 'layoutSection' && parentNode.childCount === 1 && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('advanced_layouts', 'isEnabled', true) && !(0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true)) {
-    return false;
-  }
   var anchors = controls === null || controls === void 0 ? void 0 : controls.surfaceAnchors;
   var anchorName = (_anchors$get = anchors === null || anchors === void 0 ? void 0 : anchors.get(targetPosition)) !== null && _anchors$get !== void 0 ? _anchors$get : api.core.actions.getAnchorIdForNode(node, targetPosition);
   var rootPos = $target.depth > 0 ? $target.before(1) : targetPosition;

package/dist/cjs/ui/block-controls-surface-drag-handle-utils.js

@@ -1,23 +1,15 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getNodeSpacingForDragPreview = exports.getNodeMarginsForDragPreview = exports.buildLayoutColumnMenuMeta = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _consts = require("./consts");
-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 buildLayoutColumnMenuMeta = exports.buildLayoutColumnMenuMeta = function buildLayoutColumnMenuMeta(anchorPos, openedViaKeyboard) {
-  return _objectSpread(_objectSpread({
-    anchorPos: anchorPos
-  }, (0, _fg.fg)('platform_editor_layout_column_menu_kill_switch_1') ? {
-    isOpen: true
-  } : {}), {}, {
+  return {
+    anchorPos: anchorPos,
     openedViaKeyboard: openedViaKeyboard
-  });
+  };
 };
 var getNodeSpacingForDragPreview = exports.getNodeSpacingForDragPreview = function getNodeSpacingForDragPreview(node) {
   var _spacingBetweenNodesF2;

package/dist/cjs/ui/block-controls-surface-drag-handle.js

@@ -23,7 +23,6 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _dragHandleVertical = _interopRequireDefault(require("@atlaskit/icon/core/drag-handle-vertical"));
 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 _Tooltip = _interopRequireDefault(require("@atlaskit/tooltip/Tooltip"));
 var _pluginKey = require("../pm-plugins/selection-preservation/plugin-key");
 var _collapsedHeading = require("../pm-plugins/utils/collapsed-heading");
@@ -189,7 +188,7 @@ var BlockControlsSurfaceDragHandle = exports.BlockControlsSurfaceDragHandle = fu
       if (startPos === undefined) {
         return tr;
       }
-      if (nodeType === 'layoutColumn' && (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true)) {
+      if (nodeType === 'layoutColumn') {
         tr.setMeta('toggleLayoutColumnMenu', (0, _blockControlsSurfaceDragHandleUtils.buildLayoutColumnMenuMeta)(startPos, openedViaKeyboard));
       }
       var selection = (_selectionPreservatio = (_selectionPreservatio2 = _pluginKey.selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio2 === void 0 ? void 0 : _selectionPreservatio2.preservedSelection) !== null && _selectionPreservatio !== void 0 ? _selectionPreservatio : tr.selection;

package/dist/cjs/ui/drag-handle.js

@@ -333,16 +333,12 @@ var getNodeMargins = function getNodeMargins(node) {
   return _consts2.nodeMargins[nodeTypeName] || _consts2.nodeMargins['default'];
 };
 
-// Kill switch OFF: omit `isOpen` so the reducer toggles per clicked column. ON: keep
-// `isOpen: true` for legacy always-open. Centralised so all dispatch sites stay in sync.
+// Omit `isOpen` so the reducer toggles the menu for a re-clicked layout column.
 var buildToggleLayoutColumnMenuMeta = function buildToggleLayoutColumnMenuMeta(anchorPos, openedViaKeyboard) {
-  return _objectSpread(_objectSpread({
-    anchorPos: anchorPos
-  }, (0, _fg.fg)('platform_editor_layout_column_menu_kill_switch_1') ? {
-    isOpen: true
-  } : {}), {}, {
+  return {
+    anchorPos: anchorPos,
     openedViaKeyboard: openedViaKeyboard
-  });
+  };
 };
 var getDragHandleAnchorReference = function getDragHandleAnchorReference(_ref) {
   var edge = _ref.edge,
@@ -466,7 +462,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
       if (startPos === undefined) {
         return tr;
       }
-      if (nodeType === 'layoutColumn' && (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true)) {
+      if (nodeType === 'layoutColumn') {
         tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, false));
       }
       var resolvedStartPos = tr.doc.resolve(startPos);
@@ -536,7 +532,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
         api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || _api$blockControls3.commands.startPreservingSelection()({
           tr: tr
         });
-        if (nodeType === 'layoutColumn' && (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true)) {
+        if (nodeType === 'layoutColumn') {
           tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, true));
         }
         var triggerByNode = {
@@ -1127,7 +1123,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
       }
     }, renderButton());
   };
-  var tooltipContent = isLayoutColumn && (0, _expValEquals.expValEquals)('platform_editor_layout_column_menu', 'isEnabled', true) && currentUserIntent === 'layoutColumnMenuPopupOpen' ? null : (0, _react2.jsx)(_keymaps.TooltipContentWithMultipleShortcuts, {
+  var tooltipContent = isLayoutColumn && currentUserIntent === 'layoutColumnMenuPopupOpen' ? null : (0, _react2.jsx)(_keymaps.TooltipContentWithMultipleShortcuts, {
     helpDescriptors: helpDescriptors
   });
   return (0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1') ? stickyWithTooltip() : buttonWithTooltip();

package/dist/cjs/ui/should-use-nested-drag-handle-icon.js

@@ -4,16 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.shouldUseNestedDragHandleIcon = void 0;
-var _fg = require("@atlaskit/platform-feature-flags/fg");
-// Nested icon for non-top-level nodes. Exception: with the
-// kill switch OFF, layout columns use the full block handle instead.
-// TODO: EDITOR-7732 - remove this whole function when
-// `platform_editor_layout_column_menu_kill_switch_1` is cleaned up
+// Nested layout columns use the full block handle; other non-top-level nodes use the nested icon.
 var shouldUseNestedDragHandleIcon = exports.shouldUseNestedDragHandleIcon = function shouldUseNestedDragHandleIcon(isTopLevelNode, isLayoutColumn) {
   if (isTopLevelNode) {
     return false;
   }
-  if (isLayoutColumn && !(0, _fg.fg)('platform_editor_layout_column_menu_kill_switch_1')) {
+  if (isLayoutColumn) {
     return false;
   }
   return true;

package/dist/es2019/blockControlsPlugin.js

@@ -7,7 +7,6 @@ import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { handleKeyDownWithPreservedSelection } from './editor-commands/handle-key-down-with-preserved-selection';
 import { mapPreservedSelection } from './editor-commands/map-preserved-selection';
 import { moveNode } from './editor-commands/move-node';
@@ -85,7 +84,7 @@ export const blockControlsPlugin = ({
           // so that adjacent cells are not fused (e.g. 'hello world' + 'foo' must not
           // become 'hello worldfoo'). Intl.Segmenter word-counting requires correct
           // word boundaries, which raw textContent fusion breaks.
-          if (preservedSelection instanceof CellSelection && expValEquals('remix_iw_block_menu_table_calc_fix', 'isEnabled', true)) {
+          if (preservedSelection instanceof CellSelection) {
             // Use node(1) to reliably target the table node regardless of $anchorCell depth.
             // node(-1) would return tableRow if $anchorCell is at tableCell depth.
             const tableNode = preservedSelection.$anchorCell.node(1);

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

@@ -242,11 +242,6 @@ export const handleMouseOver = (view, event, api) => {
     } else {
       pos = view.posAtDOM(rootElement, 0);
     }
-    if (parentRootElement && parentRootElement.getAttribute('data-layout-section') === 'true' && parentRootElement.querySelectorAll('[data-layout-column]').length === 1 && editorExperiment('advanced_layouts', true) && !expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
-      // Don't show drag handle for layout column in a single column layout,
-      // unless the layout column menu is enabled (menu needs the handle to be accessible).
-      return false;
-    }
     const targetPos = view.state.doc.resolve(pos).pos;
     let rootAnchorName;
     let rootNodeType;

package/dist/es2019/pm-plugins/handle-sparse-mouse-over.js

@@ -1,5 +1,4 @@
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { getNodeTypeWithLevel } from './decorations-common';
 const OPAQUE_BLOCKS = new Set(['table', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'mediaSingle']);
@@ -100,9 +99,6 @@ export const handleSparseMouseOver = (view, event, api) => {
   if (isPanelNodeTypeName(parentNode.type.name) && !(parentDOM instanceof HTMLElement && parentDOM.classList.contains('ak-editor-panel__no-icon')) && $target.index() === 0) {
     return false;
   }
-  if (node.type.name === 'layoutColumn' && parentNode.type.name === 'layoutSection' && parentNode.childCount === 1 && expValEqualsNoExposure('advanced_layouts', 'isEnabled', true) && !expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
-    return false;
-  }
   const anchors = controls === null || controls === void 0 ? void 0 : controls.surfaceAnchors;
   const anchorName = (_anchors$get = anchors === null || anchors === void 0 ? void 0 : anchors.get(targetPosition)) !== null && _anchors$get !== void 0 ? _anchors$get : api.core.actions.getAnchorIdForNode(node, targetPosition);
   const rootPos = $target.depth > 0 ? $target.before(1) : targetPosition;

package/dist/es2019/ui/block-controls-surface-drag-handle-utils.js

@@ -1,10 +1,6 @@
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { nodeMargins, spacingBetweenNodesForPreview } from './consts';
 export const buildLayoutColumnMenuMeta = (anchorPos, openedViaKeyboard) => ({
   anchorPos,
-  ...(fg('platform_editor_layout_column_menu_kill_switch_1') ? {
-    isOpen: true
-  } : {}),
   openedViaKeyboard
 });
 export const getNodeSpacingForDragPreview = node => {

package/dist/es2019/ui/block-controls-surface-drag-handle.js

@@ -17,7 +17,6 @@ import { blockControlsMessages } from '@atlaskit/editor-common/messages';
 import DragHandleVerticalIcon from '@atlaskit/icon/core/drag-handle-vertical';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import Tooltip from '@atlaskit/tooltip/Tooltip';
 import { selectionPreservationPluginKey } from '../pm-plugins/selection-preservation/plugin-key';
 import { prepareCollapsedHeadingSelection } from '../pm-plugins/utils/collapsed-heading';
@@ -179,7 +178,7 @@ export const BlockControlsSurfaceDragHandle = ({
       if (startPos === undefined) {
         return tr;
       }
-      if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
+      if (nodeType === 'layoutColumn') {
         tr.setMeta('toggleLayoutColumnMenu', buildLayoutColumnMenuMeta(startPos, openedViaKeyboard));
       }
       const selection = (_selectionPreservatio = (_selectionPreservatio2 = selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio2 === void 0 ? void 0 : _selectionPreservatio2.preservedSelection) !== null && _selectionPreservatio !== void 0 ? _selectionPreservatio : tr.selection;

package/dist/es2019/ui/drag-handle.js

@@ -327,13 +327,9 @@ const getNodeMargins = node => {
   return nodeMargins[nodeTypeName] || nodeMargins['default'];
 };
 
-// Kill switch OFF: omit `isOpen` so the reducer toggles per clicked column. ON: keep
-// `isOpen: true` for legacy always-open. Centralised so all dispatch sites stay in sync.
+// Omit `isOpen` so the reducer toggles the menu for a re-clicked layout column.
 const buildToggleLayoutColumnMenuMeta = (anchorPos, openedViaKeyboard) => ({
   anchorPos,
-  ...(fg('platform_editor_layout_column_menu_kill_switch_1') ? {
-    isOpen: true
-  } : {}),
   openedViaKeyboard
 });
 const getDragHandleAnchorReference = ({
@@ -444,7 +440,7 @@ export const DragHandle = ({
       if (startPos === undefined) {
         return tr;
       }
-      if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
+      if (nodeType === 'layoutColumn') {
         tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, false));
       }
       const resolvedStartPos = tr.doc.resolve(startPos);
@@ -515,7 +511,7 @@ export const DragHandle = ({
         api === null || api === void 0 ? void 0 : (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.startPreservingSelection()({
           tr
         });
-        if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
+        if (nodeType === 'layoutColumn') {
           tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, true));
         }
         const triggerByNode = {
@@ -1106,7 +1102,7 @@ export const DragHandle = ({
       });
     }
   }, renderButton());
-  const tooltipContent = isLayoutColumn && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) && currentUserIntent === 'layoutColumnMenuPopupOpen' ? null : jsx(TooltipContentWithMultipleShortcuts, {
+  const tooltipContent = isLayoutColumn && currentUserIntent === 'layoutColumnMenuPopupOpen' ? null : jsx(TooltipContentWithMultipleShortcuts, {
     helpDescriptors: helpDescriptors
   });
   return editorExperiment('platform_editor_controls', 'variant1') ? stickyWithTooltip() : buttonWithTooltip();

package/dist/es2019/ui/should-use-nested-drag-handle-icon.js

@@ -1,14 +1,9 @@
-import { fg } from '@atlaskit/platform-feature-flags/fg';
-
-// Nested icon for non-top-level nodes. Exception: with the
-// kill switch OFF, layout columns use the full block handle instead.
-// TODO: EDITOR-7732 - remove this whole function when
-// `platform_editor_layout_column_menu_kill_switch_1` is cleaned up
+// Nested layout columns use the full block handle; other non-top-level nodes use the nested icon.
 export const shouldUseNestedDragHandleIcon = (isTopLevelNode, isLayoutColumn) => {
   if (isTopLevelNode) {
     return false;
   }
-  if (isLayoutColumn && !fg('platform_editor_layout_column_menu_kill_switch_1')) {
+  if (isLayoutColumn) {
     return false;
   }
   return true;

package/dist/esm/blockControlsPlugin.js

@@ -11,7 +11,6 @@ import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { handleKeyDownWithPreservedSelection } from './editor-commands/handle-key-down-with-preserved-selection';
 import { mapPreservedSelection as _mapPreservedSelection } from './editor-commands/map-preserved-selection';
 import { moveNode } from './editor-commands/move-node';
@@ -80,7 +79,7 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
           // so that adjacent cells are not fused (e.g. 'hello world' + 'foo' must not
           // become 'hello worldfoo'). Intl.Segmenter word-counting requires correct
           // word boundaries, which raw textContent fusion breaks.
-          if (preservedSelection instanceof CellSelection && expValEquals('remix_iw_block_menu_table_calc_fix', 'isEnabled', true)) {
+          if (preservedSelection instanceof CellSelection) {
             // Use node(1) to reliably target the table node regardless of $anchorCell depth.
             // node(-1) would return tableRow if $anchorCell is at tableCell depth.
             var tableNode = preservedSelection.$anchorCell.node(1);

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

@@ -243,11 +243,6 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
     } else {
       pos = view.posAtDOM(rootElement, 0);
     }
-    if (parentRootElement && parentRootElement.getAttribute('data-layout-section') === 'true' && parentRootElement.querySelectorAll('[data-layout-column]').length === 1 && editorExperiment('advanced_layouts', true) && !expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
-      // Don't show drag handle for layout column in a single column layout,
-      // unless the layout column menu is enabled (menu needs the handle to be accessible).
-      return false;
-    }
     var targetPos = view.state.doc.resolve(pos).pos;
     var rootAnchorName;
     var rootNodeType;

package/dist/esm/pm-plugins/handle-sparse-mouse-over.js

@@ -1,5 +1,4 @@
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { getNodeTypeWithLevel } from './decorations-common';
 var OPAQUE_BLOCKS = new Set(['table', 'bulletList', 'orderedList', 'taskList', 'decisionList', 'mediaSingle']);
@@ -103,9 +102,6 @@ export var handleSparseMouseOver = function handleSparseMouseOver(view, event, a
   if (isPanelNodeTypeName(parentNode.type.name) && !(parentDOM instanceof HTMLElement && parentDOM.classList.contains('ak-editor-panel__no-icon')) && $target.index() === 0) {
     return false;
   }
-  if (node.type.name === 'layoutColumn' && parentNode.type.name === 'layoutSection' && parentNode.childCount === 1 && expValEqualsNoExposure('advanced_layouts', 'isEnabled', true) && !expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
-    return false;
-  }
   var anchors = controls === null || controls === void 0 ? void 0 : controls.surfaceAnchors;
   var anchorName = (_anchors$get = anchors === null || anchors === void 0 ? void 0 : anchors.get(targetPosition)) !== null && _anchors$get !== void 0 ? _anchors$get : api.core.actions.getAnchorIdForNode(node, targetPosition);
   var rootPos = $target.depth > 0 ? $target.before(1) : targetPosition;

package/dist/esm/ui/block-controls-surface-drag-handle-utils.js

@@ -1,16 +1,9 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-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) { _defineProperty(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; }
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { nodeMargins, spacingBetweenNodesForPreview } from './consts';
 export var buildLayoutColumnMenuMeta = function buildLayoutColumnMenuMeta(anchorPos, openedViaKeyboard) {
-  return _objectSpread(_objectSpread({
-    anchorPos: anchorPos
-  }, fg('platform_editor_layout_column_menu_kill_switch_1') ? {
-    isOpen: true
-  } : {}), {}, {
+  return {
+    anchorPos: anchorPos,
     openedViaKeyboard: openedViaKeyboard
-  });
+  };
 };
 export var getNodeSpacingForDragPreview = function getNodeSpacingForDragPreview(node) {
   var _spacingBetweenNodesF2;

package/dist/esm/ui/block-controls-surface-drag-handle.js

@@ -18,7 +18,6 @@ import { blockControlsMessages } from '@atlaskit/editor-common/messages';
 import DragHandleVerticalIcon from '@atlaskit/icon/core/drag-handle-vertical';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import Tooltip from '@atlaskit/tooltip/Tooltip';
 import { selectionPreservationPluginKey } from '../pm-plugins/selection-preservation/plugin-key';
 import { prepareCollapsedHeadingSelection } from '../pm-plugins/utils/collapsed-heading';
@@ -183,7 +182,7 @@ export var BlockControlsSurfaceDragHandle = function BlockControlsSurfaceDragHan
       if (startPos === undefined) {
         return tr;
       }
-      if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
+      if (nodeType === 'layoutColumn') {
         tr.setMeta('toggleLayoutColumnMenu', buildLayoutColumnMenuMeta(startPos, openedViaKeyboard));
       }
       var selection = (_selectionPreservatio = (_selectionPreservatio2 = selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio2 === void 0 ? void 0 : _selectionPreservatio2.preservedSelection) !== null && _selectionPreservatio !== void 0 ? _selectionPreservatio : tr.selection;

package/dist/esm/ui/drag-handle.js

@@ -329,16 +329,12 @@ var getNodeMargins = function getNodeMargins(node) {
   return nodeMargins[nodeTypeName] || nodeMargins['default'];
 };
 
-// Kill switch OFF: omit `isOpen` so the reducer toggles per clicked column. ON: keep
-// `isOpen: true` for legacy always-open. Centralised so all dispatch sites stay in sync.
+// Omit `isOpen` so the reducer toggles the menu for a re-clicked layout column.
 var buildToggleLayoutColumnMenuMeta = function buildToggleLayoutColumnMenuMeta(anchorPos, openedViaKeyboard) {
-  return _objectSpread(_objectSpread({
-    anchorPos: anchorPos
-  }, fg('platform_editor_layout_column_menu_kill_switch_1') ? {
-    isOpen: true
-  } : {}), {}, {
+  return {
+    anchorPos: anchorPos,
     openedViaKeyboard: openedViaKeyboard
-  });
+  };
 };
 var getDragHandleAnchorReference = function getDragHandleAnchorReference(_ref) {
   var edge = _ref.edge,
@@ -462,7 +458,7 @@ export var DragHandle = function DragHandle(_ref2) {
       if (startPos === undefined) {
         return tr;
       }
-      if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
+      if (nodeType === 'layoutColumn') {
         tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, false));
       }
       var resolvedStartPos = tr.doc.resolve(startPos);
@@ -532,7 +528,7 @@ export var DragHandle = function DragHandle(_ref2) {
         api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || _api$blockControls3.commands.startPreservingSelection()({
           tr: tr
         });
-        if (nodeType === 'layoutColumn' && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true)) {
+        if (nodeType === 'layoutColumn') {
           tr.setMeta('toggleLayoutColumnMenu', buildToggleLayoutColumnMenuMeta(startPos, true));
         }
         var triggerByNode = {
@@ -1123,7 +1119,7 @@ export var DragHandle = function DragHandle(_ref2) {
       }
     }, renderButton());
   };
-  var tooltipContent = isLayoutColumn && expValEquals('platform_editor_layout_column_menu', 'isEnabled', true) && currentUserIntent === 'layoutColumnMenuPopupOpen' ? null : jsx(TooltipContentWithMultipleShortcuts, {
+  var tooltipContent = isLayoutColumn && currentUserIntent === 'layoutColumnMenuPopupOpen' ? null : jsx(TooltipContentWithMultipleShortcuts, {
     helpDescriptors: helpDescriptors
   });
   return editorExperiment('platform_editor_controls', 'variant1') ? stickyWithTooltip() : buttonWithTooltip();

package/dist/esm/ui/should-use-nested-drag-handle-icon.js

@@ -1,14 +1,9 @@
-import { fg } from '@atlaskit/platform-feature-flags/fg';
-
-// Nested icon for non-top-level nodes. Exception: with the
-// kill switch OFF, layout columns use the full block handle instead.
-// TODO: EDITOR-7732 - remove this whole function when
-// `platform_editor_layout_column_menu_kill_switch_1` is cleaned up
+// Nested layout columns use the full block handle; other non-top-level nodes use the nested icon.
 export var shouldUseNestedDragHandleIcon = function shouldUseNestedDragHandleIcon(isTopLevelNode, isLayoutColumn) {
   if (isTopLevelNode) {
     return false;
   }
-  if (isLayoutColumn && !fg('platform_editor_layout_column_menu_kill_switch_1')) {
+  if (isLayoutColumn) {
     return false;
   }
   return true;

package/dist/types/ui/block-controls-surface-drag-handle-utils.d.ts

@@ -1,7 +1,6 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 export declare const buildLayoutColumnMenuMeta: (anchorPos: number, openedViaKeyboard: boolean) => {
     anchorPos: number;
-    isOpen?: true;
     openedViaKeyboard: boolean;
 };
 export declare const getNodeSpacingForDragPreview: (node?: PMNode | null) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "23.0.3",
+	"version": "23.0.4",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -51,7 +51,7 @@
 		"@atlaskit/editor-tables": "^3.2.0",
 		"@atlaskit/editor-ui-control-model": "^2.10.0",
 		"@atlaskit/icon": "^38.0.0",
-		"@atlaskit/icon-lab": "^7.10.0",
+		"@atlaskit/icon-lab": "^7.11.0",
 		"@atlaskit/link": "^5.1.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
@@ -61,7 +61,7 @@
 		"@atlaskit/primitives": "^22.5.0",
 		"@atlaskit/section-message": "^10.2.0",
 		"@atlaskit/theme": "^28.2.0",
-		"@atlaskit/tmp-editor-statsig": "^212.0.0",
+		"@atlaskit/tmp-editor-statsig": "^213.0.0",
 		"@atlaskit/tokens": "^20.1.0",
 		"@atlaskit/tooltip": "^24.3.0",
 		"@babel/runtime": "^7.0.0",
@@ -73,7 +73,7 @@
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^126.1.0",
+		"@atlaskit/editor-common": "^126.2.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -100,10 +100,6 @@
 		"platform_editor_controls_reliable_anchor_patch_1": {
 			"type": "boolean"
 		},
-		"platform_editor_layout_column_menu_kill_switch_1": {
-			"type": "boolean",
-			"referenceOnly": true
-		},
 		"platform-dst-top-layer-tooltip": {
 			"type": "boolean",
 			"referenceOnly": true