@atlaskit/editor-plugin-layout 10.5.0 → 10.6.1

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

@@ -12,6 +12,7 @@ import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equ
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { EVEN_DISTRIBUTED_COL_WIDTHS, MAX_LAYOUT_COLUMNS, MAX_STANDARD_LAYOUT_COLUMNS, MIN_LAYOUT_COLUMN_WIDTH_PERCENT } from './consts';
 import { pluginKey } from './plugin-key';
+import { getSelectedLayoutColumns } from './utils/layout-column-selection';
 import { redistributeAfterDeletion, redistributeProportionally } from './utils/redistribute-proportionally';
 export var ONE_COL_LAYOUTS = ['single'];
 export var TWO_COL_LAYOUTS = ['two_equal', 'two_left_sidebar', 'two_right_sidebar'];
@@ -547,44 +548,24 @@ var formatLayoutName = function formatLayoutName(layout) {
 export function getEffectiveMaxLayoutColumns() {
   return editorExperiment('advanced_layouts', true) ? MAX_LAYOUT_COLUMNS : MAX_STANDARD_LAYOUT_COLUMNS;
 }
-var getSelectedLayoutColumnInSection = function getSelectedLayoutColumnInSection(_ref4) {
-  var doc = _ref4.doc,
-    selection = _ref4.selection;
-  var _doc$type$schema$node = doc.type.schema.nodes,
-    layoutColumn = _doc$type$schema$node.layoutColumn,
-    layoutSection = _doc$type$schema$node.layoutSection;
-  if (!(selection instanceof NodeSelection) || selection.node.type !== layoutColumn) {
-    return;
-  }
-  var $from = selection.$from;
-  if ($from.parent.type !== layoutSection) {
-    return;
-  }
-  var selectedColumnIndex = $from.index($from.depth);
-  var selectedColumnNode = selection.node;
-  var selectedColumnPos = selection.from;
-  var layoutSectionPos = $from.before($from.depth);
-  return {
-    layoutSectionNode: $from.parent,
-    layoutSectionPos: layoutSectionPos,
-    selectedColumnIndex: selectedColumnIndex,
-    selectedColumnNode: selectedColumnNode,
-    selectedColumnPos: selectedColumnPos
-  };
-};
 var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAPI) {
-  return function (_ref5) {
-    var tr = _ref5.tr;
+  return function (_ref4) {
+    var tr = _ref4.tr;
     if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
-    var selectedColumn = getSelectedLayoutColumnInSection(tr);
-    if (!selectedColumn) {
+    var selectedLayoutColumns = getSelectedLayoutColumns(tr.selection);
+    if (!selectedLayoutColumns) {
       return null;
     }
-    var layoutSectionNode = selectedColumn.layoutSectionNode,
-      layoutSectionPos = selectedColumn.layoutSectionPos,
-      selectedColumnIndex = selectedColumn.selectedColumnIndex;
+    var layoutSectionNode = selectedLayoutColumns.layoutSectionNode,
+      layoutSectionPos = selectedLayoutColumns.layoutSectionPos,
+      selectedColumnIndices = selectedLayoutColumns.selectedColumnIndices,
+      selectedColumns = selectedLayoutColumns.selectedColumns;
+    var startIndex = selectedColumnIndices[0];
+    var endIndex = selectedColumnIndices[selectedColumnIndices.length - 1];
+    var selectedColumnIndex = side === 'left' ? startIndex : endIndex;
+    var selectedColumnCount = selectedColumns.length;
     if (layoutSectionNode.childCount >= getEffectiveMaxLayoutColumns()) {
       return null;
     }
@@ -621,9 +602,11 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
       actionSubjectId: ACTION_SUBJECT_ID.LAYOUT_COLUMN,
       attributes: {
         columnCount: redistributedWidths.length,
+        endIndex: endIndex,
         inputMethod: INPUT_METHOD.LAYOUT_COLUMN_MENU,
-        selectedIndex: selectedColumnIndex,
-        side: side
+        selectedCount: selectedColumnCount,
+        side: side,
+        startIndex: startIndex
       },
       eventType: EVENT_TYPE.TRACK
     })(tr);
@@ -634,35 +617,61 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
 export var insertLayoutColumn = function insertLayoutColumn(side, editorAnalyticsAPI) {
   return insertLayoutColumnAt(side, editorAnalyticsAPI);
 };
-export var setLayoutColumnValign = function setLayoutColumnValign(valign) {
-  return function (_ref6) {
-    var tr = _ref6.tr;
+export var setLayoutColumnValign = function setLayoutColumnValign(valign, editorAnalyticsAPI) {
+  return function (_ref5) {
+    var tr = _ref5.tr;
     if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
-    var layoutColumn = tr.doc.type.schema.nodes.layoutColumn;
-    var selectedColumn = tr.selection instanceof NodeSelection && tr.selection.node.type === layoutColumn ? {
-      node: tr.selection.node,
-      pos: tr.selection.from
-    } : undefined;
-    if (!selectedColumn) {
+    var selectedLayoutColumns = getSelectedLayoutColumns(tr.selection);
+    if (!selectedLayoutColumns) {
       return null;
     }
-    if (selectedColumn.node.attrs.valign === valign) {
+    var selectedColumnIndices = selectedLayoutColumns.selectedColumnIndices,
+      selectedColumns = selectedLayoutColumns.selectedColumns;
+    var columnsToUpdate = selectedColumns.filter(function (_ref6) {
+      var node = _ref6.node;
+      return node.attrs.valign !== valign;
+    });
+    if (columnsToUpdate.length === 0) {
       return null;
     }
-    tr.setNodeMarkup(selectedColumn.pos, selectedColumn.node.type, _objectSpread(_objectSpread({}, selectedColumn.node.attrs), {}, {
-      valign: valign
-    }));
+    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,
+        pos = _ref7.pos;
+      tr.setNodeMarkup(pos, node.type, _objectSpread(_objectSpread({}, node.attrs), {}, {
+        valign: valign
+      }));
+    });
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
+      action: ACTION.UPDATED,
+      actionSubject: ACTION_SUBJECT.DOCUMENT,
+      actionSubjectId: ACTION_SUBJECT_ID.LAYOUT_COLUMN,
+      attributes: {
+        endIndex: endIndex,
+        inputMethod: INPUT_METHOD.LAYOUT_COLUMN_MENU,
+        selectedCount: selectedColumnCount,
+        startIndex: startIndex,
+        updatedCount: updatedColumnCount,
+        valign: valign
+      },
+      eventType: EVENT_TYPE.TRACK
+    })(tr);
     tr.setMeta('scrollIntoView', false);
     return tr;
   };
 };
-export var toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref7) {
-  var isOpen = _ref7.isOpen;
-  return function (_ref8) {
-    var tr = _ref8.tr;
+export var toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref8) {
+  var anchorPos = _ref8.anchorPos,
+    isOpen = _ref8.isOpen;
+  return function (_ref9) {
+    var tr = _ref9.tr;
     tr.setMeta('toggleLayoutColumnMenu', {
+      anchorPos: anchorPos,
       isOpen: isOpen
     });
     tr.setMeta('scrollIntoView', false);
@@ -670,18 +679,23 @@ export var toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref7) {
   };
 };
 export var deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI) {
-  return function (_ref9) {
-    var tr = _ref9.tr;
+  return function (_ref0) {
+    var tr = _ref0.tr;
     if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
-    var selectedColumn = getSelectedLayoutColumnInSection(tr);
-    if (!selectedColumn) {
+    var selectedLayoutColumns = getSelectedLayoutColumns(tr.selection);
+    if (!selectedLayoutColumns) {
       return null;
     }
-    var layoutSectionNode = selectedColumn.layoutSectionNode,
-      layoutSectionPos = selectedColumn.layoutSectionPos,
-      selectedColumnIndex = selectedColumn.selectedColumnIndex;
+    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 emitDeleteColumnAnalytics = function emitDeleteColumnAnalytics(columnCount) {
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
         action: ACTION.DELETED,
@@ -689,25 +703,27 @@ export var deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI)
         actionSubjectId: ACTION_SUBJECT_ID.LAYOUT_COLUMN,
         attributes: {
           columnCount: columnCount,
+          endIndex: endIndex,
           inputMethod: INPUT_METHOD.LAYOUT_COLUMN_MENU,
-          selectedIndex: selectedColumnIndex
+          selectedCount: selectedColumnCount,
+          startIndex: startIndex
         },
         eventType: EVENT_TYPE.TRACK
       })(tr);
     };
 
-    // If only one column remains, remove the entire layoutSection
-    if (layoutSectionNode.childCount === 1) {
+    // If all columns are selected, remove the entire layoutSection
+    if (selectedColumnCount === layoutSectionNode.childCount) {
       tr.delete(layoutSectionPos, layoutSectionPos + layoutSectionNode.nodeSize);
       emitDeleteColumnAnalytics(0);
       tr.setMeta('scrollIntoView', false);
       return tr;
     }
 
-    // Build new column list without the selected column
+    // Build new column list without the selected columns
     var remainingColumns = [];
     layoutSectionNode.forEach(function (column, _offset, index) {
-      if (index !== selectedColumnIndex) {
+      if (!selectedColumnIndexSet.has(index)) {
         remainingColumns.push(column);
       }
     });
@@ -716,7 +732,14 @@ export var deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI)
     var existingWidths = mapChildren(layoutSectionNode, function (column) {
       return column.attrs.width;
     });
-    var redistributed = redistributeAfterDeletion(existingWidths, selectedColumnIndex, MIN_LAYOUT_COLUMN_WIDTH_PERCENT);
+    var redistributed = selectedColumnIndices.slice()
+    // Delete highest indices first so lower original indices still point at the same columns
+    // as each redistribution step shrinks the widths array.
+    .sort(function (a, b) {
+      return b - a;
+    }).reduce(function (widths, selectedIndex) {
+      return redistributeAfterDeletion(widths, selectedIndex, MIN_LAYOUT_COLUMN_WIDTH_PERCENT);
+    }, existingWidths);
     var updatedLayoutSectionNode = layoutSectionNode.copy(Fragment.fromArray(remainingColumns));
     tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributed));
     emitDeleteColumnAnalytics(redistributed.length);

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

@@ -66,7 +66,8 @@ var getInitialPluginState = function getInitialPluginState(options, state) {
     selectedLayout: selectedLayout,
     allowSingleColumnLayout: allowSingleColumnLayout,
     isResizing: false,
-    isLayoutColumnMenuOpen: false
+    isLayoutColumnMenuOpen: false,
+    layoutColumnMenuAnchorPos: undefined
   };
 };
 
