@atlaskit/editor-plugin-layout 13.1.0 → 13.2.1

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @atlaskit/editor-plugin-layout
 
+## 13.2.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 13.2.0
+
+### Minor Changes
+
+- [`bb48c26acb8ba`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bb48c26acb8ba) -
+  Add platform_editor_layout_column_menu_kill_switch_1 kill switch and render the full block drag
+  handle icon for layout columns when the new behaviour is enabled (gate OFF). When the new
+  behaviour is enabled, re-clicking the layout column whose menu is already open now closes the
+  menu, while clicking a different column switches the menu to that column. The layout column menu
+  now opens below the drag handle with left-aligned edges (relying on the popup's built-in placement
+  to invert horizontally or nudge up when space is tight) instead of the previous centred
+  prefer-above behaviour. The layout column Delete hover/focus danger preview now matches the table
+  delete affordance exactly, using the translucent color.blanket.danger fill and a 1px
+  color.border.danger border instead of the previous low-alpha fill with a 2px border, and clears
+  the concurrent blue selected blanket while the danger preview is active so the preview reads as
+  pure red with no blue cast.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 13.1.0
 
 ### Minor Changes

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

@@ -824,28 +824,25 @@ var distributeLayoutColumns = exports.distributeLayoutColumns = function distrib
     };
   };
 };
