@cloud-ru/ds-table 1.0.8-preview-6d260fa4.0 → 1.0.8-preview-3405f207.0

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 (31) hide show
  1. package/README.md +9 -9
  2. package/dist/cjs/components/Table/Table.js +3 -3
  3. package/dist/cjs/components/Table/components/TableCardsBody/TableCardsBody.d.ts +2 -1
  4. package/dist/cjs/components/Table/components/TableCardsBody/TableCardsBody.js +2 -2
  5. package/dist/cjs/components/Table/components/TableRowsBody/TableRowsBody.d.ts +2 -1
  6. package/dist/cjs/components/Table/components/TableRowsBody/TableRowsBody.js +2 -2
  7. package/dist/cjs/components/types.d.ts +0 -5
  8. package/dist/cjs/helperComponents/Cells/HeaderCell/ResizeHandle.js +1 -15
  9. package/dist/cjs/presets/infiniteTable/toInfiniteTableProps.d.ts +2 -9
  10. package/dist/cjs/presets/infiniteTable/toInfiniteTableProps.js +1 -1
  11. package/dist/cjs/presets/infiniteTable/useInfiniteTableProps.js +3 -1
  12. package/dist/esm/components/Table/Table.js +3 -3
  13. package/dist/esm/components/Table/components/TableCardsBody/TableCardsBody.d.ts +2 -1
  14. package/dist/esm/components/Table/components/TableCardsBody/TableCardsBody.js +2 -2
  15. package/dist/esm/components/Table/components/TableRowsBody/TableRowsBody.d.ts +2 -1
  16. package/dist/esm/components/Table/components/TableRowsBody/TableRowsBody.js +2 -2
  17. package/dist/esm/components/types.d.ts +0 -5
  18. package/dist/esm/helperComponents/Cells/HeaderCell/ResizeHandle.js +1 -15
  19. package/dist/esm/presets/infiniteTable/toInfiniteTableProps.d.ts +2 -9
  20. package/dist/esm/presets/infiniteTable/toInfiniteTableProps.js +2 -2
  21. package/dist/esm/presets/infiniteTable/useInfiniteTableProps.js +3 -1
  22. package/dist/tsconfig.cjs.tsbuildinfo +1 -1
  23. package/dist/tsconfig.esm.tsbuildinfo +1 -1
  24. package/package.json +14 -14
  25. package/src/components/Table/Table.tsx +2 -1
  26. package/src/components/Table/components/TableCardsBody/TableCardsBody.tsx +3 -0
  27. package/src/components/Table/components/TableRowsBody/TableRowsBody.tsx +3 -0
  28. package/src/components/types.ts +2 -6
  29. package/src/helperComponents/Cells/HeaderCell/ResizeHandle.tsx +0 -19
  30. package/src/presets/infiniteTable/toInfiniteTableProps.ts +3 -10
  31. package/src/presets/infiniteTable/useInfiniteTableProps.ts +4 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloud-ru/ds-table",
3
- "version": "1.0.8-preview-6d260fa4.0",
3
+ "version": "1.0.8-preview-3405f207.0",
4
4
  "description": "Таблица данных: клиентская Table, серверная ServerTable и preset-обёртки с упрощённым API.",
5
5
  "repository": {
6
6
  "type": "git",
@@ -49,25 +49,25 @@
49
49
  "@tanstack/react-virtual": "^3.14.8",
50
50
  "classnames": "^2.5.1",
51
51
  "@cloud-ru/ds-adaptive": "1.0.1",
52
- "@cloud-ru/ds-chips": "1.0.7-preview-6d260fa4.0",
53
- "@cloud-ru/ds-card": "1.0.5-preview-6d260fa4.0",
52
+ "@cloud-ru/ds-button": "1.0.1",
53
+ "@cloud-ru/ds-icons": "1.0.1",
54
+ "@cloud-ru/ds-card": "1.0.5-preview-3405f207.0",
55
+ "@cloud-ru/ds-chips": "1.0.7-preview-3405f207.0",
54
56
  "@cloud-ru/ds-info-block": "1.0.1",
55
- "@cloud-ru/ds-list": "2.0.1-preview-6d260fa4.0",
57
+ "@cloud-ru/ds-drag-and-drop": "1.1.1",
58
+ "@cloud-ru/ds-list": "2.0.1-preview-3405f207.0",
56
59
  "@cloud-ru/ds-locale": "1.0.0",
57
60
  "@cloud-ru/ds-materials": "1.0.1",
58
- "@cloud-ru/ds-pagination": "1.0.2-preview-6d260fa4.0",
59
- "@cloud-ru/ds-scroll": "1.0.2-preview-6d260fa4.0",
61
+ "@cloud-ru/ds-scroll": "1.0.1",
60
62
  "@cloud-ru/ds-skeleton": "1.0.1",
61
63
  "@cloud-ru/ds-status": "1.0.1",
62
- "@cloud-ru/ds-theme": "1.0.1-preview-6d260fa4.0",
63
- "@cloud-ru/ds-toggles": "1.1.2-preview-6d260fa4.0",
64
- "@cloud-ru/ds-toolbar": "1.0.8-preview-6d260fa4.0",
65
- "@cloud-ru/ds-tooltip": "1.0.3-preview-6d260fa4.0",
66
- "@cloud-ru/ds-truncate-string": "1.0.3-preview-6d260fa4.0",
64
+ "@cloud-ru/ds-theme": "1.0.0",
65
+ "@cloud-ru/ds-toggles": "1.1.1",
66
+ "@cloud-ru/ds-toolbar": "1.0.8-preview-3405f207.0",
67
+ "@cloud-ru/ds-tooltip": "1.0.2",
68
+ "@cloud-ru/ds-truncate-string": "1.0.2",
67
69
  "@cloud-ru/ds-utils": "1.1.0",
68
- "@cloud-ru/ds-drag-and-drop": "1.1.1",
69
- "@cloud-ru/ds-icons": "1.0.2-preview-6d260fa4.0",
70
- "@cloud-ru/ds-button": "1.0.1"
70
+ "@cloud-ru/ds-pagination": "1.0.1"
71
71
  },
