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