-var toggleLayoutColumnMenu = exports.toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref14) {
-  var anchorPos = _ref14.anchorPos,
-    isOpen = _ref14.isOpen,
-    openedViaKeyboard = _ref14.openedViaKeyboard;
-  return function (_ref15) {
-    var tr = _ref15.tr;
-    tr.setMeta('toggleLayoutColumnMenu', {
-      anchorPos: anchorPos,
-      isOpen: isOpen,
-      openedViaKeyboard: openedViaKeyboard
-    });
+
+// Omitting `isOpen` (toggle) requires `anchorPos`, so a toggle can never open the menu
+// without a valid anchor. Explicit open/close keeps `anchorPos` optional (close needs none).
+
+var toggleLayoutColumnMenu = exports.toggleLayoutColumnMenu = function toggleLayoutColumnMenu(options) {
+  return function (_ref14) {
+    var tr = _ref14.tr;
+    tr.setMeta('toggleLayoutColumnMenu', options);
     tr.setMeta('scrollIntoView', false);
     return tr;
   };
 };
 var setLayoutColumnDangerPreview = exports.setLayoutColumnDangerPreview = function setLayoutColumnDangerPreview(show) {
-  return function (_ref16) {
+  return function (_ref15) {
     var _selectedLayoutColumn2;
-    var tr = _ref16.tr;
+    var tr = _ref15.tr;
     var selectedLayoutColumnsResult = (0, _layoutColumnSelection.getSelectedLayoutColumnsFromSelection)(tr.selection);
-    var positions = show ? (_selectedLayoutColumn2 = selectedLayoutColumnsResult === null || selectedLayoutColumnsResult === void 0 ? void 0 : selectedLayoutColumnsResult.selectedLayoutColumns.map(function (_ref17) {
-      var pos = _ref17.pos;
+    var positions = show ? (_selectedLayoutColumn2 = selectedLayoutColumnsResult === null || selectedLayoutColumnsResult === void 0 ? void 0 : selectedLayoutColumnsResult.selectedLayoutColumns.map(function (_ref16) {
+      var pos = _ref16.pos;
       return pos;
     })) !== null && _selectedLayoutColumn2 !== void 0 ? _selectedLayoutColumn2 : [] : null;
     tr.setMeta('layoutColumnDangerPreview', positions);
@@ -855,14 +852,14 @@ var setLayoutColumnDangerPreview = exports.setLayoutColumnDangerPreview = functi
   };
 };
 var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColumn() {
-  var _ref18 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-    _ref18$inputMethod = _ref18.inputMethod,
-    inputMethod = _ref18$inputMethod === void 0 ? _analytics.INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref18$inputMethod;
+  var _ref17 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    _ref17$inputMethod = _ref17.inputMethod,
+    inputMethod = _ref17$inputMethod === void 0 ? _analytics.INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref17$inputMethod;
   var editorAnalyticsAPI = arguments.length > 1 ? arguments[1] : undefined;
   var api = arguments.length > 2 ? arguments[2] : undefined;
-  return function (_ref19) {
+  return function (_ref18) {
     var _api$blockControls4;
-    var tr = _ref19.tr;
+    var tr = _ref18.tr;
     if (!(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
@@ -875,8 +872,8 @@ var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColum
       selectedLayoutColumns = selectedLayoutColumnsResult.selectedLayoutColumns,
       startIndex = selectedLayoutColumnsResult.startIndex,
       endIndex = selectedLayoutColumnsResult.endIndex;
-    var hadContent = selectedLayoutColumns.some(function (_ref20) {
-      var node = _ref20.node;
+    var hadContent = selectedLayoutColumns.some(function (_ref19) {
+      var node = _ref19.node;
       return hasLayoutColumnContent(node);
     });
     var emitDeleteColumnAnalytics = function emitDeleteColumnAnalytics(newColumnCount) {

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

@@ -123,7 +123,10 @@ var reduceLayoutColumnMenuState = function reduceLayoutColumnMenuState(pluginSta
           anchorPos = _action$meta.anchorPos,
           isOpen = _action$meta.isOpen,
           openedViaKeyboard = _action$meta.openedViaKeyboard;
-        var nextIsOpen = isOpen !== null && isOpen !== void 0 ? isOpen : !pluginState.isLayoutColumnMenuOpen;
+        // `isOpen` provided: use directly (legacy). Omitted: toggle off only when re-clicking
+        // the already-open column; otherwise open for the clicked column.
+        var isSameColumnAsOpenMenu = pluginState.isLayoutColumnMenuOpen && anchorPos !== undefined && anchorPos === pluginState.layoutColumnMenuAnchorPos;
+        var nextIsOpen = isOpen !== null && isOpen !== void 0 ? isOpen : !isSameColumnAsOpenMenu;
         return _objectSpread(_objectSpread({}, pluginState), {}, {
           isLayoutColumnMenuOpen: nextIsOpen,
           layoutColumnMenuOpenedViaKeyboard: nextIsOpen ? openedViaKeyboard !== null && openedViaKeyboard !== void 0 ? openedViaKeyboard : false : false,

package/dist/cjs/ui/LayoutColumnMenu/index.js

@@ -146,6 +146,13 @@ var LayoutColumnMenu = exports.LayoutColumnMenu = /*#__PURE__*/_react.default.me
       closeLayoutColumnMenu();
     }
   }, [closeLayoutColumnMenu, components.length, hasValidTarget, isLayoutColumnMenuOpen]);
+  var _useMemo = (0, _react.useMemo)(function () {
+      return (0, _utils.getLayoutColumnMenuPositioningProps)();
+    }, []),
+    alignX = _useMemo.alignX,
+    alignY = _useMemo.alignY,
+    offset = _useMemo.offset,
+    useManualBelowFlip = _useMemo.useManualBelowFlip;
   if (!isLayoutColumnMenuOpen || components.length === 0 || !hasValidTarget) {
     return null;
   }
@@ -155,13 +162,13 @@ var LayoutColumnMenu = exports.LayoutColumnMenu = /*#__PURE__*/_react.default.me
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement,
     zIndex: _editorSharedStyles.akEditorFloatingOverlapPanelZIndex,
-    alignX: "center",
-    alignY: "top",
+    alignX: alignX,
+    alignY: alignY,
     forcePlacement: true,
     preventOverflow: true,
     stick: true,
-    offset: _utils.LAYOUT_COLUMN_MENU_POPUP_OFFSET,
-    onPositionCalculated: positionLayoutColumnMenu,
+    offset: offset,
+    onPositionCalculated: useManualBelowFlip ? positionLayoutColumnMenu : undefined,
     handleClickOutside: handleClickOutside,
     handleEscapeKeydown: closeLayoutColumnMenu,
     focusTrap: openedViaKeyboard ? focusTrap : undefined

package/dist/cjs/ui/LayoutColumnMenu/utils.js

@@ -4,12 +4,33 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.shouldOpenLayoutColumnMenuBelow = exports.calculateFallbackBottomPosition = exports.LAYOUT_COLUMN_MENU_POPUP_OFFSET = void 0;
+exports.shouldOpenLayoutColumnMenuBelow = exports.getLayoutColumnMenuPositioningProps = exports.calculateFallbackBottomPosition = exports.LAYOUT_COLUMN_MENU_POPUP_OFFSET_BELOW = exports.LAYOUT_COLUMN_MENU_POPUP_OFFSET = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _ui = require("@atlaskit/editor-common/ui");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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 LAYOUT_COLUMN_MENU_POPUP_OFFSET = exports.LAYOUT_COLUMN_MENU_POPUP_OFFSET = [0, 4];
+
+// Gate OFF: small gap below the handle; Popup handles invert/nudge fallbacks.
+var LAYOUT_COLUMN_MENU_POPUP_OFFSET_BELOW = exports.LAYOUT_COLUMN_MENU_POPUP_OFFSET_BELOW = [0, 2];
+// Gate OFF: left-aligned, below the handle. Gate ON (legacy): centred, prefer above with manual flip.
+var getLayoutColumnMenuPositioningProps = exports.getLayoutColumnMenuPositioningProps = function getLayoutColumnMenuPositioningProps() {
+  if (!(0, _platformFeatureFlags.fg)('platform_editor_layout_column_menu_kill_switch_1')) {
+    return {
+      alignX: undefined,
+      alignY: undefined,
+      offset: LAYOUT_COLUMN_MENU_POPUP_OFFSET_BELOW,
+      useManualBelowFlip: false
+    };
+  }
+  return {
+    alignX: 'center',
+    alignY: 'top',
+    offset: LAYOUT_COLUMN_MENU_POPUP_OFFSET,
+    useManualBelowFlip: true
+  };
+};
 var getVisibleEditorAreaTop = function getVisibleEditorAreaTop(editorView, scrollableElement) {
   var visibleEditorArea = scrollableElement || (0, _ui.findOverflowScrollParent)(editorView.dom);
   return Math.max(visibleEditorArea ? visibleEditorArea.getBoundingClientRect().top : 0, 0);

package/dist/cjs/ui/global-styles.js

@@ -22,8 +22,12 @@ var PLACEHOLDER_SELECTOR = '.ProseMirror-focused .layoutSectionView-content-wrap
 var layoutColumnDangerPreviewStyle = (0, _react2.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
   '.ProseMirror [data-layout-column].layout-column-danger-preview': {
-    backgroundColor: "var(--ds-background-danger, #FFECEB)",
-    boxShadow: "inset 0 0 0 2px ".concat("var(--ds-border-danger, #E2483D)")
+    backgroundColor: "var(--ds-blanket-danger, #EF5C4814)",
+    boxShadow: "inset 0 0 0 1px ".concat("var(--ds-border-danger, #E2483D)"),
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+    '&::before': {
+      visibility: 'hidden'
+    }
   }
 });
 var getPlaceholderStyle = function getPlaceholderStyle(message) {

package/dist/es2019/pm-plugins/actions.js

@@ -796,18 +796,14 @@ export const distributeLayoutColumns = (editorAnalyticsAPI, api) => ({
   mapLayoutColumnPreservedSelection(tr, api);
   return tr;
 };
-export const toggleLayoutColumnMenu = ({
-  anchorPos,
-  isOpen,
-  openedViaKeyboard
-}) => ({
+
+// Omitting `isOpen` (toggle) requires `anchorPos`, so a toggle can never open the menu
+// without a valid anchor. Explicit open/close keeps `anchorPos` optional (close needs none).
+
+export const toggleLayoutColumnMenu = options => ({
   tr
 }) => {
-  tr.setMeta('toggleLayoutColumnMenu', {
-    anchorPos,
-    isOpen,
-    openedViaKeyboard
-  });
+  tr.setMeta('toggleLayoutColumnMenu', options);
   tr.setMeta('scrollIntoView', false);
   return tr;
 };

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

@@ -120,7 +120,10 @@ const reduceLayoutColumnMenuState = (pluginState, action) => {
           isOpen,
           openedViaKeyboard
         } = action.meta;
-        const nextIsOpen = isOpen !== null && isOpen !== void 0 ? isOpen : !pluginState.isLayoutColumnMenuOpen;
+        // `isOpen` provided: use directly (legacy). Omitted: toggle off only when re-clicking
+        // the already-open column; otherwise open for the clicked column.
+        const isSameColumnAsOpenMenu = pluginState.isLayoutColumnMenuOpen && anchorPos !== undefined && anchorPos === pluginState.layoutColumnMenuAnchorPos;
+        const nextIsOpen = isOpen !== null && isOpen !== void 0 ? isOpen : !isSameColumnAsOpenMenu;
         return {
           ...pluginState,
           isLayoutColumnMenuOpen: nextIsOpen,

package/dist/es2019/ui/LayoutColumnMenu/index.js

@@ -12,7 +12,7 @@ import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model';
 import { getLayoutColumnMenuAnchorPos } from '../../pm-plugins/utils/layout-column-selection';
 import { LAYOUT_COLUMN_MENU_FALLBACKS } from './components';
 import { LAYOUT_COLUMN_MENU } from './keys';
-import { calculateFallbackBottomPosition, LAYOUT_COLUMN_MENU_POPUP_OFFSET, shouldOpenLayoutColumnMenuBelow } from './utils';
+import { calculateFallbackBottomPosition, getLayoutColumnMenuPositioningProps, shouldOpenLayoutColumnMenuBelow } from './utils';
 const PopupWithListeners = withReactEditorViewOuterListeners(Popup);
 const TOOLBAR_MENU_SELECTOR = '[data-toolbar-component="menu"]';
 const NESTED_DROPDOWN_MENU_SELECTOR = '[data-toolbar-nested-dropdown-menu]';
@@ -138,6 +138,12 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
       closeLayoutColumnMenu();
     }
   }, [closeLayoutColumnMenu, components.length, hasValidTarget, isLayoutColumnMenuOpen]);
+  const {
+    alignX,
+    alignY,
+    offset,
+    useManualBelowFlip
+  } = useMemo(() => getLayoutColumnMenuPositioningProps(), []);
   if (!isLayoutColumnMenuOpen || components.length === 0 || !hasValidTarget) {
     return null;
   }
@@ -147,13 +153,13 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement,
     zIndex: akEditorFloatingOverlapPanelZIndex,
-    alignX: "center",
-    alignY: "top",
+    alignX: alignX,
+    alignY: alignY,
     forcePlacement: true,
     preventOverflow: true,
     stick: true,
-    offset: LAYOUT_COLUMN_MENU_POPUP_OFFSET,
-    onPositionCalculated: positionLayoutColumnMenu,
+    offset: offset,
+    onPositionCalculated: useManualBelowFlip ? positionLayoutColumnMenu : undefined,
     handleClickOutside: handleClickOutside,
     handleEscapeKeydown: closeLayoutColumnMenu,
     focusTrap: openedViaKeyboard ? focusTrap : undefined

package/dist/es2019/ui/LayoutColumnMenu/utils.js

@@ -1,5 +1,26 @@
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
+import { fg } from '@atlaskit/platform-feature-flags';
 export const LAYOUT_COLUMN_MENU_POPUP_OFFSET = [0, 4];
+
+// Gate OFF: small gap below the handle; Popup handles invert/nudge fallbacks.
+export const LAYOUT_COLUMN_MENU_POPUP_OFFSET_BELOW = [0, 2];
+// Gate OFF: left-aligned, below the handle. Gate ON (legacy): centred, prefer above with manual flip.
+export const getLayoutColumnMenuPositioningProps = () => {
+  if (!fg('platform_editor_layout_column_menu_kill_switch_1')) {
+    return {
+      alignX: undefined,
+      alignY: undefined,
+      offset: LAYOUT_COLUMN_MENU_POPUP_OFFSET_BELOW,
+      useManualBelowFlip: false
+    };
+  }
+  return {
+    alignX: 'center',
+    alignY: 'top',
+    offset: LAYOUT_COLUMN_MENU_POPUP_OFFSET,
+    useManualBelowFlip: true
+  };
+};
 const getVisibleEditorAreaTop = (editorView, scrollableElement) => {
   const visibleEditorArea = scrollableElement || findOverflowScrollParent(editorView.dom);
   return Math.max(visibleEditorArea ? visibleEditorArea.getBoundingClientRect().top : 0, 0);

package/dist/es2019/ui/global-styles.js

@@ -5,7 +5,7 @@
 import { useMemo } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-global-styles, @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
-import { css, Global, jsx } from '@emotion/react';
+import { Global, css, jsx } from '@emotion/react';
 import { useIntl } from 'react-intl';
 import { layoutMessages as messages } from '@atlaskit/editor-common/messages';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -13,8 +13,12 @@ const PLACEHOLDER_SELECTOR = '.ProseMirror-focused .layoutSectionView-content-wr
 const layoutColumnDangerPreviewStyle = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
   '.ProseMirror [data-layout-column].layout-column-danger-preview': {
-    backgroundColor: "var(--ds-background-danger, #FFECEB)",
-    boxShadow: `inset 0 0 0 2px ${"var(--ds-border-danger, #E2483D)"}`
+    backgroundColor: "var(--ds-blanket-danger, #EF5C4814)",
+    boxShadow: `inset 0 0 0 1px ${"var(--ds-border-danger, #E2483D)"}`,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+    '&::before': {
+      visibility: 'hidden'
+    }
   }
 });
 const getPlaceholderStyle = message => {

package/dist/esm/pm-plugins/actions.js

@@ -814,28 +814,25 @@ export var distributeLayoutColumns = function distributeLayoutColumns(editorAnal
     };
   };
 };
-export var toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref14) {
-  var anchorPos = _ref14.anchorPos,
-    isOpen = _ref14.isOpen,
-    openedViaKeyboard = _ref14.openedViaKeyboard;
-  return function (_ref15) {
-    var tr = _ref15.tr;
-    tr.setMeta('toggleLayoutColumnMenu', {
-      anchorPos: anchorPos,
-      isOpen: isOpen,
-      openedViaKeyboard: openedViaKeyboard
-    });
+
+// Omitting `isOpen` (toggle) requires `anchorPos`, so a toggle can never open the menu
+// without a valid anchor. Explicit open/close keeps `anchorPos` optional (close needs none).
+
+export var toggleLayoutColumnMenu = function toggleLayoutColumnMenu(options) {
+  return function (_ref14) {
+    var tr = _ref14.tr;
+    tr.setMeta('toggleLayoutColumnMenu', options);
     tr.setMeta('scrollIntoView', false);
     return tr;
   };
 };
 export var setLayoutColumnDangerPreview = function setLayoutColumnDangerPreview(show) {
-  return function (_ref16) {
+  return function (_ref15) {
     var _selectedLayoutColumn2;
-    var tr = _ref16.tr;
+    var tr = _ref15.tr;
     var selectedLayoutColumnsResult = getSelectedLayoutColumnsFromSelection(tr.selection);
-    var positions = show ? (_selectedLayoutColumn2 = selectedLayoutColumnsResult === null || selectedLayoutColumnsResult === void 0 ? void 0 : selectedLayoutColumnsResult.selectedLayoutColumns.map(function (_ref17) {
-      var pos = _ref17.pos;
+    var positions = show ? (_selectedLayoutColumn2 = selectedLayoutColumnsResult === null || selectedLayoutColumnsResult === void 0 ? void 0 : selectedLayoutColumnsResult.selectedLayoutColumns.map(function (_ref16) {
+      var pos = _ref16.pos;
       return pos;
     })) !== null && _selectedLayoutColumn2 !== void 0 ? _selectedLayoutColumn2 : [] : null;
     tr.setMeta('layoutColumnDangerPreview', positions);
@@ -845,14 +842,14 @@ export var setLayoutColumnDangerPreview = function setLayoutColumnDangerPreview(
   };
 };
 export var deleteLayoutColumn = function deleteLayoutColumn() {
-  var _ref18 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-    _ref18$inputMethod = _ref18.inputMethod,
-    inputMethod = _ref18$inputMethod === void 0 ? INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref18$inputMethod;
+  var _ref17 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    _ref17$inputMethod = _ref17.inputMethod,
+    inputMethod = _ref17$inputMethod === void 0 ? INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref17$inputMethod;
   var editorAnalyticsAPI = arguments.length > 1 ? arguments[1] : undefined;
   var api = arguments.length > 2 ? arguments[2] : undefined;
-  return function (_ref19) {
+  return function (_ref18) {
     var _api$blockControls4;
-    var tr = _ref19.tr;
+    var tr = _ref18.tr;
     if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
@@ -865,8 +862,8 @@ export var deleteLayoutColumn = function deleteLayoutColumn() {
       selectedLayoutColumns = selectedLayoutColumnsResult.selectedLayoutColumns,
       startIndex = selectedLayoutColumnsResult.startIndex,
       endIndex = selectedLayoutColumnsResult.endIndex;
-    var hadContent = selectedLayoutColumns.some(function (_ref20) {
-      var node = _ref20.node;
+    var hadContent = selectedLayoutColumns.some(function (_ref19) {
+      var node = _ref19.node;
       return hasLayoutColumnContent(node);
     });
     var emitDeleteColumnAnalytics = function emitDeleteColumnAnalytics(newColumnCount) {

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

@@ -116,7 +116,10 @@ var reduceLayoutColumnMenuState = function reduceLayoutColumnMenuState(pluginSta
           anchorPos = _action$meta.anchorPos,
           isOpen = _action$meta.isOpen,
           openedViaKeyboard = _action$meta.openedViaKeyboard;
-        var nextIsOpen = isOpen !== null && isOpen !== void 0 ? isOpen : !pluginState.isLayoutColumnMenuOpen;
+        // `isOpen` provided: use directly (legacy). Omitted: toggle off only when re-clicking
+        // the already-open column; otherwise open for the clicked column.
+        var isSameColumnAsOpenMenu = pluginState.isLayoutColumnMenuOpen && anchorPos !== undefined && anchorPos === pluginState.layoutColumnMenuAnchorPos;
+        var nextIsOpen = isOpen !== null && isOpen !== void 0 ? isOpen : !isSameColumnAsOpenMenu;
         return _objectSpread(_objectSpread({}, pluginState), {}, {
           isLayoutColumnMenuOpen: nextIsOpen,
           layoutColumnMenuOpenedViaKeyboard: nextIsOpen ? openedViaKeyboard !== null && openedViaKeyboard !== void 0 ? openedViaKeyboard : false : false,

package/dist/esm/ui/LayoutColumnMenu/index.js

@@ -12,7 +12,7 @@ import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model';
 import { getLayoutColumnMenuAnchorPos } from '../../pm-plugins/utils/layout-column-selection';
 import { LAYOUT_COLUMN_MENU_FALLBACKS } from './components';
 import { LAYOUT_COLUMN_MENU } from './keys';
-import { calculateFallbackBottomPosition, LAYOUT_COLUMN_MENU_POPUP_OFFSET, shouldOpenLayoutColumnMenuBelow } from './utils';
+import { calculateFallbackBottomPosition, getLayoutColumnMenuPositioningProps, shouldOpenLayoutColumnMenuBelow } from './utils';
 var PopupWithListeners = withReactEditorViewOuterListeners(Popup);
 var TOOLBAR_MENU_SELECTOR = '[data-toolbar-component="menu"]';
 var NESTED_DROPDOWN_MENU_SELECTOR = '[data-toolbar-nested-dropdown-menu]';
@@ -138,6 +138,13 @@ export var LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMenu(
       closeLayoutColumnMenu();
     }
   }, [closeLayoutColumnMenu, components.length, hasValidTarget, isLayoutColumnMenuOpen]);
+  var _useMemo = useMemo(function () {
+      return getLayoutColumnMenuPositioningProps();
+    }, []),
+    alignX = _useMemo.alignX,
+    alignY = _useMemo.alignY,
+    offset = _useMemo.offset,
+    useManualBelowFlip = _useMemo.useManualBelowFlip;
   if (!isLayoutColumnMenuOpen || components.length === 0 || !hasValidTarget) {
     return null;
   }
@@ -147,13 +154,13 @@ export var LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMenu(
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement,
     zIndex: akEditorFloatingOverlapPanelZIndex,
-    alignX: "center",
-    alignY: "top",
+    alignX: alignX,
+    alignY: alignY,
     forcePlacement: true,
     preventOverflow: true,
     stick: true,
-    offset: LAYOUT_COLUMN_MENU_POPUP_OFFSET,
-    onPositionCalculated: positionLayoutColumnMenu,
+    offset: offset,
+    onPositionCalculated: useManualBelowFlip ? positionLayoutColumnMenu : undefined,
     handleClickOutside: handleClickOutside,
     handleEscapeKeydown: closeLayoutColumnMenu,
     focusTrap: openedViaKeyboard ? focusTrap : undefined

package/dist/esm/ui/LayoutColumnMenu/utils.js

@@ -2,7 +2,28 @@ 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 { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
+import { fg } from '@atlaskit/platform-feature-flags';
 export var LAYOUT_COLUMN_MENU_POPUP_OFFSET = [0, 4];
+
+// Gate OFF: small gap below the handle; Popup handles invert/nudge fallbacks.
+export var LAYOUT_COLUMN_MENU_POPUP_OFFSET_BELOW = [0, 2];
+// Gate OFF: left-aligned, below the handle. Gate ON (legacy): centred, prefer above with manual flip.
+export var getLayoutColumnMenuPositioningProps = function getLayoutColumnMenuPositioningProps() {
+  if (!fg('platform_editor_layout_column_menu_kill_switch_1')) {
+    return {
+      alignX: undefined,
+      alignY: undefined,
+      offset: LAYOUT_COLUMN_MENU_POPUP_OFFSET_BELOW,
+      useManualBelowFlip: false
+    };
+  }
+  return {
+    alignX: 'center',
+    alignY: 'top',
+    offset: LAYOUT_COLUMN_MENU_POPUP_OFFSET,
+    useManualBelowFlip: true
+  };
+};
 var getVisibleEditorAreaTop = function getVisibleEditorAreaTop(editorView, scrollableElement) {
   var visibleEditorArea = scrollableElement || findOverflowScrollParent(editorView.dom);
   return Math.max(visibleEditorArea ? visibleEditorArea.getBoundingClientRect().top : 0, 0);

package/dist/esm/ui/global-styles.js

@@ -6,7 +6,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { useMemo } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-global-styles, @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports
-import { css, Global, jsx } from '@emotion/react';
+import { Global, css, jsx } from '@emotion/react';
 import { useIntl } from 'react-intl';
 import { layoutMessages as messages } from '@atlaskit/editor-common/messages';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -14,8 +14,12 @@ var PLACEHOLDER_SELECTOR = '.ProseMirror-focused .layoutSectionView-content-wrap
 var layoutColumnDangerPreviewStyle = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
   '.ProseMirror [data-layout-column].layout-column-danger-preview': {
-    backgroundColor: "var(--ds-background-danger, #FFECEB)",
-    boxShadow: "inset 0 0 0 2px ".concat("var(--ds-border-danger, #E2483D)")
+    backgroundColor: "var(--ds-blanket-danger, #EF5C4814)",
+    boxShadow: "inset 0 0 0 1px ".concat("var(--ds-border-danger, #E2483D)"),
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+    '&::before': {
+      visibility: 'hidden'
+    }
   }
 });
 var getPlaceholderStyle = function getPlaceholderStyle(message) {

package/dist/types/pm-plugins/actions.d.ts

@@ -58,11 +58,15 @@ export type DistributeLayoutColumnsOptions = {
 };
 export declare const distributeLayoutColumns: (editorAnalyticsAPI?: EditorAnalyticsAPI, api?: LayoutPluginAPI) => ({ inputMethod, target, }?: DistributeLayoutColumnsOptions) => EditorCommand;
 export type ToggleLayoutColumnMenuOptions = {
+    anchorPos: number;
+    isOpen?: undefined;
+    openedViaKeyboard?: boolean;
+} | {
     anchorPos?: number;
-    isOpen?: boolean;
+    isOpen: boolean;
     openedViaKeyboard?: boolean;
 };
-export declare const toggleLayoutColumnMenu: ({ anchorPos, isOpen, openedViaKeyboard }: ToggleLayoutColumnMenuOptions) => EditorCommand;
+export declare const toggleLayoutColumnMenu: (options: ToggleLayoutColumnMenuOptions) => EditorCommand;
 export declare const setLayoutColumnDangerPreview: (show: boolean) => EditorCommand;
 export type DeleteLayoutColumnOptions = {
     inputMethod?: LayoutColumnActionInputMethod;

package/dist/types/ui/LayoutColumnMenu/utils.d.ts

@@ -1,6 +1,14 @@
 import { type PopupPosition } from '@atlaskit/editor-common/ui';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export declare const LAYOUT_COLUMN_MENU_POPUP_OFFSET: [number, number];
+export declare const LAYOUT_COLUMN_MENU_POPUP_OFFSET_BELOW: [number, number];
+type LayoutColumnMenuPositioningProps = {
+    alignX: 'center' | undefined;
+    alignY: 'top' | undefined;
+    offset: [number, number];
+    useManualBelowFlip: boolean;
+};
+export declare const getLayoutColumnMenuPositioningProps: () => LayoutColumnMenuPositioningProps;
 export declare const shouldOpenLayoutColumnMenuBelow: ({ editorView, popup, scrollableElement, target, }: {
     editorView: EditorView;
     popup: HTMLElement;
@@ -8,3 +16,4 @@ export declare const shouldOpenLayoutColumnMenuBelow: ({ editorView, popup, scro
     target: HTMLElement;
 }) => boolean;
 export declare const calculateFallbackBottomPosition: (position: PopupPosition, target: HTMLElement, popup: HTMLElement) => PopupPosition;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "13.1.0",
+	"version": "13.2.1",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -24,7 +24,7 @@
 		"@atlaskit/adf-schema": "^56.0.0",
 		"@atlaskit/css": "^1.0.0",
 		"@atlaskit/editor-plugin-analytics": "^12.0.0",
-		"@atlaskit/editor-plugin-block-controls": "^13.0.0",
+		"@atlaskit/editor-plugin-block-controls": "^13.1.0",
 		"@atlaskit/editor-plugin-block-menu": "^11.1.0",
 		"@atlaskit/editor-plugin-decorations": "^12.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^12.0.0",
@@ -42,14 +42,14 @@
 		"@atlaskit/icon": "^36.0.0",
 		"@atlaskit/icon-lab": "^7.1.0",
 		"@atlaskit/platform-feature-flags": "^2.0.0",
-		"@atlaskit/tmp-editor-statsig": "^110.0.0",
+		"@atlaskit/tmp-editor-statsig": "^112.0.0",
 		"@atlaskit/tokens": "^15.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.11.0",
+		"@atlaskit/editor-common": "^116.12.0",
 		"react": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},
@@ -109,6 +109,9 @@
 		},
 		"platform_editor_layout_resize_analytics": {
 			"type": "boolean"
+		},
+		"platform_editor_layout_column_menu_kill_switch_1": {
+			"type": "boolean"
 		}
 	},
 	"devDependencies": {