@atlaskit/editor-plugin-layout 10.7.1 → 10.8.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @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
+
+- [`1c86d46da6101`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1c86d46da6101) -
+  Address layout column alignment follow-up review feedback
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 10.7.1
 
 ### Patch 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/pm-plugins/utils/layout-column-selection.js

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

package/dist/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/cjs/ui/LayoutColumnMenu/VerticalAlignDropdownItem.js

@@ -35,6 +35,7 @@ var VerticalAlignDropdownItem = exports.VerticalAlignDropdownItem = function Ver
       size: "small"
     }),
     isSelected: isSelected,
-    onClick: onClick
+    onClick: onClick,
+    role: "menuitemradio"
   }, formatMessage(label));
 };

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

@@ -31,10 +31,7 @@ var VerticalAlignNestedMenu = exports.VerticalAlignNestedMenu = function Vertica
     }
     return firstValign;
   }, [selectedLayoutColumns]);
-  var TriggerIcon = currentValign ? _verticalAlignIcons.VERTICAL_ALIGN_ICONS[currentValign] : _editorToolbar.LayoutIcon;
-  if (!selectedLayoutColumns) {
-    return null;
-  }
+  var TriggerIcon = currentValign ? _verticalAlignIcons.VERTICAL_ALIGN_ICONS[currentValign] : _verticalAlignIcons.VERTICAL_ALIGN_ICONS.top;
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarNestedDropdownMenu, {
     elemBefore: /*#__PURE__*/_react.default.createElement(TriggerIcon, {
       label: "",

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

@@ -1,13 +1,15 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getLayoutColumnMenuComponents = exports.LAYOUT_COLUMN_MENU_FALLBACKS = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _messages = require("@atlaskit/editor-common/messages");
+var _uiReact = require("@atlaskit/editor-common/ui-react");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _toolbarMenuContainer = require("@atlaskit/editor-toolbar/toolbar-menu-container");
 var _DeleteColumnDropdownItem = require("./DeleteColumnDropdownItem");
@@ -16,18 +18,26 @@ var _InsertColumnDropdownItem = require("./InsertColumnDropdownItem");
 var _keys = require("./keys");
 var _VerticalAlignDropdownItem = require("./VerticalAlignDropdownItem");
 var _VerticalAlignNestedMenu = require("./VerticalAlignNestedMenu");
+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); }
 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 LayoutColumnMenuContainer = function LayoutColumnMenuContainer(_ref) {
+  var children = _ref.children;
+  var setOutsideClickTargetRef = (0, _react.useContext)(_uiReact.OutsideClickTargetRefContext);
+  return /*#__PURE__*/_react.default.createElement(_toolbarMenuContainer.ToolbarMenuContainer, {
+    ref: setOutsideClickTargetRef
+  }, children);
+};
 var LAYOUT_COLUMN_MENU_FALLBACKS = exports.LAYOUT_COLUMN_MENU_FALLBACKS = {
-  'menu-section': function menuSection(_ref) {
-    var children = _ref.children;
+  'menu-section': function menuSection(_ref2) {
+    var children = _ref2.children;
     return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, null, children);
   }
 };
-var getLayoutColumnMenuComponents = exports.getLayoutColumnMenuComponents = function getLayoutColumnMenuComponents(_ref2) {
-  var api = _ref2.api;
+var getLayoutColumnMenuComponents = exports.getLayoutColumnMenuComponents = function getLayoutColumnMenuComponents(_ref3) {
+  var api = _ref3.api;
   return [_objectSpread(_objectSpread({}, _keys.LAYOUT_COLUMN_MENU), {}, {
-    component: _toolbarMenuContainer.ToolbarMenuContainer
+    component: LayoutColumnMenuContainer
   }), _objectSpread(_objectSpread({}, _keys.LAYOUT_COLUMN_MENU_SECTION), {}, {
     parents: [_objectSpread(_objectSpread({}, _keys.LAYOUT_COLUMN_MENU), {}, {
       rank: _keys.LAYOUT_COLUMN_MENU_RANK[_keys.LAYOUT_COLUMN_MENU_SECTION.key]
@@ -71,8 +81,8 @@ var getLayoutColumnMenuComponents = exports.getLayoutColumnMenuComponents = func
       rank: _keys.LAYOUT_COLUMN_MENU_SECTION_RANK[_keys.DELETE_COLUMN_MENU_ITEM.key]
     })]
   }), _objectSpread(_objectSpread({}, _keys.VERTICAL_ALIGN_MENU), {}, {
-    component: function component(_ref3) {
-      var children = _ref3.children;
+    component: function component(_ref4) {
+      var children = _ref4.children;
       return /*#__PURE__*/_react.default.createElement(_VerticalAlignNestedMenu.VerticalAlignNestedMenu, {
         api: api
       }, children);

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

@@ -1,16 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.LayoutColumnMenu = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _styles = require("@atlaskit/editor-common/styles");
-var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _ui = require("@atlaskit/editor-common/ui");
 var _uiReact = require("@atlaskit/editor-common/ui-react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
@@ -21,8 +18,8 @@ var _components = require("./components");
 var _keys = require("./keys");
 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 PopupWithListeners = (0, _uiReact.withReactEditorViewOuterListeners)(_ui.Popup);
-var FALLBACK_MENU_HEIGHT = 300;
 var LAYOUT_COLUMN_MENU_POPUP_OFFSET = [0, 4];
+var TOOLBAR_MENU_SELECTOR = '[data-toolbar-component="menu"]';
 
 /**
  * Returns the drag handle button for the selected layout column.
@@ -58,20 +55,6 @@ var LayoutColumnMenu = exports.LayoutColumnMenu = /*#__PURE__*/_react.default.me
     isLayoutColumnMenuOpen = _useSharedPluginState.isLayoutColumnMenuOpen,
     layoutColumnMenuAnchorPos = _useSharedPluginState.layoutColumnMenuAnchorPos,
     selection = _useSharedPluginState.selection;
-  var setOutsideClickTargetRef = (0, _react.useContext)(_uiReact.OutsideClickTargetRefContext);
-  var menuRef = (0, _react.useRef)(null);
-  var popupRef = (0, _react.useRef)(undefined);
-  var _React$useState = _react.default.useState(FALLBACK_MENU_HEIGHT),
-    _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
-    menuHeight = _React$useState2[0],
-    setMenuHeight = _React$useState2[1];
-  (0, _react.useLayoutEffect)(function () {
-    var _popupRef$current;
-    if (!isLayoutColumnMenuOpen) {
-      return;
-    }
-    setMenuHeight(((_popupRef$current = popupRef.current) === null || _popupRef$current === void 0 ? void 0 : _popupRef$current.clientHeight) || FALLBACK_MENU_HEIGHT);
-  }, [isLayoutColumnMenuOpen]);
   var closeLayoutColumnMenu = (0, _react.useCallback)(function () {
     var _api$core, _api$layout;
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$layout = api.layout) === null || _api$layout === void 0 ? void 0 : _api$layout.commands.toggleLayoutColumnMenu({
@@ -79,11 +62,7 @@ var LayoutColumnMenu = exports.LayoutColumnMenu = /*#__PURE__*/_react.default.me
     }));
   }, [api]);
   var handleClickOutside = (0, _react.useCallback)(function (event) {
-    var _menuRef$current;
-    if (event.target instanceof Node && (_menuRef$current = menuRef.current) !== null && _menuRef$current !== void 0 && _menuRef$current.contains(event.target)) {
-      return;
-    }
-    if (event.target instanceof Element && event.target.closest('[data-toolbar-nested-dropdown-menu]')) {
+    if (event.target instanceof Element && (event.target.closest(TOOLBAR_MENU_SELECTOR) || event.target.closest('[data-toolbar-nested-dropdown-menu]'))) {
       return;
     }
 
@@ -100,13 +79,6 @@ var LayoutColumnMenu = exports.LayoutColumnMenu = /*#__PURE__*/_react.default.me
       closeLayoutColumnMenu();
     }
   }, [closeLayoutColumnMenu]);
-  var handleMenuRef = (0, _react.useCallback)(function (el) {
-    setOutsideClickTargetRef === null || setOutsideClickTargetRef === void 0 || setOutsideClickTargetRef(el);
-    menuRef.current = el;
-    if (el) {
-      popupRef.current = el;
-    }
-  }, [setOutsideClickTargetRef]);
   var components = (_api$uiControlRegistr = api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(_keys.LAYOUT_COLUMN_MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
   var target = (0, _react.useMemo)(function () {
     return isLayoutColumnMenuOpen ? getLayoutColumnMenuTarget(editorView, selection, layoutColumnMenuAnchorPos) : null;
@@ -127,16 +99,11 @@ var LayoutColumnMenu = exports.LayoutColumnMenu = /*#__PURE__*/_react.default.me
     scrollableElement: scrollableElement,
     zIndex: _editorSharedStyles.akEditorFloatingOverlapPanelZIndex,
     alignX: "center",
-    fitHeight: menuHeight,
     preventOverflow: true,
     stick: true,
     offset: LAYOUT_COLUMN_MENU_POPUP_OFFSET,
     handleClickOutside: handleClickOutside,
     handleEscapeKeydown: closeLayoutColumnMenu
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    ref: handleMenuRef
-  }, /*#__PURE__*/_react.default.createElement(_toolbar.EditorToolbarProvider, {
-    editorView: editorView
   }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownMenuProvider, {
     isOpen: isLayoutColumnMenuOpen,
     setIsOpen: handleSetIsOpen
@@ -144,5 +111,5 @@ var LayoutColumnMenu = exports.LayoutColumnMenu = /*#__PURE__*/_react.default.me
     components: components,
     fallbacks: _components.LAYOUT_COLUMN_MENU_FALLBACKS,
     surface: _keys.LAYOUT_COLUMN_MENU
-  })))));
+  })));
 });

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/pm-plugins/utils/layout-column-selection.js

@@ -104,7 +104,10 @@ export const getSelectedLayoutColumns = selection => {
   };
 };
 export const getLayoutSectionColumnCount = layoutSection => (layoutSection === null || layoutSection === void 0 ? void 0 : layoutSection.type.name) === 'layoutSection' ? layoutSection.childCount : 0;
-export const getLayoutColumnValign = layoutColumn => layoutColumn === null || layoutColumn === void 0 ? void 0 : layoutColumn.attrs.valign;
+export const getLayoutColumnValign = layoutColumn => {
+  var _ref;
+  return layoutColumn ? (_ref = layoutColumn.attrs.valign) !== null && _ref !== void 0 ? _ref : 'top' : undefined;
+};
 export const getLayoutColumnMenuAnchorPos = (selection, anchorPosFromHandle) => {
   var _clickedSelectedColum, _selectedLayoutColumn;
   const selectedLayoutColumns = getSelectedLayoutColumns(selection);