@atlaskit/editor-plugin-layout 10.5.0 → 10.6.1

package/dist/es2019/layoutPlugin.js

@@ -357,7 +357,10 @@ export const layoutPlugin = ({
         var _api$analytics5;
         return insertLayoutColumn(side, api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
       },
-      setLayoutColumnValign,
+      setLayoutColumnValign: valign => {
+        var _api$analytics6;
+        return setLayoutColumnValign(valign, api === null || api === void 0 ? void 0 : (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions);
+      },
       toggleLayoutColumnMenu
     }
   };

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

@@ -9,6 +9,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 const ONE_COL_LAYOUTS = ['single'];
 export const TWO_COL_LAYOUTS = ['two_equal', 'two_left_sidebar', 'two_right_sidebar'];
@@ -533,50 +534,26 @@ const formatLayoutName = layout => {
 export function getEffectiveMaxLayoutColumns() {
   return editorExperiment('advanced_layouts', true) ? MAX_LAYOUT_COLUMNS : MAX_STANDARD_LAYOUT_COLUMNS;
 }
-const getSelectedLayoutColumnInSection = ({
-  doc,
-  selection
-}) => {
-  const {
-    layoutColumn,
-    layoutSection
-  } = doc.type.schema.nodes;
-  if (!(selection instanceof NodeSelection) || selection.node.type !== layoutColumn) {
-    return;
-  }
-  const {
-    $from
-  } = selection;
-  if ($from.parent.type !== layoutSection) {
-    return;
-  }
-  const selectedColumnIndex = $from.index($from.depth);
-  const selectedColumnNode = selection.node;
-  const selectedColumnPos = selection.from;
-  const layoutSectionPos = $from.before($from.depth);
-  return {
-    layoutSectionNode: $from.parent,
-    layoutSectionPos,
-    selectedColumnIndex,
-    selectedColumnNode,
-    selectedColumnPos
-  };
-};
 const insertLayoutColumnAt = (side, editorAnalyticsAPI) => ({
   tr
 }) => {
   if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
     return null;
   }
-  const selectedColumn = getSelectedLayoutColumnInSection(tr);
-  if (!selectedColumn) {
+  const selectedLayoutColumns = getSelectedLayoutColumns(tr.selection);
+  if (!selectedLayoutColumns) {
     return null;
   }
   const {
     layoutSectionNode,
     layoutSectionPos,
-    selectedColumnIndex
-  } = selectedColumn;
+    selectedColumnIndices,
+    selectedColumns
+  } = selectedLayoutColumns;
+  const startIndex = selectedColumnIndices[0];
+  const endIndex = selectedColumnIndices[selectedColumnIndices.length - 1];
+  const selectedColumnIndex = side === 'left' ? startIndex : endIndex;
+  const selectedColumnCount = selectedColumns.length;
   if (layoutSectionNode.childCount >= getEffectiveMaxLayoutColumns()) {
     return null;
   }
@@ -613,9 +590,11 @@ const insertLayoutColumnAt = (side, editorAnalyticsAPI) => ({
     actionSubjectId: ACTION_SUBJECT_ID.LAYOUT_COLUMN,
     attributes: {
       columnCount: redistributedWidths.length,
+      endIndex,
       inputMethod: INPUT_METHOD.LAYOUT_COLUMN_MENU,
-      selectedIndex: selectedColumnIndex,
-      side
+      selectedCount: selectedColumnCount,
+      side,
+      startIndex
     },
     eventType: EVENT_TYPE.TRACK
   })(tr);
@@ -623,38 +602,64 @@ const insertLayoutColumnAt = (side, editorAnalyticsAPI) => ({
   return tr;
 };
 export const insertLayoutColumn = (side, editorAnalyticsAPI) => insertLayoutColumnAt(side, editorAnalyticsAPI);
-export const setLayoutColumnValign = valign => ({
+export const setLayoutColumnValign = (valign, editorAnalyticsAPI) => ({
   tr
 }) => {
   if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
     return null;
   }
-  const {
-    layoutColumn
-  } = tr.doc.type.schema.nodes;
-  const selectedColumn = tr.selection instanceof NodeSelection && tr.selection.node.type === layoutColumn ? {
-    node: tr.selection.node,
-    pos: tr.selection.from
-  } : undefined;
-  if (!selectedColumn) {
+  const selectedLayoutColumns = getSelectedLayoutColumns(tr.selection);
+  if (!selectedLayoutColumns) {
     return null;
   }
-  if (selectedColumn.node.attrs.valign === valign) {
+  const {
+    selectedColumnIndices,
+    selectedColumns
+  } = selectedLayoutColumns;
+  const columnsToUpdate = selectedColumns.filter(({
+    node
+  }) => node.attrs.valign !== valign);
+  if (columnsToUpdate.length === 0) {
     return null;
   }
-  tr.setNodeMarkup(selectedColumn.pos, selectedColumn.node.type, {
-    ...selectedColumn.node.attrs,
-    valign
+  const startIndex = selectedColumnIndices[0];
+  const endIndex = selectedColumnIndices[selectedColumnIndices.length - 1];
+  const selectedColumnCount = selectedColumns.length;
+  const updatedColumnCount = columnsToUpdate.length;
+  columnsToUpdate.forEach(({
+    node,
+    pos
+  }) => {
+    tr.setNodeMarkup(pos, node.type, {
+      ...node.attrs,
+      valign
+    });
   });
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+    action: ACTION.UPDATED,
+    actionSubject: ACTION_SUBJECT.DOCUMENT,
+    actionSubjectId: ACTION_SUBJECT_ID.LAYOUT_COLUMN,
+    attributes: {
+      endIndex,
+      inputMethod: INPUT_METHOD.LAYOUT_COLUMN_MENU,
+      selectedCount: selectedColumnCount,
+      startIndex,
+      updatedCount: updatedColumnCount,
+      valign
+    },
+    eventType: EVENT_TYPE.TRACK
+  })(tr);
   tr.setMeta('scrollIntoView', false);
   return tr;
 };
 export const toggleLayoutColumnMenu = ({
+  anchorPos,
   isOpen
 }) => ({
   tr
 }) => {
   tr.setMeta('toggleLayoutColumnMenu', {
+    anchorPos,
     isOpen
   });
   tr.setMeta('scrollIntoView', false);
@@ -666,15 +671,20 @@ export const deleteLayoutColumn = editorAnalyticsAPI => ({
   if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
     return null;
   }
-  const selectedColumn = getSelectedLayoutColumnInSection(tr);
-  if (!selectedColumn) {
+  const selectedLayoutColumns = getSelectedLayoutColumns(tr.selection);
+  if (!selectedLayoutColumns) {
     return null;
   }
   const {
     layoutSectionNode,
     layoutSectionPos,
-    selectedColumnIndex
-  } = selectedColumn;
+    selectedColumnIndices,
+    selectedColumns
+  } = selectedLayoutColumns;
+  const startIndex = selectedColumnIndices[0];
+  const endIndex = selectedColumnIndices[selectedColumnIndices.length - 1];
+  const selectedColumnCount = selectedColumns.length;
+  const selectedColumnIndexSet = new Set(selectedColumnIndices);
   const emitDeleteColumnAnalytics = columnCount => {
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
       action: ACTION.DELETED,
@@ -682,32 +692,37 @@ export const deleteLayoutColumn = editorAnalyticsAPI => ({
       actionSubjectId: ACTION_SUBJECT_ID.LAYOUT_COLUMN,
       attributes: {
         columnCount,
+        endIndex,
         inputMethod: INPUT_METHOD.LAYOUT_COLUMN_MENU,
-        selectedIndex: selectedColumnIndex
+        selectedCount: selectedColumnCount,
+        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
   const remainingColumns = [];
   layoutSectionNode.forEach((column, _offset, index) => {
-    if (index !== selectedColumnIndex) {
+    if (!selectedColumnIndexSet.has(index)) {
       remainingColumns.push(column);
     }
   });
 
   // Redistribute widths proportionally among remaining columns using shared utility
   const existingWidths = mapChildren(layoutSectionNode, column => column.attrs.width);
-  const redistributed = redistributeAfterDeletion(existingWidths, selectedColumnIndex, MIN_LAYOUT_COLUMN_WIDTH_PERCENT);
+  const 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((a, b) => b - a).reduce((widths, selectedIndex) => redistributeAfterDeletion(widths, selectedIndex, MIN_LAYOUT_COLUMN_WIDTH_PERCENT), existingWidths);
   const 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/es2019/pm-plugins/main.js

@@ -67,7 +67,8 @@ const getInitialPluginState = (options, state) => {
     selectedLayout,
     allowSingleColumnLayout,
     isResizing: false,
-    isLayoutColumnMenuOpen: false
+    isLayoutColumnMenuOpen: false,
+    layoutColumnMenuAnchorPos: undefined
   };
 };
 
@@ -118,7 +119,8 @@ export default (options => {
         const columnMenuMeta = tr.getMeta('toggleLayoutColumnMenu');
         const nextPluginState = columnMenuMeta ? {
           ...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;
         const 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/es2019/pm-plugins/utils/layout-column-selection.js

@@ -0,0 +1,118 @@
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+const isLayoutColumn = node => (node === null || node === void 0 ? void 0 : node.type.name) === 'layoutColumn';
+const isLayoutSection = node => (node === null || node === void 0 ? void 0 : node.type.name) === 'layoutSection';
+const getLayoutColumnIndexAtPos = $pos => {
+  for (let depth = $pos.depth; depth > 0; depth--) {
+    if (isLayoutColumn($pos.node(depth)) && isLayoutSection($pos.node(depth - 1))) {
+      return $pos.index(depth - 1);
+    }
+  }
+  return undefined;
+};
+const getLayoutSectionDepth = selection => {
+  const {
+    $from,
+    $to
+  } = selection;
+  const sharedDepth = $from.sharedDepth($to.pos);
+  for (let depth = sharedDepth; depth > 0; depth--) {
+    if (isLayoutSection($from.node(depth))) {
+      return depth;
+    }
+  }
+  return undefined;
+};
+export const getSelectedLayoutColumns = selection => {
+  if (!selection) {
+    return undefined;
+  }
+  if (selection instanceof NodeSelection && isLayoutColumn(selection.node)) {
+    const {
+      $from
+    } = selection;
+    const layoutSectionNode = $from.parent;
+    if (!isLayoutSection(layoutSectionNode)) {
+      return undefined;
+    }
+    const selectedColumnIndex = $from.index($from.depth);
+    return {
+      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;
+  }
+  const layoutSectionDepth = getLayoutSectionDepth(selection);
+  if (layoutSectionDepth === undefined) {
+    return undefined;
+  }
+  const {
+    $from,
+    $to
+  } = selection;
+  const layoutSectionNode = $from.node(layoutSectionDepth);
+  const layoutSectionPos = $from.before(layoutSectionDepth);
+  const selectedColumns = [];
+  let invalidSelection = false;
+  layoutSectionNode.forEach((column, offset, index) => {
+    const columnStart = layoutSectionPos + 1 + offset;
+    const columnEnd = columnStart + column.nodeSize;
+    const intersectsColumn = selection.from < columnEnd && selection.to > columnStart;
+    if (!intersectsColumn) {
+      return;
+    }
+    if (!isLayoutColumn(column)) {
+      invalidSelection = true;
+      return;
+    }
+    selectedColumns.push({
+      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;
+  }
+  const firstColumn = selectedColumns[0];
+  const lastColumn = selectedColumns[selectedColumns.length - 1];
+  const startColumnIndex = getLayoutColumnIndexAtPos($from);
+  const endColumnIndex = getLayoutColumnIndexAtPos($to);
+  if (startColumnIndex !== undefined && startColumnIndex !== firstColumn.index || endColumnIndex !== undefined && endColumnIndex !== lastColumn.index) {
+    return undefined;
+  }
+  return {
+    layoutSectionNode,
+    layoutSectionPos,
+    selectedColumnIndices: selectedColumns.map(({
+      index
+    }) => index),
+    selectedColumns
+  };
+};
+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 getLayoutColumnMenuAnchorPos = (selection, anchorPosFromHandle) => {
+  var _clickedSelectedColum, _selectedLayoutColumn;
+  const selectedLayoutColumns = getSelectedLayoutColumns(selection);
+  if (!selectedLayoutColumns) {
+    return undefined;
+  }
+  const clickedSelectedColumn = selectedLayoutColumns.selectedColumns.find(({
+    pos
+  }) => 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/es2019/ui/LayoutColumnMenu/DeleteColumnDropdownItem.js

@@ -2,14 +2,14 @@ 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';
 const DeleteColumnDropdownItem = ({
   api
 }) => {
   const {
     formatMessage
   } = useIntl();
-  const currentColumn = useCurrentLayoutColumn(api);
+  const selectedLayoutColumns = useSelectedLayoutColumns(api);
   const onClick = useCallback(() => {
     var _api$layout, _api$core;
     const deleteCommand = api === null || api === void 0 ? void 0 : (_api$layout = api.layout) === null || _api$layout === void 0 ? void 0 : _api$layout.commands.deleteLayoutColumn;
@@ -27,11 +27,14 @@ const DeleteColumnDropdownItem = ({
       return tr;
     });
   }, [api]);
-  if (currentColumn === undefined) {
+  if (selectedLayoutColumns === undefined) {
     return null;
   }
+  const selectedColumnCount = selectedLayoutColumns.selectedColumns.length;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
     onClick: onClick
-  }, formatMessage(layoutMessages.deleteColumn));
+  }, formatMessage(layoutMessages.deleteColumn, {
+    count: selectedColumnCount
+  }));
 };
 export { DeleteColumnDropdownItem };

package/dist/es2019/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';
 const INSERT_COLUMN_OPTIONS = {
   left: {
     Icon: TableColumnAddLeftIcon,
@@ -28,11 +28,10 @@ export const InsertColumnDropdownItem = ({
     Icon,
     label
   } = INSERT_COLUMN_OPTIONS[side];
-  const currentColumn = useCurrentLayoutColumn(api);
-  const currentLayoutSection = useCurrentLayoutSection(api);
-  const columnCount = getLayoutSectionColumnCount(currentLayoutSection);
+  const selectedLayoutColumns = useSelectedLayoutColumns(api);
+  const columnCount = getLayoutSectionColumnCount(selectedLayoutColumns === null || selectedLayoutColumns === void 0 ? void 0 : selectedLayoutColumns.layoutSectionNode);
   const maxColumnCount = getEffectiveMaxLayoutColumns();
-  const canInsertColumn = currentColumn !== undefined && columnCount < maxColumnCount;
+  const canInsertColumn = selectedLayoutColumns !== undefined && columnCount < maxColumnCount;
   const onClick = useCallback(() => {
     var _api$layout, _api$core;
     const insertCommand = api === null || api === void 0 ? void 0 : (_api$layout = api.layout) === null || _api$layout === void 0 ? void 0 : _api$layout.commands.insertLayoutColumn(side);

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

@@ -1,19 +1,22 @@
-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 const VerticalAlignDropdownItem = ({
   api,
   label,
   value
 }) => {
+  var _selectedLayoutColumn;
   const {
     formatMessage
   } = useIntl();
-  const currentColumn = useCurrentLayoutColumn(api);
-  const currentValign = useMemo(() => getLayoutColumnValign(currentColumn), [currentColumn]);
+  const selectedLayoutColumns = useSelectedLayoutColumns(api);
+  const isSelected = (_selectedLayoutColumn = selectedLayoutColumns === null || selectedLayoutColumns === void 0 ? void 0 : selectedLayoutColumns.selectedColumns.every(({
+    node
+  }) => getLayoutColumnValign(node) === value)) !== null && _selectedLayoutColumn !== void 0 ? _selectedLayoutColumn : false;
   const Icon = VERTICAL_ALIGN_ICONS[value];
   const onClick = useCallback(() => {
     var _api$core, _api$layout;
@@ -24,7 +27,7 @@ export const VerticalAlignDropdownItem = ({
       label: "",
       size: "small"
     }),
-    isSelected: currentValign === value,
+    isSelected: isSelected,
     onClick: onClick
   }, formatMessage(label));
 };

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

@@ -2,8 +2,8 @@ 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 const VerticalAlignNestedMenu = ({
   api,
@@ -12,10 +12,20 @@ export const VerticalAlignNestedMenu = ({
   const {
     formatMessage
   } = useIntl();
-  const currentColumn = useCurrentLayoutColumn(api);
-  const currentValign = useMemo(() => getLayoutColumnValign(currentColumn), [currentColumn]);
+  const selectedLayoutColumns = useSelectedLayoutColumns(api);
+  const currentValign = useMemo(() => {
+    const selectedColumns = selectedLayoutColumns === null || selectedLayoutColumns === void 0 ? void 0 : selectedLayoutColumns.selectedColumns;
+    const firstColumn = selectedColumns === null || selectedColumns === void 0 ? void 0 : selectedColumns[0];
+    const firstValign = getLayoutColumnValign(firstColumn === null || firstColumn === void 0 ? void 0 : firstColumn.node);
+    if (!firstValign || !(selectedColumns !== null && selectedColumns !== void 0 && selectedColumns.every(({
+      node
+    }) => getLayoutColumnValign(node) === firstValign))) {
+      return undefined;
+    }
+    return firstValign;
+  }, [selectedLayoutColumns]);
   const TriggerIcon = currentValign ? VERTICAL_ALIGN_ICONS[currentValign] : LayoutIcon;
-  if (!currentColumn) {
+  if (!selectedLayoutColumns) {
     return null;
   }
   return /*#__PURE__*/React.createElement(ToolbarNestedDropdownMenu, {

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

@@ -7,9 +7,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';
 const PopupWithListeners = withReactEditorViewOuterListeners(Popup);
 const FALLBACK_MENU_HEIGHT = 300;
 const LAYOUT_COLUMN_MENU_POPUP_OFFSET = [0, 4];
@@ -17,12 +17,13 @@ const LAYOUT_COLUMN_MENU_POPUP_OFFSET = [0, 4];
 /**
  * Returns the drag handle button for the selected layout column.
  */
-const getLayoutColumnMenuTarget = (editorView, selection) => {
+const getLayoutColumnMenuTarget = (editorView, selection, anchorPosFromHandle) => {
   var _columnDomRef$parentE;
-  if (!getLayoutColumnAtSelection(selection) || (selection === null || selection === void 0 ? void 0 : selection.from) === undefined) {
+  const anchorPos = getLayoutColumnMenuAnchorPos(selection, anchorPosFromHandle);
+  if (anchorPos === undefined) {
     return null;
   }
-  const columnDomRef = editorView.nodeDOM(selection.from);
+  const columnDomRef = editorView.nodeDOM(anchorPos);
   if (!(columnDomRef instanceof HTMLElement)) {
     return null;
   }
@@ -39,11 +40,13 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
   var _api$uiControlRegistr, _api$uiControlRegistr2;
   const {
     isLayoutColumnMenuOpen,
+    layoutColumnMenuAnchorPos,
     selection
   } = useSharedPluginStateWithSelector(api, ['layout', 'selection'], 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
     };
   });
@@ -72,6 +75,13 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
     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]);
   const handleSetIsOpen = useCallback(isOpen => {
@@ -87,7 +97,7 @@ export const LayoutColumnMenu = /*#__PURE__*/React.memo(function LayoutColumnMen
     }
   }, [setOutsideClickTargetRef]);
   const components = (_api$uiControlRegistr = api === null || api === void 0 ? 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 : [];
-  const target = useMemo(() => isLayoutColumnMenuOpen ? getLayoutColumnMenuTarget(editorView, selection) : null, [editorView, isLayoutColumnMenuOpen, selection]);
+  const target = useMemo(() => isLayoutColumnMenuOpen ? getLayoutColumnMenuTarget(editorView, selection, layoutColumnMenuAnchorPos) : null, [editorView, isLayoutColumnMenuOpen, layoutColumnMenuAnchorPos, selection]);
   const hasValidTarget = target instanceof HTMLElement;
   useEffect(() => {
     if (isLayoutColumnMenuOpen && (!hasValidTarget || components.length === 0)) {

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

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

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, insertLayoutColumn as _insertLayoutColumn, insertLayoutColumnsWithAnalytics, setLayoutColumnValign, toggleLayoutColumnMenu } from './pm-plugins/actions';
+import { createDefaultLayoutSection, createMultiColumnLayoutSection, deleteLayoutColumn as _deleteLayoutColumn, 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';
@@ -378,7 +378,10 @@ export var layoutPlugin = function layoutPlugin(_ref) {
         var _api$analytics5;
         return _insertLayoutColumn(side, api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
       },
-      setLayoutColumnValign: setLayoutColumnValign,
+      setLayoutColumnValign: function setLayoutColumnValign(valign) {
+        var _api$analytics6;
+        return _setLayoutColumnValign(valign, api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions);
+      },
       toggleLayoutColumnMenu: toggleLayoutColumnMenu
     }
   };