@atlaskit/editor-plugin-layout 10.7.1 → 10.8.1

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

@@ -2,6 +2,7 @@ import React, { useCallback, useMemo } from 'react';
 import { useIntl } from 'react-intl';
 import { layoutMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { isDistributedUniformly } from '../../pm-plugins/utils/layout-column-distribution';
 import { useSelectedLayoutColumns } from './useSelectedLayoutColumns';
 export const DistributeColumnsDropdownItem = ({
   api
@@ -26,25 +27,18 @@ export const DistributeColumnsDropdownItem = ({
       return closedTr !== null && closedTr !== void 0 ? closedTr : tr;
     });
   }, [api]);
-
-  // Hide when selected columns are already evenly distributed — no-op action.
-  // Must be before any early return to satisfy rules-of-hooks.
   const isAlreadyUniform = useMemo(() => {
     if (!selectedLayoutColumns || selectedLayoutColumns.selectedColumns.length < 2) {
       return false;
     }
     const selectedWidths = selectedLayoutColumns.selectedColumns.map(col => col.node.attrs.width);
-    const selectedTotal = selectedWidths.reduce((sum, w) => sum + w, 0);
-    const equalWidth = Number((selectedTotal / selectedWidths.length).toFixed(2));
-    return selectedWidths.every(w => w === equalWidth);
+    return isDistributedUniformly(selectedWidths);
   }, [selectedLayoutColumns]);
   if (selectedLayoutColumns === undefined || selectedLayoutColumns.selectedColumns.length < 2) {
     return null;
   }
-  if (isAlreadyUniform) {
-    return null;
-  }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
-    onClick: handleClick
+    onClick: handleClick,
+    isDisabled: isAlreadyUniform
   }, formatMessage(layoutMessages.distributeColumns));
 };

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

@@ -28,6 +28,7 @@ export const VerticalAlignDropdownItem = ({
       size: "small"
     }),
     isSelected: isSelected,
-    onClick: onClick
+    onClick: onClick,
+    role: "menuitemradio"
   }, formatMessage(label));
 };

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

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import { useIntl } from 'react-intl';
 import { layoutMessages } from '@atlaskit/editor-common/messages';
