@cloud-ru/ds-table 1.0.8-preview-04507fc5.0 → 1.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (35) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/README.md +9 -9
  3. package/dist/cjs/components/Table/Table.js +3 -3
  4. package/dist/cjs/components/Table/components/TableCardsBody/TableCardsBody.d.ts +1 -2
  5. package/dist/cjs/components/Table/components/TableCardsBody/TableCardsBody.js +2 -2
  6. package/dist/cjs/components/Table/components/TableRowsBody/TableRowsBody.d.ts +1 -2
  7. package/dist/cjs/components/Table/components/TableRowsBody/TableRowsBody.js +2 -2
  8. package/dist/cjs/components/Table/hooks/useColumnSizes.js +32 -9
  9. package/dist/cjs/components/types.d.ts +5 -0
  10. package/dist/cjs/helperComponents/Cells/HeaderCell/ResizeHandle.js +15 -1
  11. package/dist/cjs/presets/infiniteTable/toInfiniteTableProps.d.ts +9 -2
  12. package/dist/cjs/presets/infiniteTable/toInfiniteTableProps.js +1 -1
  13. package/dist/cjs/presets/infiniteTable/useInfiniteTableProps.js +1 -3
  14. package/dist/esm/components/Table/Table.js +3 -3
  15. package/dist/esm/components/Table/components/TableCardsBody/TableCardsBody.d.ts +1 -2
  16. package/dist/esm/components/Table/components/TableCardsBody/TableCardsBody.js +2 -2
  17. package/dist/esm/components/Table/components/TableRowsBody/TableRowsBody.d.ts +1 -2
  18. package/dist/esm/components/Table/components/TableRowsBody/TableRowsBody.js +2 -2
  19. package/dist/esm/components/Table/hooks/useColumnSizes.js +27 -4
  20. package/dist/esm/components/types.d.ts +5 -0
  21. package/dist/esm/helperComponents/Cells/HeaderCell/ResizeHandle.js +15 -1
  22. package/dist/esm/presets/infiniteTable/toInfiniteTableProps.d.ts +9 -2
  23. package/dist/esm/presets/infiniteTable/toInfiniteTableProps.js +2 -2
  24. package/dist/esm/presets/infiniteTable/useInfiniteTableProps.js +1 -3
  25. package/dist/tsconfig.cjs.tsbuildinfo +1 -1
  26. package/dist/tsconfig.esm.tsbuildinfo +1 -1
  27. package/package.json +21 -21
  28. package/src/components/Table/Table.tsx +1 -2
  29. package/src/components/Table/components/TableCardsBody/TableCardsBody.tsx +0 -3
  30. package/src/components/Table/components/TableRowsBody/TableRowsBody.tsx +0 -3
  31. package/src/components/Table/hooks/useColumnSizes.ts +37 -10
  32. package/src/components/types.ts +6 -2
  33. package/src/helperComponents/Cells/HeaderCell/ResizeHandle.tsx +19 -0
  34. package/src/presets/infiniteTable/toInfiniteTableProps.ts +10 -3
  35. package/src/presets/infiniteTable/useInfiniteTableProps.ts +1 -4
