@atlaskit/editor-plugin-table 24.2.1 → 24.2.3

package/dist/es2019/pm-plugins/utils/column-controls.js

@@ -34,6 +34,69 @@ export const getColumnsWidths = view => {
   }
   return widths;
 };
+
+/**
+ * Splits a merged cell's rendered width by `colwidth` ratios, falling back to an even split when
+ * usable ratios are unavailable.
+ */
+export const getProportionalColumnWidths = (totalWidth, columnCount, ratios) => {
+  const evenSplit = () => new Array(columnCount).fill(totalWidth / columnCount);
+  if (!ratios || ratios.length !== columnCount) {
+    return evenSplit();
+  }
+  const total = ratios.reduce((sum, ratio) => sum + (ratio > 0 ? ratio : 0), 0);
+  if (total <= 0) {
+    return evenSplit();
+  }
+  return ratios.map(ratio => totalWidth * ((ratio > 0 ? ratio : 0) / total));
+};
+
+/**
+ * Like `getColumnsWidths`, but fills every visual column under a first-row `colspan` so column
+ * controls can render one grid track per column.
+ */
+export const getColumnsWidthsWithMergedCells = view => {
+  const {
+    selection
+  } = view.state;
+  const table = findTable(selection);
+  if (!table) {
+    return [];
+  }
+  const map = TableMap.get(table.node);
+  const domAtPos = view.domAtPos.bind(view);
+  const widths = Array.from({
+    length: map.width
+  });
+  for (let i = 0; i < map.width; i++) {
+    var _node$attrs$colspan;
+    if (map.isCellMergedTopLeft(0, i)) {
+      continue;
+    }
+
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const node = table.node.nodeAt(map.map[i]);
+    const pos = map.map[i] + table.start;
+    // Ignored via go/ees005
+    // eslint-disable-next-line @atlaskit/editor/no-as-casting
+    const cellRef = findDomRefAtPos(pos, domAtPos);
+    const rect = cellRef.getBoundingClientRect();
+    const measuredWidth = (rect ? rect.width : cellRef.offsetWidth) + 1;
+    const colspan = (_node$attrs$colspan = node.attrs.colspan) !== null && _node$attrs$colspan !== void 0 ? _node$attrs$colspan : 1;
+    if (colspan <= 1) {
+      widths[i] = measuredWidth;
+      continue;
+    }
+    const colwidth = Array.isArray(node.attrs.colwidth) ? node.attrs.colwidth : undefined;
+    const perColumnWidths = getProportionalColumnWidths(measuredWidth, colspan, colwidth);
+    for (let span = 0; span < colspan && i + span < map.width; span++) {
+      widths[i + span] = perColumnWidths[span];
+    }
+    i += colspan - 1;
+  }
+  return widths;
+};
 export const getColumnDeleteButtonParams = (columnsWidths, selection) => {
   const rect = getSelectionRect(selection);
   if (!rect) {
@@ -108,7 +171,9 @@ const getRelativeDomCellWidths = ({
   const totalCalculatedCellWidth = cellColWidths.reduce((acc, cellColWidth) => acc + cellColWidth, 0);
   return cellColWidths.map(cellColWidth => width * (cellColWidth / totalCalculatedCellWidth));
 };
-export const colWidthsForRow = tr => {
+export const colWidthsForRow = (tr, {
+  useColwidthRatios = false
+} = {}) => {
   // get the colspans
   const rowColSpans = maphElem(tr, cell => Number(cell.getAttribute('colspan') || 1 /* default to span of 1 */));
 
@@ -132,7 +197,7 @@ export const colWidthsForRow = tr => {
     // reverse engineer cell widths from table widths
     const domBasedCellWidths = [];
     cellInfos.map(cell => {
-      domBasedCellWidths.push(...getRelativeDomCellWidths(cell));
+      domBasedCellWidths.push(...(useColwidthRatios ? getRelativeDomCellWidths(cell) : new Array(cell.colspan).fill(cell.width / cell.colspan)));
     });
     if (cellInfos.reduce((acc, cell) => acc + cell.width, 0) !== 0) {
       const newWidths = mapTableColwidthsToRow(rowColSpans, domBasedCellWidths);
@@ -146,6 +211,53 @@ export const colWidthsForRow = tr => {
   const pctWidths = rowColSpans.map(cellColSpan => cellColSpan / visualColCount * 100);
   return pctWidths.map(pct => `${pct}%`).join(' ');
 };
+
+/**
+ * Returns the visual column index that the mouse pointer is over within a column-spanned
+ * cell, by walking the per-column boundaries of the spanned cell and finding the column whose
+ * horizontal range contains `mouseEvent.clientX`.
+ *
+ * `<td>.cellIndex` for a cell with `colspan > 1` only resolves to the first column the cell
+ * occupies, so hovering anywhere inside a colspanned first-row cell pins the column drag handle
+ * to that first column. This resolver disambiguates which visual column the pointer is actually
+ * over so the handle/menu can target a single column.
+ *
+ * The search is restricted to columns in `[startIndex, endIndex)` (the cell's own span). The
+ * spanned cell's bounding rect is read once and split into per-column boundaries using the cell's
+ * `data-colwidth` ratios (falling back to an even split for unresized columns) — this keeps the
+ * work bounded by the colspan size and avoids measuring the whole table.
+ *
+ * Returns `undefined` when the mouse is outside the spanned range (so callers can fall back to
+ * the converted HTML column index).
+ */
+export const getColumnIndexByMousePosition = (cellElement, mouseEvent, columnIndexRange) => {
+  var _cellElement$dataset$;
+  const {
+    startIndex,
+    endIndex
+  } = columnIndexRange;
+  const columnCount = endIndex - startIndex;
+  if (columnCount <= 0) {
+    return undefined;
+  }
+  const cellRect = cellElement.getBoundingClientRect();
+  if (mouseEvent.clientX < cellRect.left || mouseEvent.clientX >= cellRect.right) {
+    return undefined;
+  }
+
+  // Read DOM ratios here to avoid resolving the ProseMirror node on this mouse-move path.
+  const ratios = (_cellElement$dataset$ = cellElement.dataset.colwidth) === null || _cellElement$dataset$ === void 0 ? void 0 : _cellElement$dataset$.split(',').map(Number).filter(value => !Number.isNaN(value));
+  const perColumnWidths = getProportionalColumnWidths(cellRect.width, columnCount, ratios);
+  const offsetFromLeft = mouseEvent.clientX - cellRect.left;
+  let cumulativeWidth = 0;
+  for (let column = 0; column < columnCount; column++) {
+    cumulativeWidth += perColumnWidths[column];
+    if (offsetFromLeft < cumulativeWidth) {
+      return startIndex + column;
+    }
+  }
+  return endIndex - 1;
+};
 export const convertHTMLCellIndexToColumnIndex = (htmlColIndex, htmlRowIndex, tableMap) => {
   // Same numbers (positions) in tableMap.map array mean that there are merged cells.
   // Cells can be merged across columns. So we need to check if the cell on the left and current cell have the same value.

package/dist/es2019/pm-plugins/utils/dom.js

@@ -6,6 +6,25 @@ export const isCell = node => {
 export const isCornerButton = node => containsClassName(node, ClassName.CONTROLS_CORNER_BUTTON);
 export const isInsertRowButton = node => containsClassName(node, ClassName.CONTROLS_INSERT_ROW) || closestElement(node, `.${ClassName.CONTROLS_INSERT_ROW}`) || containsClassName(node, ClassName.CONTROLS_BUTTON_OVERLAY) && closestElement(node, `.${ClassName.ROW_CONTROLS}`);
 export const getColumnOrRowIndex = target => [parseInt(target.getAttribute('data-start-index') || '-1', 10), parseInt(target.getAttribute('data-end-index') || '-1', 10)];
+
+/**
+ * Returns the element that carries the `data-start-index` / `data-end-index` attributes for a
+ * column/row control.
+ *
+ * The floating insert dot is a child of a wrapper that holds the index attributes, so when the
+ * pointer is directly over the dot the attributes are not on the event target. This walks up to
+ * the nearest ancestor that has `data-start-index`, falling back to the original element so the
+ * behaviour is unchanged when the target already carries the attributes.
+ */
+export const getIndexAttributeSourceElement = target => {
+  if (target.hasAttribute('data-start-index')) {
+    return target;
+  }
+  // Ignored via go/ees005
+  // eslint-disable-next-line @atlaskit/editor/no-as-casting
+  const closestWithIndex = target.closest('[data-start-index]');
+  return closestWithIndex !== null && closestWithIndex !== void 0 ? closestWithIndex : target;
+};
 export const isColumnControlsDecorations = node => containsClassName(node, ClassName.COLUMN_CONTROLS_DECORATIONS);
 export const isRowControlsButton = node => containsClassName(node, ClassName.ROW_CONTROLS_BUTTON) || containsClassName(node, ClassName.NUMBERED_COLUMN_BUTTON);
 export const isResizeHandleDecoration = node => containsClassName(node, ClassName.RESIZE_HANDLE_DECORATION);

package/dist/es2019/pm-plugins/utils/row-controls.js

@@ -74,6 +74,48 @@ export const getRowsParams = rowsHeights => {
   }
   return rows;
 };
+
+/**
+ * Returns the visual row index that the mouse pointer is over, by walking the row heights
+ * inside `tbody` and finding the row whose vertical range contains `mouseEvent.clientY`.
+ *
+ * When `rowIndexRange` is provided, the search is restricted to rows in that range (the
+ * `endIndex` is exclusive). This is the hot path used on `mousemove` when hovering over a
+ * row-spanned cell — restricting the range to `[startIndex, endIndex)` keeps the number
+ * of forced layout reads bounded by the row-span size, not the table size.
+ *
+ * Returns `undefined` when the mouse is above the search range or below it (so callers can
+ * fall back to the HTML row index).
+ */
+export const getRowIndexByMousePosition = (tableRef, mouseEvent, rowIndexRange) => {
+  var _rowIndexRange$startI, _rowIndexRange$endInd;
+  const tableBody = tableRef.querySelector('tbody');
+  if (!tableBody) {
+    return undefined;
+  }
+  const rows = tableBody.children;
+  const startIndex = (_rowIndexRange$startI = rowIndexRange === null || rowIndexRange === void 0 ? void 0 : rowIndexRange.startIndex) !== null && _rowIndexRange$startI !== void 0 ? _rowIndexRange$startI : 0;
+  const endIndex = Math.min((_rowIndexRange$endInd = rowIndexRange === null || rowIndexRange === void 0 ? void 0 : rowIndexRange.endIndex) !== null && _rowIndexRange$endInd !== void 0 ? _rowIndexRange$endInd : rows.length, rows.length);
+  if (startIndex >= endIndex) {
+    return undefined;
+  }
+  const firstRowRect = rows[startIndex].getBoundingClientRect();
+  if (mouseEvent.clientY < firstRowRect.top) {
+    return undefined;
+  }
+  let rowBottom = firstRowRect.bottom;
+  if (mouseEvent.clientY < rowBottom) {
+    return startIndex;
+  }
+  for (let rowIndex = startIndex + 1; rowIndex < endIndex; rowIndex++) {
+    const rowRect = rows[rowIndex].getBoundingClientRect();
+    rowBottom = rowRect.bottom;
+    if (mouseEvent.clientY < rowBottom) {
+      return rowIndex;
+    }
+  }
+  return undefined;
+};
 export const getRowClassNames = (index, selection, hoveredRows = [], isInDanger, isResizing) => {
   const classNames = [];
   if (isRowSelected(index)(selection) || hoveredRows.indexOf(index) > -1 && !isResizing) {

package/dist/es2019/pm-plugins/utils/selection.js

@@ -1,3 +1,5 @@
+import { TableMap } from '@atlaskit/editor-tables/table-map';
+import { findTableClosestToPos, getSelectionRect } from '@atlaskit/editor-tables/utils';
 export const getSelectedColumnIndexes = selectionRect => {
   const columnIndexes = [];
   for (let i = selectionRect.left; i < selectionRect.right; i++) {
@@ -11,4 +13,62 @@ export const getSelectedRowIndexes = selectionRect => {
     rowIndexes.push(i);
   }
   return rowIndexes;
+};
+
+/**
+ * Treats a column as fully selected when its first-row area is covered by a horizontal merge and
+ * the explicit `CellSelection` starts below that merged cell. `CellSelection.isColSelection()`
+ * returns `false` in this case because the selection does not include the merged first-row cell.
+ */
+export const isColumnSelectionWithMergedFirstRow = selection => {
+  const rect = getSelectionRect(selection);
+  if (!rect) {
+    return false;
+  }
+  const table = findTableClosestToPos(selection.$anchorCell);
+  if (!table) {
+    return false;
+  }
+  const map = TableMap.get(table.node);
+  if (rect.bottom !== map.height || rect.top === 0) {
+    return false;
+  }
+  for (let col = rect.left; col < rect.right; col++) {
+    const topCellRect = map.findCell(map.map[col]);
+    const isHorizontallyMerged = topCellRect.right - topCellRect.left > 1;
+    const bridgesGapAboveSelection = topCellRect.bottom >= rect.top;
+    if (!isHorizontallyMerged || !bridgesGapAboveSelection) {
+      return false;
+    }
+  }
+  return true;
+};
+
+/**
+ * Treats a row as fully selected when its first-column area is covered by a vertical merge and the
+ * explicit `CellSelection` starts to the right of that merged cell. `CellSelection.isRowSelection()`
+ * returns `false` in this case because the selection does not include the merged first-column cell.
+ */
+export const isRowSelectionWithMergedFirstColumn = selection => {
+  const rect = getSelectionRect(selection);
+  if (!rect) {
+    return false;
+  }
+  const table = findTableClosestToPos(selection.$anchorCell);
+  if (!table) {
+    return false;
+  }
+  const map = TableMap.get(table.node);
+  if (rect.right !== map.width || rect.left === 0) {
+    return false;
+  }
+  for (let row = rect.top; row < rect.bottom; row++) {
+    const leftCellRect = map.findCell(map.map[row * map.width]);
+    const isVerticallyMerged = leftCellRect.bottom - leftCellRect.top > 1;
+    const bridgesGapLeftOfSelection = leftCellRect.right >= rect.left;
+    if (!isVerticallyMerged || !bridgesGapLeftOfSelection) {
+      return false;
+    }
+  }
+  return true;
 };

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

@@ -216,12 +216,20 @@ const DragHandleComponent = ({
       // return focus to editor so copying table selections whilst still works, i cannot call e.preventDefault in a mousemove event as this stops dragstart events from firing
       // -> this is bad for a11y but is the current standard new copy/paste keyboard shortcuts should be introduced instead
       editorView.focus();
-      toggleDragMenu && toggleDragMenu('mouse', e);
+      if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
+        toggleDragMenu && toggleDragMenu('mouse', e, indexes[0]);
+      } else {
+        toggleDragMenu && toggleDragMenu('mouse', e);
+      }
     },
     onClick: onClick,
     onKeyDown: e => {
       if (e.key === 'Enter' || e.key === ' ') {
-        toggleDragMenu && toggleDragMenu('keyboard');
+        if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
+          toggleDragMenu && toggleDragMenu('keyboard', undefined, indexes[0]);
+        } else {
+          toggleDragMenu && toggleDragMenu('keyboard');
+        }
       }
     }
   }, appearance !== 'placeholder' ?

package/dist/es2019/ui/FloatingInsertButton/getPopupOptions.js

@@ -30,7 +30,9 @@ function getRowOptions(index) {
     }
   };
 }
-function getColumnOptions(index, tableContainer, hasNumberedColumns) {
+function getColumnOptions(index, tableContainer, hasNumberedColumns,
+// Distance between the target cell top and table top, used when anchoring to a lower-row cell.
+verticalOffsetCorrection = 0) {
   const options = {
     alignX: 'end',
     alignY: 'top',
@@ -41,16 +43,32 @@ function getColumnOptions(index, tableContainer, hasNumberedColumns) {
     // we should always set the InsertButton on the start,
     // considering the offset from the first column
     onPositionCalculated(position) {
+      // Move the popup upward whether the offset parent provides `top` or `bottom`.
+      let verticalCorrection;
+      if (verticalOffsetCorrection) {
+        if (position.top !== undefined) {
+          verticalCorrection = {
+            top: position.top - verticalOffsetCorrection
+          };
+        } else if (position.bottom !== undefined) {
+          verticalCorrection = {
+            bottom: position.bottom + verticalOffsetCorrection
+          };
+        }
+      }
       const {
         left
       } = position;
       if (!left) {
-        // If not left, lest skip expensive next calculations.
-        return position;
+        return {
+          ...position,
+          ...verticalCorrection
+        };
       }
       if (index === 0) {
         return {
           ...position,
+          ...verticalCorrection,
           left: hasNumberedColumns ? HORIZONTAL_ALIGN_NUMBERED_COLUMN_BUTTON : HORIZONTAL_ALIGN_COLUMN_BUTTON
         };
       }
@@ -59,6 +77,7 @@ function getColumnOptions(index, tableContainer, hasNumberedColumns) {
       const rect = tableContainer ? tableContainer.getBoundingClientRect() : null;
       return {
         ...position,
+        ...verticalCorrection,
         left: rect && left > rect.width ? rect.width : left
       };
     }
@@ -75,10 +94,10 @@ function getColumnOptions(index, tableContainer, hasNumberedColumns) {
   }
   return options;
 }
-function getPopupOptions(direction, index, hasNumberedColumns, tableContainer) {
+function getPopupOptions(direction, index, hasNumberedColumns, tableContainer, verticalOffsetCorrection = 0) {
   switch (direction) {
     case 'column':
-      return getColumnOptions(index, tableContainer, hasNumberedColumns);
+      return getColumnOptions(index, tableContainer, hasNumberedColumns, verticalOffsetCorrection);
     case 'row':
       return getRowOptions(index);
     default:

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

@@ -13,6 +13,7 @@ import { findTable } from '@atlaskit/editor-tables/utils';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { insertColumnWithAnalytics, insertRowWithAnalytics } from '../../pm-plugins/commands/commands-with-analytics';
 import { checkIfNumberColumnEnabled } from '../../pm-plugins/utils/nodes';
+import { isColumnSelectionWithMergedFirstRow, isRowSelectionWithMergedFirstColumn } from '../../pm-plugins/utils/selection';
 import { TableCssClassName as ClassName } from '../../types';
 import getPopupOptions from './getPopupOptions';
 import { DragAndDropInsertButton } from './InsertButton';
@@ -65,8 +66,14 @@ export class FloatingInsertButton extends React.Component {
         tr
       }
     } = editorView;
-    if (tr.selection instanceof CellSelection && (tr.selection.isColSelection() || tr.selection.isRowSelection())) {
-      return null;
+    if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
+      if (tr.selection instanceof CellSelection && (tr.selection.isColSelection() || tr.selection.isRowSelection() || isColumnSelectionWithMergedFirstRow(tr.selection) || isRowSelectionWithMergedFirstColumn(tr.selection))) {
+        return null;
+      }
+    } else {
+      if (tr.selection instanceof CellSelection && (tr.selection.isColSelection() || tr.selection.isRowSelection())) {
+        return null;
+      }
     }
     const tablePos = findTable(tr.selection);
     if (!tablePos) {
@@ -120,6 +127,15 @@ export class FloatingInsertButton extends React.Component {
     const index = type === 'column' ? insertColumnButtonIndex : insertRowButtonIndex;
     const hasNumberedColumns = checkIfNumberColumnEnabled(editorView.state.selection);
 
+    // If row 0 has a colspan, anchor to a lower row for the real column boundary (X),
+    // then move back up to the table top (Y):
+    //   row 0: [   colspan=2   ]
+    //   row 1: [ col 1 ][ col 2 ]  ← anchor here for X
+    //          ↑ button should render at row 0/table top
+    let verticalOffsetCorrection = 0;
+    if (type === 'column' && expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
+      verticalOffsetCorrection = Math.max(0, targetCellRef.getBoundingClientRect().top - tableRef.getBoundingClientRect().top);
+    }
     // Fixed the 'add column button' not visible issue when sticky header is enabled
     // By setting the Popup z-index higher than the sticky header z-index ( common-styles.ts tr.sticky)
     // Only when inserting a column, otherwise set to undefined
@@ -137,7 +153,7 @@ export class FloatingInsertButton extends React.Component {
       allowOutOfBounds: true
       // Ignored via go/ees005
       // eslint-disable-next-line react/jsx-props-no-spreading
-    }, getPopupOptions(type, index, hasNumberedColumns, tableContainerWrapper), {
+    }, getPopupOptions(type, index, hasNumberedColumns, tableContainerWrapper, verticalOffsetCorrection), {
       zIndex: zIndex
     }), /*#__PURE__*/React.createElement(DragAndDropInsertButton, {
       type: type,
@@ -147,6 +163,18 @@ export class FloatingInsertButton extends React.Component {
       isChromelessEditor: isChromelessEditor
     }));
   }
+
+  // Finds a row where `columnIndex` has real left/right cell boundaries.
+  findRowWithUnmergedColumn(tableMap, columnIndex) {
+    for (let row = 0; row < tableMap.height; row++) {
+      const pos = tableMap.map[row * tableMap.width + columnIndex];
+      const rect = tableMap.findCell(pos);
+      if (rect.left === columnIndex && rect.right === columnIndex + 1) {
+        return row;
+      }
+    }
+    return null;
+  }
   getCellPosition(type, tableNode) {
     const {
       insertColumnButtonIndex,
@@ -163,6 +191,10 @@ export class FloatingInsertButton extends React.Component {
       if (columnIndex > tableMap.width - 1) {
         return null;
       }
+      if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
+        const rowWithRealColumn = this.findRowWithUnmergedColumn(tableMap, columnIndex);
+        return rowWithRealColumn === null ? null : tableMap.positionAt(rowWithRealColumn, columnIndex, tableNode);
+      }
       return tableMap.positionAt(0, columnIndex, tableNode);
     } else {
       // This condition is to make typescript happy.

package/dist/es2019/ui/TableFloatingColumnControls/ColumnControls/index.js

@@ -8,15 +8,29 @@ import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { CellSelection } from '@atlaskit/editor-tables';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { clearHoverSelection, closeActiveTableMenu, hoverCell, hoverColumns, selectColumn, selectColumns, toggleActiveTableMenu } from '../../../pm-plugins/commands';
+import { clearHoverSelection, hoverCell, hoverColumns, selectColumn, selectColumns, toggleActiveTableMenu } from '../../../pm-plugins/commands';
 import { toggleDragMenuWithAnalytics } from '../../../pm-plugins/drag-and-drop/commands-with-analytics';
 import { getPluginState as getTablePluginState } from '../../../pm-plugins/plugin-factory';
 import { getRowsParams } from '../../../pm-plugins/utils/row-controls';
-import { getSelectedColumnIndexes } from '../../../pm-plugins/utils/selection';
+import { getSelectedColumnIndexes, isColumnSelectionWithMergedFirstRow } from '../../../pm-plugins/utils/selection';
 import { TableCssClassName as ClassName } from '../../../types';
 import { DragHandle } from '../../DragHandle';
 const getSelectedColumns = selection => {
-  if (selection instanceof CellSelection && selection.isColSelection()) {
+  if (!(selection instanceof CellSelection)) {
+    return [];
+  }
+  if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
+    // New behaviour: also treat a column selection that sits below a merged first-row cell as a
+    // full column selection.
+    if (!selection.isColSelection() && !isColumnSelectionWithMergedFirstRow(selection)) {
+      return [];
+    }
+    const rect = getSelectionRect(selection);
+    return rect ? getSelectedColumnIndexes(rect) : [];
+  }
+
+  // Old behaviour: only standard column selections are recognised.
+  if (selection.isColSelection()) {
     const rect = getSelectionRect(selection);
     if (!rect) {
       return [];
@@ -125,27 +139,23 @@ export const ColumnControls = ({
       clearHoverSelection()(state, dispatch);
     }
   }, [editorView, tableActive]);
-  const toggleDragMenuHandler = useCallback((trigger, event) => {
+  const toggleDragMenuHandler = useCallback((trigger, event, handleIndex) => {
     var _api$analytics2;
+    if (event !== null && event !== void 0 && event.shiftKey) {
+      return;
+    }
     const {
       state,
       dispatch
     } = editorView;
-    if (event !== null && event !== void 0 && event.shiftKey) {
-      // Shift-click extends the selection rather than toggling the menu, but the
-      // open drag menu would otherwise stay anchored to a stale column. Close it here
-      // for the updated menu (legacy menu closes via outside-click on its dropdown).
-      if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
-        api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu(api));
-      }
-      return;
-    }
     if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
-      if (colIndex !== undefined && api) {
+      // Use the clicked handle index because `hoveredCell` can point at a merged cell's first column.
+      const targetColIndex = handleIndex !== null && handleIndex !== void 0 ? handleIndex : colIndex;
+      if (targetColIndex !== undefined && api) {
         const {
           activeTableMenu: currentActiveTableMenu
         } = getTablePluginState(state);
-        const isSameActiveMenu = (currentActiveTableMenu === null || currentActiveTableMenu === void 0 ? void 0 : currentActiveTableMenu.type) === 'column' && currentActiveTableMenu.index === colIndex;
+        const isSameActiveMenu = (currentActiveTableMenu === null || currentActiveTableMenu === void 0 ? void 0 : currentActiveTableMenu.type) === 'column' && currentActiveTableMenu.index === targetColIndex;
         api.core.actions.execute(({
           tr
         }) => {
@@ -164,7 +174,7 @@ export const ColumnControls = ({
           }
           toggleActiveTableMenu({
             type: 'column',
-            index: colIndex,
+            index: targetColIndex,
             openedBy: trigger
           }, currentActiveTableMenu, api)({
             tr

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

@@ -1,7 +1,7 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { getColumnsWidths } from '../../pm-plugins/utils/column-controls';
+import { getColumnsWidths, getColumnsWidthsWithMergedCells } from '../../pm-plugins/utils/column-controls';
 import { containsHeaderColumn } from '../../pm-plugins/utils/nodes';
 import { getRowHeights } from '../../pm-plugins/utils/row-controls';
 import { isNativeStickySupported } from '../../pm-plugins/utils/sticky-header';
@@ -63,7 +63,7 @@ const TableFloatingColumnControls = ({
   if (!tableRef || !tableActive || isResizing) {
     return null;
   }
-  const colWidths = getColumnsWidths(editorView);
+  const colWidths = expValEquals('platform_editor_table_menu_updates', 'isEnabled', true) ? getColumnsWidthsWithMergedCells(editorView) : getColumnsWidths(editorView);
   if (stickyTop) {
     var _containerRef$current;
     const columnControlTopOffsetFromParent = '-12px';

package/dist/es2019/ui/TableFloatingControls/RowControls/DragControls.js

@@ -7,17 +7,31 @@ import { CellSelection } from '@atlaskit/editor-tables';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { clearHoverSelection, closeActiveTableMenu, toggleActiveTableMenu } from '../../../pm-plugins/commands';
+import { clearHoverSelection, toggleActiveTableMenu } from '../../../pm-plugins/commands';
 import { toggleDragMenuWithAnalytics } from '../../../pm-plugins/drag-and-drop/commands-with-analytics';
 import { getPluginState as getTablePluginState } from '../../../pm-plugins/plugin-factory';
 import { getRowHeights, getRowsParams } from '../../../pm-plugins/utils/row-controls';
-import { getSelectedRowIndexes } from '../../../pm-plugins/utils/selection';
+import { getSelectedRowIndexes, isRowSelectionWithMergedFirstColumn } from '../../../pm-plugins/utils/selection';
 import { TableCssClassName as ClassName } from '../../../types';
 import { dragRowControlsWidth, dropTargetExtendedWidth } from '../../consts';
 import { DragHandle } from '../../DragHandle';
 import RowDropTarget from '../RowDropTarget';
 const getSelectedRows = selection => {
-  if (selection instanceof CellSelection && selection.isRowSelection()) {
+  if (!(selection instanceof CellSelection)) {
+    return [];
+  }
+  if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
+    // New behaviour: also treat a row selection that sits to the right of a merged first-column
+    // cell as a full row selection.
+    if (!selection.isRowSelection() && !isRowSelectionWithMergedFirstColumn(selection)) {
+      return [];
+    }
+    const rect = getSelectionRect(selection);
+    return rect ? getSelectedRowIndexes(rect) : [];
+  }
+
+  // Old behaviour: only standard row selections are recognised.
+  if (selection.isRowSelection()) {
     const rect = getSelectionRect(selection);
     if (!rect) {
       return [];
@@ -78,18 +92,14 @@ export const DragControls = ({
       }
     });
   }, [editorView]);
-  const toggleDragMenuHandler = useCallback((trigger, event) => {
+  const toggleDragMenuHandler = useCallback((trigger, event, handleIndex) => {
     var _api$analytics2;
     if (event !== null && event !== void 0 && event.shiftKey) {
-      // Shift-click extends the selection rather than toggling the menu, but the
-      // open drag menu would otherwise stay anchored to a stale row. Close it here
-      // for the updated menu (legacy menu closes via outside-click on its dropdown).
-      if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
-        api === null || api === void 0 ? void 0 : api.core.actions.execute(closeActiveTableMenu(api));
-      }
       return;
     }
-    const rowIndex = hoveredCell === null || hoveredCell === void 0 ? void 0 : hoveredCell.rowIndex;
+
+    // Use the clicked handle index because `hoveredCell` can point at a merged cell's first row.
+    const rowIndex = handleIndex !== null && handleIndex !== void 0 ? handleIndex : hoveredCell === null || hoveredCell === void 0 ? void 0 : hoveredCell.rowIndex;
     if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
       if (rowIndex !== undefined && api) {
         const {
@@ -230,10 +240,17 @@ export const DragControls = ({
     if (!tableActive) {
       return null;
     }
+    const selectedAppearance = isRowSelected && isEntireTableSelected ? isInDanger ? 'danger' : 'selected' : 'placeholder';
 
     // placeholder / selected need to always render at least one handle
     // so it can be focused via keyboard shortcuts
-    handles.push(generateHandleByType('selected', isRowSelected && isEntireTableSelected ? isInDanger ? 'danger' : 'selected' : 'placeholder', `${selectedRowIndexes[0] + 1} / span ${selectedRowIndexes.length}`, selectedRowIndexes));
+    const selectedGridRow = expValEquals('platform_editor_table_menu_updates', 'isEnabled', true) ?
+    // New behaviour: always position the placeholder in the first row to avoid an invalid
+    // `NaN / span 0` grid placement (which makes the handle disappear) when no rows are selected.
+    selectedAppearance === 'placeholder' ? '1 / span 1' : `${selectedRowIndexes[0] + 1} / span ${selectedRowIndexes.length}` :
+    // Old behaviour.
+    `${selectedRowIndexes[0] + 1} / span ${selectedRowIndexes.length}`;
+    handles.push(generateHandleByType('selected', selectedAppearance, selectedGridRow, selectedRowIndexes));
     if (hoveredCell && isTableHovered && rowIndex !== undefined && !selectedRowIndexes.includes(rowIndex) && rowIndex < rowHeights.length) {
       handles.push(generateHandleByType('hover', 'default', `${rowIndex + 1} / span 1`, rowIndexes));
     }