-import { LayoutIcon, NestedDropdownRightIcon, ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
+import { NestedDropdownRightIcon, ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
 import { getLayoutColumnValign } from '../../pm-plugins/utils/layout-column-selection';
 import { useSelectedLayoutColumns } from './useSelectedLayoutColumns';
 import { VERTICAL_ALIGN_ICONS } from './verticalAlignIcons';
@@ -24,10 +24,7 @@ export const VerticalAlignNestedMenu = ({
     }
     return firstValign;
   }, [selectedLayoutColumns]);
-  const TriggerIcon = currentValign ? VERTICAL_ALIGN_ICONS[currentValign] : LayoutIcon;
-  if (!selectedLayoutColumns) {
-    return null;
-  }
+  const TriggerIcon = currentValign ? VERTICAL_ALIGN_ICONS[currentValign] : VERTICAL_ALIGN_ICONS.top;
   return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
     elemBefore: /*#__PURE__*/React.createElement(TriggerIcon, {
       label: "",

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

@@ -1,5 +1,6 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import { layoutMessages } from '@atlaskit/editor-common/messages';
+import { OutsideClickTargetRefContext } from '@atlaskit/editor-common/ui-react';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
 import { ToolbarMenuContainer } from '@atlaskit/editor-toolbar/toolbar-menu-container';
 import { DeleteColumnDropdownItem } from './DeleteColumnDropdownItem';
@@ -8,6 +9,14 @@ import { InsertColumnDropdownItem } from './InsertColumnDropdownItem';
 import { DELETE_COLUMN_MENU_ITEM, DISTRIBUTE_COLUMNS_MENU_ITEM, INSERT_COLUMN_LEFT_MENU_ITEM, INSERT_COLUMN_RIGHT_MENU_ITEM, LAYOUT_COLUMN_MENU, LAYOUT_COLUMN_MENU_RANK, LAYOUT_COLUMN_MENU_SECTION, LAYOUT_COLUMN_MENU_SECTION_RANK, LAYOUT_COLUMN_VERTICAL_ALIGN_MENU_SECTION, VERTICAL_ALIGN_BOTTOM_MENU_ITEM, VERTICAL_ALIGN_MENU, VERTICAL_ALIGN_MENU_RANK, VERTICAL_ALIGN_MENU_SECTION_RANK, VERTICAL_ALIGN_MIDDLE_MENU_ITEM, VERTICAL_ALIGN_TOP_MENU_ITEM } from './keys';
 import { VerticalAlignDropdownItem } from './VerticalAlignDropdownItem';
 import { VerticalAlignNestedMenu } from './VerticalAlignNestedMenu';
+const LayoutColumnMenuContainer = ({
+  children
+}) => {
+  const setOutsideClickTargetRef = useContext(OutsideClickTargetRefContext);
+  return /*#__PURE__*/React.createElement(ToolbarMenuContainer, {
+    ref: setOutsideClickTargetRef
+  }, children);
+};
 export const LAYOUT_COLUMN_MENU_FALLBACKS = {
   'menu-section': ({
     children
@@ -18,7 +27,7 @@ export const getLayoutColumnMenuComponents = ({
 }) => {
   return [{
     ...LAYOUT_COLUMN_MENU,
-    component: ToolbarMenuContainer
+    component: LayoutColumnMenuContainer
   }, {
     ...LAYOUT_COLUMN_MENU_SECTION,
     parents: [{

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

@@ -1,9 +1,8 @@
-import React, { useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { DRAG_HANDLE_SELECTOR } from '@atlaskit/editor-common/styles';
-import { EditorToolbarProvider } from '@atlaskit/editor-common/toolbar';
 import { Popup } from '@atlaskit/editor-common/ui';
-import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-react';
+import { withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-react';
 import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { ToolbarDropdownMenuProvider } from '@atlaskit/editor-toolbar';
 import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model';
@@ -11,8 +10,8 @@ import { getLayoutColumnMenuAnchorPos } from '../../pm-plugins/utils/layout-colu
 import { LAYOUT_COLUMN_MENU_FALLBACKS } from './components';
 import { LAYOUT_COLUMN_MENU } from './keys';
 const PopupWithListeners = withReactEditorViewOuterListeners(Popup);
-const FALLBACK_MENU_HEIGHT = 300;
 const LAYOUT_COLUMN_MENU_POPUP_OFFSET = [0, 4];
+const TOOLBAR_MENU_SELECTOR = '[data-toolbar-component="menu"]';
 
 /**
  * Returns the drag handle button for the selected layout column.
@@ -50,17 +49,6 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
       selection: (_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection
     };
   });
-  const setOutsideClickTargetRef = useContext(OutsideClickTargetRefContext);
-  const menuRef = useRef(null);
-  const popupRef = useRef(undefined);
-  const [menuHeight, setMenuHeight] = React.useState(FALLBACK_MENU_HEIGHT);
-  useLayoutEffect(() => {
-    var _popupRef$current;
-    if (!isLayoutColumnMenuOpen) {
-      return;
-    }
-    setMenuHeight(((_popupRef$current = popupRef.current) === null || _popupRef$current === void 0 ? void 0 : _popupRef$current.clientHeight) || FALLBACK_MENU_HEIGHT);
-  }, [isLayoutColumnMenuOpen]);
   const closeLayoutColumnMenu = useCallback(() => {
     var _api$core, _api$layout;
     api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? void 0 : (_api$layout = api.layout) === null || _api$layout === void 0 ? void 0 : _api$layout.commands.toggleLayoutColumnMenu({
@@ -68,11 +56,7 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
     }));
   }, [api]);
   const handleClickOutside = useCallback(event => {
-    var _menuRef$current;
-    if (event.target instanceof Node && (_menuRef$current = menuRef.current) !== null && _menuRef$current !== void 0 && _menuRef$current.contains(event.target)) {
-      return;
-    }
-    if (event.target instanceof Element && event.target.closest('[data-toolbar-nested-dropdown-menu]')) {
+    if (event.target instanceof Element && (event.target.closest(TOOLBAR_MENU_SELECTOR) || event.target.closest('[data-toolbar-nested-dropdown-menu]'))) {
       return;
     }
 
@@ -89,13 +73,6 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
       closeLayoutColumnMenu();
     }
   }, [closeLayoutColumnMenu]);
-  const handleMenuRef = useCallback(el => {
-    setOutsideClickTargetRef === null || setOutsideClickTargetRef === void 0 ? void 0 : setOutsideClickTargetRef(el);
-    menuRef.current = el;
-    if (el) {
-      popupRef.current = el;
-    }
-  }, [setOutsideClickTargetRef]);
   const components = (_api$uiControlRegistr = api === null || api === void 0 ? void 0 : (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(LAYOUT_COLUMN_MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
   const target = useMemo(() => isLayoutColumnMenuOpen ? getLayoutColumnMenuTarget(editorView, selection, layoutColumnMenuAnchorPos) : null, [editorView, isLayoutColumnMenuOpen, layoutColumnMenuAnchorPos, selection]);
   const hasValidTarget = target instanceof HTMLElement;
@@ -114,16 +91,11 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
     scrollableElement: scrollableElement,
     zIndex: akEditorFloatingOverlapPanelZIndex,
     alignX: "center",
-    fitHeight: menuHeight,
     preventOverflow: true,
     stick: true,
     offset: LAYOUT_COLUMN_MENU_POPUP_OFFSET,
     handleClickOutside: handleClickOutside,
     handleEscapeKeydown: closeLayoutColumnMenu
-  }, /*#__PURE__*/React.createElement("div", {
-    ref: handleMenuRef
-  }, /*#__PURE__*/React.createElement(EditorToolbarProvider, {
-    editorView: editorView
   }, /*#__PURE__*/React.createElement(ToolbarDropdownMenuProvider, {
     isOpen: isLayoutColumnMenuOpen,
     setIsOpen: handleSetIsOpen
@@ -131,5 +103,5 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
     components: components,
     fallbacks: LAYOUT_COLUMN_MENU_FALLBACKS,
     surface: LAYOUT_COLUMN_MENU
-  })))));
+  })));
 });

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

@@ -12,8 +12,8 @@ import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equ
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { EVEN_DISTRIBUTED_COL_WIDTHS, MAX_LAYOUT_COLUMNS, MAX_STANDARD_LAYOUT_COLUMNS, MIN_LAYOUT_COLUMN_WIDTH_PERCENT } from './consts';
 import { pluginKey } from './plugin-key';
+import { calculateDistribution, isDistributedUniformly, redistributeAfterDeletion, redistributeProportionally } from './utils/layout-column-distribution';
 import { getSelectedLayoutColumns } from './utils/layout-column-selection';
-import { redistributeAfterDeletion, redistributeProportionally } from './utils/redistribute-proportionally';
 export var ONE_COL_LAYOUTS = ['single'];
 export var TWO_COL_LAYOUTS = ['two_equal', 'two_left_sidebar', 'two_right_sidebar'];
 export var THREE_COL_LAYOUTS = ['three_equal', 'three_with_sidebars'];
@@ -677,31 +677,30 @@ export var distributeLayoutColumns = function distributeLayoutColumns(editorAnal
       return null;
     }
     var layoutSectionNode = selectedLayoutColumns.layoutSectionNode,
-      layoutSectionPos = selectedLayoutColumns.layoutSectionPos,
       selectedColumnIndices = selectedLayoutColumns.selectedColumnIndices,
       selectedColumns = selectedLayoutColumns.selectedColumns;
     var endIndex = selectedColumnIndices[selectedColumnIndices.length - 1];
     var selectedColumnCount = selectedColumns.length;
     var totalColumnCount = layoutSectionNode.childCount;
-
-    // Compute equal width for selected columns
     var existingWidths = mapChildren(layoutSectionNode, function (column) {
       return column.attrs.width;
     });
-    var selectedTotal = selectedColumnIndices.reduce(function (sum, idx) {
-      return sum + existingWidths[idx];
-    }, 0);
-    var equalWidth = selectedTotal / selectedColumnCount;
-
-    // Early return if selected columns are already uniformly distributed — avoids spurious undo entry.
-    if (selectedColumnIndices.every(function (idx) {
-      return existingWidths[idx] === Number(equalWidth.toFixed(2));
-    })) {
+    var selectedWidths = selectedColumns.map(function (_ref9) {
+      var node = _ref9.node;
+      return node.attrs.width;
+    });
+    var distribution = calculateDistribution(selectedWidths);
+    if (!distribution) {
+      return null;
+    }
+    var selectedTotal = distribution.selectedTotal,
+      equalWidth = distribution.equalWidth;
+    if (isDistributedUniformly(selectedWidths, distribution)) {
       return null;
     }
 
     // Build new widths array: selected columns get equal share, unselected unchanged.
-    // Assign truncated (2dp) equal widths to all selected cols except the last, which absorbs
+    // Assign rounded (2dp) equal widths to all selected cols except the last, which absorbs
     // the rounding remainder so the sum of selected widths equals selectedTotal exactly.
     var selectedIndexSet = new Set(selectedColumnIndices);
     var assignedToSelected = 0;
@@ -712,16 +711,22 @@ export var distributeLayoutColumns = function distributeLayoutColumns(editorAnal
       }
       selectedAssignedCount += 1;
       if (selectedAssignedCount < selectedColumnCount) {
-        var truncated = Number(equalWidth.toFixed(2));
-        assignedToSelected += truncated;
-        return truncated;
+        assignedToSelected += equalWidth;
+        return equalWidth;
       }
       // Last selected column: absorb the remainder to avoid drift
       return Number((selectedTotal - assignedToSelected).toFixed(2));
     });
 
-    // Apply widths via replaceWith (mirroring forceColumnWidths approach)
-    tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(layoutSectionNode, tr.doc.type.schema, newWidths));
+    // Apply widths via setNodeMarkup per selected column — keeps nodes in place (preserves identity, marks, decorations)
+    selectedColumns.forEach(function (_ref0, i) {
+      var node = _ref0.node,
+        pos = _ref0.pos;
+      var colIdx = selectedColumnIndices[i];
+      tr.setNodeMarkup(pos, node.type, _objectSpread(_objectSpread({}, node.attrs), {}, {
+        width: newWidths[colIdx]
+      }));
+    });
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
       action: ACTION.UPDATED,
       actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -739,11 +744,11 @@ export var distributeLayoutColumns = function distributeLayoutColumns(editorAnal
     return tr;
   };
 };
-export var toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref9) {
-  var anchorPos = _ref9.anchorPos,
-    isOpen = _ref9.isOpen;
-  return function (_ref0) {
-    var tr = _ref0.tr;
+export var toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref1) {
+  var anchorPos = _ref1.anchorPos,
+    isOpen = _ref1.isOpen;
+  return function (_ref10) {
+    var tr = _ref10.tr;
     tr.setMeta('toggleLayoutColumnMenu', {
       anchorPos: anchorPos,
       isOpen: isOpen
@@ -753,8 +758,8 @@ export var toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref9) {
   };
 };
 export var deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI) {
-  return function (_ref1) {
-    var tr = _ref1.tr;
+  return function (_ref11) {
+    var tr = _ref11.tr;
     if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }

package/dist/esm/pm-plugins/utils/{redistribute-proportionally.js → layout-column-distribution.js}

@@ -7,9 +7,6 @@ var sumWidths = function sumWidths(widths) {
     return sum + width;
   }, 0);
 };
-var isValidWidth = function isValidWidth(width) {
-  return Number.isFinite(width) && width > 0;
-};
 var normaliseWidthsTotal = function normaliseWidthsTotal(widths, totalWidth, minWidth) {
   var roundedWidths = widths.map(roundLayoutColumnWidth);
   var remainder = roundLayoutColumnWidth(totalWidth - sumWidths(roundedWidths));
@@ -30,6 +27,9 @@ var normaliseWidthsTotal = function normaliseWidthsTotal(widths, totalWidth, min
     return index === adjustmentIndex ? adjustedWidth : width;
   });
 };
+var isValidWidth = function isValidWidth(width) {
+  return Number.isFinite(width) && width > 0;
+};
 var redistributeWithMinimumWidth = function redistributeWithMinimumWidth(_ref) {
   var minWidth = _ref.minWidth,
     totalWidth = _ref.totalWidth,
@@ -74,6 +74,40 @@ var redistributeWithMinimumWidth = function redistributeWithMinimumWidth(_ref) {
   });
   return widths;
 };
+
+/**
+ * Returns true when the given selected columns already reflect the distribution that
+ * `distributeLayoutColumns` would produce — i.e. the first N-1 cols each hold
+ * `equalWidth` (rounded to 2 dp) and the last col absorbs the rounding remainder.
+ *
+ * This mirrors the action's "last col absorbs remainder" logic so that the UI can
+ * disable the option when it would be a no-op, avoiding spurious undo entries.
+ */
+
+export var calculateDistribution = function calculateDistribution(selectedWidths) {
+  var count = selectedWidths.length;
+  if (count < 2) {
+    return undefined;
+  }
+  var selectedTotal = sumWidths(selectedWidths);
+  var equalWidth = roundLayoutColumnWidth(selectedTotal / count);
+  return {
+    selectedTotal: selectedTotal,
+    equalWidth: equalWidth
+  };
+};
+export function isDistributedUniformly(selectedWidths) {
+  var distribution = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : calculateDistribution(selectedWidths);
+  if (!distribution || selectedWidths.length < 2) {
+    return false;
+  }
+  var selectedTotal = distribution.selectedTotal,
+    equalWidth = distribution.equalWidth;
+  var lastColWidth = roundLayoutColumnWidth(selectedTotal - equalWidth * (selectedWidths.length - 1));
+  return selectedWidths.slice(0, -1).every(function (width) {
+    return width === equalWidth;
+  }) && selectedWidths[selectedWidths.length - 1] === lastColWidth;
+}
 export var redistributeAfterDeletion = function redistributeAfterDeletion(currentWidths, removeIndex, minWidth) {
   if (currentWidths.length === 0 || removeIndex < 0 || removeIndex >= currentWidths.length || !isValidWidth(minWidth)) {
     return currentWidths;

package/dist/esm/pm-plugins/utils/layout-column-selection.js

@@ -106,7 +106,8 @@ export var getLayoutSectionColumnCount = function getLayoutSectionColumnCount(la
   return (layoutSection === null || layoutSection === void 0 ? void 0 : layoutSection.type.name) === 'layoutSection' ? layoutSection.childCount : 0;
 };
 export var getLayoutColumnValign = function getLayoutColumnValign(layoutColumn) {
-  return layoutColumn === null || layoutColumn === void 0 ? void 0 : layoutColumn.attrs.valign;
+  var _ref2;
+  return layoutColumn ? (_ref2 = layoutColumn.attrs.valign) !== null && _ref2 !== void 0 ? _ref2 : 'top' : undefined;
 };
 export var getLayoutColumnMenuAnchorPos = function getLayoutColumnMenuAnchorPos(selection, anchorPosFromHandle) {
   var _clickedSelectedColum, _selectedLayoutColumn;
@@ -114,8 +115,8 @@ export var getLayoutColumnMenuAnchorPos = function getLayoutColumnMenuAnchorPos(
   if (!selectedLayoutColumns) {
     return undefined;
   }
-  var clickedSelectedColumn = selectedLayoutColumns.selectedColumns.find(function (_ref2) {
-    var pos = _ref2.pos;
+  var clickedSelectedColumn = selectedLayoutColumns.selectedColumns.find(function (_ref3) {
+    var pos = _ref3.pos;
     return pos === anchorPosFromHandle;
   });
   return (_clickedSelectedColum = clickedSelectedColumn === null || clickedSelectedColumn === void 0 ? void 0 : clickedSelectedColumn.pos) !== null && _clickedSelectedColum !== void 0 ? _clickedSelectedColum : (_selectedLayoutColumn = selectedLayoutColumns.selectedColumns[0]) === null || _selectedLayoutColumn === void 0 ? void 0 : _selectedLayoutColumn.pos;

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

@@ -2,6 +2,7 @@ import React, { useCallback, useMemo } from 'react';
 import { useIntl } from 'react-intl';
 import { layoutMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { isDistributedUniformly } from '../../pm-plugins/utils/layout-column-distribution';
 import { useSelectedLayoutColumns } from './useSelectedLayoutColumns';
 export var DistributeColumnsDropdownItem = function DistributeColumnsDropdownItem(_ref) {
   var api = _ref.api;
@@ -24,9 +25,6 @@ export var DistributeColumnsDropdownItem = function DistributeColumnsDropdownIte
       return closedTr !== null && closedTr !== void 0 ? closedTr : tr;
     });
   }, [api]);
-
-  // Hide when selected columns are already evenly distributed — no-op action.
-  // Must be before any early return to satisfy rules-of-hooks.
   var isAlreadyUniform = useMemo(function () {
     if (!selectedLayoutColumns || selectedLayoutColumns.selectedColumns.length < 2) {
       return false;
@@ -34,21 +32,13 @@ export var DistributeColumnsDropdownItem = function DistributeColumnsDropdownIte
     var selectedWidths = selectedLayoutColumns.selectedColumns.map(function (col) {
       return col.node.attrs.width;
     });
-    var selectedTotal = selectedWidths.reduce(function (sum, w) {
-      return sum + w;
-    }, 0);
-    var equalWidth = Number((selectedTotal / selectedWidths.length).toFixed(2));
-    return selectedWidths.every(function (w) {
-      return w === equalWidth;
-    });
+    return isDistributedUniformly(selectedWidths);
   }, [selectedLayoutColumns]);
   if (selectedLayoutColumns === undefined || selectedLayoutColumns.selectedColumns.length < 2) {
     return null;
   }
-  if (isAlreadyUniform) {
-    return null;
-  }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
-    onClick: handleClick
+    onClick: handleClick,
+    isDisabled: isAlreadyUniform
   }, formatMessage(layoutMessages.distributeColumns));
 };

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

@@ -27,6 +27,7 @@ export var VerticalAlignDropdownItem = function VerticalAlignDropdownItem(_ref)
       size: "small"
     }),
     isSelected: isSelected,
-    onClick: onClick
+    onClick: onClick,
+    role: "menuitemradio"
   }, formatMessage(label));
 };

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

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import { useIntl } from 'react-intl';
 import { layoutMessages } from '@atlaskit/editor-common/messages';