@@ -118,7 +119,8 @@ export default (function (options) {
         var _columnMenuMeta$isOpe, _tr$getMeta, _pluginKey$getState;
         var columnMenuMeta = tr.getMeta('toggleLayoutColumnMenu');
         var nextPluginState = columnMenuMeta ? _objectSpread(_objectSpread({}, pluginState), {}, {
-          isLayoutColumnMenuOpen: (_columnMenuMeta$isOpe = columnMenuMeta.isOpen) !== null && _columnMenuMeta$isOpe !== void 0 ? _columnMenuMeta$isOpe : !pluginState.isLayoutColumnMenuOpen
+          isLayoutColumnMenuOpen: (_columnMenuMeta$isOpe = columnMenuMeta.isOpen) !== null && _columnMenuMeta$isOpe !== void 0 ? _columnMenuMeta$isOpe : !pluginState.isLayoutColumnMenuOpen,
+          layoutColumnMenuAnchorPos: columnMenuMeta.isOpen === false ? undefined : columnMenuMeta.anchorPos
         }) : pluginState;
         var isResizing = editorExperiment('single_column_layouts', true) ? (_tr$getMeta = tr.getMeta('is-resizer-resizing')) !== null && _tr$getMeta !== void 0 ? _tr$getMeta : (_pluginKey$getState = pluginKey.getState(oldState)) === null || _pluginKey$getState === void 0 ? void 0 : _pluginKey$getState.isResizing : false;
         if (tr.docChanged || tr.selectionSet) {

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

@@ -0,0 +1,122 @@
+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;
+    }
+  }
+  return undefined;
+};
+export var getSelectedLayoutColumns = function getSelectedLayoutColumns(selection) {
+  if (!selection) {
+    return undefined;
+  }
+  if (selection instanceof NodeSelection && isLayoutColumn(selection.node)) {
+    var _$from = selection.$from;
+    var _layoutSectionNode = _$from.parent;
+    if (!isLayoutSection(_layoutSectionNode)) {
+      return undefined;
+    }
+    var selectedColumnIndex = _$from.index(_$from.depth);
+    return {
+      layoutSectionNode: _layoutSectionNode,
+      layoutSectionPos: _$from.before(_$from.depth),
+      selectedColumnIndices: [selectedColumnIndex],
+      selectedColumns: [{
+        index: selectedColumnIndex,
+        node: selection.node,
+        pos: selection.from
+      }]
+    };
+  }
+  if (selection.empty) {
+    return undefined;
+  }
+  if (!editorExperiment('platform_editor_block_menu', true)) {
+    return undefined;
+  }
+  var layoutSectionDepth = getLayoutSectionDepth(selection);
+  if (layoutSectionDepth === undefined) {
+    return undefined;
+  }
+  var $from = selection.$from,
+    $to = selection.$to;
+  var layoutSectionNode = $from.node(layoutSectionDepth);
+  var layoutSectionPos = $from.before(layoutSectionDepth);
+  var selectedColumns = [];
+  var invalidSelection = false;
+  layoutSectionNode.forEach(function (column, offset, index) {
+    var columnStart = layoutSectionPos + 1 + offset;
+    var columnEnd = columnStart + column.nodeSize;
+    var intersectsColumn = selection.from < columnEnd && selection.to > columnStart;
+    if (!intersectsColumn) {
+      return;
+    }
+    if (!isLayoutColumn(column)) {
+      invalidSelection = true;
+      return;
+    }
+    selectedColumns.push({
+      index: index,
+      node: column,
+      pos: columnStart
+    });
+  });
+
+  // TextSelection inside a single column is normal text editing, not a selected column set.
+  if (invalidSelection || selectedColumns.length < 2) {
+    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) {
+    return undefined;
+  }
+  return {
+    layoutSectionNode: layoutSectionNode,
+    layoutSectionPos: layoutSectionPos,
+    selectedColumnIndices: selectedColumns.map(function (_ref) {
+      var index = _ref.index;
+      return index;
+    }),
+    selectedColumns: selectedColumns
+  };
+};
+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) {
+  return layoutColumn === null || layoutColumn === void 0 ? void 0 : layoutColumn.attrs.valign;
+};
+export var getLayoutColumnMenuAnchorPos = function getLayoutColumnMenuAnchorPos(selection, anchorPosFromHandle) {
+  var _clickedSelectedColum, _selectedLayoutColumn;
+  var selectedLayoutColumns = getSelectedLayoutColumns(selection);
+  if (!selectedLayoutColumns) {
+    return undefined;
+  }
+  var clickedSelectedColumn = selectedLayoutColumns.selectedColumns.find(function (_ref2) {
+    var pos = _ref2.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/esm/ui/LayoutColumnMenu/DeleteColumnDropdownItem.js

@@ -2,12 +2,12 @@ import React, { useCallback } from 'react';
 import { useIntl } from 'react-intl';
 import { layoutMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
-import { useCurrentLayoutColumn } from './useCurrentLayoutColumn';
+import { useSelectedLayoutColumns } from './useSelectedLayoutColumns';
 var DeleteColumnDropdownItem = function DeleteColumnDropdownItem(_ref) {
   var api = _ref.api;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
-  var currentColumn = useCurrentLayoutColumn(api);
+  var selectedLayoutColumns = useSelectedLayoutColumns(api);
   var onClick = useCallback(function () {
     var _api$layout, _api$core;
     var deleteCommand = api === null || api === void 0 || (_api$layout = api.layout) === null || _api$layout === void 0 ? void 0 : _api$layout.commands.deleteLayoutColumn;
@@ -25,11 +25,14 @@ var DeleteColumnDropdownItem = function DeleteColumnDropdownItem(_ref) {
       return tr;
     });
   }, [api]);
-  if (currentColumn === undefined) {
+  if (selectedLayoutColumns === undefined) {
     return null;
   }
+  var selectedColumnCount = selectedLayoutColumns.selectedColumns.length;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: onClick
-  }, formatMessage(layoutMessages.deleteColumn));
+  }, formatMessage(layoutMessages.deleteColumn, {
+    count: selectedColumnCount
+  }));
 };
 export { DeleteColumnDropdownItem };

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

