@atlaskit/editor-plugin-layout 10.8.0 → 10.9.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-layout
 
+## 10.9.0
+
+### Minor Changes
+
+- [`10c5beb57bb0d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/10c5beb57bb0d) -
+  [ux] Add Distribute columns to the layout floating toolbar
+
+### Patch Changes
+
+- Updated dependencies
+
+## 10.8.1
+
+### Patch Changes
+
+- [`2ad681c18e86f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2ad681c18e86f) -
+  Add layout column menu actions for inserting, deleting, distributing, and aligning columns.
+- Updated dependencies
+
 ## 10.8.0
 
 ### Minor Changes

package/dist/cjs/layoutPlugin.js

@@ -57,7 +57,7 @@ var selectIntoLayoutSection = exports.selectIntoLayoutSection = function selectI
   return tr;
 };
 var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
-  var _api$analytics;
+  var _api$analytics, _api$analytics5;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
@@ -381,10 +381,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
         var _api$analytics4;
         return (0, _actions.deleteLayoutColumn)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(props);
       },
-      distributeLayoutColumns: function distributeLayoutColumns(props) {
-        var _api$analytics5;
-        return (0, _actions.distributeLayoutColumns)(api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions)(props);
-      },
+      distributeLayoutColumns: (0, _actions.createDistributeLayoutColumnsCommand)(api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions),
       insertLayoutColumn: function insertLayoutColumn(side) {
         var _api$analytics6;
         return (0, _actions.insertLayoutColumn)(side, api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions);

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.fixColumnStructure = exports.fixColumnSizes = exports.distributeLayoutColumns = exports.deleteLayoutColumn = exports.deleteActiveLayoutNode = exports.createMultiColumnLayoutSection = exports.createDefaultLayoutSection = exports.TWO_COL_LAYOUTS = exports.THREE_COL_LAYOUTS = exports.ONE_COL_LAYOUTS = void 0;
+exports.fixColumnStructure = exports.fixColumnSizes = exports.distributeLayoutColumns = exports.deleteLayoutColumn = exports.deleteActiveLayoutNode = exports.createMultiColumnLayoutSection = exports.createDistributeLayoutColumnsCommand = exports.createDefaultLayoutSection = exports.TWO_COL_LAYOUTS = exports.THREE_COL_LAYOUTS = exports.ONE_COL_LAYOUTS = void 0;
 exports.forceSectionToPresetLayout = forceSectionToPresetLayout;
 exports.getEffectiveMaxLayoutColumns = getEffectiveMaxLayoutColumns;
 exports.toggleLayoutColumnMenu = exports.setPresetLayout = exports.setLayoutColumnValign = exports.insertLayoutColumnsWithAnalytics = exports.insertLayoutColumns = exports.insertLayoutColumn = exports.getSelectedLayout = exports.getPresetLayout = void 0;
@@ -20,8 +20,8 @@ var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equa
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _consts = require("./consts");
 var _pluginKey = require("./plugin-key");
+var _layoutColumnDistribution = require("./utils/layout-column-distribution");
 var _layoutColumnSelection = require("./utils/layout-column-selection");
-var _redistributeProportionally = require("./utils/redistribute-proportionally");
 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 ONE_COL_LAYOUTS = exports.ONE_COL_LAYOUTS = ['single'];
@@ -564,18 +564,17 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
     if (!(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
-    var selectedLayoutColumns = (0, _layoutColumnSelection.getSelectedLayoutColumns)(tr.selection);
-    if (!selectedLayoutColumns) {
+    var selectedLayoutColumnsResult = (0, _layoutColumnSelection.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;
     }
@@ -583,7 +582,7 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
     var existingWidths = (0, _utils.mapChildren)(layoutSectionNode, function (column) {
       return column.attrs.width;
     });
-    var redistributedWidths = (0, _redistributeProportionally.redistributeProportionally)(existingWidths, insertIndex, getEffectiveMaxLayoutColumns(), _consts.MIN_LAYOUT_COLUMN_WIDTH_PERCENT);
+    var redistributedWidths = (0, _layoutColumnDistribution.redistributeProportionally)(existingWidths, insertIndex, getEffectiveMaxLayoutColumns(), _consts.MIN_LAYOUT_COLUMN_WIDTH_PERCENT);
     if (redistributedWidths === existingWidths) {
       return null;
     }
@@ -633,22 +632,20 @@ var setLayoutColumnValign = exports.setLayoutColumnValign = function setLayoutCo
     if (!(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
-    var selectedLayoutColumns = (0, _layoutColumnSelection.getSelectedLayoutColumns)(tr.selection);
-    if (!selectedLayoutColumns) {
+    var selectedLayoutColumnsResult = (0, _layoutColumnSelection.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,
@@ -664,7 +661,7 @@ var setLayoutColumnValign = exports.setLayoutColumnValign = function setLayoutCo
       attributes: {
         endIndex: endIndex,
         inputMethod: _analytics.INPUT_METHOD.LAYOUT_COLUMN_MENU,
-        selectedCount: selectedColumnCount,
+        selectedCount: selectedLayoutColumns.length,
         startIndex: startIndex,
         updatedCount: updatedColumnCount,
         valign: valign
@@ -675,73 +672,80 @@ var setLayoutColumnValign = exports.setLayoutColumnValign = function setLayoutCo
     return tr;
   };
 };
-var distributeLayoutColumns = exports.distributeLayoutColumns = function distributeLayoutColumns(editorAnalyticsAPI) {
-  var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.LAYOUT_COLUMN_MENU;
-  return function (_ref8) {
-    var tr = _ref8.tr;
+var distributeLayoutColumns = exports.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 ? _analytics.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 (!(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
-    var selectedLayoutColumns = (0, _layoutColumnSelection.getSelectedLayoutColumns)(tr.selection);
-    if (!selectedLayoutColumns || selectedLayoutColumns.selectedColumns.length < 2) {
+    var selectedLayoutColumnsResult = target === 'allColumns' ? (0, _layoutColumnSelection.getAllLayoutColumnsFromSelection)(tr.selection) : (0, _layoutColumnSelection.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 = (0, _utils.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 = (0, _layoutColumnDistribution.calculateDistribution)(selectedWidths);
+    if (!distribution) {
+      return null;
+    }
+    var selectedTotal = distribution.selectedTotal,
+      equalWidth = distribution.equalWidth;
+    if ((0, _layoutColumnDistribution.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: _analytics.ACTION.UPDATED,
       actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
       actionSubjectId: _analytics.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: _analytics.EVENT_TYPE.TRACK
     })(tr);
@@ -749,11 +753,19 @@ var distributeLayoutColumns = exports.distributeLayoutColumns = function distrib
     return tr;
   };
 };
-var toggleLayoutColumnMenu = exports.toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref9) {
-  var anchorPos = _ref9.anchorPos,
-    isOpen = _ref9.isOpen;
-  return function (_ref0) {
-    var tr = _ref0.tr;
+var createDistributeLayoutColumnsCommand = exports.createDistributeLayoutColumnsCommand = function createDistributeLayoutColumnsCommand(editorAnalyticsAPI) {
+  return function () {
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    return distributeLayoutColumns(_objectSpread(_objectSpread({}, options), {}, {
+      editorAnalyticsAPI: editorAnalyticsAPI
+    }));
+  };
+};
+var toggleLayoutColumnMenu = exports.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
@@ -763,23 +775,20 @@ var toggleLayoutColumnMenu = exports.toggleLayoutColumnMenu = function toggleLay
   };
 };
 var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI) {
-  return function (_ref1) {
-    var tr = _ref1.tr;
+  return function (_ref12) {
+    var tr = _ref12.tr;
     if (!(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
-    var selectedLayoutColumns = (0, _layoutColumnSelection.getSelectedLayoutColumns)(tr.selection);
-    if (!selectedLayoutColumns) {
+    var selectedLayoutColumnsResult = (0, _layoutColumnSelection.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: _analytics.ACTION.DELETED,
@@ -789,7 +798,7 @@ var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColum
           columnCount: columnCount,
           endIndex: endIndex,
           inputMethod: _analytics.INPUT_METHOD.LAYOUT_COLUMN_MENU,
-          selectedCount: selectedColumnCount,
+          selectedCount: selectedLayoutColumns.length,
           startIndex: startIndex
         },
         eventType: _analytics.EVENT_TYPE.TRACK
@@ -797,7 +806,7 @@ var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColum
     };
 
     // 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);
@@ -807,7 +816,7 @@ var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColum
     // 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);
       }
     });
@@ -816,13 +825,13 @@ var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColum
     var existingWidths = (0, _utils.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) {
-      return (0, _redistributeProportionally.redistributeAfterDeletion)(widths, selectedIndex, _consts.MIN_LAYOUT_COLUMN_WIDTH_PERCENT);
+    .reverse().reduce(function (widths, selectedIndex) {
+      return (0, _layoutColumnDistribution.redistributeAfterDeletion)(widths, selectedIndex, _consts.MIN_LAYOUT_COLUMN_WIDTH_PERCENT);
     }, existingWidths);
     var updatedLayoutSectionNode = layoutSectionNode.copy(_model.Fragment.fromArray(remainingColumns));
     tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributed));

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

@@ -4,6 +4,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.calculateDistribution = void 0;
+exports.isDistributedUniformly = isDistributedUniformly;
 exports.redistributeProportionally = exports.redistributeAfterDeletion = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var roundLayoutColumnWidth = function roundLayoutColumnWidth(width) {
@@ -14,9 +16,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));
@@ -37,6 +36,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,
@@ -81,6 +83,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.
+ */
+
+var calculateDistribution = exports.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
+  };
+};
+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;
+}
 var redistributeAfterDeletion = exports.redistributeAfterDeletion = function redistributeAfterDeletion(currentWidths, removeIndex, minWidth) {
   if (currentWidths.length === 0 || removeIndex < 0 || removeIndex >= currentWidths.length || !isValidWidth(minWidth)) {
     return currentWidths;

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

@@ -3,127 +3,85 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getSelectedLayoutColumns = exports.getLayoutSectionColumnCount = exports.getLayoutColumnValign = exports.getLayoutColumnMenuAnchorPos = void 0;
-var _state = require("@atlaskit/editor-prosemirror/state");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
-var isLayoutColumn = function isLayoutColumn(node) {
-  return (node === null || node === void 0 ? void 0 : node.type.name) === 'layoutColumn';
+exports.getSelectedLayoutColumnsFromSelection = exports.getLayoutColumnValign = exports.getLayoutColumnMenuAnchorPos = exports.getAllLayoutColumnsFromSelection = void 0;
+var _utils = require("@atlaskit/editor-prosemirror/utils");
+var findLayoutSectionFromSelection = function findLayoutSectionFromSelection(selection) {
+  return (0, _utils.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;
-};
-var getSelectedLayoutColumns = exports.getSelectedLayoutColumns = function getSelectedLayoutColumns(selection) {
-  if (!selection) {
-    return undefined;
-  }
-  if (selection instanceof _state.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 (0, _utils.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 (!(0, _experiments.editorExperiment)('platform_editor_block_menu', true)) {
+  });
+};
+var getSelectedLayoutColumnsFromSelection = exports.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;
-    }
-    if (!isLayoutColumn(column)) {
-      invalidSelection = true;
-      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;
     }
-    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
+  };
+};
+var getAllLayoutColumnsFromSelection = exports.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
   };
 };
-var getLayoutSectionColumnCount = exports.getLayoutSectionColumnCount = function getLayoutSectionColumnCount(layoutSection) {
-  return (layoutSection === null || layoutSection === void 0 ? void 0 : layoutSection.type.name) === 'layoutSection' ? layoutSection.childCount : 0;
-};
 var getLayoutColumnValign = exports.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;
 };
 var getLayoutColumnMenuAnchorPos = exports.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/cjs/ui/LayoutColumnMenu/DeleteColumnDropdownItem.js

@@ -36,7 +36,7 @@ var DeleteColumnDropdownItem = exports.DeleteColumnDropdownItem = function Delet
   if (selectedLayoutColumns === undefined) {
     return null;
   }
-  var selectedColumnCount = selectedLayoutColumns.selectedColumns.length;
+  var selectedColumnCount = selectedLayoutColumns.selectedLayoutColumns.length;
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
     onClick: onClick
   }, formatMessage(_messages.layoutMessages.deleteColumn, {