(null);
+ const data = React.useMemo(
+ () => Array.from({length: virtual ? 100 : 1}, () => ({value})),
+ [value, virtual],
+ );
+ const table = useTable({
+ columns,
+ data,
+ defaultColumn: {minSize: 100},
+ enableColumnResizing: true,
+ });
+ const virtualizer = useRowVirtualizer({
+ count: data.length,
+ estimateSize: () => 32,
+ getScrollElement: () => container.current,
+ overscan: 2,
+ });
+ return (
+
+ );
+}
+function Regression() {
+ return (
+
+ {cases.map((value) => (
+
+ ))}
+
+
+
+ );
+}
+export default {title: 'Browser tests/Native widths', tags: ['browser-regression', '!autodocs']};
+export const Layout = {render: () => };
diff --git a/.storybook/browser-tests/nativeWidths/testNativeWidths.ts b/.storybook/browser-tests/nativeWidths/testNativeWidths.ts
new file mode 100644
index 00000000..7b4bea56
--- /dev/null
+++ b/.storybook/browser-tests/nativeWidths/testNativeWidths.ts
@@ -0,0 +1,58 @@
+import type {TestRunnerConfig} from '@storybook/test-runner';
+type Page = Parameters>[0];
+export async function testNativeWidths(page: Page) {
+ await page.waitForFunction(
+ () => document.querySelectorAll('[data-qa="native-fixture"] td').length >= 6,
+ );
+ await page.waitForTimeout(50);
+ await page
+ .locator('[data-qa="native-fixture"] table[hidden]')
+ .evaluateAll((tables) => tables.forEach((table) => table.removeAttribute('hidden')));
+ const verify = async () => {
+ await page.waitForFunction(() =>
+ Array.from(document.querySelectorAll('[data-qa="native-fixture"]')).every((fixture) => {
+ const cell = fixture.querySelector('td');
+ const text = cell?.querySelector('[data-qa="native-text"]');
+ if (!cell || !text) return false;
+ const style = getComputedStyle(cell);
+ const expected = Math.max(
+ 100,
+ text.getBoundingClientRect().width +
+ parseFloat(style.paddingLeft) +
+ parseFloat(style.paddingRight),
+ );
+ const actual = parseFloat(style.width);
+ return Math.abs(expected - actual) < 2;
+ }),
+ );
+ };
+ await verify();
+ const initial = await page
+ .locator('[data-qa="native-fixture"] td')
+ .evaluateAll((cells) => cells.map((cell) => getComputedStyle(cell).width));
+ // Hide only tables: parent viewport dimensions stay unchanged.
+ await page.locator('[data-qa="native-fixture"] table').evaluateAll((tables) =>
+ tables.forEach((table) => {
+ (table as HTMLElement).style.display = 'none';
+ }),
+ );
+ await page.waitForTimeout(50);
+ await page.locator('[data-qa="native-fixture"] table').evaluateAll((tables) =>
+ tables.forEach((table) => {
+ (table as HTMLElement).style.display = '';
+ }),
+ );
+ await verify();
+ await page.locator('[data-qa="native-fixture"]').evaluateAll((fixtures) =>
+ fixtures.forEach((fixture) => {
+ (fixture as HTMLElement).style.transform = 'scale(.5)';
+ (fixture as HTMLElement).style.width = '620px';
+ }),
+ );
+ await page.waitForTimeout(100);
+ const scaled = await page
+ .locator('[data-qa="native-fixture"] td')
+ .evaluateAll((cells) => cells.map((cell) => getComputedStyle(cell).width));
+ if (JSON.stringify(initial) !== JSON.stringify(scaled))
+ throw new Error('Scale changed native column widths');
+}
diff --git a/.storybook/main.ts b/.storybook/main.ts
index f09a0a6d..af0a6cd3 100644
--- a/.storybook/main.ts
+++ b/.storybook/main.ts
@@ -23,7 +23,13 @@ const config: StorybookConfig = {
'@storybook/addon-webpack5-compiler-babel',
],
framework: '@storybook/react-webpack5',
- stories: ['../src/**/*.mdx', '../src/**/*.stories.@(ts|tsx)'],
+ stories: [
+ '../src/**/*.mdx',
+ '../src/**/*.stories.@(ts|tsx)',
+ ...(process.env.STORYBOOK_BROWSER_TESTS === '1'
+ ? ['./browser-tests/**/*.stories.tsx']
+ : []),
+ ],
typescript: {
reactDocgen: 'react-docgen-typescript',
},
diff --git a/.storybook/test-runner.ts b/.storybook/test-runner.ts
index caa4f496..b718d1df 100644
--- a/.storybook/test-runner.ts
+++ b/.storybook/test-runner.ts
@@ -1,6 +1,7 @@
import type {TestRunnerConfig} from '@storybook/test-runner';
import {toMatchImageSnapshot} from 'jest-image-snapshot';
+import {testNativeWidths} from './browser-tests/nativeWidths/testNativeWidths';
import {testAdaptiveVirtualization} from './browser-tests/testAdaptiveVirtualization/testAdaptiveVirtualization';
import {testVirtualizedTreeReordering} from './browser-tests/testVirtualizedTreeReordering/testVirtualizedTreeReordering';
@@ -13,6 +14,10 @@ const config: TestRunnerConfig = {
expect.extend({toMatchImageSnapshot});
},
async postVisit(page, context) {
+ if (context.id === 'browser-tests-native-widths--layout') {
+ await testNativeWidths(page);
+ return;
+ }
if (context.id === ADAPTIVE_VIRTUALIZATION_STORY) {
await testAdaptiveVirtualization(page);
return;
diff --git a/src/components/BaseCell/BaseCell.tsx b/src/components/BaseCell/BaseCell.tsx
index 9921d608..e520c67a 100644
--- a/src/components/BaseCell/BaseCell.tsx
+++ b/src/components/BaseCell/BaseCell.tsx
@@ -8,8 +8,10 @@ import {b} from '../BaseTable/BaseTable.classname';
import {areMemoizedCellPropsEqual} from './utils/areMemoizedCellPropsEqual';
-export interface BaseCellProps
- extends Omit, 'className'> {
+export interface BaseCellProps extends Omit<
+ React.TdHTMLAttributes,
+ 'className'
+> {
cell?: Cell;
className?: string | ((cell?: Cell) => string);
attributes?:
@@ -48,6 +50,7 @@ const BaseCellComponent = ({
className={b('cell', getCellClassModes(cell), className)}
{...restProps}
{...attributes}
+ data-column-id={cell?.column.id}
data-virtualization-cell-content={deferContent ? 'deferred' : undefined}
style={getCellStyles(cell, {...style, ...attributes?.style})}
>
diff --git a/src/components/BaseFooterCell/BaseFooterCell.tsx b/src/components/BaseFooterCell/BaseFooterCell.tsx
index 1d3d6ccf..6fe13588 100644
--- a/src/components/BaseFooterCell/BaseFooterCell.tsx
+++ b/src/components/BaseFooterCell/BaseFooterCell.tsx
@@ -32,6 +32,9 @@ export const BaseFooterCell = ({
colSpan={header.colSpan > 1 ? header.colSpan : undefined}
rowSpan={rowSpan > 1 ? rowSpan : undefined}
{...attributes}
+ data-column-id={
+ header.colSpan === 1 && !header.isPlaceholder ? header.column.id : undefined
+ }
style={getCellStyles(header, attributes?.style)}
>
{flexRender(header.column.columnDef.footer, header.getContext())}
diff --git a/src/components/BaseHeaderCell/BaseHeaderCell.tsx b/src/components/BaseHeaderCell/BaseHeaderCell.tsx
index 1b087f9b..635d72da 100644
--- a/src/components/BaseHeaderCell/BaseHeaderCell.tsx
+++ b/src/components/BaseHeaderCell/BaseHeaderCell.tsx
@@ -18,8 +18,7 @@ import {b} from '../BaseTable/BaseTable.classname';
export interface BaseHeaderCellProps {
className?:
- | string
- | ((header: Header, parentHeader?: Header) => string);
+ string | ((header: Header, parentHeader?: Header) => string);
header: Header;
parentHeader?: Header;
renderHeaderCellContent?: (props: {header: Header}) => React.ReactNode;
@@ -114,6 +113,9 @@ export const BaseHeaderCell = React.forwardRef(
aria-sort={getAriaSort(header.column.getIsSorted())}
aria-colindex={getHeaderCellAriaColIndex(header)}
{...attributes}
+ data-column-id={
+ header.colSpan === 1 && !header.isPlaceholder ? header.column.id : undefined
+ }
style={getCellStyles(header, attributes?.style)}
>
{renderContent()}
diff --git a/src/components/BaseResizeHandle/BaseResizeHandle.tsx b/src/components/BaseResizeHandle/BaseResizeHandle.tsx
index 58188f06..bf40404f 100644
--- a/src/components/BaseResizeHandle/BaseResizeHandle.tsx
+++ b/src/components/BaseResizeHandle/BaseResizeHandle.tsx
@@ -1,4 +1,5 @@
import type {Header} from '../../types/base';
+import {autoSizeColumn} from '../BaseTable/hooks/useColumnWidths';
import {b} from './BaseResizeHandle.classname';
@@ -28,7 +29,9 @@ export const BaseResizeHandle = ({
},
className,
)}
- onDoubleClick={() => header.column.resetSize()}
+ onDoubleClick={() => {
+ if (!autoSizeColumn(table, header.column.id)) header.column.resetSize();
+ }}
onMouseDown={header.getResizeHandler()}
onTouchStart={header.getResizeHandler()}
style={{
diff --git a/src/components/BaseTable/BaseTable.tsx b/src/components/BaseTable/BaseTable.tsx
index 12562702..46a7682e 100644
--- a/src/components/BaseTable/BaseTable.tsx
+++ b/src/components/BaseTable/BaseTable.tsx
@@ -1,5 +1,6 @@
import * as React from 'react';
+import {useForkRef} from '@gravity-ui/uikit';
import type {QAProps} from '@gravity-ui/uikit';
import type {Row, Table} from '@tanstack/react-table';
import type {VirtualItem, Virtualizer} from '@tanstack/react-virtual';
@@ -18,13 +19,16 @@ import {LastSelectedRowContextProvider} from '../LastSelectedRowContext';
import {SortableListContext} from '../SortableListContext';
import {b} from './BaseTable.classname';
+import {useColumnWidths} from './hooks/useColumnWidths';
import {useTableVirtualization} from './hooks/useTableVirtualization';
import type {CanDeferOffscreenCellContent} from './types';
import './BaseTable.scss';
-export interface BaseTableProps
- extends QAProps {
+export interface BaseTableProps<
+ TData,
+ TScrollElement extends Element | Window = HTMLDivElement,
+> extends QAProps {
/** The table instance returned from the `useTable` hook */
table: Table;
/** HTML attributes for the `` element */
@@ -175,6 +179,8 @@ export const BaseTable = React.forwardRef(
}: BaseTableProps,
ref: React.Ref,
) => {
+ const {tableRef} = useColumnWidths(table);
+ const resolvedTableRef = useForkRef(tableRef, ref);
const draggableContext = React.useContext(SortableListContext);
const columnReorderingContext = React.useContext(ColumnReorderingContext);
const draggingRowIndex = draggableContext?.activeItemIndex ?? -1;
@@ -302,7 +308,7 @@ export const BaseTable = React.forwardRef(
return (
-1 ? draggingRowIndex : undefined}
data-column-drag-active={isColumnDragActive || undefined}
diff --git a/src/components/BaseTable/hooks/useColumnWidths.test.tsx b/src/components/BaseTable/hooks/useColumnWidths.test.tsx
new file mode 100644
index 00000000..4237c8cf
--- /dev/null
+++ b/src/components/BaseTable/hooks/useColumnWidths.test.tsx
@@ -0,0 +1,126 @@
+/* eslint-disable testing-library/no-node-access -- Verify native track measurements and style restoration. */
+import * as React from 'react';
+
+import {act, fireEvent, render, screen} from '@testing-library/react';
+
+import {useTable} from '../../../hooks/useTable';
+import type {ColumnDef} from '../../../types/base';
+import {BaseTable} from '../BaseTable';
+
+const columns: ColumnDef<{value: string}>[] = [
+ {accessorKey: 'value', header: 'Value', width: 'max-content', minSize: 50},
+];
+let intrinsicWidth = 100;
+const readWidth = jest.fn();
+let table: ReturnType>;
+function Example({
+ value = 'short',
+ controlled = false,
+ empty = false,
+}: {
+ value?: string;
+ controlled?: boolean;
+ empty?: boolean;
+}) {
+ const data = React.useMemo(() => (empty ? [] : [{value}]), [value, empty]);
+ table = useTable({
+ columns,
+ data,
+ enableColumnResizing: true,
+ ...(controlled ? {state: {columnSizing: {}}} : {}),
+ });
+ return ;
+}
+beforeEach(() => {
+ intrinsicWidth = 100;
+ readWidth.mockClear();
+ jest.spyOn(HTMLElement.prototype, 'offsetWidth', 'get').mockImplementation(function (
+ this: HTMLElement,
+ ) {
+ return this.getBoundingClientRect().width;
+ });
+ jest.spyOn(HTMLElement.prototype, 'getClientRects').mockImplementation(function (
+ this: HTMLElement,
+ ) {
+ return (this.isConnected ? [{}] : []) as unknown as DOMRectList;
+ });
+ jest.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(function (
+ this: HTMLElement,
+ ) {
+ if (this.dataset.measuringCellKey) {
+ readWidth();
+ const liveTable = this.ownerDocument.querySelector(
+ 'table:not([aria-hidden])',
+ ) as HTMLElement;
+ expect(liveTable.style.display).not.toBe('grid');
+ expect(this.closest('table')?.getAttribute('aria-hidden')).toBe('true');
+ }
+ return {width: this.dataset.measuringCellKey ? intrinsicWidth : 600} as DOMRect;
+ });
+});
+afterEach(() => jest.restoreAllMocks());
+
+test('caches measured tracks across data updates and restores live table styles', () => {
+ const {rerender} = render();
+ const cell = screen.getByRole('cell');
+ const previousColumns = table.getAllLeafColumns();
+ expect(cell.style.width).toBe('100px');
+ intrinsicWidth = 250;
+ rerender();
+ expect(table.getAllLeafColumns()).toBe(previousColumns);
+ expect(cell.style.width).toBe('100px');
+ expect(cell.style.gridColumn).toBe('');
+ expect(screen.getByRole('table').style.display).toBe('');
+ const probes = screen.getByRole('table').querySelectorAll('[data-measuring-cell-key]');
+ expect(probes).toHaveLength(0);
+});
+test('keeps manually resized widths and double click stores a new max-content width', () => {
+ render();
+ act(() => table.setColumnSizing({value: 180}));
+ expect(screen.getByRole('cell').style.width).toBe('180px');
+ intrinsicWidth = 220;
+ const handle = screen.getByRole('columnheader').querySelector('[class*="resize-handle"]');
+ expect(handle).not.toBeNull();
+ fireEvent.doubleClick(handle as Element);
+ expect(screen.getByRole('cell').style.width).toBe('220px');
+ expect(table.getState().columnSizing.value).toBe(220);
+});
+
+test('does not remeasure when a controlled owner recreates equivalent sizing state', () => {
+ const {rerender} = render();
+ const before = readWidth.mock.calls.length;
+ rerender();
+ expect(readWidth).toHaveBeenCalledTimes(before);
+});
+
+test('replaces header-only widths when the first rows arrive', () => {
+ const {rerender} = render();
+ expect(table.getColumn('value')?.getSize()).toBe(100);
+ intrinsicWidth = 250;
+ rerender();
+ expect(table.getColumn('value')?.getSize()).toBe(250);
+});
+
+test('resetting a manual width measures current content', () => {
+ render();
+ act(() => table.setColumnSizing({value: 180}));
+ intrinsicWidth = 250;
+ act(() => table.setColumnSizing({}));
+ expect(table.getColumn('value')?.getSize()).toBe(250);
+});
+
+test('font loading refreshes native widths', () => {
+ const descriptor = Object.getOwnPropertyDescriptor(document, 'fonts');
+ const fonts = Object.assign(new EventTarget(), {status: 'loaded', ready: Promise.resolve()});
+ Object.defineProperty(document, 'fonts', {configurable: true, value: fonts});
+ try {
+ const {unmount} = render();
+ intrinsicWidth = 250;
+ act(() => fonts.dispatchEvent(new Event('loadingdone')));
+ expect(table.getColumn('value')?.getSize()).toBe(250);
+ unmount();
+ } finally {
+ if (descriptor) Object.defineProperty(document, 'fonts', descriptor);
+ else Reflect.deleteProperty(document, 'fonts');
+ }
+});
diff --git a/src/components/BaseTable/hooks/useColumnWidths.ts b/src/components/BaseTable/hooks/useColumnWidths.ts
new file mode 100644
index 00000000..520f410d
--- /dev/null
+++ b/src/components/BaseTable/hooks/useColumnWidths.ts
@@ -0,0 +1,181 @@
+import * as React from 'react';
+
+import type {Table} from '@tanstack/react-table';
+import {flushSync} from 'react-dom';
+
+import {useIsomorphicLayoutEffect} from '../../../hooks/useIsomorphicLayoutEffect';
+import type {ColumnDef} from '../../../types/base';
+import {getLeafColumnDefinitions} from '../utils/getLeafColumnDefinitions';
+import {getNativeColumnId} from '../utils/getNativeColumnId';
+import {measureGridColumns} from '../utils/measureGridColumns';
+
+const autoSizeHandlers = new WeakMap