@@ -3,8 +3,8 @@ import { useIntl } from 'react-intl';
 import { layoutMessages } from '@atlaskit/editor-common/messages';
 import { TableColumnAddLeftIcon, TableColumnAddRightIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import { getEffectiveMaxLayoutColumns } from '../../pm-plugins/actions';
-import { getLayoutSectionColumnCount } from './layoutColumnSelection';
-import { useCurrentLayoutColumn, useCurrentLayoutSection } from './useCurrentLayoutColumn';
+import { getLayoutSectionColumnCount } from '../../pm-plugins/utils/layout-column-selection';
+import { useSelectedLayoutColumns } from './useSelectedLayoutColumns';
 var INSERT_COLUMN_OPTIONS = {
   left: {
     Icon: TableColumnAddLeftIcon,
@@ -25,11 +25,10 @@ export var InsertColumnDropdownItem = function InsertColumnDropdownItem(_ref) {
   var _INSERT_COLUMN_OPTION = INSERT_COLUMN_OPTIONS[side],
     Icon = _INSERT_COLUMN_OPTION.Icon,
     label = _INSERT_COLUMN_OPTION.label;
-  var currentColumn = useCurrentLayoutColumn(api);
-  var currentLayoutSection = useCurrentLayoutSection(api);
-  var columnCount = getLayoutSectionColumnCount(currentLayoutSection);
+  var selectedLayoutColumns = useSelectedLayoutColumns(api);
+  var columnCount = getLayoutSectionColumnCount(selectedLayoutColumns === null || selectedLayoutColumns === void 0 ? void 0 : selectedLayoutColumns.layoutSectionNode);
   var maxColumnCount = getEffectiveMaxLayoutColumns();
-  var canInsertColumn = currentColumn !== undefined && columnCount < maxColumnCount;
+  var canInsertColumn = selectedLayoutColumns !== undefined && columnCount < maxColumnCount;
   var onClick = useCallback(function () {
     var _api$layout, _api$core;
     var insertCommand = api === null || api === void 0 || (_api$layout = api.layout) === null || _api$layout === void 0 ? void 0 : _api$layout.commands.insertLayoutColumn(side);

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

@@ -1,19 +1,21 @@
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback } from 'react';
 import { useIntl } from 'react-intl';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
-import { getLayoutColumnValign } from './layoutColumnSelection';
-import { useCurrentLayoutColumn } from './useCurrentLayoutColumn';
+import { getLayoutColumnValign } from '../../pm-plugins/utils/layout-column-selection';
+import { useSelectedLayoutColumns } from './useSelectedLayoutColumns';
 import { VERTICAL_ALIGN_ICONS } from './verticalAlignIcons';
 export var VerticalAlignDropdownItem = function VerticalAlignDropdownItem(_ref) {
+  var _selectedLayoutColumn;
   var api = _ref.api,
     label = _ref.label,
     value = _ref.value;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
-  var currentColumn = useCurrentLayoutColumn(api);
-  var currentValign = useMemo(function () {
-    return getLayoutColumnValign(currentColumn);
-  }, [currentColumn]);
+  var selectedLayoutColumns = useSelectedLayoutColumns(api);
+  var isSelected = (_selectedLayoutColumn = selectedLayoutColumns === null || selectedLayoutColumns === void 0 ? void 0 : selectedLayoutColumns.selectedColumns.every(function (_ref2) {
+    var node = _ref2.node;
+    return getLayoutColumnValign(node) === value;
+  })) !== null && _selectedLayoutColumn !== void 0 ? _selectedLayoutColumn : false;
   var Icon = VERTICAL_ALIGN_ICONS[value];
   var onClick = useCallback(function () {
     var _api$core, _api$layout;
@@ -24,7 +26,7 @@ export var VerticalAlignDropdownItem = function VerticalAlignDropdownItem(_ref)
       label: "",
       size: "small"
     }),
-    isSelected: currentValign === value,
+    isSelected: isSelected,
     onClick: onClick
   }, formatMessage(label));
 };

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

@@ -2,20 +2,29 @@ import React, { useMemo } from 'react';
 import { useIntl } from 'react-intl';
 import { layoutMessages } from '@atlaskit/editor-common/messages';
 import { LayoutIcon, NestedDropdownRightIcon, ToolbarNestedDropdownMenu } from '@atlaskit/editor-toolbar';
-import { getLayoutColumnValign } from './layoutColumnSelection';
-import { useCurrentLayoutColumn } from './useCurrentLayoutColumn';
+import { getLayoutColumnValign } from '../../pm-plugins/utils/layout-column-selection';
+import { useSelectedLayoutColumns } from './useSelectedLayoutColumns';
 import { VERTICAL_ALIGN_ICONS } from './verticalAlignIcons';
 export var VerticalAlignNestedMenu = function VerticalAlignNestedMenu(_ref) {
   var api = _ref.api,
     children = _ref.children;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
-  var currentColumn = useCurrentLayoutColumn(api);
+  var selectedLayoutColumns = useSelectedLayoutColumns(api);
   var currentValign = useMemo(function () {
-    return getLayoutColumnValign(currentColumn);
-  }, [currentColumn]);
+    var selectedColumns = selectedLayoutColumns === null || selectedLayoutColumns === void 0 ? void 0 : selectedLayoutColumns.selectedColumns;
+    var firstColumn = selectedColumns === null || selectedColumns === void 0 ? void 0 : selectedColumns[0];
+    var firstValign = getLayoutColumnValign(firstColumn === null || firstColumn === void 0 ? void 0 : firstColumn.node);
+    if (!firstValign || !(selectedColumns !== null && selectedColumns !== void 0 && selectedColumns.every(function (_ref2) {
+      var node = _ref2.node;
+      return getLayoutColumnValign(node) === firstValign;
+    }))) {
+      return undefined;
+    }
+    return firstValign;
+  }, [selectedLayoutColumns]);
   var TriggerIcon = currentValign ? VERTICAL_ALIGN_ICONS[currentValign] : LayoutIcon;
-  if (!currentColumn) {
+  if (!selectedLayoutColumns) {
     return null;
   }
   return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {

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

@@ -8,9 +8,9 @@ import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners } from
 import { akEditorFloatingOverlapPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { ToolbarDropdownMenuProvider } from '@atlaskit/editor-toolbar';
 import { SurfaceRenderer } from '@atlaskit/editor-ui-control-model';
+import { getLayoutColumnMenuAnchorPos } from '../../pm-plugins/utils/layout-column-selection';
 import { LAYOUT_COLUMN_MENU_FALLBACKS } from './components';
 import { LAYOUT_COLUMN_MENU } from './keys';
-import { getLayoutColumnAtSelection } from './layoutColumnSelection';
 var PopupWithListeners = withReactEditorViewOuterListeners(Popup);
 var FALLBACK_MENU_HEIGHT = 300;
 var LAYOUT_COLUMN_MENU_POPUP_OFFSET = [0, 4];
@@ -18,12 +18,13 @@ var LAYOUT_COLUMN_MENU_POPUP_OFFSET = [0, 4];
 /**
  * Returns the drag handle button for the selected layout column.
  */
-var getLayoutColumnMenuTarget = function getLayoutColumnMenuTarget(editorView, selection) {
+var getLayoutColumnMenuTarget = function getLayoutColumnMenuTarget(editorView, selection, anchorPosFromHandle) {
   var _columnDomRef$parentE;
-  if (!getLayoutColumnAtSelection(selection) || (selection === null || selection === void 0 ? void 0 : selection.from) === undefined) {
+  var anchorPos = getLayoutColumnMenuAnchorPos(selection, anchorPosFromHandle);
+  if (anchorPos === undefined) {
     return null;
   }
-  var columnDomRef = editorView.nodeDOM(selection.from);
+  var columnDomRef = editorView.nodeDOM(anchorPos);
   if (!(columnDomRef instanceof HTMLElement)) {
     return null;
   }
@@ -38,13 +39,15 @@ export var LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMenu(
     boundariesElement = _ref.boundariesElement,
     scrollableElement = _ref.scrollableElement;
   var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['layout', 'selection'], function (states) {
-      var _states$layoutState$i, _states$layoutState, _states$selectionStat;
+      var _states$layoutState$i, _states$layoutState, _states$layoutState2, _states$selectionStat;
       return {
         isLayoutColumnMenuOpen: (_states$layoutState$i = (_states$layoutState = states.layoutState) === null || _states$layoutState === void 0 ? void 0 : _states$layoutState.isLayoutColumnMenuOpen) !== null && _states$layoutState$i !== void 0 ? _states$layoutState$i : false,
+        layoutColumnMenuAnchorPos: (_states$layoutState2 = states.layoutState) === null || _states$layoutState2 === void 0 ? void 0 : _states$layoutState2.layoutColumnMenuAnchorPos,
         selection: (_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection
       };
     }),
     isLayoutColumnMenuOpen = _useSharedPluginState.isLayoutColumnMenuOpen,
+    layoutColumnMenuAnchorPos = _useSharedPluginState.layoutColumnMenuAnchorPos,
     selection = _useSharedPluginState.selection;
   var setOutsideClickTargetRef = useContext(OutsideClickTargetRefContext);
   var menuRef = useRef(null);
@@ -74,6 +77,13 @@ export var LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMenu(
     if (event.target instanceof Element && event.target.closest('[data-toolbar-nested-dropdown-menu]')) {
       return;
     }
+
+    // Clicking a drag handle should let the drag handle's own click handler
+    // update selection/menu state. Treating it as a generic outside click
+    // races that transaction and can immediately close the layout column menu.
+    if (event.target instanceof Element && event.target.closest(DRAG_HANDLE_SELECTOR)) {
+      return;
+    }
     closeLayoutColumnMenu();
   }, [closeLayoutColumnMenu]);
   var handleSetIsOpen = useCallback(function (isOpen) {
@@ -90,8 +100,8 @@ export var LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMenu(
   }, [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(LAYOUT_COLUMN_MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
   var target = useMemo(function () {
-    return isLayoutColumnMenuOpen ? getLayoutColumnMenuTarget(editorView, selection) : null;
-  }, [editorView, isLayoutColumnMenuOpen, selection]);
+    return isLayoutColumnMenuOpen ? getLayoutColumnMenuTarget(editorView, selection, layoutColumnMenuAnchorPos) : null;
+  }, [editorView, isLayoutColumnMenuOpen, layoutColumnMenuAnchorPos, selection]);
   var hasValidTarget = target instanceof HTMLElement;
   useEffect(function () {
     if (isLayoutColumnMenuOpen && (!hasValidTarget || components.length === 0)) {

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

@@ -0,0 +1,8 @@
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
+import { getSelectedLayoutColumns } from '../../pm-plugins/utils/layout-column-selection';
+export var useSelectedLayoutColumns = function useSelectedLayoutColumns(api) {
+  return useSharedPluginStateWithSelector(api, ['selection'], function (states) {
+    var _states$selectionStat;
+    return getSelectedLayoutColumns((_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection);
+  });
+};

package/dist/types/layoutPluginType.d.ts

@@ -31,7 +31,7 @@ export type LayoutPlugin = NextEditorPlugin<'layout', {
     commands: {
         deleteLayoutColumn: ReturnType<typeof deleteLayoutColumn>;
         insertLayoutColumn: (side: InsertLayoutColumnSide) => EditorCommand;
-        setLayoutColumnValign: typeof setLayoutColumnValign;
+        setLayoutColumnValign: (valign: Parameters<typeof setLayoutColumnValign>[0]) => EditorCommand;
         toggleLayoutColumnMenu: typeof toggleLayoutColumnMenu;
     };
     dependencies: LayoutPluginDependencies;

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

@@ -33,8 +33,9 @@ export type InsertLayoutColumnSide = 'left' | 'right';
  */
 export declare function getEffectiveMaxLayoutColumns(): number;
 export declare const insertLayoutColumn: (side: InsertLayoutColumnSide, editorAnalyticsAPI?: EditorAnalyticsAPI) => EditorCommand;
-export declare const setLayoutColumnValign: (valign: Valign) => EditorCommand;
-export declare const toggleLayoutColumnMenu: ({ isOpen }: {
+export declare const setLayoutColumnValign: (valign: Valign, editorAnalyticsAPI?: EditorAnalyticsAPI) => EditorCommand;
+export declare const toggleLayoutColumnMenu: ({ anchorPos, isOpen }: {
+    anchorPos?: number;
     isOpen?: boolean;
 }) => EditorCommand;
 export declare const deleteLayoutColumn: (editorAnalyticsAPI?: EditorAnalyticsAPI) => EditorCommand;

package/dist/types/pm-plugins/types.d.ts

@@ -6,6 +6,7 @@ export type LayoutState = {
     allowSingleColumnLayout: boolean;
     isLayoutColumnMenuOpen: boolean;
     isResizing: boolean;
+    layoutColumnMenuAnchorPos: number | undefined;
     pos: number | null;
     selectedLayout: PresetLayout | undefined;
 };

package/dist/types/pm-plugins/utils/layout-column-selection.d.ts

@@ -0,0 +1,18 @@
+import type { Valign } from '@atlaskit/editor-common/types/valign';
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import type { Selection } from '@atlaskit/editor-prosemirror/state';
+export type SelectedLayoutColumn = {
+    index: number;
+    node: PMNode;
+    pos: number;
+};
+export type SelectedLayoutColumns = {
+    layoutSectionNode: PMNode;
+    layoutSectionPos: number;
+    selectedColumnIndices: number[];
+    selectedColumns: SelectedLayoutColumn[];
+};
+export declare const getSelectedLayoutColumns: (selection: Selection | undefined) => SelectedLayoutColumns | undefined;
+export declare const getLayoutSectionColumnCount: (layoutSection: PMNode | undefined) => number;
+export declare const getLayoutColumnValign: (layoutColumn: PMNode | undefined) => Valign | undefined;
+export declare const getLayoutColumnMenuAnchorPos: (selection: Selection | undefined, anchorPosFromHandle?: number) => number | undefined;

package/dist/types/ui/LayoutColumnMenu/useSelectedLayoutColumns.d.ts

@@ -0,0 +1,4 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { LayoutPlugin } from '../../layoutPluginType';
+import { type SelectedLayoutColumns } from '../../pm-plugins/utils/layout-column-selection';
+export declare const useSelectedLayoutColumns: (api: ExtractInjectionAPI<LayoutPlugin> | undefined) => SelectedLayoutColumns | undefined;