@tanstack/table-core 9.0.0-beta.69 → 9.0.0-beta.70

package/dist/core/cells/constructCell.d.ts

@@ -1,7 +1,7 @@
 import { CellData, RowData } from "../../types/type-utils.js";
-import { Table } from "../../types/Table.js";
 import { Column } from "../../types/Column.js";
 import { Row } from "../../types/Row.js";
+import { Table } from "../../types/Table.js";
 import { Cell } from "../../types/Cell.js";
 import { TableFeatures } from "../../types/TableFeatures.js";
 //#region src/core/cells/constructCell.d.ts

package/dist/core/cells/coreCellsFeature.types.d.ts

@@ -1,7 +1,7 @@
 import { CellData, Getter, RowData } from "../../types/type-utils.js";
-import { Table } from "../../types/Table.js";
 import { Column } from "../../types/Column.js";
 import { Row } from "../../types/Row.js";
+import { Table } from "../../types/Table.js";
 import { Cell } from "../../types/Cell.js";
 import { TableFeatures } from "../../types/TableFeatures.js";
 //#region src/core/cells/coreCellsFeature.types.d.ts

package/dist/core/cells/coreCellsFeature.utils.d.ts

@@ -1,7 +1,7 @@
 import { CellData, NoInfer, RowData } from "../../types/type-utils.js";
-import { Table } from "../../types/Table.js";
 import { Column } from "../../types/Column.js";
 import { Row } from "../../types/Row.js";
+import { Table } from "../../types/Table.js";
 import { Cell } from "../../types/Cell.js";
 import { TableFeatures } from "../../types/TableFeatures.js";
 import "../../index.js";

package/dist/core/columns/constructColumn.d.ts

@@ -1,7 +1,7 @@
 import { CellData, RowData } from "../../types/type-utils.js";
 import { ColumnDef } from "../../types/ColumnDef.js";
-import { Table } from "../../types/Table.js";
 import { Column } from "../../types/Column.js";