72
72
  "publishConfig": {
73
73
  "access": "public"
@@ -511,6 +511,7 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
511
511
  emptyState={tableEmptyState}
512
512
  showInfiniteLoadingTail={showInfiniteLoadingTail}
513
513
  loadingTableRows={loadingTableRows}
514
+ loadMoreButton={loadMoreButtonNode}
514
515
  />
515
516
  );
516
517
 
@@ -530,6 +531,7 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
530
531
  showInfiniteLoadingTail={showInfiniteLoadingTail}
531
532
  loadingTableRows={loadingTableRows}
532
533
  loadingTable={loadingTable}
534
+ loadMoreButton={loadMoreButtonNode}
533
535
  />
534
536
  );
535
537
 
@@ -766,7 +768,6 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
766
768
  {scrollContent}
767
769
  </TableScrollHost>
768
770
  </DndContext>
769
- {loadMoreButtonNode}
770
771
  {!isCardsView && outline ? <span className={styles.contentBorder} aria-hidden /> : null}
771
772
  </div>
772
773
 
@@ -27,6 +27,7 @@ type TableCardsBodyProps<TData extends object> = {
27
27
  showInfiniteLoadingTail: boolean;
28
28
  loadingTableRows: Row<TData>[];
29
29
  loadingTable: Table<TData>;
30
+ loadMoreButton?: ReactNode;
30
31
  };
31
32
 
