@atlaskit/editor-plugin-layout 10.8.1 → 10.9.1

package/dist/esm/layoutPlugin.js

@@ -11,7 +11,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { createDefaultLayoutSection, createMultiColumnLayoutSection, deleteLayoutColumn as _deleteLayoutColumn, distributeLayoutColumns as _distributeLayoutColumns, insertLayoutColumn as _insertLayoutColumn, insertLayoutColumnsWithAnalytics, setLayoutColumnValign as _setLayoutColumnValign, toggleLayoutColumnMenu } from './pm-plugins/actions';
+import { createDefaultLayoutSection, createMultiColumnLayoutSection, deleteLayoutColumn as _deleteLayoutColumn, distributeLayoutColumns, insertLayoutColumn as _insertLayoutColumn, insertLayoutColumnsWithAnalytics, setLayoutColumnValign as _setLayoutColumnValign, toggleLayoutColumnMenu } from './pm-plugins/actions';
 import { default as createLayoutPlugin } from './pm-plugins/main';
 import { pluginKey } from './pm-plugins/plugin-key';
 import { default as createLayoutResizingPlugin } from './pm-plugins/resizing';
@@ -50,7 +50,7 @@ export var selectIntoLayoutSection = function selectIntoLayoutSection(tr) {
   return tr;
 };
 export var 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;