+import { Table } from "../../types/Table.js";
 import { TableFeatures } from "../../types/TableFeatures.js";
 //#region src/core/columns/constructColumn.d.ts
 /**

package/dist/core/columns/coreColumnsFeature.types.d.ts

@@ -1,7 +1,7 @@
 import { CellData, RowData } from "../../types/type-utils.js";
 import { AccessorFn, ColumnDef } from "../../types/ColumnDef.js";
-import { Table } from "../../types/Table.js";
 import { Column } from "../../types/Column.js";
+import { Table } from "../../types/Table.js";
 import { TableFeatures } from "../../types/TableFeatures.js";
 //#region src/core/columns/coreColumnsFeature.types.d.ts
 interface Column_CoreProperties<in out TFeatures extends TableFeatures, in out TData extends RowData, TValue extends CellData = CellData> {

package/dist/core/columns/coreColumnsFeature.utils.d.ts

@@ -1,7 +1,7 @@
 import { CellData, RowData } from "../../types/type-utils.js";
 import { ColumnDef } from "../../types/ColumnDef.js";
-import { Table } from "../../types/Table.js";
 import { Column } from "../../types/Column.js";
+import { Table } from "../../types/Table.js";
 import { TableFeatures } from "../../types/TableFeatures.js";
 //#region src/core/columns/coreColumnsFeature.utils.d.ts
 /**

package/dist/core/headers/buildHeaderGroups.d.ts

@@ -1,7 +1,7 @@
 import { CellData, RowData } from "../../types/type-utils.js";
 import { HeaderGroup } from "../../types/HeaderGroup.js";
-import { Table } from "../../types/Table.js";
 import { Column } from "../../types/Column.js";
+import { Table } from "../../types/Table.js";
 import { TableFeatures } from "../../types/TableFeatures.js";
 //#region src/core/headers/buildHeaderGroups.d.ts
 /**

package/dist/core/headers/constructHeader.d.ts

@@ -1,7 +1,7 @@
 import { CellData, RowData } from "../../types/type-utils.js";
 import { Header } from "../../types/Header.js";
-import { Table } from "../../types/Table.js";
 import { Column } from "../../types/Column.js";
+import { Table } from "../../types/Table.js";
 import { TableFeatures } from "../../types/TableFeatures.js";
 //#region src/core/headers/constructHeader.d.ts
 /**

package/dist/core/headers/coreHeadersFeature.types.d.ts

@@ -1,8 +1,8 @@
 import { CellData, RowData } from "../../types/type-utils.js";
 import { HeaderGroup } from "../../types/HeaderGroup.js";
 import { Header } from "../../types/Header.js";
-import { Table } from "../../types/Table.js";
 import { Column } from "../../types/Column.js";
+import { Table } from "../../types/Table.js";
 import { TableFeatures } from "../../types/TableFeatures.js";
 //#region src/core/headers/coreHeadersFeature.types.d.ts
 interface Table_Headers<in out TFeatures extends TableFeatures, in out TData extends RowData> {

package/dist/core/headers/coreHeadersFeature.utils.d.ts

@@ -1,8 +1,8 @@
 import { RowData } from "../../types/type-utils.js";
 import { HeaderGroup } from "../../types/HeaderGroup.js";
 import { Header } from "../../types/Header.js";
-import { Table } from "../../types/Table.js";
 import { Column } from "../../types/Column.js";
+import { Table } from "../../types/Table.js";
 import { TableFeatures } from "../../types/TableFeatures.js";
 import "../../index.js";
 //#region src/core/headers/coreHeadersFeature.utils.d.ts

package/dist/core/row-models/coreRowModelsFeature.types.d.ts

@@ -1,11 +1,11 @@
 import { RowData } from "../../types/type-utils.js";
-import { Table_RowModels_Faceted } from "../../features/column-faceting/columnFacetingFeature.types.js";
-import { Table_RowModels_Expanded } from "../../features/row-expanding/rowExpandingFeature.types.js";
-import { Table_RowModels_Paginated } from "../../features/row-pagination/rowPaginationFeature.types.js";
 import { Table_RowModels_Sorted } from "../../features/row-sorting/rowSortingFeature.types.js";
+import { Table_RowModels_Grouped } from "../../features/column-grouping/columnGroupingFeature.types.js";
+import { Table_RowModels_Expanded } from "../../features/row-expanding/rowExpandingFeature.types.js";
 import { Row } from "../../types/Row.js";
 import { Table_RowModels_Filtered } from "../../features/column-filtering/columnFilteringFeature.types.js";
-import { Table_RowModels_Grouped } from "../../features/column-grouping/columnGroupingFeature.types.js";
+import { Table_RowModels_Paginated } from "../../features/row-pagination/rowPaginationFeature.types.js";
+import { Table_RowModels_Faceted } from "../../features/column-faceting/columnFacetingFeature.types.js";
 import { TableFeatures } from "../../types/TableFeatures.js";
 //#region src/core/row-models/coreRowModelsFeature.types.d.ts
 interface RowModel<in out TFeatures extends TableFeatures, in out TData extends RowData> {

package/dist/core/row-models/coreRowModelsFeature.utils.d.ts

@@ -1,6 +1,6 @@
 import { RowData } from "../../types/type-utils.js";
-import { Table } from "../../types/Table.js";
 import { RowModel } from "./coreRowModelsFeature.types.js";
+import { Table } from "../../types/Table.js";
 import { TableFeatures } from "../../types/TableFeatures.js";
 //#region src/core/row-models/coreRowModelsFeature.utils.d.ts
 /**

package/dist/core/row-models/createCoreRowModel.d.ts

@@ -1,6 +1,6 @@
 import { RowData } from "../../types/type-utils.js";
-import { Table } from "../../types/Table.js";
 import { RowModel } from "./coreRowModelsFeature.types.js";
+import { Table } from "../../types/Table.js";
 import { TableFeatures } from "../../types/TableFeatures.js";
 //#region src/core/row-models/createCoreRowModel.d.ts
 /**

package/dist/core/rows/constructRow.d.ts

@@ -1,6 +1,6 @@
 import { RowData } from "../../types/type-utils.js";
-import { Table } from "../../types/Table.js";
 import { Row } from "../../types/Row.js";
+import { Table } from "../../types/Table.js";
 import { TableFeatures } from "../../types/TableFeatures.js";
 //#region src/core/rows/constructRow.d.ts
 /**

package/dist/core/rows/coreRowsFeature.types.d.ts

@@ -1,7 +1,7 @@
 import { RowData } from "../../types/type-utils.js";
-import { Table } from "../../types/Table.js";
 import { Column } from "../../types/Column.js";
 import { Row } from "../../types/Row.js";
+import { Table } from "../../types/Table.js";
 import { Cell } from "../../types/Cell.js";
 import { TableFeatures } from "../../types/TableFeatures.js";
 //#region src/core/rows/coreRowsFeature.types.d.ts

package/dist/core/rows/coreRowsFeature.utils.d.ts

@@ -1,6 +1,6 @@
 import { RowData } from "../../types/type-utils.js";
-import { Table } from "../../types/Table.js";
 import { Row } from "../../types/Row.js";
+import { Table } from "../../types/Table.js";
 import { Cell } from "../../types/Cell.js";
 import { TableFeatures } from "../../types/TableFeatures.js";
 //#region src/core/rows/coreRowsFeature.utils.d.ts

package/dist/features/cell-selection/cellSelectionFeature.js

@@ -1,5 +1,5 @@
 import { assignPrototypeAPIs, assignTableAPIs, callMemoOrStaticFn, makeStateUpdater } from "../../utils.js";
-import { cell_getCanSelect, cell_getIsFocused, cell_getIsSelected, cell_getSelectionEdges, cell_getSelectionExtendHandler, cell_getSelectionStartHandler, cell_getTabIndex, getDefaultCellSelectionState, table_autoResetCellSelection, table_extendCellSelection, table_getCellSelectionBounds, table_getCellSelectionColumnIds, table_getCellSelectionColumnIndexes, table_getCellSelectionRowIds, table_getFocusedCell, table_getSelectedCellCount, table_getSelectedCellIds, table_getSelectedCellRangesData, table_moveCellSelection, table_resetCellSelection, table_selectAllCells, table_selectCellRange, table_setCellSelection, table_setFocusedCell } from "./cellSelectionFeature.utils.js";
+import { cell_getCanSelect, cell_getIsFocused, cell_getIsSelected, cell_getSelectionEdges, cell_getSelectionExtendHandler, cell_getSelectionStartHandler, cell_getTabIndex, getDefaultCellSelectionState, table_autoResetCellSelection, table_extendCellSelection, table_getCellSelectionBounds, table_getCellSelectionColumnIds, table_getCellSelectionColumnIndexes, table_getCellSelectionMergeBounds, table_getCellSelectionRowIds, table_getFocusedCell, table_getSelectedCellCount, table_getSelectedCellIds, table_getSelectedCellRangesData, table_moveCellSelection, table_resetCellSelection, table_selectAllCells, table_selectCellRange, table_setCellSelection, table_setFocusedCell } from "./cellSelectionFeature.utils.js";
 
 //#region src/features/cell-selection/cellSelectionFeature.ts
 /**
@@ -63,12 +63,21 @@ const cellSelectionFeature = {
 					table.options.groupedColumnMode
 				]
 			},
+			table_getCellSelectionMergeBounds: {
+				fn: () => table_getCellSelectionMergeBounds(table),
+				memoDeps: () => [
+					table.getCellSpanIndex?.(),
+					table.getRowsInDisplayOrder(),
+					callMemoOrStaticFn(table, "getCellSelectionColumnIndexes", table_getCellSelectionColumnIndexes)
+				]
+			},
 			table_getCellSelectionBounds: {
 				fn: () => table_getCellSelectionBounds(table),
 				memoDeps: () => [
 					table.atoms.cellSelection?.get(),
 					table.getRowsInDisplayOrder(),
-					callMemoOrStaticFn(table, "getCellSelectionColumnIndexes", table_getCellSelectionColumnIndexes)
+					callMemoOrStaticFn(table, "getCellSelectionColumnIndexes", table_getCellSelectionColumnIndexes),
+					callMemoOrStaticFn(table, "getCellSelectionMergeBounds", table_getCellSelectionMergeBounds)
 				]
 			},
 			table_selectCellRange: { fn: (range, opts) => table_selectCellRange(table, range, opts) },
@@ -81,6 +90,7 @@ const cellSelectionFeature = {
 				fn: () => table_getSelectedCellIds(table),
 				memoDeps: () => [
 					callMemoOrStaticFn(table, "getCellSelectionBounds", table_getCellSelectionBounds),
+					callMemoOrStaticFn(table, "getCellSelectionMergeBounds", table_getCellSelectionMergeBounds),
 					table.getRowsInDisplayOrder(),
 					table.options.enableCellSelection
 				]
@@ -97,6 +107,7 @@ const cellSelectionFeature = {
 				fn: () => table_getSelectedCellCount(table),
 				memoDeps: () => [
 					callMemoOrStaticFn(table, "getCellSelectionBounds", table_getCellSelectionBounds),
+					callMemoOrStaticFn(table, "getCellSelectionMergeBounds", table_getCellSelectionMergeBounds),
 					table.getRowsInDisplayOrder(),
 					table.options.enableCellSelection
 				]

package/dist/features/cell-selection/cellSelectionFeature.types.d.ts

@@ -211,6 +211,15 @@ interface Table_CellSelection<in out TFeatures extends TableFeatures, in out TDa
    * corners no longer resolve are omitted.
    */
   getCellSelectionBounds: () => Array<CellSelectionBounds>;
