@atlaskit/editor-plugin-layout 10.4.0 → 10.6.0

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

@@ -8,20 +8,22 @@ exports.VerticalAlignDropdownItem = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
-var _layoutColumnSelection = require("./layoutColumnSelection");
-var _useCurrentLayoutColumn = require("./useCurrentLayoutColumn");
+var _layoutColumnSelection = require("../../pm-plugins/utils/layout-column-selection");
+var _useSelectedLayoutColumns = require("./useSelectedLayoutColumns");
 var _verticalAlignIcons = require("./verticalAlignIcons");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var VerticalAlignDropdownItem = exports.VerticalAlignDropdownItem = function VerticalAlignDropdownItem(_ref) {
+  var _selectedLayoutColumn;
   var api = _ref.api,
     label = _ref.label,
     value = _ref.value;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var currentColumn = (0, _useCurrentLayoutColumn.useCurrentLayoutColumn)(api);
-  var currentValign = (0, _react.useMemo)(function () {
-    return (0, _layoutColumnSelection.getLayoutColumnValign)(currentColumn);
-  }, [currentColumn]);
+  var selectedLayoutColumns = (0, _useSelectedLayoutColumns.useSelectedLayoutColumns)(api);
+  var isSelected = (_selectedLayoutColumn = selectedLayoutColumns === null || selectedLayoutColumns === void 0 ? void 0 : selectedLayoutColumns.selectedColumns.every(function (_ref2) {
+    var node = _ref2.node;
+    return (0, _layoutColumnSelection.getLayoutColumnValign)(node) === value;
+  })) !== null && _selectedLayoutColumn !== void 0 ? _selectedLayoutColumn : false;
   var Icon = _verticalAlignIcons.VERTICAL_ALIGN_ICONS[value];
   var onClick = (0, _react.useCallback)(function () {
     var _api$core, _api$layout;
@@ -32,7 +34,7 @@ var VerticalAlignDropdownItem = exports.VerticalAlignDropdownItem = function Ver
       label: "",
       size: "small"
     }),
-    isSelected: currentValign === value,
+    isSelected: isSelected,
     onClick: onClick
   }, formatMessage(label));
 };

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

@@ -9,8 +9,8 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
-var _layoutColumnSelection = require("./layoutColumnSelection");
-var _useCurrentLayoutColumn = require("./useCurrentLayoutColumn");
+var _layoutColumnSelection = require("../../pm-plugins/utils/layout-column-selection");
+var _useSelectedLayoutColumns = require("./useSelectedLayoutColumns");
 var _verticalAlignIcons = require("./verticalAlignIcons");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var VerticalAlignNestedMenu = exports.VerticalAlignNestedMenu = function VerticalAlignNestedMenu(_ref) {
@@ -18,12 +18,21 @@ var VerticalAlignNestedMenu = exports.VerticalAlignNestedMenu = function Vertica
     children = _ref.children;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var currentColumn = (0, _useCurrentLayoutColumn.useCurrentLayoutColumn)(api);
+  var selectedLayoutColumns = (0, _useSelectedLayoutColumns.useSelectedLayoutColumns)(api);
   var currentValign = (0, _react.useMemo)(function () {
-    return (0, _layoutColumnSelection.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 = (0, _layoutColumnSelection.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 (0, _layoutColumnSelection.getLayoutColumnValign)(node) === firstValign;
+    }))) {
+      return undefined;
+    }
+    return firstValign;
+  }, [selectedLayoutColumns]);
   var TriggerIcon = currentValign ? _verticalAlignIcons.VERTICAL_ALIGN_ICONS[currentValign] : _editorToolbar.LayoutIcon;