package/CHANGELOG.md CHANGED
@@ -3,6 +3,14 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## 1.0.8 (2026-08-27)
7
+
8
+ ### Bug Fixes
9
+
10
+ - **FF-8948:** keep load-more button out of the horizontal scroller, take standard column defs in InfiniteTable ([a29c542](https://github.com/cloud-ru-tech/snack-v2/commit/a29c542527966c084dcca69e657e0b8db9936927))
11
+ - **FF-8948:** pin rendered width before resizing sizeless column ([23f5764](https://github.com/cloud-ru-tech/snack-v2/commit/23f5764fb820f3067b77fab86b3e115b922f35f6))
12
+ - **FF-8948:** stop infinite column sizing updates for minSize-only columns ([c7d0064](https://github.com/cloud-ru-tech/snack-v2/commit/c7d00649fa12aaa254ecd5115db74b75b157de61))
13
+
6
14
  ## 1.0.7 (2026-08-25)
7
15
 
8
16
  **Note:** Version bump only for package @ds/table
package/README.md CHANGED
@@ -940,7 +940,7 @@ export function FullWidth() {
940
940
  | `defaultView` | `"cards"` \| `"table"` | `'table' (на mobile — `cards`)` | Начальный режим отображения (uncontrolled). <br/> Если не задан — дефолт по раскладке: `table` на desktop, `cards` на mobile (`TABLE_LAYOUT_PRESETS`). |
941
941
  | `enableColumnVirtualization` | `boolean` | `false` | Включает виртуализацию колонок (windowing по горизонтали). <br/> Рекомендуется при > 30 видимых колонок. Несовместимо с `view='cards'`. <br/> Pinned-колонки (left/right) всегда отрисовываются вне зависимости от настройки. |
942
942
  | `enableFuzzySearch` | `boolean` | — | Включить нечеткий поиск |
943
- | `enableRowVirtualization` | `boolean` | `false` | Включает виртуализацию строк (windowing по вертикали). <br/> Рекомендуется при > 200 строк. Несовместимо с `view='cards'` — при картах игнорируется. |
943
+ | `enableRowVirtualization` | `boolean` | `false` | Включает виртуализацию строк (windowing по вертикали). <br/> Рекомендуется при > 200 строк. Несовместимо с `view='cards'` — при картах игнорируется. <br/> 🔴 Требует `size` у колонок: виртуализованные строки позиционируются абсолютно и не участвуют в <br/> расчёте внутренней ширины, поэтому колонка без `size` делит ширину контейнера поровну с <br/> остальными вместо растягивания по содержимому. |
944
944
  | `enableSelectPinned` | `boolean` | `false` | Параметр отвечает за чекбокс выбора закрепленных строк |
945
945
  | `errorDataState` | `EmptyStateProps` | — | Экран при ошибке запроса |
946
946
  | `expanding` | `TreeColumnDefinitionProps` | — | Общие настройки раскрывающихся (tree) строк: `getSubRows`, `expandingColumnDefinition`, <br/> `initialState`, `state`, `onChange`. |
@@ -1360,7 +1360,7 @@ export function ServerDriven() {
1360
1360
  | `defaultView` | `"cards"` \| `"table"` | `'table' (на mobile — `cards`)` | Начальный режим отображения (uncontrolled). <br/> Если не задан — дефолт по раскладке: `table` на desktop, `cards` на mobile (`TABLE_LAYOUT_PRESETS`). |
1361
1361
  | `enableColumnVirtualization` | `boolean` | `false` | Включает виртуализацию колонок (windowing по горизонтали). <br/> Рекомендуется при > 30 видимых колонок. Несовместимо с `view='cards'`. <br/> Pinned-колонки (left/right) всегда отрисовываются вне зависимости от настройки. |
1362
1362
  | `enableFuzzySearch` | `boolean` | — | Включить нечеткий поиск |
1363
- | `enableRowVirtualization` | `boolean` | `false` | Включает виртуализацию строк (windowing по вертикали). <br/> Рекомендуется при > 200 строк. Несовместимо с `view='cards'` — при картах игнорируется. |
1363
+ | `enableRowVirtualization` | `boolean` | `false` | Включает виртуализацию строк (windowing по вертикали). <br/> Рекомендуется при > 200 строк. Несовместимо с `view='cards'` — при картах игнорируется. <br/> 🔴 Требует `size` у колонок: виртуализованные строки позиционируются абсолютно и не участвуют в <br/> расчёте внутренней ширины, поэтому колонка без `size` делит ширину контейнера поровну с <br/> остальными вместо растягивания по содержимому. |
1364
1364
  | `enableSelectPinned` | `boolean` | — | Параметр отвечает за чекбокс выбора закрепленных строк |
1365
1365
  | `errorDataState` | `EmptyStateProps` | — | Экран при ошибке запроса |
1366
1366
  | `expanding` | `TreeColumnDefinitionProps` | — | Общие настройки раскрывающихся (tree) строк: `getSubRows`, `expandingColumnDefinition`, <br/> `initialState`, `state`, `onChange`. |
@@ -2011,7 +2011,7 @@ export function TreeTableWithSelection() {
2011
2011
  #### Подгрузка при скролле
2012
2012
 
2013
2013
  ```tsx
2014
- import { InfiniteTable, SimpleColumnDef } from '@cloud-ru/ds-table';
2014
+ import { defineColumns, InfiniteTable, SimpleColumnDef } from '@cloud-ru/ds-table';
2015
2015
  import { useCallback, useState } from 'react';
2016
2016
 
2017
2017
  type User = {
@@ -2053,7 +2053,7 @@ export function InfiniteTableBasic() {
2053
2053
  <div style={{ display: 'grid', gridTemplateRows: 'minmax(0, 1fr)', height: 360 }}>
2054
2054
  <InfiniteTable
2055
2055
  data={items}
2056
- columns={columns}
2056
+ columns={defineColumns(columns)}
2057
2057
  getRowId={user => user.id}
2058
2058
  loading={loading}
2059
2059
  hasMore={hasMore}
@@ -2068,7 +2068,7 @@ export function InfiniteTableBasic() {
2068
2068
  #### Через хук useInfiniteTableProps
2069
2069
 
2070
2070
  ```tsx
2071
- import { SimpleColumnDef, Table, useInfiniteTableProps } from '@cloud-ru/ds-table';
2071
+ import { defineColumns, SimpleColumnDef, Table, useInfiniteTableProps } from '@cloud-ru/ds-table';
2072
2072
  import { useCallback, useState } from 'react';
2073
2073
 
2074
2074
  type User = { id: string; name: string; email: string };
@@ -2101,7 +2101,7 @@ export function InfiniteTableWithHook() {
2101
2101
 
2102
2102
  const tableProps = useInfiniteTableProps({
2103
2103
  data: items,
2104
- columns,
2104
+ columns: defineColumns(columns),
2105
2105
  getRowId: user => user.id,
2106
2106
  loading,
2107
2107
  hasMore,
@@ -2119,7 +2119,7 @@ export function InfiniteTableWithHook() {
2119
2119
  #### Без подгрузки (hasMore: false)
2120
2120
 
2121
2121
  ```tsx
2122
- import { InfiniteTable, SimpleColumnDef } from '@cloud-ru/ds-table';
2122
+ import { defineColumns, InfiniteTable, SimpleColumnDef } from '@cloud-ru/ds-table';
2123
2123
 
2124
2124
  type User = { id: string; name: string; email: string };
2125
2125
 
@@ -2136,7 +2136,7 @@ const columns: SimpleColumnDef<User>[] = [
2136
2136
  export function InfiniteTableStatic() {
2137
2137
  return (
2138
2138
  <div style={{ display: 'grid', gridTemplateRows: 'minmax(0, 1fr)', height: 280 }}>
2139
- <InfiniteTable data={USERS} columns={columns} getRowId={user => user.id} hasMore={false} outline />
2139
+ <InfiniteTable data={USERS} columns={defineColumns(columns)} getRowId={user => user.id} hasMore={false} outline />
2140
2140
  </div>
2141
2141
  );
2142
2142
  }
@@ -2483,7 +2483,7 @@ export function EntitiesTableWithFilters() {
2483
2483
  | `defaultView` | `"cards"` \| `"table"` | `'table' (на mobile — `cards`)` | Начальный режим отображения (uncontrolled). <br/> Если не задан — дефолт по раскладке: `table` на desktop, `cards` на mobile (`TABLE_LAYOUT_PRESETS`). |
2484
2484
  | `enableColumnVirtualization` | `boolean` | `false` | Включает виртуализацию колонок (windowing по горизонтали). <br/> Рекомендуется при > 30 видимых колонок. Несовместимо с `view='cards'`. <br/> Pinned-колонки (left/right) всегда отрисовываются вне зависимости от настройки. |
2485
2485
  | `enableFuzzySearch` | `boolean` | — | Включить нечеткий поиск |
2486
- | `enableRowVirtualization` | `boolean` | `false` | Включает виртуализацию строк (windowing по вертикали). <br/> Рекомендуется при > 200 строк. Несовместимо с `view='cards'` — при картах игнорируется. |
2486
+ | `enableRowVirtualization` | `boolean` | `false` | Включает виртуализацию строк (windowing по вертикали). <br/> Рекомендуется при > 200 строк. Несовместимо с `view='cards'` — при картах игнорируется. <br/> 🔴 Требует `size` у колонок: виртуализованные строки позиционируются абсолютно и не участвуют в <br/> расчёте внутренней ширины, поэтому колонка без `size` делит ширину контейнера поровну с <br/> остальными вместо растягивания по содержимому. |
2487
2487
  | `enableSelectPinned` | `boolean` | — | Параметр отвечает за чекбокс выбора закрепленных строк |
2488
2488
  | `errorDataState` | `EmptyStateProps` | — | Экран при ошибке запроса |
2489
2489
  | `expanding` | `{ getSubRows: (element: T) => T[]; expandingColumnDefinition: TreeColumnDefinitionProps<T>; initialState?: ExpandedState; state?: ExpandedState \| undefined; onChange?(state: ExpandedState): void; } \| undefined` | — | Общие настройки раскрывающихся (tree) строк: `getSubRows`, `expandingColumnDefinition`, <br/> `initialState`, `state`, `onChange`. |
@@ -273,8 +273,8 @@ function Table({ data, rowPinning = {
273
273
  // и ныряла под закреплённые колонки.
274
274
  const draggingColumnPreview = ((0, jsx_runtime_1.jsx)(core_1.DragOverlay, { dropAnimation: null, modifiers: [utils_3.alignOverlayToHeader], children: draggingHeader ? ((0, jsx_runtime_1.jsx)(drag_and_drop_1.DragPreview, { className: styles_module_scss_1.default.columnDragPreview, style: { width: `var(${constants_1.TABLE_COLUMN_CSS_VARS.size(draggingHeader.column.id)})` }, children: (0, react_table_1.flexRender)(draggingHeader.column.columnDef.header, draggingHeader.getContext()) })) : null }));
275
275
  const tableHeaderElement = showTableHeader ? ((0, jsx_runtime_1.jsx)(helperComponents_1.HeaderRow, { rowAutoHeight: rowAutoHeight, columnOrder: columnOrder, enableColumnsOrderSortByDrag: enableColumnsOrderSortByDrag, suppressSticky: usePageStickyHeader })) : null;
276
- const tableRowsContent = ((0, jsx_runtime_1.jsx)(TableRowsBody_1.TableRowsBody, { filteredTopRows: filteredTopRows, centerRows: centerRows, rowVirtualizer: rowVirtualizer, columnOrder: columnOrder, rowAutoHeight: rowAutoHeight, onRowClick: onRowClick, enableColumnsOrderSortByDrag: enableColumnsOrderSortByDrag, rowSelectionAppearance: rowSelectionProp?.appearance, emptyState: tableEmptyState, showInfiniteLoadingTail: showInfiniteLoadingTail, loadingTableRows: loadingTableRows, loadMoreButton: loadMoreButtonNode }));
277
- const cardsContentBody = ((0, jsx_runtime_1.jsx)(TableCardsBody_1.TableCardsBody, { filteredTopRows: filteredTopRows, centerRows: centerRows, table: table, headlineId: headlineId, cardSelection: cardSelection, rowSelectionAppearance: rowSelectionProp?.appearance, suppressHeader: suppressHeader, onRowClick: onRowClick, renderCard: renderCard, cardsListProps: cardsListProps, emptyState: tableEmptyState, showInfiniteLoadingTail: showInfiniteLoadingTail, loadingTableRows: loadingTableRows, loadingTable: loadingTable, loadMoreButton: loadMoreButtonNode }));
276
+ const tableRowsContent = ((0, jsx_runtime_1.jsx)(TableRowsBody_1.TableRowsBody, { filteredTopRows: filteredTopRows, centerRows: centerRows, rowVirtualizer: rowVirtualizer, columnOrder: columnOrder, rowAutoHeight: rowAutoHeight, onRowClick: onRowClick, enableColumnsOrderSortByDrag: enableColumnsOrderSortByDrag, rowSelectionAppearance: rowSelectionProp?.appearance, emptyState: tableEmptyState, showInfiniteLoadingTail: showInfiniteLoadingTail, loadingTableRows: loadingTableRows }));
277
+ const cardsContentBody = ((0, jsx_runtime_1.jsx)(TableCardsBody_1.TableCardsBody, { filteredTopRows: filteredTopRows, centerRows: centerRows, table: table, headlineId: headlineId, cardSelection: cardSelection, rowSelectionAppearance: rowSelectionProp?.appearance, suppressHeader: suppressHeader, onRowClick: onRowClick, renderCard: renderCard, cardsListProps: cardsListProps, emptyState: tableEmptyState, showInfiniteLoadingTail: showInfiniteLoadingTail, loadingTableRows: loadingTableRows, loadingTable: loadingTable }));
278
278
  const tableContentBody = ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [!usePageStickyHeader ? tableHeaderElement : null, tableRowsContent] }));
279
279
  let tableBody = tableContentBody;
280
280
  let tableScrollRows = tableRowsContent;
@@ -337,7 +337,7 @@ function Table({ data, rowPinning = {
337
337
  paginationChrome =
338
338
  isStickyControls && controlsAcrylic ? ((0, jsx_runtime_1.jsx)(TableChrome_1.TableChrome, { variant: 'footer', acrylic: controlsAcrylic, children: pagination })) : (pagination);
339
339
  }
340
- return ((0, jsx_runtime_1.jsx)("div", { ref: wrapperRef, className: (0, classnames_1.default)(styles_module_scss_1.default.wrapper, className, themeClassName), "data-view": view, "data-layout-type": layoutType, "data-sticky-controls": isStickyControls || undefined, "data-with-toolbar": showToolbar || undefined, "data-empty-body": isEmptyBody || undefined, "data-fit-content": !resolvedFullWidth || undefined, ...(0, utils_1.extractSupportProps)(rest), children: (0, jsx_runtime_1.jsxs)(contexts_1.TableContext.Provider, { value: tableContextValue, children: [toolbarChrome, (0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_1.default.tableView, children: [(0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_1.default.content, "data-outline": !isCardsView && outline ? true : undefined, "data-page-sticky-header": !isCardsView && usePageStickyHeader ? true : undefined, ...(!isCardsView ? TABLE_CONTENT_ACRYLIC : {}), children: [!isCardsView ? (0, jsx_runtime_1.jsx)("span", { className: styles_module_scss_1.default.contentAcrylic, "data-acrylic-background": true, "aria-hidden": true }) : null, hasMobileToolbarMounts ? ((0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_1.default.mobileToolbarMounts, children: [sortingToolbarSlot.mobileMount, columnsSettingsToolbarSlot.mobileMount] })) : null, (0, jsx_runtime_1.jsxs)(core_1.DndContext, { ...dndContextProps, children: [draggingColumnPreview, (0, jsx_runtime_1.jsx)(TableScrollHost_1.TableScrollHost, { view: view, isMobile: isMobile, isCardsView: isCardsView, usePageStickyHeader: usePageStickyHeader, scrollOverflow: scrollOverflow, scrollPaddingAbsolute: scrollPaddingAbsolute, internalScrollRef: internalScrollRef, scrollRef: scrollRef, scrollContainerRef: scrollContainerRef, handleScrollInitialized: handleScrollInitialized, syncHeaderHorizontalScroll: syncHeaderHorizontalScroll, tableHeaderElement: tableHeaderElement, columnSizeVars: columnSizes.vars, children: scrollContent })] }), !isCardsView && outline ? (0, jsx_runtime_1.jsx)("span", { className: styles_module_scss_1.default.contentBorder, "aria-hidden": true }) : null] }), paginationChrome] })] }) }));
340
+ return ((0, jsx_runtime_1.jsx)("div", { ref: wrapperRef, className: (0, classnames_1.default)(styles_module_scss_1.default.wrapper, className, themeClassName), "data-view": view, "data-layout-type": layoutType, "data-sticky-controls": isStickyControls || undefined, "data-with-toolbar": showToolbar || undefined, "data-empty-body": isEmptyBody || undefined, "data-fit-content": !resolvedFullWidth || undefined, ...(0, utils_1.extractSupportProps)(rest), children: (0, jsx_runtime_1.jsxs)(contexts_1.TableContext.Provider, { value: tableContextValue, children: [toolbarChrome, (0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_1.default.tableView, children: [(0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_1.default.content, "data-outline": !isCardsView && outline ? true : undefined, "data-page-sticky-header": !isCardsView && usePageStickyHeader ? true : undefined, ...(!isCardsView ? TABLE_CONTENT_ACRYLIC : {}), children: [!isCardsView ? (0, jsx_runtime_1.jsx)("span", { className: styles_module_scss_1.default.contentAcrylic, "data-acrylic-background": true, "aria-hidden": true }) : null, hasMobileToolbarMounts ? ((0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_1.default.mobileToolbarMounts, children: [sortingToolbarSlot.mobileMount, columnsSettingsToolbarSlot.mobileMount] })) : null, (0, jsx_runtime_1.jsxs)(core_1.DndContext, { ...dndContextProps, children: [draggingColumnPreview, (0, jsx_runtime_1.jsx)(TableScrollHost_1.TableScrollHost, { view: view, isMobile: isMobile, isCardsView: isCardsView, usePageStickyHeader: usePageStickyHeader, scrollOverflow: scrollOverflow, scrollPaddingAbsolute: scrollPaddingAbsolute, internalScrollRef: internalScrollRef, scrollRef: scrollRef, scrollContainerRef: scrollContainerRef, handleScrollInitialized: handleScrollInitialized, syncHeaderHorizontalScroll: syncHeaderHorizontalScroll, tableHeaderElement: tableHeaderElement, columnSizeVars: columnSizes.vars, children: scrollContent })] }), loadMoreButtonNode, !isCardsView && outline ? (0, jsx_runtime_1.jsx)("span", { className: styles_module_scss_1.default.contentBorder, "aria-hidden": true }) : null] }), paginationChrome] })] }) }));
341
341
  }
342
342
  Table.getStatusColumnDef = helperComponents_1.getStatusColumnDef;
343
343
  Table.statusAppearances = helperComponents_1.STATUS_APPEARANCE;
@@ -21,9 +21,8 @@ type TableCardsBodyProps<TData extends object> = {
21
21
  showInfiniteLoadingTail: boolean;
22
22
  loadingTableRows: Row<TData>[];
23
23
  loadingTable: Table<TData>;
24
- loadMoreButton?: ReactNode;
25
24
  };
26
- export declare function TableCardsBody<TData extends object>({ filteredTopRows, centerRows, table, headlineId, cardSelection, rowSelectionAppearance, suppressHeader, onRowClick, renderCard, cardsListProps, emptyState, showInfiniteLoadingTail, loadingTableRows, loadingTable, loadMoreButton, }: TableCardsBodyProps<TData>): import("react/jsx-runtime").JSX.Element;
25
+ export declare function TableCardsBody<TData extends object>({ filteredTopRows, centerRows, table, headlineId, cardSelection, rowSelectionAppearance, suppressHeader, onRowClick, renderCard, cardsListProps, emptyState, showInfiniteLoadingTail, loadingTableRows, loadingTable, }: TableCardsBodyProps<TData>): import("react/jsx-runtime").JSX.Element;
27
26
  export declare function getCardsListProps({ isMobile, cardMinWidth, cardColumns, }: {
28
27
  isMobile: boolean;
29
28
  cardMinWidth?: number;
@@ -13,12 +13,12 @@ const constants_1 = require("../../../../constants");
13
13
  const helperComponents_1 = require("../../../../helperComponents");
14
14
  const types_1 = require("../../../types");
15
15
  const styles_module_scss_1 = __importDefault(require('../../styles.module.css'));
16
- function TableCardsBody({ filteredTopRows, centerRows, table, headlineId, cardSelection, rowSelectionAppearance, suppressHeader, onRowClick, renderCard, cardsListProps, emptyState, showInfiniteLoadingTail, loadingTableRows, loadingTable, loadMoreButton, }) {
16
+ function TableCardsBody({ filteredTopRows, centerRows, table, headlineId, cardSelection, rowSelectionAppearance, suppressHeader, onRowClick, renderCard, cardsListProps, emptyState, showInfiniteLoadingTail, loadingTableRows, loadingTable, }) {
17
17
  const renderContentCard = (row, selectionAppearance) => {
18
18
  const defaultRender = ((0, jsx_runtime_1.jsx)(helperComponents_1.TableCard, { headlineId: headlineId, row: row, table: table, selection: cardSelection, selectionAppearance: selectionAppearance, suppressHeader: suppressHeader, onRowClick: onRowClick }));
19
19
  return (0, jsx_runtime_1.jsx)(react_1.Fragment, { children: renderCard ? renderCard({ row, table, defaultRender }) : defaultRender }, row.id);
20
20
  };
21
- return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)("div", { ...cardsListProps, children: [filteredTopRows.map(row => renderContentCard(row, types_1.RowAppearance.HideToggler)), centerRows.map(row => renderContentCard(row, rowSelectionAppearance))] }), showInfiniteLoadingTail ? ((0, jsx_runtime_1.jsx)(skeleton_1.SkeletonContextProvider, { loading: true, children: (0, jsx_runtime_1.jsx)("div", { ...cardsListProps, children: loadingTableRows.slice(0, 3).map(row => ((0, jsx_runtime_1.jsx)(helperComponents_1.TableCard, { headlineId: headlineId, row: row, table: loadingTable, selection: 'none', suppressHeader: suppressHeader }, row.id))) }) })) : null, loadMoreButton, emptyState] }));
21
+ return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)("div", { ...cardsListProps, children: [filteredTopRows.map(row => renderContentCard(row, types_1.RowAppearance.HideToggler)), centerRows.map(row => renderContentCard(row, rowSelectionAppearance))] }), showInfiniteLoadingTail ? ((0, jsx_runtime_1.jsx)(skeleton_1.SkeletonContextProvider, { loading: true, children: (0, jsx_runtime_1.jsx)("div", { ...cardsListProps, children: loadingTableRows.slice(0, 3).map(row => ((0, jsx_runtime_1.jsx)(helperComponents_1.TableCard, { headlineId: headlineId, row: row, table: loadingTable, selection: 'none', suppressHeader: suppressHeader }, row.id))) }) })) : null, emptyState] }));
22
22
  }
23
23
  function getCardsListProps({ isMobile, cardMinWidth, cardColumns, }) {
24
24
  const cardsGridProps = {
@@ -15,7 +15,6 @@ type TableRowsBodyProps<TData extends object> = {
15
15
  emptyState: ReactNode;
16
16
  showInfiniteLoadingTail: boolean;
17
17
  loadingTableRows: Row<TData>[];
18
- loadMoreButton?: ReactNode;
19
18
  };
20
- export declare function TableRowsBody<TData extends object>({ filteredTopRows, centerRows, rowVirtualizer, columnOrder, rowAutoHeight, onRowClick, enableColumnsOrderSortByDrag, rowSelectionAppearance, emptyState, showInfiniteLoadingTail, loadingTableRows, loadMoreButton, }: TableRowsBodyProps<TData>): import("react/jsx-runtime").JSX.Element;
19
+ export declare function TableRowsBody<TData extends object>({ filteredTopRows, centerRows, rowVirtualizer, columnOrder, rowAutoHeight, onRowClick, enableColumnsOrderSortByDrag, rowSelectionAppearance, emptyState, showInfiniteLoadingTail, loadingTableRows, }: TableRowsBodyProps<TData>): import("react/jsx-runtime").JSX.Element;
21
20
  export {};
@@ -10,12 +10,12 @@ const constants_1 = require("../../../../constants");
10
10
  const helperComponents_1 = require("../../../../helperComponents");
11
11
  const types_1 = require("../../../types");
12
12
  const styles_module_scss_1 = __importDefault(require('../../styles.module.css'));
13
- function TableRowsBody({ filteredTopRows, centerRows, rowVirtualizer, columnOrder, rowAutoHeight, onRowClick, enableColumnsOrderSortByDrag, rowSelectionAppearance, emptyState, showInfiniteLoadingTail, loadingTableRows, loadMoreButton, }) {
13
+ function TableRowsBody({ filteredTopRows, centerRows, rowVirtualizer, columnOrder, rowAutoHeight, onRowClick, enableColumnsOrderSortByDrag, rowSelectionAppearance, emptyState, showInfiniteLoadingTail, loadingTableRows, }) {
14
14
  return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [filteredTopRows.length ? ((0, jsx_runtime_1.jsx)("div", { className: styles_module_scss_1.default.topRowWrapper, children: filteredTopRows.map(row => ((0, jsx_runtime_1.jsx)(helperComponents_1.BodyRow, { row: row, onRowClick: onRowClick, rowAutoHeight: rowAutoHeight, columnOrder: columnOrder, enableColumnsOrderSortByDrag: enableColumnsOrderSortByDrag, disabledRowAppearance: types_1.RowAppearance.HideToggler }, row.id))) })) : null, rowVirtualizer ? ((0, jsx_runtime_1.jsx)("div", { style: {
15
15
  position: 'relative',
16
16
  height: `${rowVirtualizer.getTotalSize()}px`,
17
17
  }, children: rowVirtualizer.getVirtualItems().map(virtualRow => {
18
18
  const row = centerRows[virtualRow.index];
19
19
  return ((0, jsx_runtime_1.jsx)("div", { ref: rowVirtualizer.measureElement, "data-index": virtualRow.index, className: styles_module_scss_1.default.virtualRow, style: { [constants_1.TABLE_CSS_VARS.virtualRowStart]: `${virtualRow.start}px` }, children: (0, jsx_runtime_1.jsx)(helperComponents_1.BodyRow, { row: row, onRowClick: onRowClick, rowAutoHeight: rowAutoHeight, columnOrder: columnOrder, enableColumnsOrderSortByDrag: enableColumnsOrderSortByDrag, disabledRowAppearance: rowSelectionAppearance }) }, row.id));
20
- }) })) : (centerRows.map(row => ((0, jsx_runtime_1.jsx)(helperComponents_1.BodyRow, { row: row, onRowClick: onRowClick, rowAutoHeight: rowAutoHeight, columnOrder: columnOrder, enableColumnsOrderSortByDrag: enableColumnsOrderSortByDrag, disabledRowAppearance: rowSelectionAppearance }, row.id)))), showInfiniteLoadingTail ? ((0, jsx_runtime_1.jsx)(skeleton_1.SkeletonContextProvider, { loading: true, children: loadingTableRows.slice(0, 3).map(row => ((0, jsx_runtime_1.jsx)(helperComponents_1.BodyRow, { row: row, columnOrder: columnOrder, enableColumnsOrderSortByDrag: enableColumnsOrderSortByDrag, disabledRowAppearance: rowSelectionAppearance }, row.id))) })) : null, loadMoreButton, emptyState] }));
20
+ }) })) : (centerRows.map(row => ((0, jsx_runtime_1.jsx)(helperComponents_1.BodyRow, { row: row, onRowClick: onRowClick, rowAutoHeight: rowAutoHeight, columnOrder: columnOrder, enableColumnsOrderSortByDrag: enableColumnsOrderSortByDrag, disabledRowAppearance: rowSelectionAppearance }, row.id)))), showInfiniteLoadingTail ? ((0, jsx_runtime_1.jsx)(skeleton_1.SkeletonContextProvider, { loading: true, children: loadingTableRows.slice(0, 3).map(row => ((0, jsx_runtime_1.jsx)(helperComponents_1.BodyRow, { row: row, columnOrder: columnOrder, enableColumnsOrderSortByDrag: enableColumnsOrderSortByDrag, disabledRowAppearance: rowSelectionAppearance }, row.id))) })) : null, emptyState] }));
21
21
  }
@@ -5,7 +5,25 @@ const utils_1 = require("@cloud-ru/ds-utils");
5
5
  const react_1 = require("react");
6
6
  const constants_1 = require("../../../constants");
7
7
  const constants_2 = require("../../../helperComponents/Cells/TreeCell/constants");
8
- const utils_2 = require("../utils");
8
+ // Импорт по файлам: баррель `../utils` загружает helperComponents и весь пакет следом.
9
+ const columnSize_1 = require("../utils/columnSize");
10
+ const getColumnIdentifier_1 = require("../utils/getColumnIdentifier");
11
+ const getColumnStyleVars_1 = require("../utils/getColumnStyleVars");
12
+ const getCurrentlyConfiguredHeaderWidth_1 = require("../utils/getCurrentlyConfiguredHeaderWidth");
13
+ /** Дефолты `defaultColumnSizing`: наружу tanstack их не экспортирует. */
14
+ const TANSTACK_DEFAULT_COLUMN_SIZE = 150;
15
+ const TANSTACK_DEFAULT_COLUMN_MIN_SIZE = 20;
16
+ const TANSTACK_DEFAULT_COLUMN_MAX_SIZE = Number.MAX_SAFE_INTEGER;
17
+ /**
18
+ * Размер, который вернёт `header.getSize()`, пока в `columnSizing` нет записи о колонке.
19
+ * Сравнивать с `columnDef.size` напрямую нельзя: `getSize` ограничивает его значениями
20
+ * `minSize` и `maxSize`, поэтому у колонки с `minSize` больше `size` они не совпадут
21
+ * никогда — колонка постоянно считалась бы изменённой пользователем.
22
+ */
23
+ function getDefaultColumnSize(header) {
24
+ const { size = TANSTACK_DEFAULT_COLUMN_SIZE, minSize = TANSTACK_DEFAULT_COLUMN_MIN_SIZE, maxSize = TANSTACK_DEFAULT_COLUMN_MAX_SIZE, } = header.column.columnDef;
25
+ return Math.min(Math.max(minSize, size), maxSize);
26
+ }
9
27
  function useColumnSizes({ table, headers, isLoadingState, savedState, }) {
10
28
  const columnSizeVarsRef = (0, react_1.useRef)();
11
29
  const [measuredHeaderWidths, setMeasuredHeaderWidths] = (0, react_1.useState)({});
@@ -19,14 +37,14 @@ function useColumnSizes({ table, headers, isLoadingState, savedState, }) {
19
37
  const resizedColumnIndex = headers.findIndex(({ column }) => column.getIsResizing());
20
38
  for (let i = 0; i < headers.length; i++) {
21
39
  const header = headers[i];
22
- const { sizeKey, flexKey } = (0, utils_2.getColumnStyleVars)(header.id);
23
- const originalColDef = originalColumnDefs.find(col => header.id === (0, utils_2.getColumnIdentifier)(col));
40
+ const { sizeKey, flexKey } = (0, getColumnStyleVars_1.getColumnStyleVars)(header.id);
41
+ const originalColDef = originalColumnDefs.find(col => header.id === (0, getColumnIdentifier_1.getColumnIdentifier)(col));
24
42
  const originalColumnDefSize = originalColDef?.size;
25
43
  let initSize = originalColumnDefSize ? `${originalColumnDefSize}px` : '100%';
26
44
  const prevSize = columnSizeVarsRef.current?.[sizeKey];
27
45
  const isResizeSavedToStore = originalColDef?.enableResizing && savedState?.id && savedState?.resize !== false;
28
46
  if (isResizeSavedToStore) {
29
- const savedSize = (0, utils_2.getInitColumnSizeFromLocalStorage)({ id: savedState.id, columnId: header.id });
47
+ const savedSize = (0, columnSize_1.getInitColumnSizeFromLocalStorage)({ id: savedState.id, columnId: header.id });
30
48
  if (savedSize) {
31
49
  initSize = savedSize;
32
50
  // Sync tanstack's columnSizing with the persisted value so that the first
@@ -42,8 +60,8 @@ function useColumnSizes({ table, headers, isLoadingState, savedState, }) {
42
60
  let size = initSize;
43
61
  if (header.column.getCanResize()) {
44
62
  const currentSize = header.getSize();
45
- const colDefSize = header.column.columnDef.size;
46
- if (currentSize !== colDefSize || (i < resizedColumnIndex && prevSize === '100%')) {
63
+ const defaultSize = getDefaultColumnSize(header);
64
+ if (currentSize !== defaultSize || (i < resizedColumnIndex && prevSize === '100%')) {
47
65
  let realSize = currentSize;
48
66
  let needsMeasurement = false;
49
67
  if (prevSize === '100%') {
@@ -114,14 +132,19 @@ function useColumnSizes({ table, headers, isLoadingState, savedState, }) {
114
132
  if (next[id] !== undefined) {
115
133
  continue;
116
134
  }
117
- next[id] = (0, utils_2.getCurrentlyConfiguredHeaderWidth)(id);
135
+ next[id] = (0, getCurrentlyConfiguredHeaderWidth_1.getCurrentlyConfiguredHeaderWidth)(id);
118
136
  changed = true;
119
137
  }
120
138
  return changed ? next : prev;
121
139
  });
122
140
  return;
123
141
  }
124
- if (Object.keys(columnSizes.realSizes).length) {
142
+ // `setColumnSizing` всегда создаёт новый объект состояния таблицы, то есть вызывает
143
+ // рендер, а рендер возвращает выполнение сюда. Записываем только реальные изменения,
144
+ // иначе обновления становятся бесконечными.
145
+ const currentColumnSizing = table.getState().columnSizing;
146
+ const hasSizeChanges = Object.entries(columnSizes.realSizes).some(([columnId, size]) => currentColumnSizing[columnId] !== size);
147
+ if (hasSizeChanges) {
125
148
  table.setColumnSizing(old => ({ ...old, ...columnSizes.realSizes }));
126
149
  }
127
150
  columnSizeVarsRef.current = columnSizes.vars;
@@ -131,7 +154,7 @@ function useColumnSizes({ table, headers, isLoadingState, savedState, }) {
131
154
  return;
132
155
  }
133
156
  for (const args of columnSizes.statesToSave) {
134
- (0, utils_2.saveStateToLocalStorage)(args);
157
+ (0, columnSize_1.saveStateToLocalStorage)(args);
135
158
  }
136
159
  }, [columnSizes]);
137
160
  return { columnSizes };
@@ -290,6 +290,11 @@ type BaseTableProps<TData extends object, TFilters extends FiltersState = Record
290
290
  /**
291
291
  * Включает виртуализацию строк (windowing по вертикали).
292
292
  * Рекомендуется при > 200 строк. Несовместимо с `view='cards'` — при картах игнорируется.
293
+ *
294
+ * 🔴 Требует `size` у колонок: виртуализованные строки позиционируются абсолютно и не участвуют в
295
+ * расчёте внутренней ширины, поэтому колонка без `size` делит ширину контейнера поровну с
296
+ * остальными вместо растягивания по содержимому.
297
+ *
293
298
  * @default false
294
299
  */
295
300
  enableRowVirtualization?: boolean;
@@ -29,6 +29,20 @@ function getResizeIndicatorOffset({ header, cellRef }) {
29
29
  function ResizeHandle({ header, cellRef }) {
30
30
  const isResizing = header.column.getIsResizing();
31
31
  const resizeHandler = header.getResizeHandler();
32
+ const { table } = header.getContext();
33
+ // У колонки без `size` нет записи в columnSizing, и tanstack стартует перетаскивание от дефолта
34
+ // columnDef (150px), а не от отрисованной ширины. Реальная ширина фиксируется заранее, на
35
+ // наведении: к моменту mousedown состояние уже применено.
36
+ const pinRenderedWidth = () => {
37
+ const id = header.column.id;
38
+ if (table.getState().columnSizing[id] !== undefined) {
39
+ return;
40
+ }
41
+ const rendered = cellRef.current?.offsetWidth;
42
+ if (rendered) {
43
+ table.setColumnSizing(prev => ({ ...prev, [id]: rendered }));
44
+ }
45
+ };
32
46
  const handleMouseDown = (event) => {
33
47
  if (event.detail === 2) {
34
48
  header.column.resetSize();
@@ -37,5 +51,5 @@ function ResizeHandle({ header, cellRef }) {
37
51
  resizeHandler(event);
38
52
  };
39
53
  const offset = isResizing ? getResizeIndicatorOffset({ header, cellRef }) : 0;
40
- return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("div", { "aria-hidden": true, className: (0, classnames_1.default)(styles_module_scss_1.default.tableHeaderIcon, styles_module_scss_1.default.tableHeaderResizeHandle), "data-resizing": isResizing || undefined, onMouseDown: handleMouseDown, onTouchStart: resizeHandler, onMouseUp: helpers_1.stopEventPropagation }), isResizing && ((0, jsx_runtime_1.jsx)("div", { "data-test-id": constants_1.TEST_IDS.headerResizeHandleMovingPart, className: styles_module_scss_1.default.tableHeaderResizeIndicator, style: { '--offset': `${offset}px` } }))] }));
54
+ return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("div", { "aria-hidden": true, className: (0, classnames_1.default)(styles_module_scss_1.default.tableHeaderIcon, styles_module_scss_1.default.tableHeaderResizeHandle), "data-resizing": isResizing || undefined, onMouseEnter: pinRenderedWidth, onMouseDown: handleMouseDown, onTouchStart: resizeHandler, onMouseUp: helpers_1.stopEventPropagation }), isResizing && ((0, jsx_runtime_1.jsx)("div", { "data-test-id": constants_1.TEST_IDS.headerResizeHandleMovingPart, className: styles_module_scss_1.default.tableHeaderResizeIndicator, style: { '--offset': `${offset}px` } }))] }));
41
55
  }
@@ -1,10 +1,17 @@
1
1
  import { Ref } from 'react';
2
- import { CardViewInput, SimpleColumnDef } from '../../columnUtils';
2
+ import { CardViewInput } from '../../columnUtils';
3
3
  import { InfiniteTableProps } from '../../components/types';
4
+ import { ColumnDefinition } from '../../types';
4
5
  /** Входные пропсы `InfiniteTable` / `useInfiniteTableProps` */
5
6
  export type InfiniteTableInput<TData extends object> = CardViewInput<TData> & {
6
7
  data: TData[];
7
- columns: SimpleColumnDef<TData>[];
8
+ /**
9
+ * Определения колонок в стандартном виде — том же, что у `Table.columnDefinitions`.
10
+ * Упрощённое описание здесь не используется: у таблиц с бесконечной подгрузкой колонки
11
+ * обычно не выражаются им (спред `getStatusColumnDef`, собственный `cell`, `id` не совпадающий
12
+ * с `accessorKey`), а `defineColumns` остаётся доступен отдельно, если он всё же нужен.
13
+ */
14
+ columns: ColumnDefinition<TData>[];
8
15
  getRowId?: (row: TData) => string;
9
16
  } & Omit<InfiniteTableProps<TData>, 'data' | 'columnDefinitions' | 'getRowId' | 'headlineId' | 'infiniteLoading' | 'scrollRef'>;
10
17
  /** Маппинг упрощённых пропсов в `InfiniteTableProps` для `Table` */
@@ -10,7 +10,7 @@ function toInfiniteTableProps(input, scrollRef) {
10
10
  ...rest,
11
11
  ...(0, columnUtils_1.mapCardViewProps)({ headlineKey, defaultView, view, onViewChange, renderCard }),
12
12
  data,
13
- columnDefinitions: (0, columnUtils_1.defineColumns)(columns),
13
+ columnDefinitions: columns,
14
14
  infiniteLoading: true,
15
15
  outline: outline ?? true,
16
16
  enableRowVirtualization: enableRowVirtualization ?? true,
@@ -2,7 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.useInfiniteTableProps = useInfiniteTableProps;
4
4
  const react_1 = require("react");
5
- const columnUtils_1 = require("../../columnUtils");
6
5
  const wrapGetRowId_1 = require("../wrapGetRowId");
7
6
  const toInfiniteTableProps_1 = require("./toInfiniteTableProps");
8
7
  const useInfiniteScrollRef_1 = require("./useInfiniteScrollRef");
@@ -16,11 +15,10 @@ function useInfiniteTableProps(input) {
16
15
  dataLength: input.data.length,
17
16
  });
18
17
  const { columns, getRowId } = input;
19
- const columnDefinitions = (0, react_1.useMemo)(() => (0, columnUtils_1.defineColumns)(columns), [columns]);
20
18
  const wrappedGetRowId = (0, react_1.useMemo)(() => (0, wrapGetRowId_1.wrapGetRowId)(getRowId), [getRowId]);
21
19
  return {
22
20
  ...(0, toInfiniteTableProps_1.toInfiniteTableProps)(input, isButtonMode ? null : scrollRef),
23
- columnDefinitions,
21
+ columnDefinitions: columns,
24
22
  getRowId: wrappedGetRowId,
25
23
  };
26
24
  }
@@ -266,8 +266,8 @@ export function Table({ data, rowPinning = {
266
266
  // и ныряла под закреплённые колонки.
267
267
  const draggingColumnPreview = (_jsx(DragOverlay, { dropAnimation: null, modifiers: [alignOverlayToHeader], children: draggingHeader ? (_jsx(DragPreview, { className: styles.columnDragPreview, style: { width: `var(${TABLE_COLUMN_CSS_VARS.size(draggingHeader.column.id)})` }, children: flexRender(draggingHeader.column.columnDef.header, draggingHeader.getContext()) })) : null }));
268
268
  const tableHeaderElement = showTableHeader ? (_jsx(HeaderRow, { rowAutoHeight: rowAutoHeight, columnOrder: columnOrder, enableColumnsOrderSortByDrag: enableColumnsOrderSortByDrag, suppressSticky: usePageStickyHeader })) : null;
269
- const tableRowsContent = (_jsx(TableRowsBody, { filteredTopRows: filteredTopRows, centerRows: centerRows, rowVirtualizer: rowVirtualizer, columnOrder: columnOrder, rowAutoHeight: rowAutoHeight, onRowClick: onRowClick, enableColumnsOrderSortByDrag: enableColumnsOrderSortByDrag, rowSelectionAppearance: rowSelectionProp?.appearance, emptyState: tableEmptyState, showInfiniteLoadingTail: showInfiniteLoadingTail, loadingTableRows: loadingTableRows, loadMoreButton: loadMoreButtonNode }));
270
- const cardsContentBody = (_jsx(TableCardsBody, { filteredTopRows: filteredTopRows, centerRows: centerRows, table: table, headlineId: headlineId, cardSelection: cardSelection, rowSelectionAppearance: rowSelectionProp?.appearance, suppressHeader: suppressHeader, onRowClick: onRowClick, renderCard: renderCard, cardsListProps: cardsListProps, emptyState: tableEmptyState, showInfiniteLoadingTail: showInfiniteLoadingTail, loadingTableRows: loadingTableRows, loadingTable: loadingTable, loadMoreButton: loadMoreButtonNode }));
269
+ const tableRowsContent = (_jsx(TableRowsBody, { filteredTopRows: filteredTopRows, centerRows: centerRows, rowVirtualizer: rowVirtualizer, columnOrder: columnOrder, rowAutoHeight: rowAutoHeight, onRowClick: onRowClick, enableColumnsOrderSortByDrag: enableColumnsOrderSortByDrag, rowSelectionAppearance: rowSelectionProp?.appearance, emptyState: tableEmptyState, showInfiniteLoadingTail: showInfiniteLoadingTail, loadingTableRows: loadingTableRows }));
270
+ const cardsContentBody = (_jsx(TableCardsBody, { filteredTopRows: filteredTopRows, centerRows: centerRows, table: table, headlineId: headlineId, cardSelection: cardSelection, rowSelectionAppearance: rowSelectionProp?.appearance, suppressHeader: suppressHeader, onRowClick: onRowClick, renderCard: renderCard, cardsListProps: cardsListProps, emptyState: tableEmptyState, showInfiniteLoadingTail: showInfiniteLoadingTail, loadingTableRows: loadingTableRows, loadingTable: loadingTable }));
271
271
  const tableContentBody = (_jsxs(_Fragment, { children: [!usePageStickyHeader ? tableHeaderElement : null, tableRowsContent] }));
272
272
  let tableBody = tableContentBody;
273
273
  let tableScrollRows = tableRowsContent;
@@ -330,7 +330,7 @@ export function Table({ data, rowPinning = {
330
330
  paginationChrome =
331
331
  isStickyControls && controlsAcrylic ? (_jsx(TableChrome, { variant: 'footer', acrylic: controlsAcrylic, children: pagination })) : (pagination);
332
332
  }
333
- return (_jsx("div", { ref: wrapperRef, className: cn(styles.wrapper, className, themeClassName), "data-view": view, "data-layout-type": layoutType, "data-sticky-controls": isStickyControls || undefined, "data-with-toolbar": showToolbar || undefined, "data-empty-body": isEmptyBody || undefined, "data-fit-content": !resolvedFullWidth || undefined, ...extractSupportProps(rest), children: _jsxs(TableContext.Provider, { value: tableContextValue, children: [toolbarChrome, _jsxs("div", { className: styles.tableView, children: [_jsxs("div", { className: styles.content, "data-outline": !isCardsView && outline ? true : undefined, "data-page-sticky-header": !isCardsView && usePageStickyHeader ? true : undefined, ...(!isCardsView ? TABLE_CONTENT_ACRYLIC : {}), children: [!isCardsView ? _jsx("span", { className: styles.contentAcrylic, "data-acrylic-background": true, "aria-hidden": true }) : null, hasMobileToolbarMounts ? (_jsxs("div", { className: styles.mobileToolbarMounts, children: [sortingToolbarSlot.mobileMount, columnsSettingsToolbarSlot.mobileMount] })) : null, _jsxs(DndContext, { ...dndContextProps, children: [draggingColumnPreview, _jsx(TableScrollHost, { view: view, isMobile: isMobile, isCardsView: isCardsView, usePageStickyHeader: usePageStickyHeader, scrollOverflow: scrollOverflow, scrollPaddingAbsolute: scrollPaddingAbsolute, internalScrollRef: internalScrollRef, scrollRef: scrollRef, scrollContainerRef: scrollContainerRef, handleScrollInitialized: handleScrollInitialized, syncHeaderHorizontalScroll: syncHeaderHorizontalScroll, tableHeaderElement: tableHeaderElement, columnSizeVars: columnSizes.vars, children: scrollContent })] }), !isCardsView && outline ? _jsx("span", { className: styles.contentBorder, "aria-hidden": true }) : null] }), paginationChrome] })] }) }));
333
+ return (_jsx("div", { ref: wrapperRef, className: cn(styles.wrapper, className, themeClassName), "data-view": view, "data-layout-type": layoutType, "data-sticky-controls": isStickyControls || undefined, "data-with-toolbar": showToolbar || undefined, "data-empty-body": isEmptyBody || undefined, "data-fit-content": !resolvedFullWidth || undefined, ...extractSupportProps(rest), children: _jsxs(TableContext.Provider, { value: tableContextValue, children: [toolbarChrome, _jsxs("div", { className: styles.tableView, children: [_jsxs("div", { className: styles.content, "data-outline": !isCardsView && outline ? true : undefined, "data-page-sticky-header": !isCardsView && usePageStickyHeader ? true : undefined, ...(!isCardsView ? TABLE_CONTENT_ACRYLIC : {}), children: [!isCardsView ? _jsx("span", { className: styles.contentAcrylic, "data-acrylic-background": true, "aria-hidden": true }) : null, hasMobileToolbarMounts ? (_jsxs("div", { className: styles.mobileToolbarMounts, children: [sortingToolbarSlot.mobileMount, columnsSettingsToolbarSlot.mobileMount] })) : null, _jsxs(DndContext, { ...dndContextProps, children: [draggingColumnPreview, _jsx(TableScrollHost, { view: view, isMobile: isMobile, isCardsView: isCardsView, usePageStickyHeader: usePageStickyHeader, scrollOverflow: scrollOverflow, scrollPaddingAbsolute: scrollPaddingAbsolute, internalScrollRef: internalScrollRef, scrollRef: scrollRef, scrollContainerRef: scrollContainerRef, handleScrollInitialized: handleScrollInitialized, syncHeaderHorizontalScroll: syncHeaderHorizontalScroll, tableHeaderElement: tableHeaderElement, columnSizeVars: columnSizes.vars, children: scrollContent })] }), loadMoreButtonNode, !isCardsView && outline ? _jsx("span", { className: styles.contentBorder, "aria-hidden": true }) : null] }), paginationChrome] })] }) }));
334
334
  }
335
335
  Table.getStatusColumnDef = getStatusColumnDef;
336
336
  Table.statusAppearances = STATUS_APPEARANCE;
@@ -21,9 +21,8 @@ type TableCardsBodyProps<TData extends object> = {
21
21
  showInfiniteLoadingTail: boolean;
22
22
  loadingTableRows: Row<TData>[];
23
23
  loadingTable: Table<TData>;
24
- loadMoreButton?: ReactNode;
25
24
  };
26
- export declare function TableCardsBody<TData extends object>({ filteredTopRows, centerRows, table, headlineId, cardSelection, rowSelectionAppearance, suppressHeader, onRowClick, renderCard, cardsListProps, emptyState, showInfiniteLoadingTail, loadingTableRows, loadingTable, loadMoreButton, }: TableCardsBodyProps<TData>): import("react/jsx-runtime").JSX.Element;
25
+ export declare function TableCardsBody<TData extends object>({ filteredTopRows, centerRows, table, headlineId, cardSelection, rowSelectionAppearance, suppressHeader, onRowClick, renderCard, cardsListProps, emptyState, showInfiniteLoadingTail, loadingTableRows, loadingTable, }: TableCardsBodyProps<TData>): import("react/jsx-runtime").JSX.Element;
27
26
  export declare function getCardsListProps({ isMobile, cardMinWidth, cardColumns, }: {
28
27
  isMobile: boolean;
29
28
  cardMinWidth?: number;
@@ -5,12 +5,12 @@ import { TABLE_CSS_VARS } from '../../../../constants.js';
5
5
  import { TableCard } from '../../../../helperComponents/index.js';
6
6
  import { RowAppearance } from '../../../types.js';
7
7
  import styles from '../../styles.module.css';
8
- export function TableCardsBody({ filteredTopRows, centerRows, table, headlineId, cardSelection, rowSelectionAppearance, suppressHeader, onRowClick, renderCard, cardsListProps, emptyState, showInfiniteLoadingTail, loadingTableRows, loadingTable, loadMoreButton, }) {
8
+ export function TableCardsBody({ filteredTopRows, centerRows, table, headlineId, cardSelection, rowSelectionAppearance, suppressHeader, onRowClick, renderCard, cardsListProps, emptyState, showInfiniteLoadingTail, loadingTableRows, loadingTable, }) {
9
9
  const renderContentCard = (row, selectionAppearance) => {
10
10
  const defaultRender = (_jsx(TableCard, { headlineId: headlineId, row: row, table: table, selection: cardSelection, selectionAppearance: selectionAppearance, suppressHeader: suppressHeader, onRowClick: onRowClick }));
11
11
  return _jsx(Fragment, { children: renderCard ? renderCard({ row, table, defaultRender }) : defaultRender }, row.id);
12
12
  };
13
- return (_jsxs(_Fragment, { children: [_jsxs("div", { ...cardsListProps, children: [filteredTopRows.map(row => renderContentCard(row, RowAppearance.HideToggler)), centerRows.map(row => renderContentCard(row, rowSelectionAppearance))] }), showInfiniteLoadingTail ? (_jsx(SkeletonContextProvider, { loading: true, children: _jsx("div", { ...cardsListProps, children: loadingTableRows.slice(0, 3).map(row => (_jsx(TableCard, { headlineId: headlineId, row: row, table: loadingTable, selection: 'none', suppressHeader: suppressHeader }, row.id))) }) })) : null, loadMoreButton, emptyState] }));
13
+ return (_jsxs(_Fragment, { children: [_jsxs("div", { ...cardsListProps, children: [filteredTopRows.map(row => renderContentCard(row, RowAppearance.HideToggler)), centerRows.map(row => renderContentCard(row, rowSelectionAppearance))] }), showInfiniteLoadingTail ? (_jsx(SkeletonContextProvider, { loading: true, children: _jsx("div", { ...cardsListProps, children: loadingTableRows.slice(0, 3).map(row => (_jsx(TableCard, { headlineId: headlineId, row: row, table: loadingTable, selection: 'none', suppressHeader: suppressHeader }, row.id))) }) })) : null, emptyState] }));
14
14
  }
15
15
  export function getCardsListProps({ isMobile, cardMinWidth, cardColumns, }) {
16
16
  const cardsGridProps = {
@@ -15,7 +15,6 @@ type TableRowsBodyProps<TData extends object> = {
15
15
  emptyState: ReactNode;
16
16
  showInfiniteLoadingTail: boolean;
17
17
  loadingTableRows: Row<TData>[];
18
- loadMoreButton?: ReactNode;
19
18
  };
20
- export declare function TableRowsBody<TData extends object>({ filteredTopRows, centerRows, rowVirtualizer, columnOrder, rowAutoHeight, onRowClick, enableColumnsOrderSortByDrag, rowSelectionAppearance, emptyState, showInfiniteLoadingTail, loadingTableRows, loadMoreButton, }: TableRowsBodyProps<TData>): import("react/jsx-runtime").JSX.Element;
19
+ export declare function TableRowsBody<TData extends object>({ filteredTopRows, centerRows, rowVirtualizer, columnOrder, rowAutoHeight, onRowClick, enableColumnsOrderSortByDrag, rowSelectionAppearance, emptyState, showInfiniteLoadingTail, loadingTableRows, }: TableRowsBodyProps<TData>): import("react/jsx-runtime").JSX.Element;
21
20
  export {};
@@ -4,12 +4,12 @@ import { TABLE_CSS_VARS } from '../../../../constants.js';
4
4
  import { BodyRow } from '../../../../helperComponents/index.js';
5
5
  import { RowAppearance } from '../../../types.js';
6
6
  import styles from '../../styles.module.css';
7
- export function TableRowsBody({ filteredTopRows, centerRows, rowVirtualizer, columnOrder, rowAutoHeight, onRowClick, enableColumnsOrderSortByDrag, rowSelectionAppearance, emptyState, showInfiniteLoadingTail, loadingTableRows, loadMoreButton, }) {
7
+ export function TableRowsBody({ filteredTopRows, centerRows, rowVirtualizer, columnOrder, rowAutoHeight, onRowClick, enableColumnsOrderSortByDrag, rowSelectionAppearance, emptyState, showInfiniteLoadingTail, loadingTableRows, }) {
8
8
  return (_jsxs(_Fragment, { children: [filteredTopRows.length ? (_jsx("div", { className: styles.topRowWrapper, children: filteredTopRows.map(row => (_jsx(BodyRow, { row: row, onRowClick: onRowClick, rowAutoHeight: rowAutoHeight, columnOrder: columnOrder, enableColumnsOrderSortByDrag: enableColumnsOrderSortByDrag, disabledRowAppearance: RowAppearance.HideToggler }, row.id))) })) : null, rowVirtualizer ? (_jsx("div", { style: {
9
9
  position: 'relative',
10
10
  height: `${rowVirtualizer.getTotalSize()}px`,
11
11
  }, children: rowVirtualizer.getVirtualItems().map(virtualRow => {
12
12
  const row = centerRows[virtualRow.index];
13
13
  return (_jsx("div", { ref: rowVirtualizer.measureElement, "data-index": virtualRow.index, className: styles.virtualRow, style: { [TABLE_CSS_VARS.virtualRowStart]: `${virtualRow.start}px` }, children: _jsx(BodyRow, { row: row, onRowClick: onRowClick, rowAutoHeight: rowAutoHeight, columnOrder: columnOrder, enableColumnsOrderSortByDrag: enableColumnsOrderSortByDrag, disabledRowAppearance: rowSelectionAppearance }) }, row.id));
14
- }) })) : (centerRows.map(row => (_jsx(BodyRow, { row: row, onRowClick: onRowClick, rowAutoHeight: rowAutoHeight, columnOrder: columnOrder, enableColumnsOrderSortByDrag: enableColumnsOrderSortByDrag, disabledRowAppearance: rowSelectionAppearance }, row.id)))), showInfiniteLoadingTail ? (_jsx(SkeletonContextProvider, { loading: true, children: loadingTableRows.slice(0, 3).map(row => (_jsx(BodyRow, { row: row, columnOrder: columnOrder, enableColumnsOrderSortByDrag: enableColumnsOrderSortByDrag, disabledRowAppearance: rowSelectionAppearance }, row.id))) })) : null, loadMoreButton, emptyState] }));
14
+ }) })) : (centerRows.map(row => (_jsx(BodyRow, { row: row, onRowClick: onRowClick, rowAutoHeight: rowAutoHeight, columnOrder: columnOrder, enableColumnsOrderSortByDrag: enableColumnsOrderSortByDrag, disabledRowAppearance: rowSelectionAppearance }, row.id)))), showInfiniteLoadingTail ? (_jsx(SkeletonContextProvider, { loading: true, children: loadingTableRows.slice(0, 3).map(row => (_jsx(BodyRow, { row: row, columnOrder: columnOrder, enableColumnsOrderSortByDrag: enableColumnsOrderSortByDrag, disabledRowAppearance: rowSelectionAppearance }, row.id))) })) : null, emptyState] }));
15
15
  }
@@ -2,7 +2,25 @@ import { useLayoutEffect } from '@cloud-ru/ds-utils';
2
2
  import { useEffect, useMemo, useRef, useState } from 'react';
3
3
  import { DefaultColumns } from '../../../constants.js';
4
4
  import { TREE_CELL_ID } from '../../../helperComponents/Cells/TreeCell/constants.js';
5
- import { getColumnIdentifier, getColumnStyleVars, getCurrentlyConfiguredHeaderWidth, getInitColumnSizeFromLocalStorage, saveStateToLocalStorage, } from '../utils/index.js';
5
+ // Импорт по файлам: баррель `../utils` загружает helperComponents и весь пакет следом.
6
+ import { getInitColumnSizeFromLocalStorage, saveStateToLocalStorage } from '../utils/columnSize.js';
7
+ import { getColumnIdentifier } from '../utils/getColumnIdentifier.js';
8
+ import { getColumnStyleVars } from '../utils/getColumnStyleVars.js';
9
+ import { getCurrentlyConfiguredHeaderWidth } from '../utils/getCurrentlyConfiguredHeaderWidth.js';
10
+ /** Дефолты `defaultColumnSizing`: наружу tanstack их не экспортирует. */
11
+ const TANSTACK_DEFAULT_COLUMN_SIZE = 150;
12
+ const TANSTACK_DEFAULT_COLUMN_MIN_SIZE = 20;
13
+ const TANSTACK_DEFAULT_COLUMN_MAX_SIZE = Number.MAX_SAFE_INTEGER;
14
+ /**
15
+ * Размер, который вернёт `header.getSize()`, пока в `columnSizing` нет записи о колонке.
16
+ * Сравнивать с `columnDef.size` напрямую нельзя: `getSize` ограничивает его значениями
17
+ * `minSize` и `maxSize`, поэтому у колонки с `minSize` больше `size` они не совпадут
18
+ * никогда — колонка постоянно считалась бы изменённой пользователем.
19
+ */
20
+ function getDefaultColumnSize(header) {
21
+ const { size = TANSTACK_DEFAULT_COLUMN_SIZE, minSize = TANSTACK_DEFAULT_COLUMN_MIN_SIZE, maxSize = TANSTACK_DEFAULT_COLUMN_MAX_SIZE, } = header.column.columnDef;
22
+ return Math.min(Math.max(minSize, size), maxSize);
23
+ }
6
24
  export function useColumnSizes({ table, headers, isLoadingState, savedState, }) {
7
25
  const columnSizeVarsRef = useRef();
8
26
  const [measuredHeaderWidths, setMeasuredHeaderWidths] = useState({});
@@ -39,8 +57,8 @@ export function useColumnSizes({ table, headers, isLoadingState, savedState, })
39
57
  let size = initSize;
40
58
  if (header.column.getCanResize()) {
41
59
  const currentSize = header.getSize();
42
- const colDefSize = header.column.columnDef.size;
43
- if (currentSize !== colDefSize || (i < resizedColumnIndex && prevSize === '100%')) {
60
+ const defaultSize = getDefaultColumnSize(header);
61
+ if (currentSize !== defaultSize || (i < resizedColumnIndex && prevSize === '100%')) {
44
62
  let realSize = currentSize;
45
63
  let needsMeasurement = false;
46
64
  if (prevSize === '100%') {
@@ -118,7 +136,12 @@ export function useColumnSizes({ table, headers, isLoadingState, savedState, })
118
136
  });
119
137
  return;
120
138
  }
121
- if (Object.keys(columnSizes.realSizes).length) {
139
+ // `setColumnSizing` всегда создаёт новый объект состояния таблицы, то есть вызывает
140
+ // рендер, а рендер возвращает выполнение сюда. Записываем только реальные изменения,
141
+ // иначе обновления становятся бесконечными.
142
+ const currentColumnSizing = table.getState().columnSizing;
143
+ const hasSizeChanges = Object.entries(columnSizes.realSizes).some(([columnId, size]) => currentColumnSizing[columnId] !== size);
144
+ if (hasSizeChanges) {
122
145
  table.setColumnSizing(old => ({ ...old, ...columnSizes.realSizes }));
123
146
  }
124
147
  columnSizeVarsRef.current = columnSizes.vars;
@@ -290,6 +290,11 @@ type BaseTableProps<TData extends object, TFilters extends FiltersState = Record
290
290
  /**
291
291
  * Включает виртуализацию строк (windowing по вертикали).
292
292
  * Рекомендуется при > 200 строк. Несовместимо с `view='cards'` — при картах игнорируется.
293
+ *
294
+ * 🔴 Требует `size` у колонок: виртуализованные строки позиционируются абсолютно и не участвуют в
295
+ * расчёте внутренней ширины, поэтому колонка без `size` делит ширину контейнера поровну с
296
+ * остальными вместо растягивания по содержимому.
297
+ *
293
298
  * @default false
294
299
  */
295
300
  enableRowVirtualization?: boolean;
@@ -23,6 +23,20 @@ function getResizeIndicatorOffset({ header, cellRef }) {
23
23
  export function ResizeHandle({ header, cellRef }) {
24
24
  const isResizing = header.column.getIsResizing();
25
25
  const resizeHandler = header.getResizeHandler();
26
+ const { table } = header.getContext();
27
+ // У колонки без `size` нет записи в columnSizing, и tanstack стартует перетаскивание от дефолта
28
+ // columnDef (150px), а не от отрисованной ширины. Реальная ширина фиксируется заранее, на
29
+ // наведении: к моменту mousedown состояние уже применено.
30
+ const pinRenderedWidth = () => {
31
+ const id = header.column.id;
32
+ if (table.getState().columnSizing[id] !== undefined) {
33
+ return;
34
+ }
35
+ const rendered = cellRef.current?.offsetWidth;
36
+ if (rendered) {
37
+ table.setColumnSizing(prev => ({ ...prev, [id]: rendered }));
38
+ }
39
+ };
26
40
  const handleMouseDown = (event) => {
27
41
  if (event.detail === 2) {
28
42
  header.column.resetSize();
@@ -31,5 +45,5 @@ export function ResizeHandle({ header, cellRef }) {
31
45
  resizeHandler(event);
32
46
  };
33
47
  const offset = isResizing ? getResizeIndicatorOffset({ header, cellRef }) : 0;
34
- return (_jsxs(_Fragment, { children: [_jsx("div", { "aria-hidden": true, className: cn(styles.tableHeaderIcon, styles.tableHeaderResizeHandle), "data-resizing": isResizing || undefined, onMouseDown: handleMouseDown, onTouchStart: resizeHandler, onMouseUp: stopEventPropagation }), isResizing && (_jsx("div", { "data-test-id": TEST_IDS.headerResizeHandleMovingPart, className: styles.tableHeaderResizeIndicator, style: { '--offset': `${offset}px` } }))] }));
48
+ return (_jsxs(_Fragment, { children: [_jsx("div", { "aria-hidden": true, className: cn(styles.tableHeaderIcon, styles.tableHeaderResizeHandle), "data-resizing": isResizing || undefined, onMouseEnter: pinRenderedWidth, onMouseDown: handleMouseDown, onTouchStart: resizeHandler, onMouseUp: stopEventPropagation }), isResizing && (_jsx("div", { "data-test-id": TEST_IDS.headerResizeHandleMovingPart, className: styles.tableHeaderResizeIndicator, style: { '--offset': `${offset}px` } }))] }));
35
49
  }
@@ -1,10 +1,17 @@
1
1
  import { Ref } from 'react';
2
- import { CardViewInput, SimpleColumnDef } from '../../columnUtils/index.js';
2
+ import { CardViewInput } from '../../columnUtils/index.js';
3
3
  import { InfiniteTableProps } from '../../components/types.js';
4
+ import { ColumnDefinition } from '../../types.js';
4
5
  /** Входные пропсы `InfiniteTable` / `useInfiniteTableProps` */
5
6
  export type InfiniteTableInput<TData extends object> = CardViewInput<TData> & {
6
7
  data: TData[];
7
- columns: SimpleColumnDef<TData>[];
8
+ /**
9
+ * Определения колонок в стандартном виде — том же, что у `Table.columnDefinitions`.
10
+ * Упрощённое описание здесь не используется: у таблиц с бесконечной подгрузкой колонки
11
+ * обычно не выражаются им (спред `getStatusColumnDef`, собственный `cell`, `id` не совпадающий
12
+ * с `accessorKey`), а `defineColumns` остаётся доступен отдельно, если он всё же нужен.
13
+ */
14
+ columns: ColumnDefinition<TData>[];
8
15
  getRowId?: (row: TData) => string;
9
16
  } & Omit<InfiniteTableProps<TData>, 'data' | 'columnDefinitions' | 'getRowId' | 'headlineId' | 'infiniteLoading' | 'scrollRef'>;
10
17
  /** Маппинг упрощённых пропсов в `InfiniteTableProps` для `Table` */