@drivenets/design-system 0.16.0 → 0.18.0

package/src/components/ds-table/ds-table.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { useImperativeHandle, useMemo } from 'react';
 import {
-	type ColumnDef,
 	type RowSelectionState,
 	type ColumnFiltersState,
 	getCoreRowModel,
@@ -9,6 +8,7 @@ import {
 	getFilteredRowModel,
 	getSortedRowModel,
 	type SortingState,
+	type Table as TanstackTable,
 	useReactTable,
 	type VisibilityState,
 } from '@tanstack/react-table';
@@ -16,27 +16,20 @@ import classnames from 'classnames';
 import { Table, TableBody, TableCell, TableRow } from './components/core-table';
 import { DsTableBulkActions } from './components/ds-table-bulk-actions';
 import { DsTableHeader } from './components/ds-table-header';
+import { DsTableResizeOverlay } from './components/ds-table-resize-overlay';
 import styles from './ds-table.module.scss';
 import type { DsDataTableProps, DsTableRowSize } from './ds-table.types';
+import { applyDsTableDefaults } from './ds-table-defaults';
 import { DsTableRow } from './components/ds-table-row';
-import { DsTableRowExpandableCell } from './components/ds-table-row-expandable-cell';
-import { DsTableRowSelectableCell } from './components/ds-table-row-selectable-cell';
-import { DsTableHeaderSelectableCell } from './components/ds-table-header-selectable-cell';
 import { useDragAndDrop } from './hooks/use-drag-and-drop';
-import { type DsTableContextType, DsTableContext, useEditingState } from './context/ds-table-context';
+import { useColumnResize } from './hooks/use-column-resize';
+import { DsTableContextProvider } from './context/ds-table-context';
 import { DsTableBodyVirtualized } from './components/ds-table-body-virtualized';
 import { useColumnGroups } from './grouping';
-import { DsSkeletonText } from '../ds-skeleton';
-import {
-	EMPTY_TABLE_STATE_TEXT,
-	EXPANDER_COLUMN_ID,
-	EXPANDER_COLUMN_WIDTH,
-	REORDER_COLUMN_ID,
-	REORDER_COLUMN_WIDTH,
-	SELECT_COLUMN_ID,
-	SELECT_COLUMN_WIDTH,
-	SKELETON_ROW_COUNT,
-} from './utils/constants';
+import { EMPTY_TABLE_STATE_TEXT } from './utils/constants';
+import { createSkeletonRows, getAugmentedColumns, toSkeletonColumns } from './utils/table-columns';
+import { createTableApi } from './utils/table-api';
+import { areBodiesFrozen } from './utils/frozen-body';
 
 // Row size to pixel height mapping (matches CSS variables)
 const ROW_SIZE_HEIGHT_MAP: Record<DsTableRowSize, number> = {
@@ -48,45 +41,41 @@ const ROW_SIZE_HEIGHT_MAP: Record<DsTableRowSize, number> = {
 /**
  * Design system Table component
  */
-const DsTable = <TData extends { id: string }, TValue>({
-	ref,
-	columns: columnsProp,
-	data: tableData,
-	virtualized = false,
-	virtualizedOptions,
-	className,
-	onRowClick,
-	emptyState,
-	stickyHeader = true,
-	bordered = true,
-	fullWidth = true,
-	rowSize = 'medium',
-	loading = false,
-	expandable = false,
-	renderExpandedRow,
-	selectable = false,
-	showSelectAllCheckbox = true,
-	onSelectionChange,
-	onSortingChange,
-	onScroll,
-	actions = [],
-	onRowDoubleClick,
-	primaryRowActions = [],
-	secondaryRowActions,
-	reorderable = false,
-	onOrderChange,
-	columnFilters: externalColumnFilters,
-	onColumnFiltersChange,
-	columnVisibility: externalColumnVisibility,
-	onColumnVisibilityChange,
-	collapsedColumnGroups: externalCollapsedColumnGroups,
-	onCollapsedColumnGroupsChange,
-	locale,
-	activeRowId,
-	infiniteScroll,
-	onCellEdit,
-	onCellValidate,
-}: DsDataTableProps<TData, TValue>) => {
+const DsTable = <TData extends { id: string }, TValue>(props: DsDataTableProps<TData, TValue>) => {
+	const tableProps = applyDsTableDefaults(props);
+	const {
+		ref,
+		columns: columnsProp,
+		data: tableData,
+		controls,
+		virtualized,
+		virtualizedOptions,
+		className,
+		emptyState,
+		bordered,
+		fullWidth,
+		rowSize,
+		loading,
+		expandable,
+		selectable,
+		showSelectAllCheckbox,
+		onSelectionChange,
+		onSortingChange,
+		onScroll,
+		actions,
+		reorderable,
+		onOrderChange,
+		columnFilters: externalColumnFilters,
+		onColumnFiltersChange,
+		columnVisibility: externalColumnVisibility,
+		onColumnVisibilityChange,
+		collapsedColumnGroups: externalCollapsedColumnGroups,
+		onCollapsedColumnGroupsChange,
+		infiniteScroll,
+		resizableColumns,
+		columnSizing,
+		onColumnSizingChange,
+	} = tableProps;
 	const [data, setData] = React.useState(tableData);
 	const [sorting, setSorting] = React.useState<SortingState>([]);
 	const [internalColumnFilters, setInternalColumnFilters] = React.useState<ColumnFiltersState>([]);
@@ -102,8 +91,6 @@ const DsTable = <TData extends { id: string }, TValue>({
 		items: data,
 	});
 
-	const tableContainerRef = React.useRef<HTMLDivElement>(null);
-
 	const columnFilters = externalColumnFilters ?? internalColumnFilters;
 	const handleColumnFiltersChange = (
 		updaterOrValue: ColumnFiltersState | ((old: ColumnFiltersState) => ColumnFiltersState),
@@ -156,74 +143,33 @@ const DsTable = <TData extends { id: string }, TValue>({
 		onSelectionChange?.(newRowSelection);
 	};
 
-	const hasExpanderColumn = !!expandable;
-	const hasSelectColumn = !!selectable;
-	const hasReorderColumn = reorderable && !virtualized;
-
-	const columns = useMemo<ColumnDef<TData, TValue>[]>(() => {
-		const augmentedColumns: ColumnDef<TData, TValue>[] = [...columnsProp];
-
-		if (hasSelectColumn) {
-			const selectColumn: ColumnDef<TData, TValue> = {
-				id: SELECT_COLUMN_ID,
-				size: SELECT_COLUMN_WIDTH,
-				enableSorting: false,
-				enableResizing: false,
-				header: ({ table }) => (showSelectAllCheckbox ? <DsTableHeaderSelectableCell table={table} /> : null),
-				cell: ({ row }) => <DsTableRowSelectableCell row={row} />,
-			};
-			augmentedColumns.unshift(selectColumn);
-		}
-
-		if (hasExpanderColumn) {
-			const expanderColumn: ColumnDef<TData, TValue> = {
-				id: EXPANDER_COLUMN_ID,
-				size: EXPANDER_COLUMN_WIDTH,
-				enableSorting: false,
-				enableResizing: false,
-				header: () => null,
-				cell: ({ row }) => (row.getCanExpand() ? <DsTableRowExpandableCell row={row} /> : null),
-			};
-			augmentedColumns.unshift(expanderColumn);
-		}
-
-		if (hasReorderColumn) {
-			// Cell is rendered inline by DsTableRow when it encounters REORDER_COLUMN_ID,
-			// since the drag handle needs row-level useSortable state.
-			const reorderColumn: ColumnDef<TData, TValue> = {
-				id: REORDER_COLUMN_ID,
-				size: REORDER_COLUMN_WIDTH,
-				enableSorting: false,
-				enableResizing: false,
-				header: 'Order',
-				cell: () => null,
-			};
-			augmentedColumns.unshift(reorderColumn);
-		}
-
-		return augmentedColumns;
-	}, [columnsProp, hasExpanderColumn, hasReorderColumn, hasSelectColumn, showSelectAllCheckbox]);
-
-	const skeletonColumns = useMemo<ColumnDef<TData, TValue>[]>(() => {
-		const toSkeleton = (cols: ColumnDef<TData, TValue>[]): ColumnDef<TData, TValue>[] =>
-			cols.map((column) =>
-				'columns' in column && column.columns
-					? { ...column, columns: toSkeleton(column.columns) }
-					: { ...column, cell: column.loadingCell ?? (() => <DsSkeletonText width="60%" />) },
-			);
-
-		return toSkeleton(columns);
-	}, [columns]);
-
-	const skeletonData = useMemo<TData[]>(
+	// Boolean flags only — an inline `selectable` / `expandable` callback must
+	// not rebuild column defs (and remount cells) on every parent render.
+	const hasSelectColumn = Boolean(selectable);
+	const hasExpanderColumn = Boolean(expandable);
+	const columns = useMemo(
 		() =>
-			Array.from(
-				{ length: SKELETON_ROW_COUNT },
-				(_, i) => ({ id: `ds-table-skeleton-${String(i)}` }) as TData,
-			),
-		[],
+			getAugmentedColumns(columnsProp, {
+				selectable: hasSelectColumn,
+				expandable: hasExpanderColumn,
+				reorderable,
+				virtualized,
+				showSelectAllCheckbox,
+			}),
+		[columnsProp, hasSelectColumn, hasExpanderColumn, reorderable, virtualized, showSelectAllCheckbox],
 	);
 
+	const skeletonColumns = useMemo(() => toSkeletonColumns(columns), [columns]);
+	const skeletonData = useMemo(() => createSkeletonRows<TData>(), []);
+
+	const resize = useColumnResize({
+		enabled: resizableColumns,
+		columnSizing,
+		onColumnSizingChange,
+		columns,
+		columnVisibility,
+	});
+
 	const table = useReactTable({
 		data: loading ? skeletonData : reorderable ? data : tableData,
 		columns: loading ? skeletonColumns : columns,
@@ -237,68 +183,22 @@ const DsTable = <TData extends { id: string }, TValue>({
 		getRowId: (row) => row.id,
 		getExpandedRowModel: getExpandedRowModel(),
 		getRowCanExpand: typeof expandable === 'function' ? (row) => expandable(row.original) : () => expandable,
+		...resize.tableOptions,
 		state: {
 			sorting,
 			columnFilters,
 			columnVisibility,
 			rowSelection,
+			...resize.state,
 		},
 		enableRowSelection: typeof selectable === 'function' ? (row) => selectable(row.original) : selectable,
 	});
 
-	useImperativeHandle(
-		ref,
-		() => ({
-			selectRow: (rowId: string) => {
-				table.getRow(rowId).toggleSelected(true);
-			},
-			deselectRow: (rowId: string) => {
-				table.getRow(rowId).toggleSelected(false);
-			},
-			selectAllRows: () => {
-				table.toggleAllRowsSelected(true);
-			},
-			deselectAllRows: () => {
-				table.toggleAllRowsSelected(false);
-			},
-			selectRows: (rowIds: string[]) => {
-				const selection: Record<string, boolean> = {};
-				rowIds.forEach((id) => (selection[id] = true));
-				table.setRowSelection(selection);
-			},
-			getSelectedRows: () => {
-				return table.getFilteredSelectedRowModel().rows.map((r) => r.original);
-			},
-			expandRow: (rowId: string) => {
-				table.getRow(rowId).toggleExpanded(true);
-			},
-			collapseRow: (rowId: string) => {
-				table.getRow(rowId).toggleExpanded(false);
-			},
-			expandAllRows: () => {
-				table.toggleAllRowsExpanded(true);
-			},
-			collapseAllRows: () => {
-				table.toggleAllRowsExpanded(false);
-			},
-			expandRows: (rowIds: string[]) => {
-				const expansion: Record<string, boolean> = {};
-				rowIds.forEach((id) => (expansion[id] = true));
-				table.setExpanded(expansion);
-			},
-		}),
-		[table],
-	);
+	const { columnSizeVars, activeResize, context: resizeContext } = resize.bind(table);
 
-	const { rows, rowsById } = table.getRowModel();
+	useImperativeHandle(ref, () => createTableApi(table), [table]);
 
-	const renderEmptyState = () => (
-		<TableRow>
-			<TableCell colSpan={columns.length} className={styles.emptyState}>
-				{emptyState || EMPTY_TABLE_STATE_TEXT}
-			</TableCell>
-		</TableRow>
-	);
+	const { rowsById } = table.getRowModel();
 
 	const selectedRows = Object.entries(rowSelection)
 		.filter(([, selected]) => selected)
@@ -307,70 +207,58 @@ const DsTable = <TData extends { id: string }, TValue>({
 
 	const isBulkActionsVisible = selectable && actions.length > 0 && selectedRows.length > 0;
 
-	const editingState = useEditingState<TData, TValue>(onCellEdit, onCellValidate);
-
-	const contextValue: DsTableContextType<TData, TValue> = {
-		stickyHeader,
-		bordered,
-		fullWidth,
-		rowSize,
-		expandable,
-		selectable,
-		reorderable,
-		showSelectAllCheckbox,
-		loading,
-		onRowClick: loading ? undefined : onRowClick,
-		onRowDoubleClick: loading ? undefined : onRowDoubleClick,
-		primaryRowActions,
-		secondaryRowActions,
-		renderExpandedRow,
-		virtualized,
-		activeRowId,
-		collapsedColumnGroups,
-		onToggleColumnGroup: toggleColumnGroup,
-		locale,
-		onCellEdit,
-		...editingState,
-	};
-
 	return (
-		<DsTableContext.Provider value={contextValue}>
+		<DsTableContextProvider
+			tableProps={tableProps}
+			derived={{
+				grouping: {
+					collapsedColumnGroups,
+					onToggleColumnGroup: toggleColumnGroup,
+				},
+				resize: resizeContext,
+			}}
+		>
 			<div
-				ref={tableContainerRef}
-				className={classnames(
-					styles.container,
-					!virtualized && styles.dataTableContainer,
-					virtualized && styles.virtualizedContainer,
-					isBulkActionsVisible && styles.bulkActionsVisible,
-					className,
-				)}
+				className={classnames(styles.container, isBulkActionsVisible && styles.bulkActionsVisible, className)}
 			>
-				<DragWrapper>
-					<Table className={classnames(fullWidth && styles.fullWidth, !bordered && styles.tableNoBorder)}>
-						<DsTableHeader table={table} />
-						{virtualized ? (
-							<DsTableBodyVirtualized
-								table={table}
-								emptyState={emptyState}
-								estimateSize={virtualizedOptions?.estimateSize || ROW_SIZE_HEIGHT_MAP[rowSize]}
-								overscan={virtualizedOptions?.overscan}
-								onScroll={onScroll}
-								rowSelection={rowSelection}
-								infiniteScroll={infiniteScroll}
-							/>
-						) : (
-							<TableBody>
-								<SortableWrapper>
-									{rows.length
-										? rows.map((row) => (
-												<DsTableRow key={row.id} row={row} isSelected={!!rowSelection[row.id]} />
-											))
-										: renderEmptyState()}
-								</SortableWrapper>
-							</TableBody>
-						)}
-					</Table>
-				</DragWrapper>
+				{controls && <div className={styles.controls}>{controls}</div>}
+				<div
+					ref={resizeContext.resizeContainerRef}
+					className={classnames(
+						!virtualized && styles.dataTableContainer,
+						virtualized && styles.virtualizedContainer,
+					)}
+				>
+					<DragWrapper>
+						<Table
+							className={classnames(fullWidth && styles.fullWidth, !bordered && styles.tableNoBorder)}
+							style={columnSizeVars}
+						>
+							<DsTableHeader table={table} />
+							{virtualized ? (
+								<MemoizedDsTableBodyVirtualized
+									table={table}
+									emptyState={emptyState}
+									estimateSize={virtualizedOptions?.estimateSize || ROW_SIZE_HEIGHT_MAP[rowSize]}
+									overscan={virtualizedOptions?.overscan}
+									onScroll={onScroll}
+									rowSelection={rowSelection}
+									infiniteScroll={infiniteScroll}
+								/>
+							) : (
+								<MemoizedDsTableRowsBody
+									table={table}
+									rowSelection={rowSelection}
+									emptyState={emptyState}
+									SortableWrapper={SortableWrapper}
+								/>
+							)}
+						</Table>
+					</DragWrapper>
+					{activeResize ? (
+						<DsTableResizeOverlay offset={activeResize.offset} phase={activeResize.phase} />
+					) : null}
+				</div>
 				{selectable && actions.length > 0 && (
 					<DsTableBulkActions
 						numSelectedRows={selectedRows.length}
@@ -382,10 +270,50 @@ const DsTable = <TData extends { id: string }, TValue>({
 					/>
 				)}
 			</div>
-		</DsTableContext.Provider>
+		</DsTableContextProvider>
+	);
+};
+
+interface DsTableRowsBodyProps<TData extends { id: string }> {
+	table: TanstackTable<TData>;
+	rowSelection: RowSelectionState;
+	emptyState?: React.ReactNode;
+	SortableWrapper: React.ComponentType<React.PropsWithChildren>;
+}
+
+const DsTableRowsBody = <TData extends { id: string }>({
+	table,
+	rowSelection,
+	emptyState,
+	SortableWrapper,
+}: DsTableRowsBodyProps<TData>) => {
+	const { rows } = table.getRowModel();
+	const columnCount = table.getVisibleLeafColumns().length;
+
+	return (
+		<TableBody>
+			<SortableWrapper>
+				{rows.length ? (
+					rows.map((row) => <DsTableRow key={row.id} row={row} isSelected={!!rowSelection[row.id]} />)
+				) : (
+					<TableRow>
+						<TableCell colSpan={columnCount} className={styles.emptyState}>
+							{emptyState || EMPTY_TABLE_STATE_TEXT}
+						</TableCell>
+					</TableRow>
+				)}
+			</SortableWrapper>
+		</TableBody>
 	);
 };
 
+const MemoizedDsTableRowsBody = React.memo(DsTableRowsBody, areBodiesFrozen) as typeof DsTableRowsBody;
+
+const MemoizedDsTableBodyVirtualized = React.memo(
+	DsTableBodyVirtualized,
+	areBodiesFrozen,
+) as typeof DsTableBodyVirtualized;
+
 DsTable.displayName = 'DsTable';
 
 export default DsTable;

package/src/components/ds-table/ds-table.types.ts

@@ -31,6 +31,11 @@ export interface DsTableLocale {
 	 * Accessible label for the toggle that expands a column group.
 	 */
 	expandColumnGroup: string;
+
+	/**
+	 * Accessible label for the column resize handle.
+	 */
+	resizeColumn: string;
 }
 
 /**
@@ -39,6 +44,7 @@ export interface DsTableLocale {
 export const defaultDsTableLocale: DsTableLocale = Object.freeze({
 	collapseColumnGroup: 'Collapse column group',
 	expandColumnGroup: 'Expand column group',
+	resizeColumn: 'Resize column',
 });
 
 /**
@@ -228,6 +234,12 @@ export interface DsDataTableProps<TData, TValue> {
 	 */
 	data: TData[];
 
+	/**
+	 * Optional content rendered in a pinned controls bar above the table header
+	 * (e.g. filters, action buttons). Layout is owned by the consumer.
+	 */
+	controls?: React.ReactNode;
+
 	/**
 	 * Whether the table is virtualized
 	 * @default false
@@ -314,6 +326,31 @@ export interface DsDataTableProps<TData, TValue> {
 	 */
 	rowSize?: DsTableRowSize;
 
+	/**
+	 * Enables resizing columns by dragging the right edge of a header cell.
+	 * Double-click a handle to restore the column's original width. Opt out per
+	 * column with `columnDef.enableResizing: false`. Leaf columns may set
+	 * `minSize` and `maxSize`. Those bounds on a column group are ignored.
+	 * @default false
+	 */
+	resizableColumns?: boolean;
+
+	/**
+	 * Persisted column widths as a column id → width (px) map, e.g. a map saved
+	 * from {@link onColumnSizingChange}. Pass it (typically on the next mount) to
+	 * restore widths; columns absent from the map are measured and sized
+	 * automatically. This seeds widths — live resizing still updates them
+	 * internally — so it is not a fully controlled value.
+	 */
+	columnSizing?: Record<string, number>;
+
+	/**
+	 * Called with the next column id → width (px) map when a resize finishes
+	 * (drag end, double-click restore, or keyboard nudge). Use this to persist
+	 * widths across sessions.
+	 */
+	onColumnSizingChange?: (columnSizing: Record<string, number>) => void;
+
 	/**
 	 * When `true`, renders placeholder skeleton rows instead of the data. Column
 	 * headers stay intact and row interactions are disabled while loading.
@@ -505,53 +542,28 @@ export interface DsDataTableProps<TData, TValue> {
 	locale?: Partial<DsTableLocale>;
 
 	/**
-	 * Callback fired when an editable cell commits a new value via one of the
-	 * `DsTableEditCell*` wrappers or the `useCellEditor` hook. The parent is
-	 * expected to update the row data in response.
-	 *
-	 * Commits occur on confirm (check button or Enter). Opening another cell
-	 * discards the previous draft without calling this callback.
-	 *
-	 * @param row - The row data of the cell that was edited
-	 * @param columnId - The id of the column whose cell was edited
-	 * @param value - The new committed value
-	 *
-	 * @example
-	 * ```tsx
-	 * const [people, setPeople] = useState(initialPeople);
-	 *
-	 * <DsTable
-	 *   data={people}
-	 *   columns={columns}
-	 *   onCellEdit={(row, columnId, value) => {
-	 *     setPeople((rows) =>
-	 *       rows.map((r) => (r.id === row.id ? { ...r, [columnId]: value } : r)),
-	 *     );
-	 *   }}
-	 * />
-	 * ```
-	 */
-	onCellEdit?: (row: TData, columnId: string, value: TValue) => void;
-
-	/**
-	 * Validates a cell value before it is committed. Return `null` to allow the
-	 * commit (which fires `onCellEdit`), or an error message string to reject it
-	 * and keep the cell in edit mode. Synchronous only.
-	 *
-	 *
-	 * @param row - The row data of the cell being edited
-	 * @param columnId - The id of the column whose cell is being edited
-	 * @param value - The candidate value to validate
-	 *
-	 * @example
-	 * ```tsx
-	 * <DsTable
-	 *   data={people}
-	 *   columns={columns}
-	 *   onCellValidate={(row, columnId, value) => validateField(columnId)(value, row)}
-	 *   onCellEdit={...}
-	 * />
-	 * ```
+	 * Commits an edited cell value. Runs when the user confirms (check button or
+	 * Enter) after `onCellValidate` passes. This is the authoritative commit: use it
+	 * for server-side validation and persistence. Return `void`/`null` to accept
+	 * (closes the editor) or an error `string` to reject (keeps the cell open with
+	 * the message); may be async. While a returned Promise is pending the editor is
+	 * locked. `signal` is aborted when the edit is cancelled (Cancel/Escape) or
+	 * superseded by opening another cell, so in-flight requests can be cancelled.
+	 */
+	onCellEdit?: (
+		row: TData,
+		columnId: string,
+		value: TValue,
+		signal: AbortSignal,
+	) => string | null | undefined | Promise<string | null | undefined>;
+
+	/**
+	 * Synchronous, per-keystroke validation for the active editor. Runs live on
+	 * every draft change and once more as a pre-commit gate before `onCellEdit`.
+	 * Return `null` to allow or an error `string` to reject. A live error is shown
+	 * inline and disables the Confirm button; `onCellEdit` never runs while the
+	 * value is invalid. Keep it pure and cheap — for async or server-side checks,
+	 * use `onCellEdit` instead.
 	 */
 	onCellValidate?: (row: TData, columnId: string, value: TValue) => string | null;
 }

package/src/components/ds-table/figma/ds-table-expandable.figma.ts

@@ -11,7 +11,7 @@ import figma from 'figma';
 
 export default {
 	example: figma.code`<DsTable columns={columns} data={data} expandable renderExpandedRow={(row) => null} />`,
-	imports: ["import { DsTable } from '@drivenets/design-system'"],
+	imports: ["import { DsTable } from '@drivenets/design-system';"],
 	id: 'ds-table-expandable',
 	metadata: { nestable: false },
-};
+} satisfies figma.Template;

package/src/components/ds-table/figma/ds-table.figma.ts

@@ -10,7 +10,7 @@ import figma from 'figma';
 
 export default {
 	example: figma.code`<DsTable columns={columns} data={data} />`,
-	imports: ["import { DsTable } from '@drivenets/design-system'"],
+	imports: ["import { DsTable } from '@drivenets/design-system';"],
 	id: 'ds-table',
 	metadata: { nestable: false },
-};
+} satisfies figma.Template;

package/src/components/ds-table/grouping/utils/column-group.ts

@@ -2,27 +2,29 @@ import type { CSSProperties } from 'react';
 import {
 	type Column,
 	type ColumnDef,
+	type ColumnSizingState,
 	type VisibilityState,
-	defaultColumnSizing,
 } from '@tanstack/react-table';
+import { isExplicitColumnWidth } from '../../utils/column-size';
 
 /**
  * Builds the flex style for a group header cell so it lines up with the combined
  * width of its visible leaf columns.
  *
- * Fixed-width leaves contribute to `flexBasis`; default-sized leaves each add one
- * unit of `flexGrow`, mirroring how {@link getColumnSizeStyle} sizes leaf cells so
- * both header rows distribute free space identically.
+ * Fixed-width leaves contribute to `flexBasis`; fill leaves each add one unit of
+ * `flexGrow`, mirroring how {@link getColumnSizeStyle} sizes leaf cells so both
+ * header rows distribute free space identically.
  */
 export const getGroupColumnSizeStyle = <TData, TValue>(
 	leafColumns: Column<TData, TValue>[],
+	columnSizing: ColumnSizingState,
 ): CSSProperties => {
 	let fixedWidth = 0;
 	let flexCount = 0;
 
 	for (const leaf of leafColumns) {
 		const size = leaf.getSize();
-		if (size !== defaultColumnSizing.size) {
+		if (isExplicitColumnWidth(leaf, columnSizing)) {
 			fixedWidth += size;
 		} else {
 			flexCount += 1;