@@ -374,10 +374,7 @@ export var layoutPlugin = function layoutPlugin(_ref) {
         var _api$analytics4;
         return _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 _distributeLayoutColumns(api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions)(props);
-      },
+      distributeLayoutColumns: distributeLayoutColumns(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 _insertLayoutColumn(side, api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions);

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

@@ -13,7 +13,7 @@ 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 { getAllLayoutColumnsFromSelection, getSelectedLayoutColumnsFromSelection } from './utils/layout-column-selection';
 export var ONE_COL_LAYOUTS = ['single'];
 export var TWO_COL_LAYOUTS = ['two_equal', 'two_left_sidebar', 'two_right_sidebar'];
 export var THREE_COL_LAYOUTS = ['three_equal', 'three_with_sidebars'];
@@ -554,18 +554,17 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
     if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
-    var selectedLayoutColumns = getSelectedLayoutColumns(tr.selection);
-    if (!selectedLayoutColumns) {
+    var selectedLayoutColumnsResult = getSelectedLayoutColumnsFromSelection(tr.selection);
+    if (!selectedLayoutColumnsResult || selectedLayoutColumnsResult.selectedLayoutColumns.length === 0) {
       return null;
     }
-    var layoutSectionNode = selectedLayoutColumns.layoutSectionNode,
-      layoutSectionPos = selectedLayoutColumns.layoutSectionPos,
-      selectedColumnIndices = selectedLayoutColumns.selectedColumnIndices,
-      selectedColumns = selectedLayoutColumns.selectedColumns;
-    var startIndex = selectedColumnIndices[0];
-    var endIndex = selectedColumnIndices[selectedColumnIndices.length - 1];
+    var layoutSectionNode = selectedLayoutColumnsResult.layoutSectionNode,
+      layoutSectionPos = selectedLayoutColumnsResult.layoutSectionPos,
+      startIndex = selectedLayoutColumnsResult.startIndex,
+      endIndex = selectedLayoutColumnsResult.endIndex,
+      selectedLayoutColumns = selectedLayoutColumnsResult.selectedLayoutColumns;
     var selectedColumnIndex = side === 'left' ? startIndex : endIndex;
-    var selectedColumnCount = selectedColumns.length;
+    var selectedColumnCount = selectedLayoutColumns.length;
     if (layoutSectionNode.childCount >= getEffectiveMaxLayoutColumns()) {
       return null;
     }
@@ -623,22 +622,20 @@ export var setLayoutColumnValign = function setLayoutColumnValign(valign, editor
     if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
-    var selectedLayoutColumns = getSelectedLayoutColumns(tr.selection);
-    if (!selectedLayoutColumns) {
+    var selectedLayoutColumnsResult = getSelectedLayoutColumnsFromSelection(tr.selection);
+    if (!selectedLayoutColumnsResult) {
       return null;
     }
-    var selectedColumnIndices = selectedLayoutColumns.selectedColumnIndices,
-      selectedColumns = selectedLayoutColumns.selectedColumns;
-    var columnsToUpdate = selectedColumns.filter(function (_ref6) {
+    var startIndex = selectedLayoutColumnsResult.startIndex,
+      endIndex = selectedLayoutColumnsResult.endIndex,
+      selectedLayoutColumns = selectedLayoutColumnsResult.selectedLayoutColumns;
+    var columnsToUpdate = selectedLayoutColumns.filter(function (_ref6) {
       var node = _ref6.node;
       return node.attrs.valign !== valign;
     });
     if (columnsToUpdate.length === 0) {
       return null;
     }
-    var startIndex = selectedColumnIndices[0];
-    var endIndex = selectedColumnIndices[selectedColumnIndices.length - 1];
-    var selectedColumnCount = selectedColumns.length;
     var updatedColumnCount = columnsToUpdate.length;
     columnsToUpdate.forEach(function (_ref7) {
       var node = _ref7.node,
@@ -654,7 +651,7 @@ export var setLayoutColumnValign = function setLayoutColumnValign(valign, editor
       attributes: {
         endIndex: endIndex,
         inputMethod: INPUT_METHOD.LAYOUT_COLUMN_MENU,
-        selectedCount: selectedColumnCount,
+        selectedCount: selectedLayoutColumns.length,
         startIndex: startIndex,
         updatedCount: updatedColumnCount,
         valign: valign
@@ -666,89 +663,92 @@ export var setLayoutColumnValign = function setLayoutColumnValign(valign, editor
   };
 };
 export var distributeLayoutColumns = function distributeLayoutColumns(editorAnalyticsAPI) {
-  var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : INPUT_METHOD.LAYOUT_COLUMN_MENU;
-  return function (_ref8) {
-    var tr = _ref8.tr;
-    if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
-      return null;
-    }
-    var selectedLayoutColumns = getSelectedLayoutColumns(tr.selection);
-    if (!selectedLayoutColumns || selectedLayoutColumns.selectedColumns.length < 2) {
-      return null;
-    }
-    var layoutSectionNode = selectedLayoutColumns.layoutSectionNode,
-      selectedColumnIndices = selectedLayoutColumns.selectedColumnIndices,
-      selectedColumns = selectedLayoutColumns.selectedColumns;
-    var endIndex = selectedColumnIndices[selectedColumnIndices.length - 1];
-    var selectedColumnCount = selectedColumns.length;
-    var totalColumnCount = layoutSectionNode.childCount;
-    var existingWidths = mapChildren(layoutSectionNode, function (column) {
-      return column.attrs.width;
-    });
-    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 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)) {
-        return w;
+  return function () {
+    var _ref8 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      _ref8$inputMethod = _ref8.inputMethod,
+      inputMethod = _ref8$inputMethod === void 0 ? INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref8$inputMethod,
+      _ref8$target = _ref8.target,
+      target = _ref8$target === void 0 ? 'selectedColumns' : _ref8$target;
+    return function (_ref9) {
+      var tr = _ref9.tr;
+      if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
+        return null;
       }
-      selectedAssignedCount += 1;
-      if (selectedAssignedCount < selectedColumnCount) {
-        assignedToSelected += equalWidth;
-        return equalWidth;
+      var selectedLayoutColumnsResult = target === 'allColumns' ? getAllLayoutColumnsFromSelection(tr.selection) : getSelectedLayoutColumnsFromSelection(tr.selection);
+      if (!selectedLayoutColumnsResult || selectedLayoutColumnsResult.selectedLayoutColumns.length < 2) {
+        return null;
+      }
+      var layoutSectionNode = selectedLayoutColumnsResult.layoutSectionNode,
+        startIndex = selectedLayoutColumnsResult.startIndex,
+        endIndex = selectedLayoutColumnsResult.endIndex,
+        selectedLayoutColumns = selectedLayoutColumnsResult.selectedLayoutColumns;
+      var existingWidths = mapChildren(layoutSectionNode, function (column) {
+        return column.attrs.width;
+      });
+      var selectedWidths = selectedLayoutColumns.map(function (_ref0) {
+        var node = _ref0.node;
+        return node.attrs.width;
+      });
+      var distribution = calculateDistribution(selectedWidths);
+      if (!distribution) {
+        return null;
+      }
+      var selectedTotal = distribution.selectedTotal,
+        equalWidth = distribution.equalWidth;
+      if (isDistributedUniformly(selectedWidths, distribution)) {
+        return null;
       }
-      // Last selected column: absorb the remainder to avoid drift
-      return Number((selectedTotal - assignedToSelected).toFixed(2));
-    });
 
-    // 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,
-      actionSubjectId: ACTION_SUBJECT_ID.LAYOUT_COLUMN,
-      attributes: {
-        columnCount: totalColumnCount,
-        endIndex: endIndex,
-        inputMethod: inputMethod,
-        selectedCount: selectedColumnCount,
-        startIndex: selectedColumnIndices[0]
-      },
-      eventType: EVENT_TYPE.TRACK
-    })(tr);
-    tr.setMeta('scrollIntoView', false);
-    return tr;
+      // Build new widths array: selected columns get equal share, unselected unchanged.
+      // 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 assignedToSelected = 0;
+      var selectedAssignedCount = 0;
+      var newWidths = existingWidths.map(function (w, idx) {
+        if (idx < startIndex || idx > endIndex) {
+          return w;
+        }
+        selectedAssignedCount += 1;
+        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 setNodeMarkup per selected column — keeps nodes in place (preserves identity, marks, decorations)
+      selectedLayoutColumns.forEach(function (_ref1, i) {
+        var node = _ref1.node,
+          pos = _ref1.pos;
+        var colIdx = startIndex + i;
+        tr.setNodeMarkup(pos, node.type, _objectSpread(_objectSpread({}, node.attrs), {}, {
+          width: newWidths[colIdx]
+        }));
+      });
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
+        action: ACTION.UPDATED,
+        actionSubject: ACTION_SUBJECT.DOCUMENT,
+        actionSubjectId: ACTION_SUBJECT_ID.LAYOUT_COLUMN,
+        attributes: {
+          columnCount: layoutSectionNode.childCount,
+          endIndex: endIndex,
+          inputMethod: inputMethod,
+          selectedCount: selectedLayoutColumns.length,
+          startIndex: startIndex
+        },
+        eventType: EVENT_TYPE.TRACK
+      })(tr);
+      tr.setMeta('scrollIntoView', false);
+      return tr;
+    };
   };
 };
-export var toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref1) {
-  var anchorPos = _ref1.anchorPos,
-    isOpen = _ref1.isOpen;
-  return function (_ref10) {
-    var tr = _ref10.tr;
+export var toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref10) {
+  var anchorPos = _ref10.anchorPos,
+    isOpen = _ref10.isOpen;
+  return function (_ref11) {
+    var tr = _ref11.tr;
     tr.setMeta('toggleLayoutColumnMenu', {
       anchorPos: anchorPos,
       isOpen: isOpen
@@ -758,23 +758,20 @@ export var toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref1) {
   };
 };
 export var deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI) {
-  return function (_ref11) {
-    var tr = _ref11.tr;
+  return function (_ref12) {
+    var tr = _ref12.tr;
     if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
-    var selectedLayoutColumns = getSelectedLayoutColumns(tr.selection);
-    if (!selectedLayoutColumns) {
+    var selectedLayoutColumnsResult = getSelectedLayoutColumnsFromSelection(tr.selection);
+    if (!selectedLayoutColumnsResult || selectedLayoutColumnsResult.selectedLayoutColumns.length === 0) {
       return null;
     }
-    var layoutSectionNode = selectedLayoutColumns.layoutSectionNode,
-      layoutSectionPos = selectedLayoutColumns.layoutSectionPos,
-      selectedColumnIndices = selectedLayoutColumns.selectedColumnIndices,
-      selectedColumns = selectedLayoutColumns.selectedColumns;
-    var startIndex = selectedColumnIndices[0];
-    var endIndex = selectedColumnIndices[selectedColumnIndices.length - 1];
-    var selectedColumnCount = selectedColumns.length;
-    var selectedColumnIndexSet = new Set(selectedColumnIndices);
+    var layoutSectionNode = selectedLayoutColumnsResult.layoutSectionNode,
+      layoutSectionPos = selectedLayoutColumnsResult.layoutSectionPos,
+      selectedLayoutColumns = selectedLayoutColumnsResult.selectedLayoutColumns,
+      startIndex = selectedLayoutColumnsResult.startIndex,
+      endIndex = selectedLayoutColumnsResult.endIndex;
     var emitDeleteColumnAnalytics = function emitDeleteColumnAnalytics(columnCount) {
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
         action: ACTION.DELETED,
@@ -784,7 +781,7 @@ export var deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI)
           columnCount: columnCount,
           endIndex: endIndex,
           inputMethod: INPUT_METHOD.LAYOUT_COLUMN_MENU,
-          selectedCount: selectedColumnCount,
+          selectedCount: selectedLayoutColumns.length,
           startIndex: startIndex
         },
         eventType: EVENT_TYPE.TRACK
@@ -792,7 +789,7 @@ export var deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI)
     };
 
     // If all columns are selected, remove the entire layoutSection
-    if (selectedColumnCount === layoutSectionNode.childCount) {
+    if (selectedLayoutColumns.length === layoutSectionNode.childCount) {
       tr.delete(layoutSectionPos, layoutSectionPos + layoutSectionNode.nodeSize);
       emitDeleteColumnAnalytics(0);
       tr.setMeta('scrollIntoView', false);
@@ -802,7 +799,7 @@ export var deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI)
     // Build new column list without the selected columns
     var remainingColumns = [];
     layoutSectionNode.forEach(function (column, _offset, index) {
-      if (!selectedColumnIndexSet.has(index)) {
+      if (index < startIndex || index > endIndex) {
         remainingColumns.push(column);
       }
     });
@@ -811,12 +808,12 @@ export var deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI)
     var existingWidths = mapChildren(layoutSectionNode, function (column) {
       return column.attrs.width;
     });
-    var redistributed = selectedColumnIndices.slice()
+    var redistributed = selectedLayoutColumns.map(function (_, i) {
+      return startIndex + i;
+    })
     // Delete highest indices first so lower original indices still point at the same columns
     // as each redistribution step shrinks the widths array.
-    .sort(function (a, b) {
-      return b - a;
-    }).reduce(function (widths, selectedIndex) {
+    .reverse().reduce(function (widths, selectedIndex) {
       return redistributeAfterDeletion(widths, selectedIndex, MIN_LAYOUT_COLUMN_WIDTH_PERCENT);
     }, existingWidths);
     var updatedLayoutSectionNode = layoutSectionNode.copy(Fragment.fromArray(remainingColumns));

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

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

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

@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import { useIntl } from 'react-intl';
 import { layoutMessages } from '@atlaskit/editor-common/messages';
-import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { DeleteIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import { useSelectedLayoutColumns } from './useSelectedLayoutColumns';
 var DeleteColumnDropdownItem = function DeleteColumnDropdownItem(_ref) {
   var api = _ref.api;
@@ -28,9 +28,14 @@ var DeleteColumnDropdownItem = function DeleteColumnDropdownItem(_ref) {
   if (selectedLayoutColumns === undefined) {
     return null;
   }
-  var selectedColumnCount = selectedLayoutColumns.selectedColumns.length;
+  var selectedColumnCount = selectedLayoutColumns.selectedLayoutColumns.length;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
-    onClick: onClick
+    onClick: onClick,
+    elemBefore: /*#__PURE__*/React.createElement(DeleteIcon, {
+      color: "currentColor",
+      label: "",
+      size: "small"
+    })
   }, formatMessage(layoutMessages.deleteColumn, {
     count: selectedColumnCount
   }));

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

@@ -1,19 +1,24 @@
 import React, { useCallback, useMemo } from 'react';
 import { useIntl } from 'react-intl';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { layoutMessages } from '@atlaskit/editor-common/messages';
-import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { TableColumnsDistributeIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import { isDistributedUniformly } from '../../pm-plugins/utils/layout-column-distribution';
 import { useSelectedLayoutColumns } from './useSelectedLayoutColumns';
 export var DistributeColumnsDropdownItem = function DistributeColumnsDropdownItem(_ref) {
   var api = _ref.api;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
-  var selectedLayoutColumns = useSelectedLayoutColumns(api);
+  var selectedLayoutColumnsResult = useSelectedLayoutColumns(api);
+  var _ref2 = selectedLayoutColumnsResult !== null && selectedLayoutColumnsResult !== void 0 ? selectedLayoutColumnsResult : {},
+    selectedLayoutColumns = _ref2.selectedLayoutColumns;
   var handleClick = useCallback(function () {
     var _api$core;
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (props) {
       var _api$layout, _api$layout2;
-      var tr = api === null || api === void 0 || (_api$layout = api.layout) === null || _api$layout === void 0 ? void 0 : _api$layout.commands.distributeLayoutColumns(props);
+      var tr = api === null || api === void 0 || (_api$layout = api.layout) === null || _api$layout === void 0 ? void 0 : _api$layout.commands.distributeLayoutColumns({
+        inputMethod: INPUT_METHOD.LAYOUT_COLUMN_MENU
+      })(props);
       if (!tr) {
         return null;
       }
@@ -26,19 +31,24 @@ export var DistributeColumnsDropdownItem = function DistributeColumnsDropdownIte
     });
   }, [api]);
   var isAlreadyUniform = useMemo(function () {
-    if (!selectedLayoutColumns || selectedLayoutColumns.selectedColumns.length < 2) {
+    if (!selectedLayoutColumns || selectedLayoutColumns.length < 2) {
       return false;
     }
-    var selectedWidths = selectedLayoutColumns.selectedColumns.map(function (col) {
+    var selectedWidths = selectedLayoutColumns.map(function (col) {
       return col.node.attrs.width;
     });
     return isDistributedUniformly(selectedWidths);
   }, [selectedLayoutColumns]);
-  if (selectedLayoutColumns === undefined || selectedLayoutColumns.selectedColumns.length < 2) {
+  if (selectedLayoutColumns === undefined || selectedLayoutColumns.length < 2) {
     return null;
   }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: handleClick,
-    isDisabled: isAlreadyUniform
+    isDisabled: isAlreadyUniform,
+    elemBefore: /*#__PURE__*/React.createElement(TableColumnsDistributeIcon, {
+      color: "currentColor",
+      label: "",
+      size: "small"
+    })
   }, formatMessage(layoutMessages.distributeColumns));
 };