@atlaskit/editor-plugin-layout 10.8.0 → 10.9.0

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 { getSelectedLayoutColumns } from './utils/layout-column-selection';
-import { redistributeAfterDeletion, redistributeProportionally } from './utils/redistribute-proportionally';
+import { calculateDistribution, isDistributedUniformly, redistributeAfterDeletion, redistributeProportionally } from './utils/layout-column-distribution';
+import { getAllLayoutColumnsFromSelection, getSelectedLayoutColumnsFromSelection } from './utils/layout-column-selection';
 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'];
@@ -554,18 +554,17 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
     if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
-    var selectedLayoutColumns = getSelectedLayoutColumns(tr.selection);
-    if (!selectedLayoutColumns) {
+    var selectedLayoutColumnsResult = getSelectedLayoutColumnsFromSelection(tr.selection);
+    if (!selectedLayoutColumnsResult || selectedLayoutColumnsResult.selectedLayoutColumns.length === 0) {
       return null;
     }
-    var layoutSectionNode = selectedLayoutColumns.layoutSectionNode,
-      layoutSectionPos = selectedLayoutColumns.layoutSectionPos,
-      selectedColumnIndices = selectedLayoutColumns.selectedColumnIndices,
-      selectedColumns = selectedLayoutColumns.selectedColumns;
-    var startIndex = selectedColumnIndices[0];
-    var endIndex = selectedColumnIndices[selectedColumnIndices.length - 1];
+    var layoutSectionNode = selectedLayoutColumnsResult.layoutSectionNode,
+      layoutSectionPos = selectedLayoutColumnsResult.layoutSectionPos,
+      startIndex = selectedLayoutColumnsResult.startIndex,
+      endIndex = selectedLayoutColumnsResult.endIndex,
+      selectedLayoutColumns = selectedLayoutColumnsResult.selectedLayoutColumns;
     var selectedColumnIndex = side === 'left' ? startIndex : endIndex;
-    var selectedColumnCount = selectedColumns.length;
+    var selectedColumnCount = selectedLayoutColumns.length;
     if (layoutSectionNode.childCount >= getEffectiveMaxLayoutColumns()) {
       return null;
     }
@@ -623,22 +622,20 @@ export var setLayoutColumnValign = function setLayoutColumnValign(valign, editor
     if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
-    var selectedLayoutColumns = getSelectedLayoutColumns(tr.selection);
-    if (!selectedLayoutColumns) {
+    var selectedLayoutColumnsResult = getSelectedLayoutColumnsFromSelection(tr.selection);
+    if (!selectedLayoutColumnsResult) {
       return null;
     }
-    var selectedColumnIndices = selectedLayoutColumns.selectedColumnIndices,
-      selectedColumns = selectedLayoutColumns.selectedColumns;
-    var columnsToUpdate = selectedColumns.filter(function (_ref6) {
+    var startIndex = selectedLayoutColumnsResult.startIndex,
+      endIndex = selectedLayoutColumnsResult.endIndex,
+      selectedLayoutColumns = selectedLayoutColumnsResult.selectedLayoutColumns;
+    var columnsToUpdate = selectedLayoutColumns.filter(function (_ref6) {
       var node = _ref6.node;
       return node.attrs.valign !== valign;
     });
     if (columnsToUpdate.length === 0) {
       return null;
     }
-    var startIndex = selectedColumnIndices[0];
-    var endIndex = selectedColumnIndices[selectedColumnIndices.length - 1];
-    var selectedColumnCount = selectedColumns.length;
     var updatedColumnCount = columnsToUpdate.length;
     columnsToUpdate.forEach(function (_ref7) {
       var node = _ref7.node,
@@ -654,7 +651,7 @@ export var setLayoutColumnValign = function setLayoutColumnValign(valign, editor
       attributes: {
         endIndex: endIndex,
         inputMethod: INPUT_METHOD.LAYOUT_COLUMN_MENU,
-        selectedCount: selectedColumnCount,
+        selectedCount: selectedLayoutColumns.length,
         startIndex: startIndex,
         updatedCount: updatedColumnCount,
         valign: valign
@@ -665,73 +662,80 @@ export var setLayoutColumnValign = function setLayoutColumnValign(valign, editor
     return tr;
   };
 };
-export var distributeLayoutColumns = function distributeLayoutColumns(editorAnalyticsAPI) {
-  var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : INPUT_METHOD.LAYOUT_COLUMN_MENU;
-  return function (_ref8) {
-    var tr = _ref8.tr;
+export var distributeLayoutColumns = function distributeLayoutColumns() {
+  var _ref8 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    editorAnalyticsAPI = _ref8.editorAnalyticsAPI,
+    _ref8$inputMethod = _ref8.inputMethod,
+    inputMethod = _ref8$inputMethod === void 0 ? INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref8$inputMethod,
+    _ref8$target = _ref8.target,
+    target = _ref8$target === void 0 ? 'selectedColumns' : _ref8$target;
+  return function (_ref9) {
+    var tr = _ref9.tr;
     if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
-    var selectedLayoutColumns = getSelectedLayoutColumns(tr.selection);
-    if (!selectedLayoutColumns || selectedLayoutColumns.selectedColumns.length < 2) {
+    var selectedLayoutColumnsResult = target === 'allColumns' ? getAllLayoutColumnsFromSelection(tr.selection) : getSelectedLayoutColumnsFromSelection(tr.selection);
+    if (!selectedLayoutColumnsResult || selectedLayoutColumnsResult.selectedLayoutColumns.length < 2) {
       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 layoutSectionNode = selectedLayoutColumnsResult.layoutSectionNode,
+      startIndex = selectedLayoutColumnsResult.startIndex,
+      endIndex = selectedLayoutColumnsResult.endIndex,
+      selectedLayoutColumns = selectedLayoutColumnsResult.selectedLayoutColumns;
     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 = selectedLayoutColumns.map(function (_ref0) {
+      var node = _ref0.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;
     var selectedAssignedCount = 0;
     var newWidths = existingWidths.map(function (w, idx) {
-      if (!selectedIndexSet.has(idx)) {
+      if (idx < startIndex || idx > endIndex) {
         return w;
       }
       selectedAssignedCount += 1;
-      if (selectedAssignedCount < selectedColumnCount) {
-        var truncated = Number(equalWidth.toFixed(2));
-        assignedToSelected += truncated;
-        return truncated;
+      if (selectedAssignedCount < selectedLayoutColumns.length) {
+        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)
+    selectedLayoutColumns.forEach(function (_ref1, i) {
+      var node = _ref1.node,
+        pos = _ref1.pos;
+      var colIdx = startIndex + 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,
       actionSubjectId: ACTION_SUBJECT_ID.LAYOUT_COLUMN,
       attributes: {
-        columnCount: totalColumnCount,
+        columnCount: layoutSectionNode.childCount,
         endIndex: endIndex,
         inputMethod: inputMethod,
-        selectedCount: selectedColumnCount,
-        startIndex: selectedColumnIndices[0]
+        selectedCount: selectedLayoutColumns.length,
+        startIndex: startIndex
       },
       eventType: EVENT_TYPE.TRACK
     })(tr);
@@ -739,11 +743,19 @@ 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 createDistributeLayoutColumnsCommand = function createDistributeLayoutColumnsCommand(editorAnalyticsAPI) {
+  return function () {
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    return distributeLayoutColumns(_objectSpread(_objectSpread({}, options), {}, {
+      editorAnalyticsAPI: editorAnalyticsAPI
+    }));
+  };
+};
+export var toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref10) {
+  var anchorPos = _ref10.anchorPos,
+    isOpen = _ref10.isOpen;
+  return function (_ref11) {
+    var tr = _ref11.tr;
     tr.setMeta('toggleLayoutColumnMenu', {
       anchorPos: anchorPos,
       isOpen: isOpen
@@ -753,23 +765,20 @@ export var toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref9) {
   };
 };
 export var deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI) {
-  return function (_ref1) {
-    var tr = _ref1.tr;
+  return function (_ref12) {
+    var tr = _ref12.tr;
     if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
-    var selectedLayoutColumns = getSelectedLayoutColumns(tr.selection);
-    if (!selectedLayoutColumns) {
+    var selectedLayoutColumnsResult = getSelectedLayoutColumnsFromSelection(tr.selection);
+    if (!selectedLayoutColumnsResult || selectedLayoutColumnsResult.selectedLayoutColumns.length === 0) {
       return null;
     }
-    var layoutSectionNode = selectedLayoutColumns.layoutSectionNode,
-      layoutSectionPos = selectedLayoutColumns.layoutSectionPos,
-      selectedColumnIndices = selectedLayoutColumns.selectedColumnIndices,
-      selectedColumns = selectedLayoutColumns.selectedColumns;
-    var startIndex = selectedColumnIndices[0];
-    var endIndex = selectedColumnIndices[selectedColumnIndices.length - 1];
-    var selectedColumnCount = selectedColumns.length;
-    var selectedColumnIndexSet = new Set(selectedColumnIndices);
+    var layoutSectionNode = selectedLayoutColumnsResult.layoutSectionNode,
+      layoutSectionPos = selectedLayoutColumnsResult.layoutSectionPos,
+      selectedLayoutColumns = selectedLayoutColumnsResult.selectedLayoutColumns,
+      startIndex = selectedLayoutColumnsResult.startIndex,
+      endIndex = selectedLayoutColumnsResult.endIndex;
     var emitDeleteColumnAnalytics = function emitDeleteColumnAnalytics(columnCount) {
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
         action: ACTION.DELETED,
@@ -779,7 +788,7 @@ export var deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI)
           columnCount: columnCount,
           endIndex: endIndex,
           inputMethod: INPUT_METHOD.LAYOUT_COLUMN_MENU,
-          selectedCount: selectedColumnCount,
+          selectedCount: selectedLayoutColumns.length,
           startIndex: startIndex
         },
         eventType: EVENT_TYPE.TRACK
@@ -787,7 +796,7 @@ export var deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI)
     };
 
     // If all columns are selected, remove the entire layoutSection
-    if (selectedColumnCount === layoutSectionNode.childCount) {
+    if (selectedLayoutColumns.length === layoutSectionNode.childCount) {
       tr.delete(layoutSectionPos, layoutSectionPos + layoutSectionNode.nodeSize);
       emitDeleteColumnAnalytics(0);
       tr.setMeta('scrollIntoView', false);
@@ -797,7 +806,7 @@ export var deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI)
     // Build new column list without the selected columns
     var remainingColumns = [];
     layoutSectionNode.forEach(function (column, _offset, index) {
-      if (!selectedColumnIndexSet.has(index)) {
+      if (index < startIndex || index > endIndex) {
         remainingColumns.push(column);
       }
     });
@@ -806,12 +815,12 @@ export var deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI)
     var existingWidths = mapChildren(layoutSectionNode, function (column) {
       return column.attrs.width;
     });
-    var redistributed = selectedColumnIndices.slice()
+    var redistributed = selectedLayoutColumns.map(function (_, i) {
+      return startIndex + i;
+    })
     // Delete highest indices first so lower original indices still point at the same columns
     // as each redistribution step shrinks the widths array.
-    .sort(function (a, b) {
-      return b - a;
-    }).reduce(function (widths, selectedIndex) {
+    .reverse().reduce(function (widths, selectedIndex) {
       return redistributeAfterDeletion(widths, selectedIndex, MIN_LAYOUT_COLUMN_WIDTH_PERCENT);
     }, existingWidths);
     var updatedLayoutSectionNode = layoutSectionNode.copy(Fragment.fromArray(remainingColumns));

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

@@ -1,123 +1,81 @@
-import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-var isLayoutColumn = function isLayoutColumn(node) {
-  return (node === null || node === void 0 ? void 0 : node.type.name) === 'layoutColumn';
+import { findChildrenByType, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+var findLayoutSectionFromSelection = function findLayoutSectionFromSelection(selection) {
+  return findParentNodeOfType(selection.$from.doc.type.schema.nodes.layoutSection)(selection);
 };
-var isLayoutSection = function isLayoutSection(node) {
-  return (node === null || node === void 0 ? void 0 : node.type.name) === 'layoutSection';
-};
-var getLayoutColumnIndexAtPos = function getLayoutColumnIndexAtPos($pos) {
-  for (var depth = $pos.depth; depth > 0; depth--) {
-    if (isLayoutColumn($pos.node(depth)) && isLayoutSection($pos.node(depth - 1))) {
-      return $pos.index(depth - 1);
-    }
-  }
-  return undefined;
-};
-var getLayoutSectionDepth = function getLayoutSectionDepth(selection) {
-  var $from = selection.$from,
-    $to = selection.$to;
-  var sharedDepth = $from.sharedDepth($to.pos);
-  for (var depth = sharedDepth; depth > 0; depth--) {
-    if (isLayoutSection($from.node(depth))) {
-      return depth;
-    }
-  }
-  return undefined;
-};
-export var getSelectedLayoutColumns = function getSelectedLayoutColumns(selection) {
-  if (!selection) {
-    return undefined;
-  }
-  if (selection instanceof NodeSelection && isLayoutColumn(selection.node)) {
-    var _$from = selection.$from;
-    var _layoutSectionNode = _$from.parent;
-    if (!isLayoutSection(_layoutSectionNode)) {
-      return undefined;
-    }
-    var selectedColumnIndex = _$from.index(_$from.depth);
+var findLayoutColumnsFromLayoutSection = function findLayoutColumnsFromLayoutSection(layoutSectionNode) {
+  var layoutSectionPos = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  return findChildrenByType(layoutSectionNode, layoutSectionNode.type.schema.nodes.layoutColumn).map(function (_ref) {
+    var node = _ref.node,
+      pos = _ref.pos;
     return {
-      layoutSectionNode: _layoutSectionNode,
-      layoutSectionPos: _$from.before(_$from.depth),
-      selectedColumnIndices: [selectedColumnIndex],
-      selectedColumns: [{
-        index: selectedColumnIndex,
-        node: selection.node,
-        pos: selection.from
-      }]
+      node: node,
+      pos: pos + layoutSectionPos + 1
     };
-  }
-  if (selection.empty) {
-    return undefined;
-  }
-  if (!editorExperiment('platform_editor_block_menu', true)) {
+  });
+};
+export var getSelectedLayoutColumnsFromSelection = function getSelectedLayoutColumnsFromSelection(selection) {
+  var layoutSection = findLayoutSectionFromSelection(selection);
+  if (!layoutSection) {
     return undefined;
   }
-  var layoutSectionDepth = getLayoutSectionDepth(selection);
-  if (layoutSectionDepth === undefined) {
+  var layoutSectionNode = layoutSection.node,
+    layoutSectionPos = layoutSection.pos;
+  var allLayoutColumns = findLayoutColumnsFromLayoutSection(layoutSectionNode, layoutSectionPos);
+  if (!allLayoutColumns.length) {
     return undefined;
   }
-  var $from = selection.$from,
-    $to = selection.$to;
-  var layoutSectionNode = $from.node(layoutSectionDepth);
-  var layoutSectionPos = $from.before(layoutSectionDepth);
-  var selectedColumns = [];
-  var invalidSelection = false;
-  layoutSectionNode.forEach(function (column, offset, index) {
-    var columnStart = layoutSectionPos + 1 + offset;
-    var columnEnd = columnStart + column.nodeSize;
-    var intersectsColumn = selection.from < columnEnd && selection.to > columnStart;
-    if (!intersectsColumn) {
-      return;
+  var startIndex = -1;
+  var endIndex = -1;
+  var selectedLayoutColumns = allLayoutColumns.filter(function (_ref2, index) {
+    var node = _ref2.node,
+      pos = _ref2.pos;
+    var isSelected = selection.from <= pos && selection.to >= pos + node.nodeSize;
+    if (isSelected) {
+      if (startIndex === -1) {
+        startIndex = index;
+      }
+      endIndex = index;
     }
-    if (!isLayoutColumn(column)) {
-      invalidSelection = true;
-      return;
-    }
-    selectedColumns.push({
-      index: index,
-      node: column,
-      pos: columnStart
-    });
+    return isSelected;
   });
-
-  // TextSelection inside a single column is normal text editing, not a selected column set.
-  if (invalidSelection || selectedColumns.length < 2) {
+  return {
+    layoutSectionNode: layoutSectionNode,
+    layoutSectionPos: layoutSectionPos,
+    selectedLayoutColumns: selectedLayoutColumns,
+    startIndex: startIndex,
+    endIndex: endIndex
+  };
+};
+export var getAllLayoutColumnsFromSelection = function getAllLayoutColumnsFromSelection(selection) {
+  var layoutSection = findLayoutSectionFromSelection(selection);
+  if (!layoutSection) {
     return undefined;
   }
-  var firstColumn = selectedColumns[0];
-  var lastColumn = selectedColumns[selectedColumns.length - 1];
-  var startColumnIndex = getLayoutColumnIndexAtPos($from);
-  var endColumnIndex = getLayoutColumnIndexAtPos($to);
-  if (startColumnIndex !== undefined && startColumnIndex !== firstColumn.index || endColumnIndex !== undefined && endColumnIndex !== lastColumn.index) {
+  var layoutColumns = findLayoutColumnsFromLayoutSection(layoutSection.node, layoutSection.pos);
+  if (!(layoutColumns !== null && layoutColumns !== void 0 && layoutColumns.length)) {
     return undefined;
   }
   return {
-    layoutSectionNode: layoutSectionNode,
-    layoutSectionPos: layoutSectionPos,
-    selectedColumnIndices: selectedColumns.map(function (_ref) {
-      var index = _ref.index;
-      return index;
-    }),
-    selectedColumns: selectedColumns
+    layoutSectionNode: layoutSection.node,
+    layoutSectionPos: layoutSection.pos,
+    selectedLayoutColumns: layoutColumns,
+    startIndex: 0,
+    endIndex: layoutColumns.length - 1
   };
 };
-export var getLayoutSectionColumnCount = function getLayoutSectionColumnCount(layoutSection) {
-  return (layoutSection === null || layoutSection === void 0 ? void 0 : layoutSection.type.name) === 'layoutSection' ? layoutSection.childCount : 0;
-};
 export var getLayoutColumnValign = function getLayoutColumnValign(layoutColumn) {
-  var _ref2;
-  return layoutColumn ? (_ref2 = layoutColumn.attrs.valign) !== null && _ref2 !== void 0 ? _ref2 : 'top' : undefined;
+  var _ref3;
+  return layoutColumn ? (_ref3 = layoutColumn.attrs.valign) !== null && _ref3 !== void 0 ? _ref3 : 'top' : undefined;
 };
 export var getLayoutColumnMenuAnchorPos = function getLayoutColumnMenuAnchorPos(selection, anchorPosFromHandle) {
   var _clickedSelectedColum, _selectedLayoutColumn;
-  var selectedLayoutColumns = getSelectedLayoutColumns(selection);
+  var selectedLayoutColumns = getSelectedLayoutColumnsFromSelection(selection);
   if (!selectedLayoutColumns) {
     return undefined;
   }
-  var clickedSelectedColumn = selectedLayoutColumns.selectedColumns.find(function (_ref3) {
-    var pos = _ref3.pos;
+  var clickedSelectedColumn = selectedLayoutColumns.selectedLayoutColumns.find(function (_ref4) {
+    var pos = _ref4.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;
+  return (_clickedSelectedColum = clickedSelectedColumn === null || clickedSelectedColumn === void 0 ? void 0 : clickedSelectedColumn.pos) !== null && _clickedSelectedColum !== void 0 ? _clickedSelectedColum : (_selectedLayoutColumn = selectedLayoutColumns.selectedLayoutColumns[0]) === null || _selectedLayoutColumn === void 0 ? void 0 : _selectedLayoutColumn.pos;
 };

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

@@ -28,7 +28,7 @@ var DeleteColumnDropdownItem = function DeleteColumnDropdownItem(_ref) {
   if (selectedLayoutColumns === undefined) {
     return null;
   }
-  var selectedColumnCount = selectedLayoutColumns.selectedColumns.length;
+  var selectedColumnCount = selectedLayoutColumns.selectedLayoutColumns.length;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: onClick
   }, formatMessage(layoutMessages.deleteColumn, {

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

@@ -1,18 +1,24 @@
 import React, { useCallback, useMemo } from 'react';
 import { useIntl } from 'react-intl';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 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;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
-  var selectedLayoutColumns = useSelectedLayoutColumns(api);
+  var selectedLayoutColumnsResult = useSelectedLayoutColumns(api);
+  var _ref2 = selectedLayoutColumnsResult !== null && selectedLayoutColumnsResult !== void 0 ? selectedLayoutColumnsResult : {},
+    selectedLayoutColumns = _ref2.selectedLayoutColumns;
   var handleClick = useCallback(function () {
     var _api$core;
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (props) {
       var _api$layout, _api$layout2;
-      var tr = api === null || api === void 0 || (_api$layout = api.layout) === null || _api$layout === void 0 ? void 0 : _api$layout.commands.distributeLayoutColumns(props);
+      var tr = api === null || api === void 0 || (_api$layout = api.layout) === null || _api$layout === void 0 ? void 0 : _api$layout.commands.distributeLayoutColumns({
+        inputMethod: INPUT_METHOD.LAYOUT_COLUMN_MENU
+      })(props);
       if (!tr) {
         return null;
       }
@@ -24,31 +30,20 @@ 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) {
+    if (!selectedLayoutColumns || selectedLayoutColumns.length < 2) {
       return false;
     }
-    var selectedWidths = selectedLayoutColumns.selectedColumns.map(function (col) {
+    var selectedWidths = selectedLayoutColumns.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) {
+  if (selectedLayoutColumns === undefined || selectedLayoutColumns.length < 2) {
     return null;
   }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
-    onClick: handleClick
+    onClick: handleClick,
+    isDisabled: isAlreadyUniform
   }, formatMessage(layoutMessages.distributeColumns));
 };

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

@@ -3,7 +3,6 @@ import { useIntl } from 'react-intl';
 import { layoutMessages } from '@atlaskit/editor-common/messages';
 import { TableColumnAddLeftIcon, TableColumnAddRightIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import { getEffectiveMaxLayoutColumns } from '../../pm-plugins/actions';
-import { getLayoutSectionColumnCount } from '../../pm-plugins/utils/layout-column-selection';
 import { useSelectedLayoutColumns } from './useSelectedLayoutColumns';
 var INSERT_COLUMN_OPTIONS = {
   left: {
@@ -18,6 +17,7 @@ var INSERT_COLUMN_OPTIONS = {
   }
 };
 export var InsertColumnDropdownItem = function InsertColumnDropdownItem(_ref) {
+  var _selectedLayoutColumn, _selectedLayoutColumn2;
   var api = _ref.api,
     side = _ref.side;
   var _useIntl = useIntl(),
@@ -26,7 +26,7 @@ export var InsertColumnDropdownItem = function InsertColumnDropdownItem(_ref) {
     Icon = _INSERT_COLUMN_OPTION.Icon,
     label = _INSERT_COLUMN_OPTION.label;
   var selectedLayoutColumns = useSelectedLayoutColumns(api);
-  var columnCount = getLayoutSectionColumnCount(selectedLayoutColumns === null || selectedLayoutColumns === void 0 ? void 0 : selectedLayoutColumns.layoutSectionNode);
+  var columnCount = (_selectedLayoutColumn = selectedLayoutColumns === null || selectedLayoutColumns === void 0 || (_selectedLayoutColumn2 = selectedLayoutColumns.layoutSectionNode) === null || _selectedLayoutColumn2 === void 0 ? void 0 : _selectedLayoutColumn2.childCount) !== null && _selectedLayoutColumn !== void 0 ? _selectedLayoutColumn : 0;
   var maxColumnCount = getEffectiveMaxLayoutColumns();
   var canInsertColumn = selectedLayoutColumns !== undefined && columnCount < maxColumnCount;
   var onClick = useCallback(function () {

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

@@ -12,7 +12,7 @@ export var VerticalAlignDropdownItem = function VerticalAlignDropdownItem(_ref)
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var selectedLayoutColumns = useSelectedLayoutColumns(api);
-  var isSelected = (_selectedLayoutColumn = selectedLayoutColumns === null || selectedLayoutColumns === void 0 ? void 0 : selectedLayoutColumns.selectedColumns.every(function (_ref2) {
+  var isSelected = (_selectedLayoutColumn = selectedLayoutColumns === null || selectedLayoutColumns === void 0 ? void 0 : selectedLayoutColumns.selectedLayoutColumns.every(function (_ref2) {
     var node = _ref2.node;
     return getLayoutColumnValign(node) === value;
   })) !== null && _selectedLayoutColumn !== void 0 ? _selectedLayoutColumn : false;