32
33
  export function TableCardsBody<TData extends object>({
@@ -44,6 +45,7 @@ export function TableCardsBody<TData extends object>({
44
45
  showInfiniteLoadingTail,
45
46
  loadingTableRows,
46
47
  loadingTable,
48
+ loadMoreButton,
47
49
  }: TableCardsBodyProps<TData>) {
48
50
  const renderContentCard = (row: Row<TData>, selectionAppearance?: RowAppearance) => {
49
51
  const defaultRender = (
@@ -83,6 +85,7 @@ export function TableCardsBody<TData extends object>({
83
85
  </div>
84
86
  </SkeletonContextProvider>
85
87
  ) : null}
88
+ {loadMoreButton}
86
89
  {emptyState}
87
90
  </>
88
91
  );
@@ -21,6 +21,7 @@ type TableRowsBodyProps<TData extends object> = {
21
21
  emptyState: ReactNode;
22
22
  showInfiniteLoadingTail: boolean;
23
23
  loadingTableRows: Row<TData>[];
24
+ loadMoreButton?: ReactNode;
24
25
  };
25
26
 
26
27
  export function TableRowsBody<TData extends object>({
@@ -35,6 +36,7 @@ export function TableRowsBody<TData extends object>({
35
36
  emptyState,
36
37
  showInfiniteLoadingTail,
37
38
  loadingTableRows,
39
+ loadMoreButton,
38
40
  }: TableRowsBodyProps<TData>) {
39
41
  return (
40
42
  <>
@@ -109,6 +111,7 @@ export function TableRowsBody<TData extends object>({
109
111
  ))}
110
112
  </SkeletonContextProvider>
111
113
  ) : null}
114
+ {loadMoreButton}
112
115
  {emptyState}
113
116
  </>
114
117
  );
@@ -330,11 +330,6 @@ type BaseTableProps<TData extends object, TFilters extends FiltersState = Record
330
330
  /**
331
331
  * Включает виртуализацию строк (windowing по вертикали).
332
332
  * Рекомендуется при > 200 строк. Несовместимо с `view='cards'` — при картах игнорируется.
333
- *
334
- * 🔴 Требует `size` у колонок: виртуализованные строки позиционируются абсолютно и не участвуют в
335
- * расчёте внутренней ширины, поэтому колонка без `size` делит ширину контейнера поровну с
336
- * остальными вместо растягивания по содержимому.
337
- *
338
333
  * @default false
339
334
  */
340
335
  enableRowVirtualization?: boolean;
@@ -421,7 +416,8 @@ export type ClientTableProps<
421
416
  };
422
417
 
423
418
  export type TableProps<TData extends object, TFilters extends FiltersState = Record<string, unknown>> =
424
- InfiniteTableProps<TData, TFilters> | ClientTableProps<TData, TFilters>;
419
+ | InfiniteTableProps<TData, TFilters>
420
+ | ClientTableProps<TData, TFilters>;
425
421
 
426
422
  export type ServerTableProps<TData extends object, TFilters extends FiltersState = Record<string, unknown>> = Omit<
427
423
  ClientTableProps<TData, TFilters>,
@@ -37,24 +37,6 @@ function getResizeIndicatorOffset<TData>({ header, cellRef }: ResizeHandleProps<
37
37
  export function ResizeHandle<TData>({ header, cellRef }: ResizeHandleProps<TData>) {
38
38
  const isResizing = header.column.getIsResizing();
39
39
  const resizeHandler = header.getResizeHandler();
40
- const { table } = header.getContext();
41
-
42
- // У колонки без `size` нет записи в columnSizing, и tanstack стартует перетаскивание от дефолта
43
- // columnDef (150px), а не от отрисованной ширины. Реальная ширина фиксируется заранее, на
44
- // наведении: к моменту mousedown состояние уже применено.
45
- const pinRenderedWidth = () => {
46
- const id = header.column.id;
47
-
48
- if (table.getState().columnSizing[id] !== undefined) {
49
- return;
50
- }
51
-
52
- const rendered = cellRef.current?.offsetWidth;
53
-
54
- if (rendered) {
55
- table.setColumnSizing(prev => ({ ...prev, [id]: rendered }));
56
- }
57
- };
58
40
 
59
41
  const handleMouseDown = (event: MouseEvent) => {
60
42
  if (event.detail === 2) {
@@ -74,7 +56,6 @@ export function ResizeHandle<TData>({ header, cellRef }: ResizeHandleProps<TData
74
56
  aria-hidden
75
57
  className={cn(styles.tableHeaderIcon, styles.tableHeaderResizeHandle)}
76
58
  data-resizing={isResizing || undefined}
77
- onMouseEnter={pinRenderedWidth}
78
59
  onMouseDown={handleMouseDown}
79
60
  onTouchStart={resizeHandler}
80
61
  onMouseUp={stopEventPropagation}
@@ -1,20 +1,13 @@
1
1
  import { Ref } from 'react';
2
2
 
3
- import { CardViewInput, mapCardViewProps } from '../../columnUtils';
3
+ import { CardViewInput, defineColumns, mapCardViewProps, SimpleColumnDef } from '../../columnUtils';
4
4
  import { InfiniteTableProps } from '../../components/types';
5
- import { ColumnDefinition } from '../../types';
6
5
  import { wrapGetRowId } from '../wrapGetRowId';
7
6
 
8
7
  /** Входные пропсы `InfiniteTable` / `useInfiniteTableProps` */
9
8
  export type InfiniteTableInput<TData extends object> = CardViewInput<TData> & {
10
9
  data: TData[];
11
- /**
12
- * Определения колонок в стандартном виде — том же, что у `Table.columnDefinitions`.
13
- * Упрощённое описание здесь не используется: у таблиц с бесконечной подгрузкой колонки
14
- * обычно не выражаются им (спред `getStatusColumnDef`, собственный `cell`, `id` не совпадающий
15
- * с `accessorKey`), а `defineColumns` остаётся доступен отдельно, если он всё же нужен.
16
- */
17
- columns: ColumnDefinition<TData>[];
10
+ columns: SimpleColumnDef<TData>[];
18
11
  getRowId?: (row: TData) => string;
19
12
  } & Omit<
20
13
  InfiniteTableProps<TData>,
@@ -44,7 +37,7 @@ export function toInfiniteTableProps<TData extends object>(
44
37
  ...rest,
45
38
  ...mapCardViewProps({ headlineKey, defaultView, view, onViewChange, renderCard }),
46
39
  data,
47
- columnDefinitions: columns,
40
+ columnDefinitions: defineColumns(columns),
48
41
  infiniteLoading: true,
49
42
  outline: outline ?? true,
50
43
  enableRowVirtualization: enableRowVirtualization ?? true,
@@ -1,5 +1,6 @@
1
1
  import { useMemo } from 'react';
2
2
 
3
+ import { defineColumns } from '../../columnUtils';
3
4
  import { InfiniteTableProps } from '../../components/types';
4
5
  import { wrapGetRowId } from '../wrapGetRowId';
5
6
  import { InfiniteTableInput, toInfiniteTableProps } from './toInfiniteTableProps';
@@ -20,11 +21,13 @@ export function useInfiniteTableProps<TData extends object>(
20
21
 
21
22
  const { columns, getRowId } = input;
22
23
 
24
+ const columnDefinitions = useMemo(() => defineColumns(columns), [columns]);
25
+
23
26
  const wrappedGetRowId = useMemo(() => wrapGetRowId(getRowId), [getRowId]);
24
27
 
25
28
  return {
26
29
  ...toInfiniteTableProps(input, isButtonMode ? null : scrollRef),
27
- columnDefinitions: columns,
30
+ columnDefinitions,
28
31
  getRowId: wrappedGetRowId,
29
32
  };
30
33
  }