@atlaskit/editor-plugin-layout 10.8.0 → 10.8.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-layout
 
+## 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/pm-plugins/actions.js

@@ -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'];
@@ -583,7 +583,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;
     }
@@ -687,31 +687,30 @@ var distributeLayoutColumns = exports.distributeLayoutColumns = function distrib
       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 = (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 = selectedColumns.map(function (_ref9) {
+      var node = _ref9.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;
@@ -722,16 +721,22 @@ var distributeLayoutColumns = exports.distributeLayoutColumns = function distrib
       }
       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: _analytics.ACTION.UPDATED,
       actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
@@ -749,11 +754,11 @@ 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 toggleLayoutColumnMenu = exports.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
@@ -763,8 +768,8 @@ var toggleLayoutColumnMenu = exports.toggleLayoutColumnMenu = function toggleLay
   };
 };
 var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI) {
-  return function (_ref1) {
-    var tr = _ref1.tr;
+  return function (_ref11) {
+    var tr = _ref11.tr;
     if (!(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
@@ -822,7 +827,7 @@ var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColum
     .sort(function (a, b) {
       return b - a;
     }).reduce(function (widths, selectedIndex) {
-      return (0, _redistributeProportionally.redistributeAfterDeletion)(widths, selectedIndex, _consts.MIN_LAYOUT_COLUMN_WIDTH_PERCENT);
+      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/ui/LayoutColumnMenu/DistributeColumnsDropdownItem.js

@@ -9,6 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _layoutColumnDistribution = require("../../pm-plugins/utils/layout-column-distribution");
 var _useSelectedLayoutColumns = require("./useSelectedLayoutColumns");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var DistributeColumnsDropdownItem = exports.DistributeColumnsDropdownItem = function DistributeColumnsDropdownItem(_ref) {
@@ -32,9 +33,6 @@ var DistributeColumnsDropdownItem = exports.DistributeColumnsDropdownItem = func
       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 = (0, _react.useMemo)(function () {
     if (!selectedLayoutColumns || selectedLayoutColumns.selectedColumns.length < 2) {
       return false;
@@ -42,21 +40,13 @@ var DistributeColumnsDropdownItem = exports.DistributeColumnsDropdownItem = func
     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 (0, _layoutColumnDistribution.isDistributedUniformly)(selectedWidths);
   }, [selectedLayoutColumns]);
   if (selectedLayoutColumns === undefined || selectedLayoutColumns.selectedColumns.length < 2) {
     return null;
   }
-  if (isAlreadyUniform) {
-    return null;
-  }
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
-    onClick: handleClick
+    onClick: handleClick,
+    isDisabled: isAlreadyUniform
   }, formatMessage(_messages.layoutMessages.distributeColumns));
 };

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

@@ -9,8 +9,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 const ONE_COL_LAYOUTS = ['single'];
 export const TWO_COL_LAYOUTS = ['two_equal', 'two_left_sidebar', 'two_right_sidebar'];
 export const THREE_COL_LAYOUTS = ['three_equal', 'three_with_sidebars'];
@@ -664,26 +664,30 @@ export const distributeLayoutColumns = (editorAnalyticsAPI, inputMethod = INPUT_
   }
   const {
     layoutSectionNode,
-    layoutSectionPos,
     selectedColumnIndices,
     selectedColumns
   } = selectedLayoutColumns;
   const endIndex = selectedColumnIndices[selectedColumnIndices.length - 1];
   const selectedColumnCount = selectedColumns.length;
   const totalColumnCount = layoutSectionNode.childCount;
-
-  // Compute equal width for selected columns
   const existingWidths = mapChildren(layoutSectionNode, column => column.attrs.width);
-  const selectedTotal = selectedColumnIndices.reduce((sum, idx) => sum + existingWidths[idx], 0);
-  const equalWidth = selectedTotal / selectedColumnCount;
-
-  // Early return if selected columns are already uniformly distributed — avoids spurious undo entry.
-  if (selectedColumnIndices.every(idx => existingWidths[idx] === Number(equalWidth.toFixed(2)))) {
+  const selectedWidths = selectedColumns.map(({
+    node
+  }) => node.attrs.width);
+  const distribution = calculateDistribution(selectedWidths);
+  if (!distribution) {
+    return null;
+  }
+  const {
+    selectedTotal,
+    equalWidth
+  } = distribution;
+  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.
   const selectedIndexSet = new Set(selectedColumnIndices);
   let assignedToSelected = 0;
@@ -694,16 +698,24 @@ export const distributeLayoutColumns = (editorAnalyticsAPI, inputMethod = INPUT_
     }
     selectedAssignedCount += 1;
     if (selectedAssignedCount < selectedColumnCount) {
-      const 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(({
+    node,
+    pos
+  }, i) => {
+    const colIdx = selectedColumnIndices[i];
+    tr.setNodeMarkup(pos, node.type, {
+      ...node.attrs,
+      width: newWidths[colIdx]
+    });
+  });
   editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
     action: ACTION.UPDATED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,

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

@@ -1,6 +1,5 @@
 const roundLayoutColumnWidth = width => Number(width.toFixed(2));
 const sumWidths = widths => widths.reduce((sum, width) => sum + width, 0);
-const isValidWidth = width => Number.isFinite(width) && width > 0;
 const normaliseWidthsTotal = (widths, totalWidth, minWidth) => {
   const roundedWidths = widths.map(roundLayoutColumnWidth);
   const remainder = roundLayoutColumnWidth(totalWidth - sumWidths(roundedWidths));
@@ -19,6 +18,7 @@ const normaliseWidthsTotal = (widths, totalWidth, minWidth) => {
   }
   return roundedWidths.map((width, index) => index === adjustmentIndex ? adjustedWidth : width);
 };
+const isValidWidth = width => Number.isFinite(width) && width > 0;
 const redistributeWithMinimumWidth = ({
   minWidth,
   totalWidth,
@@ -61,6 +61,39 @@ const redistributeWithMinimumWidth = ({
   });
   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 const calculateDistribution = selectedWidths => {
+  const count = selectedWidths.length;
+  if (count < 2) {
+    return undefined;
+  }
+  const selectedTotal = sumWidths(selectedWidths);
+  const equalWidth = roundLayoutColumnWidth(selectedTotal / count);
+  return {
+    selectedTotal,
+    equalWidth
+  };
+};
+export function isDistributedUniformly(selectedWidths, distribution = calculateDistribution(selectedWidths)) {
+  if (!distribution || selectedWidths.length < 2) {
+    return false;
+  }
+  const {
+    selectedTotal,
+    equalWidth
+  } = distribution;
+  const lastColWidth = roundLayoutColumnWidth(selectedTotal - equalWidth * (selectedWidths.length - 1));
+  return selectedWidths.slice(0, -1).every(width => width === equalWidth) && selectedWidths[selectedWidths.length - 1] === lastColWidth;
+}
 export const redistributeAfterDeletion = (currentWidths, removeIndex, minWidth) => {
   if (currentWidths.length === 0 || removeIndex < 0 || removeIndex >= currentWidths.length || !isValidWidth(minWidth)) {
     return currentWidths;

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/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/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/types/pm-plugins/actions.d.ts

@@ -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[];

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

@@ -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-ts4.5/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[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "10.8.0",
+	"version": "10.8.1",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -48,14 +48,14 @@
 		"@atlaskit/icon": "^35.3.0",
 		"@atlaskit/icon-lab": "^6.12.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^84.0.0",
-		"@atlaskit/tokens": "^13.0.0",
+		"@atlaskit/tmp-editor-statsig": "^85.0.0",
+		"@atlaskit/tokens": "^13.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.48.0",
+		"@atlaskit/editor-common": "^114.50.0",
 		"react": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},

package/dist/types/pm-plugins/utils/redistribute-proportionally.d.ts

@@ -1,2 +0,0 @@
-export declare const redistributeAfterDeletion: (currentWidths: number[], removeIndex: number, minWidth: number) => number[];
-export declare const redistributeProportionally: (currentWidths: number[], insertIndex: number, maxColumns: number, minWidth: number) => number[];

package/dist/types-ts4.5/pm-plugins/utils/redistribute-proportionally.d.ts

@@ -1,2 +0,0 @@
-export declare const redistributeAfterDeletion: (currentWidths: number[], removeIndex: number, minWidth: number) => number[];
-export declare const redistributeProportionally: (currentWidths: number[], insertIndex: number, maxColumns: number, minWidth: number) => number[];