+  /**
+   * Returns the merged-cell rectangles of the rendered rows in selection's
+   * display-order index space, or an empty array when `cellSpanningFeature`
+   * is not registered.
+   *
+   * Selection rectangles expand to fully enclose these, so a merged cell is
+   * always entirely selected or entirely unselected.
+   */
+  getCellSelectionMergeBounds: () => Array<CellSelectionBounds>;
   /**
    * Returns the ids of all columns intersected by the selection.
    */

package/dist/features/cell-selection/cellSelectionFeature.utils.d.ts

@@ -68,6 +68,25 @@ declare function table_autoResetCellSelection<TFeatures extends TableFeatures, T
  * ```
  */
 declare function table_getCellSelectionColumnIndexes<TFeatures extends TableFeatures, TData extends RowData>(table: Table<TFeatures, TData>): Record<string, number>;
+/**
+ * Resolves the merged-cell rectangles of the rendered rows into selection's
+ * own index space.
+ *
+ * The span index positions rows by their paginated render order while
+ * selection positions them by pre-paginated display order, so each merge is
+ * mapped through `row.getDisplayIndex()`. A merge whose rows do not map to a
+ * contiguous display range is skipped defensively; it then behaves like
+ * unmerged cells instead of corrupting the geometry.
+ *
+ * Returns an empty array when `cellSpanningFeature` is not registered, which
+ * keeps every selection code path identical to the span-unaware behavior.
+ *
+ * @example
+ * ```ts
+ * const merges = table_getCellSelectionMergeBounds(table)
+ * ```
+ */
+declare function table_getCellSelectionMergeBounds<TFeatures extends TableFeatures, TData extends RowData>(table: Table<TFeatures, TData>): Array<CellSelectionBounds>;
 /**
  * Resolves ordered range operations into disjoint, positive display-order
  * index rectangles.
@@ -284,4 +303,4 @@ declare function cell_getSelectionStartHandler<TFeatures extends TableFeatures,
  */
 declare function cell_getSelectionExtendHandler<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(cell: Cell<TFeatures, TData, TValue>): (_e: unknown) => void;
 //#endregion
-export { cell_getCanSelect, cell_getIsFocused, cell_getIsSelected, cell_getSelectionEdges, cell_getSelectionExtendHandler, cell_getSelectionStartHandler, cell_getTabIndex, getDefaultCellSelectionState, table_autoResetCellSelection, table_extendCellSelection, table_getCellSelectionBounds, table_getCellSelectionColumnIds, table_getCellSelectionColumnIndexes, table_getCellSelectionRowIds, table_getFocusedCell, table_getSelectedCellCount, table_getSelectedCellIds, table_getSelectedCellRangesData, table_moveCellSelection, table_resetCellSelection, table_selectAllCells, table_selectCellRange, table_setCellSelection, table_setFocusedCell };
+export { cell_getCanSelect, cell_getIsFocused, cell_getIsSelected, cell_getSelectionEdges, cell_getSelectionExtendHandler, cell_getSelectionStartHandler, cell_getTabIndex, getDefaultCellSelectionState, table_autoResetCellSelection, table_extendCellSelection, table_getCellSelectionBounds, table_getCellSelectionColumnIds, table_getCellSelectionColumnIndexes, table_getCellSelectionMergeBounds, table_getCellSelectionRowIds, table_getFocusedCell, table_getSelectedCellCount, table_getSelectedCellIds, table_getSelectedCellRangesData, table_moveCellSelection, table_resetCellSelection, table_selectAllCells, table_selectCellRange, table_setCellSelection, table_setFocusedCell };

package/dist/features/cell-selection/cellSelectionFeature.utils.js

@@ -1,6 +1,6 @@
 import { callMemoOrStaticFn, cloneState, makeObjectMap } from "../../utils.js";
 import { table_getVisibleLeafColumns } from "../column-visibility/columnVisibilityFeature.utils.js";
-import { applyCellSelectionBoundsOperations } from "./cellSelectionGeometry.js";
+import { applyCellSelectionBoundsOperations, expandCellSelectionBounds } from "./cellSelectionGeometry.js";
 
 //#region src/features/cell-selection/cellSelectionFeature.utils.ts
 /**
@@ -122,6 +122,87 @@ function table_getCellSelectionColumnIndexes(table) {
 	for (let i = 0; i < columns.length; i++) indexes[columns[i].id] = i;
 	return indexes;
 }
+const EMPTY_MERGE_BOUNDS = [];
+function probeCellSpanIndex(table) {
+	return table.getCellSpanIndex?.();
+}
+/**
+* Resolves the merged-cell rectangles of the rendered rows into selection's
+* own index space.
+*
+* The span index positions rows by their paginated render order while
+* selection positions them by pre-paginated display order, so each merge is
+* mapped through `row.getDisplayIndex()`. A merge whose rows do not map to a
+* contiguous display range is skipped defensively; it then behaves like
+* unmerged cells instead of corrupting the geometry.
+*
+* Returns an empty array when `cellSpanningFeature` is not registered, which
+* keeps every selection code path identical to the span-unaware behavior.
+*
+* @example
+* ```ts
+* const merges = table_getCellSelectionMergeBounds(table)
+* ```
+*/
+function table_getCellSelectionMergeBounds(table) {
+	const spanIndex = probeCellSpanIndex(table);
+	if (!spanIndex) return EMPTY_MERGE_BOUNDS;
+	const columnIndexes = callMemoOrStaticFn(table, "getCellSelectionColumnIndexes", table_getCellSelectionColumnIndexes);
+	const merges = [];
+	for (const columnId in spanIndex.rowSpans) {
+		const columnIndex = columnIndexes[columnId];
+		if (columnIndex === void 0) continue;
+		const spans = spanIndex.rowSpans[columnId];
+		const spanColumnIndex = spanIndex.columnIndexes[columnId];
+		for (let r = 0; r < spans.length; r++) {
+			const span = spans[r];
+			if (span <= 1) continue;
+			const startRow = spanIndex.rows[r].getDisplayIndex();
+			const endRow = spanIndex.rows[r + span - 1].getDisplayIndex();
+			if (startRow < 0 || endRow - startRow !== span - 1) continue;
+			const colSpan = spanColumnIndex === void 0 ? 1 : Math.max(spanIndex.colSpans[r]?.[spanColumnIndex] ?? 1, 1);
+			merges.push({
+				minRowIndex: startRow,
+				maxRowIndex: endRow,
+				minColumnIndex: columnIndex,
+				maxColumnIndex: columnIndex + colSpan - 1
+			});
+		}
+	}
+	if (spanIndex.colSpans.length) {
+		const columnIdBySpanIndex = [];
+		for (const columnId in spanIndex.columnIndexes) columnIdBySpanIndex[spanIndex.columnIndexes[columnId]] = columnId;
+		for (let r = 0; r < spanIndex.colSpans.length; r++) {
+			const rowColSpans = spanIndex.colSpans[r];
+			if (!rowColSpans) continue;
+			const displayRow = spanIndex.rows[r]?.getDisplayIndex() ?? -1;
+			if (displayRow < 0) continue;
+			for (let c = 0; c < rowColSpans.length; c++) {
+				const span = rowColSpans[c];
+				if (span <= 1) continue;
+				const columnId = columnIdBySpanIndex[c];
+				if (columnId === void 0) continue;
+				const vertical = spanIndex.rowSpans[columnId];
+				if (vertical && vertical[r] !== 1) continue;
+				const columnIndex = columnIndexes[columnId];
+				if (columnIndex === void 0) continue;
+				merges.push({
+					minRowIndex: displayRow,
+					maxRowIndex: displayRow,
+					minColumnIndex: columnIndex,
+					maxColumnIndex: columnIndex + span - 1
+				});
+			}
+		}
+	}
+	return merges;
+}
+function findMergeBoundsAt(merges, rowIndex, columnIndex) {
+	for (let i = 0; i < merges.length; i++) {
+		const merge = merges[i];
+		if (rowIndex >= merge.minRowIndex && rowIndex <= merge.maxRowIndex && columnIndex >= merge.minColumnIndex && columnIndex <= merge.maxColumnIndex) return merge;
+	}
+}
 /**
 * Resolves a row id to its display-order index, or `-1` when it no longer
 * identifies a row in the current order.
@@ -172,6 +253,15 @@ function table_getCellSelectionBounds(table) {
 			operation: range.operation ?? "include"
 		});
 	}
+	const merges = callMemoOrStaticFn(table, "getCellSelectionMergeBounds", table_getCellSelectionMergeBounds);
+	if (merges.length) for (let i = 0; i < operations.length; i++) {
+		const operation = operations[i];
+		const expanded = expandCellSelectionBounds(operation, merges);
+		operation.minRowIndex = expanded.minRowIndex;
+		operation.maxRowIndex = expanded.maxRowIndex;
+		operation.minColumnIndex = expanded.minColumnIndex;
+		operation.maxColumnIndex = expanded.maxColumnIndex;
+	}
 	return applyCellSelectionBoundsOperations(operations);
 }
 /**
@@ -290,12 +380,24 @@ function cell_getSelectionEdges(cell) {
 	if (!position) return none;
 	const { bounds, rowIndex, columnIndex } = position;
 	if (!isWithinBounds(bounds, rowIndex, columnIndex)) return none;
-	return {
+	const merges = callMemoOrStaticFn(cell.table, "getCellSelectionMergeBounds", table_getCellSelectionMergeBounds);
+	const merge = merges.length ? findMergeBoundsAt(merges, rowIndex, columnIndex) : void 0;
+	if (!merge) return {
 		top: !isWithinBounds(bounds, rowIndex - 1, columnIndex),
 		right: !isWithinBounds(bounds, rowIndex, columnIndex + 1),
 		bottom: !isWithinBounds(bounds, rowIndex + 1, columnIndex),
 		left: !isWithinBounds(bounds, rowIndex, columnIndex - 1)
 	};
+	return {
+		top: isStripOutside(bounds, merge.minRowIndex - 1, merge.minColumnIndex, merge.maxColumnIndex, true),
+		right: isStripOutside(bounds, merge.maxColumnIndex + 1, merge.minRowIndex, merge.maxRowIndex, false),
+		bottom: isStripOutside(bounds, merge.maxRowIndex + 1, merge.minColumnIndex, merge.maxColumnIndex, true),
+		left: isStripOutside(bounds, merge.minColumnIndex - 1, merge.minRowIndex, merge.maxRowIndex, false)
+	};
+}
+function isStripOutside(bounds, fixedIndex, from, to, fixedIsRow) {
+	for (let i = from; i <= to; i++) if (!isWithinBounds(bounds, fixedIsRow ? fixedIndex : i, fixedIsRow ? i : fixedIndex)) return true;
+	return false;
 }
 /**
 * Returns the active cell, i.e. the anchor of the most recent operation.
@@ -417,11 +519,23 @@ function stepCoordinate(table, rowId, columnId, direction) {
 	const rowIndex = resolveRowIndex(table, rows, rowId);
 	const columnIndex = columns.findIndex((column) => column.id === columnId);
 	if (rowIndex < 0 || columnIndex < 0) return null;
-	const nextRowIndex = rowIndex + rowDelta;
+	const merges = callMemoOrStaticFn(table, "getCellSelectionMergeBounds", table_getCellSelectionMergeBounds);
+	let fromRowIndex = rowIndex;
+	let fromColumnIndex = columnIndex;
+	if (merges.length) {
+		const startMerge = findMergeBoundsAt(merges, rowIndex, columnIndex);
+		if (startMerge) {
+			if (rowDelta > 0) fromRowIndex = startMerge.maxRowIndex;
+			if (rowDelta < 0) fromRowIndex = startMerge.minRowIndex;
+			if (columnDelta > 0) fromColumnIndex = startMerge.maxColumnIndex;
+			if (columnDelta < 0) fromColumnIndex = startMerge.minColumnIndex;
+		}
+	}
+	const nextRowIndex = fromRowIndex + rowDelta;
 	if (nextRowIndex < 0 || nextRowIndex >= rows.length) return null;
 	const selectableColumnIds = new Set(getSelectableColumns(table).map((column) => column.id));
 	if (!selectableColumnIds.size) return null;
-	let nextColumnIndex = columnIndex;
+	let nextColumnIndex = fromColumnIndex;
 	if (columnDelta) do
 		nextColumnIndex += columnDelta;
 	while (nextColumnIndex >= 0 && nextColumnIndex < columns.length && !selectableColumnIds.has(columns[nextColumnIndex].id));
@@ -438,9 +552,21 @@ function stepCoordinate(table, rowId, columnId, direction) {
 		}
 	}
 	if (nextColumnIndex < 0 || nextColumnIndex >= columns.length || !selectableColumnIds.has(columns[nextColumnIndex].id)) return null;
+	let landingRowIndex = nextRowIndex;
+	let landingColumnIndex = nextColumnIndex;
+	if (merges.length) {
+		const landingMerge = findMergeBoundsAt(merges, nextRowIndex, nextColumnIndex);
+		if (landingMerge) {
+			landingRowIndex = landingMerge.minRowIndex;
+			landingColumnIndex = landingMerge.minColumnIndex;
+		}
+	}
+	const landingRow = rows[landingRowIndex];
+	const landingColumn = columns[landingColumnIndex];
+	if (!landingRow || !landingColumn) return null;
 	return {
-		rowId: rows[nextRowIndex].id,
-		columnId: columns[nextColumnIndex].id
+		rowId: landingRow.id,
+		columnId: landingColumn.id
 	};
 }
 /**
@@ -502,7 +628,7 @@ function table_extendCellSelection(table, direction) {
 * Every expansion API shares this so the per-cell enable predicate is applied
 * in exactly one place.
 */
-function forEachSelectedCell(table, visit) {
+function forEachSelectedCell(table, visit, skipCovered = false) {
 	const bounds = callMemoOrStaticFn(table, "getCellSelectionBounds", table_getCellSelectionBounds);
 	if (!bounds.length) return;
 	const rows = table.getRowsInDisplayOrder();
@@ -519,6 +645,7 @@ function forEachSelectedCell(table, visit) {
 				const cell = cellsByColumnId[column.id];
 				if (!cell) continue;
 				if (!callMemoOrStaticFn(cell, "getCanSelect", cell_getCanSelect)) continue;
+				if (skipCovered && cell.getIsCovered?.()) continue;
 				visit(cell, i, rowIndex - bound.minRowIndex, columnIndex - bound.minColumnIndex);
 			}
 		}
@@ -542,7 +669,7 @@ function table_getSelectedCellIds(table) {
 		if (seen.has(cell.id)) return;
 		seen.add(cell.id);
 		ids.push(cell.id);
-	});
+	}, true);
 	return ids;
 }
 /**
@@ -580,9 +707,10 @@ function table_getSelectedCellCount(table) {
 	if (table.options.enableCellSelection === false) return 0;
 	const bounds = callMemoOrStaticFn(table, "getCellSelectionBounds", table_getCellSelectionBounds);
 	if (!bounds.length) return 0;
-	if (typeof table.options.enableCellSelection === "function") {
+	const merges = callMemoOrStaticFn(table, "getCellSelectionMergeBounds", table_getCellSelectionMergeBounds);
+	if (typeof table.options.enableCellSelection === "function" || merges.length) {
 		const ids = /* @__PURE__ */ new Set();
-		forEachSelectedCell(table, (cell) => ids.add(cell.id));
+		forEachSelectedCell(table, (cell) => ids.add(cell.id), true);
 		return ids.size;
 	}
 	const columns = getDisplayOrderedColumns(table);
@@ -742,4 +870,4 @@ function cell_getSelectionExtendHandler(cell) {
 }
 
 //#endregion
-export { cell_getCanSelect, cell_getIsFocused, cell_getIsSelected, cell_getSelectionEdges, cell_getSelectionExtendHandler, cell_getSelectionStartHandler, cell_getTabIndex, getDefaultCellSelectionState, table_autoResetCellSelection, table_extendCellSelection, table_getCellSelectionBounds, table_getCellSelectionColumnIds, table_getCellSelectionColumnIndexes, table_getCellSelectionRowIds, table_getFocusedCell, table_getSelectedCellCount, table_getSelectedCellIds, table_getSelectedCellRangesData, table_moveCellSelection, table_resetCellSelection, table_selectAllCells, table_selectCellRange, table_setCellSelection, table_setFocusedCell };
+export { cell_getCanSelect, cell_getIsFocused, cell_getIsSelected, cell_getSelectionEdges, cell_getSelectionExtendHandler, cell_getSelectionStartHandler, cell_getTabIndex, getDefaultCellSelectionState, table_autoResetCellSelection, table_extendCellSelection, table_getCellSelectionBounds, table_getCellSelectionColumnIds, table_getCellSelectionColumnIndexes, table_getCellSelectionMergeBounds, table_getCellSelectionRowIds, table_getFocusedCell, table_getSelectedCellCount, table_getSelectedCellIds, table_getSelectedCellRangesData, table_moveCellSelection, table_resetCellSelection, table_selectAllCells, table_selectCellRange, table_setCellSelection, table_setFocusedCell };

package/dist/features/cell-selection/cellSelectionGeometry.js

@@ -71,6 +71,37 @@ function addCellSelectionBounds(selected, included) {
 	}
 	return mergeAdjacentCellSelectionBounds([...selected, ...fragments]);
 }
+/**
+* Grows a rectangle until it fully contains every merged-cell rectangle it
+* touches.
+*
+* Merged cells make plain rectangles insufficient: a selection that clips part
+* of a merge must cover the whole merge, and covering it can bring the
+* rectangle into contact with further merges, so the expansion runs to a fixed
+* point. The loop is bounded by the merge count, since each pass that changes
+* the rectangle consumes at least one merge.
+*/
+function expandCellSelectionBounds(bounds, merges) {
+	let expanded = bounds;
+	let changed = true;
+	while (changed) {
+		changed = false;
+		for (const merge of merges) {
+			if (!intersectCellSelectionBounds(expanded, merge)) continue;
+			const union = {
+				minRowIndex: Math.min(expanded.minRowIndex, merge.minRowIndex),
+				maxRowIndex: Math.max(expanded.maxRowIndex, merge.maxRowIndex),
+				minColumnIndex: Math.min(expanded.minColumnIndex, merge.minColumnIndex),
+				maxColumnIndex: Math.max(expanded.maxColumnIndex, merge.maxColumnIndex)
+			};
+			if (union.minRowIndex !== expanded.minRowIndex || union.maxRowIndex !== expanded.maxRowIndex || union.minColumnIndex !== expanded.minColumnIndex || union.maxColumnIndex !== expanded.maxColumnIndex) {
+				expanded = union;
+				changed = true;
+			}
+		}
+	}
+	return expanded;
+}
 function applyCellSelectionBoundsOperations(operations) {
 	let selected = [];
 	for (const operation of operations) {
@@ -87,4 +118,4 @@ function applyCellSelectionBoundsOperations(operations) {
 }
 
 //#endregion
-export { addCellSelectionBounds, applyCellSelectionBoundsOperations, intersectCellSelectionBounds, mergeAdjacentCellSelectionBounds, subtractCellSelectionBounds };
+export { addCellSelectionBounds, applyCellSelectionBoundsOperations, expandCellSelectionBounds, intersectCellSelectionBounds, mergeAdjacentCellSelectionBounds, subtractCellSelectionBounds };

package/dist/features/cell-spanning/cellSpanningFeature.d.ts

@@ -0,0 +1,13 @@
+import { TableFeature } from "../../types/TableFeatures.js";
+//#region src/features/cell-spanning/cellSpanningFeature.d.ts
+/**
+ * Feature that merges adjacent cells that share a value into row-spanning
+ * cells, and lets a column def declare column-spanning cells per row.
+ *
+ * Stateless: spans are always derived from the rows that are currently
+ * rendered, so there is nothing to persist and nothing to configure beyond the
+ * column defs.
+ */
+declare const cellSpanningFeature: TableFeature;
+//#endregion
+export { cellSpanningFeature };

package/dist/features/cell-spanning/cellSpanningFeature.js

@@ -0,0 +1,47 @@
+import { assignPrototypeAPIs, assignTableAPIs } from "../../utils.js";
+import { cell_getColSpan, cell_getIsCovered, cell_getRowSpan, table_getCellSpanIndex } from "./cellSpanningFeature.utils.js";
+
+//#region src/features/cell-spanning/cellSpanningFeature.ts
+/**
+* Feature that merges adjacent cells that share a value into row-spanning
+* cells, and lets a column def declare column-spanning cells per row.
+*
+* Stateless: spans are always derived from the rows that are currently
+* rendered, so there is nothing to persist and nothing to configure beyond the
+* column defs.
+*/
+const cellSpanningFeature = {
+	getDefaultTableOptions: () => {
+		return { enableCellSpanning: true };
+	},
+	initRowInstanceData: (row) => {
+		row._cellSpanRowIndex = -1;
+	},
+	assignCellPrototype: (prototype, table) => {
+		assignPrototypeAPIs("cellSpanningFeature", prototype, table, {
+			cell_getColSpan: { fn: (cell) => cell_getColSpan(cell) },
+			cell_getIsCovered: { fn: (cell) => cell_getIsCovered(cell) },
+			cell_getRowSpan: { fn: (cell) => cell_getRowSpan(cell) }
+		});
+	},
+	constructTableAPIs: (table) => {
+		assignTableAPIs("cellSpanningFeature", table, { table_getCellSpanIndex: {
+			fn: () => table_getCellSpanIndex(table),
+			memoDeps: () => [
+				table.getRowModel().rows,
+				table.atoms.rowPinning?.get(),
+				table.options.keepPinnedRows,
+				table.atoms.columnVisibility?.get(),
+				table.atoms.columnOrder?.get(),
+				table.atoms.columnPinning?.get(),
+				table.atoms.grouping?.get(),
+				table.options.columns,
+				table.options.groupedColumnMode,
+				table.options.enableCellSpanning
+			]
+		} });
+	}
+};
+
+//#endregion
+export { cellSpanningFeature };