-  if (!currentColumn) {
+  if (!selectedLayoutColumns) {
     return null;
   }
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarNestedDropdownMenu, {

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

@@ -16,9 +16,9 @@ var _uiReact = require("@atlaskit/editor-common/ui-react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _editorUiControlModel = require("@atlaskit/editor-ui-control-model");
+var _layoutColumnSelection = require("../../pm-plugins/utils/layout-column-selection");
 var _components = require("./components");
 var _keys = require("./keys");
-var _layoutColumnSelection = require("./layoutColumnSelection");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var PopupWithListeners = (0, _uiReact.withReactEditorViewOuterListeners)(_ui.Popup);
 var FALLBACK_MENU_HEIGHT = 300;
@@ -27,12 +27,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 (!(0, _layoutColumnSelection.getLayoutColumnAtSelection)(selection) || (selection === null || selection === void 0 ? void 0 : selection.from) === undefined) {
+  var anchorPos = (0, _layoutColumnSelection.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;
   }
@@ -47,13 +48,15 @@ var LayoutColumnMenu = exports.LayoutColumnMenu = /*#__PURE__*/_react.default.me
     boundariesElement = _ref.boundariesElement,
     scrollableElement = _ref.scrollableElement;
   var _useSharedPluginState = (0, _hooks.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 = (0, _react.useContext)(_uiReact.OutsideClickTargetRefContext);
   var menuRef = (0, _react.useRef)(null);
@@ -83,6 +86,13 @@ var LayoutColumnMenu = exports.LayoutColumnMenu = /*#__PURE__*/_react.default.me
     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(_styles.DRAG_HANDLE_SELECTOR)) {
+      return;
+    }
     closeLayoutColumnMenu();
   }, [closeLayoutColumnMenu]);
   var handleSetIsOpen = (0, _react.useCallback)(function (isOpen) {
@@ -99,8 +109,8 @@ var LayoutColumnMenu = exports.LayoutColumnMenu = /*#__PURE__*/_react.default.me
   }, [setOutsideClickTargetRef]);
   var components = (_api$uiControlRegistr = api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(_keys.LAYOUT_COLUMN_MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [];
   var target = (0, _react.useMemo)(function () {
-    return isLayoutColumnMenuOpen ? getLayoutColumnMenuTarget(editorView, selection) : null;
-  }, [editorView, isLayoutColumnMenuOpen, selection]);
+    return isLayoutColumnMenuOpen ? getLayoutColumnMenuTarget(editorView, selection, layoutColumnMenuAnchorPos) : null;
+  }, [editorView, isLayoutColumnMenuOpen, layoutColumnMenuAnchorPos, selection]);
   var hasValidTarget = target instanceof HTMLElement;
   (0, _react.useEffect)(function () {
     if (isLayoutColumnMenuOpen && (!hasValidTarget || components.length === 0)) {

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

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useSelectedLayoutColumns = void 0;
+var _hooks = require("@atlaskit/editor-common/hooks");
+var _layoutColumnSelection = require("../../pm-plugins/utils/layout-column-selection");
+var useSelectedLayoutColumns = exports.useSelectedLayoutColumns = function useSelectedLayoutColumns(api) {
+  return (0, _hooks.useSharedPluginStateWithSelector)(api, ['selection'], function (states) {
+    var _states$selectionStat;
+    return (0, _layoutColumnSelection.getSelectedLayoutColumns)((_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection);
+  });
+};

package/dist/es2019/layoutPlugin.js

@@ -8,6 +8,7 @@ import { IconFiveColumnLayout, IconFourColumnLayout, IconLayout, IconOneColumnLa
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNode } from '@atlaskit/editor-prosemirror/utils';
 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, insertLayoutColumn, insertLayoutColumnsWithAnalytics, setLayoutColumnValign, toggleLayoutColumnMenu } from './pm-plugins/actions';
@@ -147,25 +148,83 @@ export const layoutPlugin = ({
           })(tr);
           return tr;
         };
-        const advancedSingleColumnOption = allowAdvancedSingleColumnLayout ? [{
-          id: 'onecolumnlayout',
-          title: formatMessage(layoutMessages.singleColumnAdvancedLayout),
-          description: formatMessage(messages.singleColumnsDescriptionAdvancedLayout),
-          keywords: ['layout', 'column', 'section', 'single column'],
-          priority: 1100,
-          icon: () => /*#__PURE__*/React.createElement(IconOneColumnLayout, null),
-          action(insert, state) {
-            const tr = insert(createMultiColumnLayoutSection(state, 1));
-            if (fg('platform_editor_column_count_analytics')) {
-              withInsertLayoutAnalytics(tr, 1);
-            } else {
-              withInsertLayoutAnalytics(tr);
+        if (editorExperiment('advanced_layouts', true)) {
+          const advancedSingleColumnOption = allowAdvancedSingleColumnLayout ? [{
+            id: 'onecolumnlayout',
+            title: formatMessage(layoutMessages.singleColumnAdvancedLayout),
+            description: formatMessage(messages.singleColumnsDescriptionAdvancedLayout),
+            keywords: ['layout', 'column', 'section', 'single column'],
+            priority: 1100,
+            icon: () => /*#__PURE__*/React.createElement(IconOneColumnLayout, null),
+            action(insert, state) {
+              const tr = insert(createMultiColumnLayoutSection(state, 1));
+              if (fg('platform_editor_column_count_analytics')) {
+                withInsertLayoutAnalytics(tr, 1);
+              } else {
+                withInsertLayoutAnalytics(tr);
+              }
+              selectIntoLayoutSection(tr);
+              return tr;
             }
-            selectIntoLayoutSection(tr);
-            return tr;
+          }] : [];
+          if (expValEquals('platform_editor_layout_typeahead_reorder', 'isEnabled', true)) {
+            const createAdvancedColumnLayoutOption = ({
+              columnCount,
+              descriptionColumnCount,
+              icon: Icon,
+              id,
+              keyword,
+              title
+            }) => ({
+              id,
+              title,
+              description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
+                numberOfColumns: descriptionColumnCount
+              }),
+              keywords: ['layout', 'column', 'section', keyword],
+              priority: 1100,
+              icon: Icon,
+              action(insert, state) {
+                const tr = insert(createMultiColumnLayoutSection(state, columnCount));
+                if (fg('platform_editor_column_count_analytics')) {
+                  withInsertLayoutAnalytics(tr, columnCount);
+                } else {
+                  withInsertLayoutAnalytics(tr);
+                }
+                selectIntoLayoutSection(tr);
+                return tr;
+              }
+            });
+            return [createAdvancedColumnLayoutOption({
+              columnCount: 2,
+              descriptionColumnCount: 'two',
+              icon: () => /*#__PURE__*/React.createElement(IconTwoColumnLayout, null),
+              id: 'twocolumnslayout',
+              keyword: 'two column',
+              title: formatMessage(layoutMessages.twoColumnsAdvancedLayout)
+            }), ...advancedSingleColumnOption, createAdvancedColumnLayoutOption({
+              columnCount: 3,
+              descriptionColumnCount: 'three',
+              icon: () => /*#__PURE__*/React.createElement(IconThreeColumnLayout, null),
+              id: 'threecolumnslayout',
+              keyword: 'three column',
+              title: formatMessage(layoutMessages.threeColumnsAdvancedLayout)
+            }), createAdvancedColumnLayoutOption({
+              columnCount: 4,
+              descriptionColumnCount: 'four',
+              icon: () => /*#__PURE__*/React.createElement(IconFourColumnLayout, null),
+              id: 'fourcolumnslayout',
+              keyword: 'four column',
+              title: formatMessage(layoutMessages.fourColumns)
+            }), createAdvancedColumnLayoutOption({
+              columnCount: 5,
+              descriptionColumnCount: 'five',
+              icon: () => /*#__PURE__*/React.createElement(IconFiveColumnLayout, null),
+              id: 'fivecolumnslayout',
+              keyword: 'five column',
+              title: formatMessage(layoutMessages.fiveColumns)
+            })];
           }
-        }] : [];
-        if (editorExperiment('advanced_layouts', true)) {
           return [...advancedSingleColumnOption, {
             id: 'twocolumnslayout',
             title: formatMessage(layoutMessages.twoColumnsAdvancedLayout),
@@ -298,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;
+};