-import { LayoutIcon, NestedDropdownRightIcon, ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
+import { NestedDropdownRightIcon, ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
 import { getLayoutColumnValign } from '../../pm-plugins/utils/layout-column-selection';
 import { useSelectedLayoutColumns } from './useSelectedLayoutColumns';
 import { VERTICAL_ALIGN_ICONS } from './verticalAlignIcons';
@@ -23,10 +23,7 @@ export var VerticalAlignNestedMenu = function VerticalAlignNestedMenu(_ref) {
     }
     return firstValign;
   }, [selectedLayoutColumns]);
-  var TriggerIcon = currentValign ? VERTICAL_ALIGN_ICONS[currentValign] : LayoutIcon;
-  if (!selectedLayoutColumns) {
-    return null;
-  }
+  var TriggerIcon = currentValign ? VERTICAL_ALIGN_ICONS[currentValign] : VERTICAL_ALIGN_ICONS.top;
   return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {
     elemBefore: /*#__PURE__*/React.createElement(TriggerIcon, {
       label: "",

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

@@ -1,8 +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 React from 'react';
+import React, { useContext } from 'react';
 import { layoutMessages } from '@atlaskit/editor-common/messages';
+import { OutsideClickTargetRefContext } from '@atlaskit/editor-common/ui-react';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
 import { ToolbarMenuContainer } from '@atlaskit/editor-toolbar/toolbar-menu-container';
 import { DeleteColumnDropdownItem } from './DeleteColumnDropdownItem';
@@ -11,16 +12,23 @@ import { InsertColumnDropdownItem } from './InsertColumnDropdownItem';
 import { DELETE_COLUMN_MENU_ITEM, DISTRIBUTE_COLUMNS_MENU_ITEM, INSERT_COLUMN_LEFT_MENU_ITEM, INSERT_COLUMN_RIGHT_MENU_ITEM, LAYOUT_COLUMN_MENU, LAYOUT_COLUMN_MENU_RANK, LAYOUT_COLUMN_MENU_SECTION, LAYOUT_COLUMN_MENU_SECTION_RANK, LAYOUT_COLUMN_VERTICAL_ALIGN_MENU_SECTION, VERTICAL_ALIGN_BOTTOM_MENU_ITEM, VERTICAL_ALIGN_MENU, VERTICAL_ALIGN_MENU_RANK, VERTICAL_ALIGN_MENU_SECTION_RANK, VERTICAL_ALIGN_MIDDLE_MENU_ITEM, VERTICAL_ALIGN_TOP_MENU_ITEM } from './keys';
 import { VerticalAlignDropdownItem } from './VerticalAlignDropdownItem';
 import { VerticalAlignNestedMenu } from './VerticalAlignNestedMenu';
+var LayoutColumnMenuContainer = function LayoutColumnMenuContainer(_ref) {
+  var children = _ref.children;
+  var setOutsideClickTargetRef = useContext(OutsideClickTargetRefContext);
+  return /*#__PURE__*/React.createElement(ToolbarMenuContainer, {
+    ref: setOutsideClickTargetRef
+  }, children);
+};
 export var LAYOUT_COLUMN_MENU_FALLBACKS = {
-  'menu-section': function menuSection(_ref) {
-    var children = _ref.children;
+  'menu-section': function menuSection(_ref2) {
+    var children = _ref2.children;
     return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, null, children);
   }
 };
-export var getLayoutColumnMenuComponents = function getLayoutColumnMenuComponents(_ref2) {
-  var api = _ref2.api;
+export var getLayoutColumnMenuComponents = function getLayoutColumnMenuComponents(_ref3) {
+  var api = _ref3.api;
   return [_objectSpread(_objectSpread({}, LAYOUT_COLUMN_MENU), {}, {
-    component: ToolbarMenuContainer
+    component: LayoutColumnMenuContainer
   }), _objectSpread(_objectSpread({}, LAYOUT_COLUMN_MENU_SECTION), {}, {
     parents: [_objectSpread(_objectSpread({}, LAYOUT_COLUMN_MENU), {}, {
       rank: LAYOUT_COLUMN_MENU_RANK[LAYOUT_COLUMN_MENU_SECTION.key]
@@ -64,8 +72,8 @@ export var getLayoutColumnMenuComponents = function getLayoutColumnMenuComponent
       rank: LAYOUT_COLUMN_MENU_SECTION_RANK[DELETE_COLUMN_MENU_ITEM.key]
     })]
   }), _objectSpread(_objectSpread({}, VERTICAL_ALIGN_MENU), {}, {
-    component: function component(_ref3) {
-      var children = _ref3.children;
+    component: function component(_ref4) {
+      var children = _ref4.children;
       return /*#__PURE__*/React.createElement(VerticalAlignNestedMenu, {
         api: api
       }, children);

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

@@ -1,10 +1,8 @@
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import React, { useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { DRAG_HANDLE_SELECTOR } from '@atlaskit/editor-common/styles';
-import { EditorToolbarProvider } from '@atlaskit/editor-common/toolbar';
 import { Popup } from '@atlaskit/editor-common/ui';
-import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-react';
+import { withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-react';
 import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { ToolbarDropdownMenuProvider } from '@atlaskit/editor-toolbar';
 import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model';
@@ -12,8 +10,8 @@ import { getLayoutColumnMenuAnchorPos } from '../../pm-plugins/utils/layout-colu
 import { LAYOUT_COLUMN_MENU_FALLBACKS } from './components';
 import { LAYOUT_COLUMN_MENU } from './keys';
 var PopupWithListeners = withReactEditorViewOuterListeners(Popup);
-var FALLBACK_MENU_HEIGHT = 300;
 var LAYOUT_COLUMN_MENU_POPUP_OFFSET = [0, 4];
+var TOOLBAR_MENU_SELECTOR = '[data-toolbar-component="menu"]';
 
 /**
  * Returns the drag handle button for the selected layout column.
@@ -49,20 +47,6 @@ export var LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMenu(
     isLayoutColumnMenuOpen = _useSharedPluginState.isLayoutColumnMenuOpen,
     layoutColumnMenuAnchorPos = _useSharedPluginState.layoutColumnMenuAnchorPos,
     selection = _useSharedPluginState.selection;
-  var setOutsideClickTargetRef = useContext(OutsideClickTargetRefContext);
-  var menuRef = useRef(null);
-  var popupRef = useRef(undefined);
-  var _React$useState = React.useState(FALLBACK_MENU_HEIGHT),
-    _React$useState2 = _slicedToArray(_React$useState, 2),
-    menuHeight = _React$useState2[0],
-    setMenuHeight = _React$useState2[1];
-  useLayoutEffect(function () {
-    var _popupRef$current;
-    if (!isLayoutColumnMenuOpen) {
-      return;
-    }
-    setMenuHeight(((_popupRef$current = popupRef.current) === null || _popupRef$current === void 0 ? void 0 : _popupRef$current.clientHeight) || FALLBACK_MENU_HEIGHT);
-  }, [isLayoutColumnMenuOpen]);
   var closeLayoutColumnMenu = useCallback(function () {
     var _api$core, _api$layout;
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$layout = api.layout) === null || _api$layout === void 0 ? void 0 : _api$layout.commands.toggleLayoutColumnMenu({
@@ -70,11 +54,7 @@ export var LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMenu(
     }));
   }, [api]);
   var handleClickOutside = useCallback(function (event) {
-    var _menuRef$current;
-    if (event.target instanceof Node && (_menuRef$current = menuRef.current) !== null && _menuRef$current !== void 0 && _menuRef$current.contains(event.target)) {
-      return;
-    }
-    if (event.target instanceof Element && event.target.closest('[data-toolbar-nested-dropdown-menu]')) {
+    if (event.target instanceof Element && (event.target.closest(TOOLBAR_MENU_SELECTOR) || event.target.closest('[data-toolbar-nested-dropdown-menu]'))) {
       return;
     }
 
@@ -91,13 +71,6 @@ export var LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMenu(
       closeLayoutColumnMenu();
     }
   }, [closeLayoutColumnMenu]);
-  var handleMenuRef = useCallback(function (el) {
-    setOutsideClickTargetRef === null || setOutsideClickTargetRef === void 0 || setOutsideClickTargetRef(el);
-    menuRef.current = el;
-    if (el) {
-      popupRef.current = el;
-    }
-  }, [setOutsideClickTargetRef]);
   var components = (_api$uiControlRegistr = api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(LAYOUT_COLUMN_MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
   var target = useMemo(function () {
     return isLayoutColumnMenuOpen ? getLayoutColumnMenuTarget(editorView, selection, layoutColumnMenuAnchorPos) : null;
@@ -118,16 +91,11 @@ export var LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMenu(
     scrollableElement: scrollableElement,
     zIndex: akEditorFloatingOverlapPanelZIndex,
     alignX: "center",
-    fitHeight: menuHeight,
     preventOverflow: true,
     stick: true,
     offset: LAYOUT_COLUMN_MENU_POPUP_OFFSET,
     handleClickOutside: handleClickOutside,
     handleEscapeKeydown: closeLayoutColumnMenu
-  }, /*#__PURE__*/React.createElement("div", {
-    ref: handleMenuRef
-  }, /*#__PURE__*/React.createElement(EditorToolbarProvider, {
-    editorView: editorView
   }, /*#__PURE__*/React.createElement(ToolbarDropdownMenuProvider, {
     isOpen: isLayoutColumnMenuOpen,
     setIsOpen: handleSetIsOpen
@@ -135,5 +103,5 @@ export var LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMenu(
     components: components,
     fallbacks: LAYOUT_COLUMN_MENU_FALLBACKS,
     surface: LAYOUT_COLUMN_MENU
-  })))));
+  })));
 });

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

@@ -1,7 +1,7 @@
+import type { Valign } from '@atlaskit/adf-schema/layout-column';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Command, EditorCommand, TOOLBAR_MENU_TYPE } from '@atlaskit/editor-common/types';
-import type { Valign } from '@atlaskit/editor-common/types/valign';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { Change, PresetLayout } from '../types';
@@ -17,7 +17,8 @@ export declare const getSelectedLayout: (maybeLayoutSection: Node | undefined, c
 export declare const createMultiColumnLayoutSection: (state: EditorState, numberOfColumns?: number) => Node;
 export declare const createDefaultLayoutSection: (state: EditorState) => Node;
 export declare const insertLayoutColumns: Command;
-export declare const insertLayoutColumnsWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod: TOOLBAR_MENU_TYPE) => Command;
+type InsertLayoutColumnsInputMethod = TOOLBAR_MENU_TYPE | INPUT_METHOD.QUICK_INSERT | INPUT_METHOD.ELEMENT_BROWSER;
+export declare const insertLayoutColumnsWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod: InsertLayoutColumnsInputMethod) => Command;
 /**
  * Forces a layout section node to match the given preset layout by adjusting
  * its column structure and widths, then restoring the original selection.
@@ -40,3 +41,4 @@ export declare const toggleLayoutColumnMenu: ({ anchorPos, isOpen }: {
     isOpen?: boolean;
 }) => EditorCommand;
 export declare const deleteLayoutColumn: (editorAnalyticsAPI?: EditorAnalyticsAPI) => EditorCommand;
+export {};

package/dist/types/pm-plugins/utils/layout-column-distribution.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Returns true when the given selected columns already reflect the distribution that
+ * `distributeLayoutColumns` would produce — i.e. the first N-1 cols each hold
+ * `equalWidth` (rounded to 2 dp) and the last col absorbs the rounding remainder.
+ *
+ * This mirrors the action's "last col absorbs remainder" logic so that the UI can
+ * disable the option when it would be a no-op, avoiding spurious undo entries.
+ */
+export type Distribution = {
+    equalWidth: number;
+    selectedTotal: number;
+};
+export declare const calculateDistribution: (selectedWidths: number[]) => Distribution | undefined;
+export declare function isDistributedUniformly(selectedWidths: number[], distribution?: Distribution | undefined): boolean;
+export declare const redistributeAfterDeletion: (currentWidths: number[], removeIndex: number, minWidth: number) => number[];
+export declare const redistributeProportionally: (currentWidths: number[], insertIndex: number, maxColumns: number, minWidth: number) => number[];