@cloud-ru/ds-table 2.2.9 → 2.2.11-preview-2f5fa273.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 (99) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/README.md +14 -286
  3. package/dist/cjs/components/ServerTable/ServerTable.js +1 -1
  4. package/dist/cjs/components/Table/Table.d.ts +1 -1
  5. package/dist/cjs/components/Table/Table.js +3 -2
  6. package/dist/cjs/components/Table/hooks/useTableInstance.d.ts +2 -1
  7. package/dist/cjs/components/Table/hooks/useTableInstance.js +2 -1
  8. package/dist/cjs/components/Table/styles.module.css +3 -3
  9. package/dist/cjs/components/types.d.ts +4 -1
  10. package/dist/cjs/helperComponents/Cells/RowActionsCell/styles.module.css +2 -0
  11. package/dist/cjs/helperComponents/Cells/TreeCell/styles.module.css +1 -1
  12. package/dist/cjs/helperComponents/LoadMoreButton/styles.module.css +2 -1
  13. package/dist/cjs/helperComponents/TablePagination/TablePagination.js +24 -2
  14. package/dist/cjs/helperComponents/TablePagination/styles.module.css +7 -0
  15. package/dist/cjs/locale/index.d.ts +16 -0
  16. package/dist/cjs/locale/index.js +8 -0
  17. package/dist/cjs/presets/index.d.ts +0 -2
  18. package/dist/cjs/presets/index.js +0 -2
  19. package/dist/cjs/presets/simpleTable/toSimpleTableProps.d.ts +1 -3
  20. package/dist/cjs/presets/simpleTable/toSimpleTableProps.js +5 -5
  21. package/dist/cjs/presets/simpleTable/useSimpleTableProps.js +1 -4
  22. package/dist/cjs/style.css +15 -5
  23. package/dist/esm/components/ServerTable/ServerTable.js +1 -1
  24. package/dist/esm/components/Table/Table.d.ts +1 -1
  25. package/dist/esm/components/Table/Table.js +3 -2
  26. package/dist/esm/components/Table/hooks/useTableInstance.d.ts +2 -1
  27. package/dist/esm/components/Table/hooks/useTableInstance.js +2 -1
  28. package/dist/esm/components/Table/styles.module.css +3 -3
  29. package/dist/esm/components/types.d.ts +4 -1
  30. package/dist/esm/helperComponents/Cells/RowActionsCell/styles.module.css +2 -0
  31. package/dist/esm/helperComponents/Cells/TreeCell/styles.module.css +1 -1
  32. package/dist/esm/helperComponents/LoadMoreButton/styles.module.css +2 -1
  33. package/dist/esm/helperComponents/TablePagination/TablePagination.js +24 -2
  34. package/dist/esm/helperComponents/TablePagination/styles.module.css +7 -0
  35. package/dist/esm/locale/index.d.ts +16 -0
  36. package/dist/esm/locale/index.js +8 -0
  37. package/dist/esm/presets/index.d.ts +0 -2
  38. package/dist/esm/presets/index.js +0 -2
  39. package/dist/esm/presets/simpleTable/toSimpleTableProps.d.ts +1 -3
  40. package/dist/esm/presets/simpleTable/toSimpleTableProps.js +5 -5
  41. package/dist/esm/presets/simpleTable/useSimpleTableProps.js +1 -4
  42. package/dist/esm/style.css +15 -5
  43. package/dist/tsconfig.cjs.tsbuildinfo +1 -1
  44. package/dist/tsconfig.esm.tsbuildinfo +1 -1
  45. package/package.json +20 -20
  46. package/src/components/ServerTable/ServerTable.tsx +1 -0
  47. package/src/components/Table/STRUCTURE.md +12 -6
  48. package/src/components/Table/Table.tsx +3 -1
  49. package/src/components/Table/hooks/useTableInstance.tsx +3 -0
  50. package/src/components/types.ts +4 -1
  51. package/src/helperComponents/Cells/RowActionsCell/styles.module.scss +4 -0
  52. package/src/helperComponents/Cells/TreeCell/styles.module.scss +1 -11
  53. package/src/helperComponents/LoadMoreButton/styles.module.scss +2 -1
  54. package/src/helperComponents/TablePagination/TablePagination.tsx +64 -5
  55. package/src/helperComponents/TablePagination/styles.module.scss +7 -0
  56. package/src/locale/index.ts +8 -0
  57. package/src/presets/index.ts +0 -2
  58. package/src/presets/simpleTable/toSimpleTableProps.ts +6 -21
  59. package/src/presets/simpleTable/useSimpleTableProps.ts +1 -5
  60. package/dist/cjs/presets/adminTable/AdminTable.d.ts +0 -4
  61. package/dist/cjs/presets/adminTable/AdminTable.js +0 -11
  62. package/dist/cjs/presets/adminTable/index.d.ts +0 -4
  63. package/dist/cjs/presets/adminTable/index.js +0 -9
  64. package/dist/cjs/presets/adminTable/toAdminTableProps.d.ts +0 -31
  65. package/dist/cjs/presets/adminTable/toAdminTableProps.js +0 -57
  66. package/dist/cjs/presets/adminTable/useAdminTableProps.d.ts +0 -5
  67. package/dist/cjs/presets/adminTable/useAdminTableProps.js +0 -25
  68. package/dist/cjs/presets/serverAdminTable/ServerAdminTable.d.ts +0 -4
  69. package/dist/cjs/presets/serverAdminTable/ServerAdminTable.js +0 -11
  70. package/dist/cjs/presets/serverAdminTable/index.d.ts +0 -4
  71. package/dist/cjs/presets/serverAdminTable/index.js +0 -9
  72. package/dist/cjs/presets/serverAdminTable/toServerAdminTableProps.d.ts +0 -13
  73. package/dist/cjs/presets/serverAdminTable/toServerAdminTableProps.js +0 -25
  74. package/dist/cjs/presets/serverAdminTable/useServerAdminTableProps.d.ts +0 -5
  75. package/dist/cjs/presets/serverAdminTable/useServerAdminTableProps.js +0 -25
  76. package/dist/esm/presets/adminTable/AdminTable.d.ts +0 -4
  77. package/dist/esm/presets/adminTable/AdminTable.js +0 -8
  78. package/dist/esm/presets/adminTable/index.d.ts +0 -4
  79. package/dist/esm/presets/adminTable/index.js +0 -3
  80. package/dist/esm/presets/adminTable/toAdminTableProps.d.ts +0 -31
  81. package/dist/esm/presets/adminTable/toAdminTableProps.js +0 -54
  82. package/dist/esm/presets/adminTable/useAdminTableProps.d.ts +0 -5
  83. package/dist/esm/presets/adminTable/useAdminTableProps.js +0 -22
  84. package/dist/esm/presets/serverAdminTable/ServerAdminTable.d.ts +0 -4
  85. package/dist/esm/presets/serverAdminTable/ServerAdminTable.js +0 -8
  86. package/dist/esm/presets/serverAdminTable/index.d.ts +0 -4
  87. package/dist/esm/presets/serverAdminTable/index.js +0 -3
  88. package/dist/esm/presets/serverAdminTable/toServerAdminTableProps.d.ts +0 -13
  89. package/dist/esm/presets/serverAdminTable/toServerAdminTableProps.js +0 -22
  90. package/dist/esm/presets/serverAdminTable/useServerAdminTableProps.d.ts +0 -5
  91. package/dist/esm/presets/serverAdminTable/useServerAdminTableProps.js +0 -22
  92. package/src/presets/adminTable/AdminTable.tsx +0 -14
  93. package/src/presets/adminTable/index.ts +0 -4
  94. package/src/presets/adminTable/toAdminTableProps.ts +0 -140
  95. package/src/presets/adminTable/useAdminTableProps.ts +0 -35
  96. package/src/presets/serverAdminTable/ServerAdminTable.tsx +0 -14
  97. package/src/presets/serverAdminTable/index.ts +0 -4
  98. package/src/presets/serverAdminTable/toServerAdminTableProps.ts +0 -44
  99. package/src/presets/serverAdminTable/useServerAdminTableProps.ts +0 -35
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloud-ru/ds-table",
3
- "version": "2.2.9",
3
+ "version": "2.2.11-preview-2f5fa273.0",
4
4
  "description": "Таблица данных: клиентская Table, серверная ServerTable и preset-обёртки с упрощённым API.",
5
5
  "repository": {
6
6
  "type": "git",
@@ -48,25 +48,25 @@
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-button": "^1.0.6",
52
- "@cloud-ru/ds-adaptive": "^1.0.4",
53
- "@cloud-ru/ds-chips": "^1.2.11",
54
- "@cloud-ru/ds-icons": "^1.7.3",
55
- "@cloud-ru/ds-card": "^1.0.36",
56
- "@cloud-ru/ds-drag-and-drop": "^1.1.5",
57
- "@cloud-ru/ds-list": "^3.1.2",
58
- "@cloud-ru/ds-materials": "^2.0.3",
59
- "@cloud-ru/ds-locale": "^1.0.0",
60
- "@cloud-ru/ds-pagination": "^1.1.10",
61
- "@cloud-ru/ds-skeleton": "^1.0.4",
62
- "@cloud-ru/ds-info-block": "^1.0.5",
63
- "@cloud-ru/ds-scroll": "^1.0.7",
64
- "@cloud-ru/ds-status": "^1.1.17",
65
- "@cloud-ru/ds-toggles": "^1.1.16",
66
- "@cloud-ru/ds-tooltip": "^1.0.19",
67
- "@cloud-ru/ds-truncate-string": "^1.0.20",
68
- "@cloud-ru/ds-utils": "^1.4.0",
69
- "@cloud-ru/ds-toolbar": "^2.1.8"
51
+ "@cloud-ru/ds-adaptive": "1.0.6-preview-2f5fa273.0",
52
+ "@cloud-ru/ds-card": "1.0.38-preview-2f5fa273.0",
53
+ "@cloud-ru/ds-button": "1.0.8-preview-2f5fa273.0",
54
+ "@cloud-ru/ds-drag-and-drop": "1.1.7-preview-2f5fa273.0",
55
+ "@cloud-ru/ds-icons": "1.7.5-preview-2f5fa273.0",
56
+ "@cloud-ru/ds-chips": "1.2.13-preview-2f5fa273.0",
57
+ "@cloud-ru/ds-locale": "1.0.0",
58
+ "@cloud-ru/ds-list": "3.1.4-preview-2f5fa273.0",
59
+ "@cloud-ru/ds-info-block": "1.0.7-preview-2f5fa273.0",
60
+ "@cloud-ru/ds-pagination": "1.1.12-preview-2f5fa273.0",
61
+ "@cloud-ru/ds-materials": "2.0.5-preview-2f5fa273.0",
62
+ "@cloud-ru/ds-scroll": "1.0.9-preview-2f5fa273.0",
63
+ "@cloud-ru/ds-skeleton": "1.0.6-preview-2f5fa273.0",
64
+ "@cloud-ru/ds-status": "1.1.19-preview-2f5fa273.0",
65
+ "@cloud-ru/ds-toggles": "1.1.18-preview-2f5fa273.0",
66
+ "@cloud-ru/ds-toolbar": "2.1.10-preview-2f5fa273.0",
67
+ "@cloud-ru/ds-tooltip": "1.0.21-preview-2f5fa273.0",
68
+ "@cloud-ru/ds-truncate-string": "1.0.22-preview-2f5fa273.0",
69
+ "@cloud-ru/ds-utils": "1.4.2-preview-2f5fa273.0"
70
70
  },
71
71
  "publishConfig": {
72
72
  "access": "public"
@@ -73,6 +73,7 @@ export function ServerTable<TData extends object, TFilters extends FiltersState
73
73
  }}
74
74
  columnFilters={columnFilters}
75
75
  pageCount={pageCount}
76
+ rowCount={total}
76
77
  pagination={{
77
78
  ...pagination,
78
79
  state: {
@@ -1,10 +1,10 @@
1
1
  # Table — внутренняя структура
2
2
 
3
- `Table.tsx` — оркестратор: пропсы, хуки, `TableContext.Provider` и сборка layout. Вся остальная логика и JSX разнесены по модулям этой папки и соседним пакетным примитивам.
3
+ `Table.tsx` связывает пропсы, состояние и контексты таблицы и собирает панель инструментов, область прокрутки и пагинацию.
4
4
 
5
5
  Публичный API компонента — в [packages/table/docs/table.mdx](../../../docs/table.mdx).
6
6
 
7
- Preset-ы (`AdminTable`, `ServerTable`, `EntitiesTable`, …) и `helperComponents/` — вне этой папки; здесь только core `Table`.
7
+ `Table` и `ServerTable` — базовые компоненты. `ServerTable` использует `Table` для серверной пагинации, сортировки и фильтрации. Готовые варианты находятся в [src/presets](../../presets), общие компоненты — в [src/helperComponents](../../helperComponents). `SimpleTable` отображает все переданные строки без панели инструментов и пагинации.
8
8
 
9
9
  ## Архитектура
10
10
 
@@ -26,6 +26,8 @@ flowchart TB
26
26
  CardsBody[TableCardsBody]
27
27
  Skeleton[TableSkeletonBody]
28
28
  Chrome[TableChrome]
29
+ Pagination[TablePagination]
30
+ LoadMore[LoadMoreButton]
29
31
  Helpers[helperComponents]
30
32
 
31
33
  Table --> Adaptive
@@ -41,8 +43,10 @@ flowchart TB
41
43
  Table --> ScrollHost
42
44
  ScrollHost --> RowsBody
43
45
  ScrollHost --> CardsBody
44
- Table --> Skeleton
46
+ ScrollHost --> Skeleton
47
+ ScrollHost --> LoadMore
45
48
  Table --> Chrome
49
+ Table --> Pagination
46
50
  RowsBody --> Helpers
47
51
  CardsBody --> Helpers
48
52
  ScrollHost --> Helpers
@@ -65,10 +69,11 @@ flowchart TB
65
69
  | Page index | `hooks/usePageReset` | сброс `pageIndex`, если страница вне диапазона (client pagination) |
66
70
  | Adaptive | `@cloud-ru/ds-adaptive` + `TABLE_LAYOUT_PRESETS` | `layoutType`, mobile-дефолты `stickyControls`, `fullWidth` |
67
71
  | Context | `contexts/` (`TableContext`, `CellAutoResizeContext`) | auto-resize ячеек, `fullWidth`, virtualization padding, shared table API для строк/ячеек |
68
- | Table rows | `components/TableRowsBody` | pinned top rows, virtualization, infinite tail, load-more, empty state |
69
- | Cards view | `components/TableCardsBody` | сетка карточек, mobile list, load-more button |
72
+ | Table rows | `components/TableRowsBody` | закреплённые сверху строки, виртуализация, индикатор дозагрузки, пустые состояния |
73
+ | Cards view | `components/TableCardsBody` | сетка карточек и список на мобильной раскладке |
70
74
  | Loading | `components/TableSkeletonBody` | skeleton table/cards |
71
- | Scroll shell | `components/TableScrollHost` | варианты `Scroll`, sticky header plate, mobile cards container |
75
+ | Scroll shell | `components/TableScrollHost` | контейнер прокрутки для строк и карточек, закреплённый заголовок, кнопка дозагрузки после содержимого |
76
+ | Пагинация | `helperComponents/TablePagination` | кнопки перехода и выбор страницы через BottomSheet на мобильной раскладке |
72
77
  | Chrome | `components/TableChrome` | `ControlsChrome` для toolbar и pagination |
73
78
  | Layout shell | `Table.tsx` + `styles.module.scss` | `.wrapper`, grid/flex, `data-fit-content` при `fullWidth={false}`, провайдеры |
74
79
  | Утилиты | `utils/` | pinning, column ids, CSS-vars, `getTableColumnsDefinitions`, `saveTableState/*` |
@@ -91,6 +96,7 @@ packages/table/src/components/Table/
91
96
  │ ├── useColumnSizes.ts
92
97
  │ ├── useTableScroll.ts
93
98
  │ ├── useTableToolbar.ts
99
+ │ ├── useTableView.ts
94
100
  │ ├── useColumnSettings/
95
101
  │ ├── useFilters/
96
102
  │ ├── useRowVirtualizer.ts
@@ -104,6 +104,7 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
104
104
  onRefresh,
105
105
  pageSize = DEFAULT_PAGE_SIZE,
106
106
  pageCount,
107
+ rowCount,
107
108
  loading = false,
108
109
  infiniteLoading = false,
109
110
  onLoadMore,
@@ -294,6 +295,7 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
294
295
  pagination,
295
296
  onPaginationChange,
296
297
  pageCount,
298
+ rowCount,
297
299
  pageSize,
298
300
  manualSorting,
299
301
  manualPagination,
@@ -770,9 +772,9 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
770
772
  columnSizeVars={columnSizes.vars as CSSProperties}
771
773
  >
772
774
  {scrollContent}
775
+ {loadMoreButtonNode}
773
776
  </TableScrollHost>
774
777
  </DndContext>
775
- {loadMoreButtonNode}
776
778
  {!isCardsView && outline ? <span className={styles.contentBorder} aria-hidden /> : null}
777
779
  </div>
778
780
 
@@ -43,6 +43,7 @@ type UseTableInstanceParams<TData extends object> = {
43
43
  pagination: PaginationState;
44
44
  onPaginationChange: OnChangeFn<PaginationState>;
45
45
  pageCount?: number;
46
+ rowCount?: number;
46
47
  pageSize: number;
47
48
  manualSorting: boolean;
48
49
  manualPagination: boolean;
@@ -82,6 +83,7 @@ export function useTableInstance<TData extends object>({
82
83
  pagination,
83
84
  onPaginationChange,
84
85
  pageCount,
86
+ rowCount,
85
87
  pageSize,
86
88
  manualSorting,
87
89
  manualPagination,
@@ -137,6 +139,7 @@ export function useTableInstance<TData extends object>({
137
139
  expanded,
138
140
  },
139
141
  pageCount,
142
+ rowCount,
140
143
  defaultColumn: {
141
144
  enableSorting: false,
142
145
  enableResizing: false,
@@ -373,6 +373,7 @@ export type InfiniteTableProps<
373
373
  pagination?: never;
374
374
  autoResetPageIndex?: never;
375
375
  pageCount?: never;
376
+ rowCount?: never;
376
377
  /** Режим работы "бесконечной" загрузки */
377
378
  infiniteLoading?: boolean;
378
379
  suppressPagination?: never;
@@ -412,6 +413,8 @@ export type ClientTableProps<
412
413
  autoResetPageIndex?: boolean;
413
414
  /** Кол-во страниц (для внешнего управления) */
414
415
  pageCount?: number;
416
+ /** Общее количество строк при внешнем управлении пагинацией. */
417
+ rowCount?: number;
415
418
  /** Отключение пагинации */
416
419
  suppressPagination?: boolean;
417
420
  manualPagination?: boolean;
@@ -428,7 +431,7 @@ export type TableProps<TData extends object, TFilters extends FiltersState = Rec
428
431
 
429
432
  export type ServerTableProps<TData extends object, TFilters extends FiltersState = Record<string, unknown>> = Omit<
430
433
  ClientTableProps<TData, TFilters>,
431
- 'pageSize' | 'pageCount' | 'pagination' | 'search' | 'data' | 'toolbarCheckBoxMode'
434
+ 'pageSize' | 'pageCount' | 'rowCount' | 'pagination' | 'search' | 'data' | 'toolbarCheckBoxMode'
432
435
  > & {
433
436
  /** Данные для отрисовки */
434
437
  items?: TData[];
@@ -1,7 +1,10 @@
1
+ @use '@cloud-ru/ds-figma-variables/build/scss/components/table.module' as table;
2
+
1
3
  // Ячейка действий строки: кнопка-троеточие (Droplist) по центру. Вертикальный разделитель
2
4
  // слева рисует sticky-обёртка закреплённого блока (.rowPinnedCells[data-position='right']::after).
3
5
 
4
6
  .rowActionsHeader {
7
+ max-width: table.$sn-table-anatomy-content-headLine-actionWrapper-maxWidth;
5
8
  padding: 0 !important;
6
9
  }
7
10
 
@@ -12,6 +15,7 @@
12
15
 
13
16
  .rowActionsCell {
14
17
  position: relative;
18
+ max-width: table.$sn-table-anatomy-content-tableLine-actionWrapper-maxWidth;
15
19
  }
16
20
 
17
21
  .rowActionsCellWrap {
@@ -138,17 +138,7 @@
138
138
  align-items: center;
139
139
 
140
140
  box-sizing: border-box;
141
- // cellToggles: 32px + padding-left 4px (sn/table/content/tableLine/pinnedWrapper/elementWrapper/cellToggles)
142
- width: base.simple-var(
143
- table.$table,
144
- 'anatomy',
145
- 'content',
146
- 'tableLine',
147
- 'pinnedWrapper',
148
- 'elementWrapper',
149
- 'cellToggles',
150
- 'width'
151
- );
141
+ width: table.$sn-table-anatomy-content-tableLineTree-pinnedWrapper-elementWrapper-cellToggles-width;
152
142
  height: 100%;
153
143
  padding-left: base.simple-var(
154
144
  table.$table,
@@ -5,5 +5,6 @@
5
5
  display: flex;
6
6
  justify-content: center;
7
7
  box-sizing: border-box;
8
- padding: base.$sn-primitive-dimension-8 0;
8
+
9
+ @include base.composite-var(table.$table, 'anatomy', 'view', 'loadTrigger');
9
10
  }
@@ -1,4 +1,7 @@
1
+ import { isMobileLayout, useAdaptiveLayout } from '@cloud-ru/ds-adaptive';
2
+ import { Button } from '@cloud-ru/ds-button';
1
3
  import { ChipChoice } from '@cloud-ru/ds-chips';
4
+ import { ChevronLeftSVG, ChevronRightSVG } from '@cloud-ru/ds-icons/interface/system';
2
5
  import { Pagination } from '@cloud-ru/ds-pagination';
3
6
  import { Table } from '@tanstack/react-table';
4
7
  import { useCallback, useMemo } from 'react';
@@ -7,6 +10,8 @@ import { View } from '../../constants';
7
10
  import { tableLocale } from '../../locale';
8
11
  import styles from './styles.module.scss';
9
12
 
13
+ const MAX_PAGE_OPTIONS = 1000;
14
+
10
15
  export type TablePaginationProps<TData> = {
11
16
  table: Table<TData>;
12
17
  options?: number[];
@@ -24,6 +29,8 @@ export function TablePagination<TData>({
24
29
  optionsRender,
25
30
  view,
26
31
  }: TablePaginationProps<TData>) {
32
+ const { layoutType } = useAdaptiveLayout();
33
+ const mobile = isMobileLayout(layoutType);
27
34
  const { t } = tableLocale.useTranslations();
28
35
  const optionsLabel = optionsLabelProp ?? t('rowsOptionsLabel');
29
36
 
@@ -54,24 +61,76 @@ export function TablePagination<TData>({
54
61
  );
55
62
 
56
63
  const tablePaginationState = table.getState().pagination;
64
+ const pageCount = table.getPageCount();
65
+ const currentPage = tablePaginationState.pageIndex + 1;
66
+ const hasKnownPageCount = Number.isSafeInteger(pageCount) && pageCount >= 0;
67
+ const showPagination = !hasKnownPageCount || pageCount > 1;
68
+ const showPagePicker = mobile && hasKnownPageCount && pageCount > 1 && pageCount <= MAX_PAGE_OPTIONS;
69
+ const useCompactPagination = mobile || !hasKnownPageCount;
70
+ const pageOptions = useMemo(
71
+ () =>
72
+ showPagePicker
73
+ ? Array.from({ length: pageCount }, (_, index) => {
74
+ const page = String(index + 1);
75
+ return { label: page, value: page };
76
+ })
77
+ : [],
78
+ [showPagePicker, pageCount],
79
+ );
57
80
 
58
- if (table.getPageCount() <= 1 && !options) {
81
+ if (!showPagination && !options?.length) {
59
82
  return null;
60
83
  }
61
84
 
62
85
  return (
63
86
  <div className={styles.footer} data-view={view}>
64
- {table.getPageCount() > 1 && (
87
+ {showPagination && useCompactPagination && (
88
+ <nav className={styles.mobilePagination} aria-label={t('pagination')}>
89
+ <Button
90
+ size='s'
91
+ view='function'
92
+ appearance='neutral'
93
+ icon={<ChevronLeftSVG />}
94
+ aria-label={t('previousPage')}
95
+ disabled={!table.getCanPreviousPage()}
96
+ onClick={() => table.previousPage()}
97
+ />
98
+ {showPagePicker && (
99
+ <ChipChoice.Single
100
+ label={t('page')}
101
+ value={String(currentPage)}
102
+ options={pageOptions}
103
+ onChange={value => {
104
+ if (value !== undefined) {
105
+ handlePaginationOnChange(Number(value));
106
+ }
107
+ }}
108
+ size='s'
109
+ />
110
+ )}
111
+ <Button
112
+ size='s'
113
+ view='function'
114
+ appearance='neutral'
115
+ icon={<ChevronRightSVG />}
116
+ aria-label={t('nextPage')}
117
+ disabled={!table.getCanNextPage()}
118
+ onClick={() => table.nextPage()}
119
+ />
120
+ </nav>
121
+ )}
122
+
123
+ {showPagination && !useCompactPagination && (
65
124
  <Pagination
66
- total={table.getPageCount()}
67
- page={tablePaginationState.pageIndex + 1}
125
+ total={pageCount}
126
+ page={currentPage}
68
127
  onChange={handlePaginationOnChange}
69
128
  size='s'
70
129
  className={styles.pagination}
71
130
  />
72
131
  )}
73
132
 
74
- {options && table.getRowModel().rows.length >= Number(options[0].value) && (
133
+ {options && options.length > 0 && (mobile || table.getRowCount() >= Number(options[0].value)) && (
75
134
  <ChipChoice.Single
76
135
  value={String(tablePaginationState.pageSize)}
77
136
  onChange={value => handleRowsVolumeOnChange(String(value))}
@@ -21,3 +21,10 @@
21
21
  .footer[data-view='cards'] .pagination {
22
22
  flex: 1;
23
23
  }
24
+
25
+ .mobilePagination {
26
+ display: flex;
27
+ gap: base.$sn-primitive-dimension-4;
28
+ align-items: center;
29
+ margin-right: auto;
30
+ }
@@ -4,6 +4,10 @@ const TABLE_MESSAGES = defineMessages({
4
4
  'en-GB': {
5
5
  searchPlaceholder: 'Search',
6
6
  rowsOptionsLabel: 'Rows volume',
7
+ pagination: 'Pagination',
8
+ page: 'Page',
9
+ previousPage: 'Previous page',
10
+ nextPage: 'Next page',
7
11
  settingsHeaderLabel: 'Columns settings',
8
12
  sort: 'Sort',
9
13
  clearSort: 'Clear sorting',
@@ -28,6 +32,10 @@ const TABLE_MESSAGES = defineMessages({
28
32
  'ru-RU': {
29
33
  searchPlaceholder: 'Поиск',
30
34
  rowsOptionsLabel: 'Строк на странице',
35
+ pagination: 'Навигация по страницам',
36
+ page: 'Страница',
37
+ previousPage: 'Предыдущая страница',
38
+ nextPage: 'Следующая страница',
31
39
  settingsHeaderLabel: 'Настройки колонок',
32
40
  sort: 'Сортировка',
33
41
  clearSort: 'Сбросить сортировку',
@@ -1,7 +1,5 @@
1
- export * from './adminTable';
2
1
  export * from './entitiesTable';
3
2
  export * from './infiniteTable';
4
- export * from './serverAdminTable';
5
3
  export * from './serverSimpleTable';
6
4
  export * from './simpleTable';
7
5
  export * from './treeTable';
@@ -1,7 +1,5 @@
1
1
  import { CardViewInput, defineColumns, mapCardViewProps, SimpleColumnDef } from '../../columnUtils';
2
2
  import { ClientTableProps } from '../../components/types';
3
- import { DEFAULT_PAGE_SIZE } from '../../constants';
4
- import { DEFAULT_PRESET_PAGE_SIZE, DEFAULT_PRESET_PAGINATION_OPTIONS } from '../constants';
5
3
  import { wrapGetRowId } from '../wrapGetRowId';
6
4
 
7
5
  /** Входные пропсы `SimpleTable` / `useSimpleTableProps` */
@@ -10,28 +8,13 @@ export type SimpleTableInput<TData extends object> = CardViewInput<TData> & {
10
8
  data: TData[];
11
9
  /** Декларативное описание колонок */
12
10
  columns: SimpleColumnDef<TData>[];
13
- /** Количество строк на страницу @default 10 */
14
- pageSize?: number;
15
11
  /** Стабильный идентификатор строки */
16
12
  getRowId?: (row: TData) => string;
17
- } & Omit<ClientTableProps<TData>, 'data' | 'columnDefinitions' | 'getRowId' | 'headlineId'>;
13
+ } & Omit<ClientTableProps<TData>, 'data' | 'columnDefinitions' | 'getRowId' | 'headlineId' | 'pageSize'>;
18
14
 
19
15
  /** Маппинг упрощённых пропсов в `ClientTableProps` для `Table` */
20
16
  export function toSimpleTableProps<TData extends object>(input: SimpleTableInput<TData>): ClientTableProps<TData> {
21
- const {
22
- data,
23
- columns,
24
- pageSize = DEFAULT_PRESET_PAGE_SIZE,
25
- getRowId,
26
- headlineKey,
27
- defaultView,
28
- view,
29
- onViewChange,
30
- renderCard,
31
- outline,
32
- pagination,
33
- ...rest
34
- } = input;
17
+ const { data, columns, getRowId, headlineKey, defaultView, view, onViewChange, renderCard, outline, ...rest } = input;
35
18
 
36
19
  return {
37
20
  ...rest,
@@ -39,8 +22,10 @@ export function toSimpleTableProps<TData extends object>(input: SimpleTableInput
39
22
  data,
40
23
  columnDefinitions: defineColumns(columns),
41
24
  outline: outline ?? true,
42
- pageSize: pageSize ?? DEFAULT_PAGE_SIZE,
43
- pagination: pagination ?? { options: [...DEFAULT_PRESET_PAGINATION_OPTIONS] },
25
+ pageSize: Math.max(data.length, 1),
26
+ manualPagination: true,
27
+ suppressToolbar: true,
28
+ suppressPagination: true,
44
29
  getRowId: wrapGetRowId(getRowId),
45
30
  };
46
31
  }
@@ -2,24 +2,20 @@ import { useMemo } from 'react';
2
2
 
3
3
  import { defineColumns } from '../../columnUtils';
4
4
  import { ClientTableProps } from '../../components/types';
5
- import { DEFAULT_PRESET_PAGINATION_OPTIONS } from '../constants';
6
5
  import { wrapGetRowId } from '../wrapGetRowId';
7
6
  import { SimpleTableInput, toSimpleTableProps } from './toSimpleTableProps';
8
7
 
9
8
  /** Возвращает готовые пропсы для `Table` из упрощённого API `SimpleTable` */
10
9
  export function useSimpleTableProps<TData extends object>(input: SimpleTableInput<TData>): ClientTableProps<TData> {
11
- const { columns, getRowId, pagination } = input;
10
+ const { columns, getRowId } = input;
12
11
 
13
12
  const columnDefinitions = useMemo(() => defineColumns(columns), [columns]);
14
13
 
15
14
  const wrappedGetRowId = useMemo(() => wrapGetRowId(getRowId), [getRowId]);
16
15
 
17
- const defaultPagination = useMemo(() => ({ options: [...DEFAULT_PRESET_PAGINATION_OPTIONS] }), []);
18
-
19
16
  return {
20
17
  ...toSimpleTableProps(input),
21
18
  columnDefinitions,
22
19
  getRowId: wrappedGetRowId,
23
- pagination: pagination ?? defaultPagination,
24
20
  };
25
21
  }
@@ -1,4 +0,0 @@
1
- import { FiltersState } from '@cloud-ru/ds-chips';
2
- import { AdminTableInput } from './toAdminTableProps';
3
- /** Стандартная админ-таблица: поиск, фильтры, выбор строк, статус и действия */
4
- export declare function AdminTable<TData extends object, TFilters extends FiltersState = Record<string, unknown>>(props: AdminTableInput<TData, TFilters>): import("react/jsx-runtime").JSX.Element;
@@ -1,11 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.AdminTable = AdminTable;
4
- const jsx_runtime_1 = require("react/jsx-runtime");
5
- const Table_1 = require("../../components/Table");
6
- const useAdminTableProps_1 = require("./useAdminTableProps");
7
- /** Стандартная админ-таблица: поиск, фильтры, выбор строк, статус и действия */
8
- function AdminTable(props) {
9
- const tableProps = (0, useAdminTableProps_1.useAdminTableProps)(props);
10
- return (0, jsx_runtime_1.jsx)(Table_1.Table, { ...tableProps });
11
- }
@@ -1,4 +0,0 @@
1
- export { AdminTable } from './AdminTable';
2
- export type { AdminTableInput } from './toAdminTableProps';
3
- export { toAdminTableProps } from './toAdminTableProps';
4
- export { useAdminTableProps } from './useAdminTableProps';
@@ -1,9 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.useAdminTableProps = exports.toAdminTableProps = exports.AdminTable = void 0;
4
- var AdminTable_1 = require("./AdminTable");
5
- Object.defineProperty(exports, "AdminTable", { enumerable: true, get: function () { return AdminTable_1.AdminTable; } });
6
- var toAdminTableProps_1 = require("./toAdminTableProps");
7
- Object.defineProperty(exports, "toAdminTableProps", { enumerable: true, get: function () { return toAdminTableProps_1.toAdminTableProps; } });
8
- var useAdminTableProps_1 = require("./useAdminTableProps");
9
- Object.defineProperty(exports, "useAdminTableProps", { enumerable: true, get: function () { return useAdminTableProps_1.useAdminTableProps; } });
@@ -1,31 +0,0 @@
1
- import { FiltersState } from '@cloud-ru/ds-chips';
2
- import { FilterRow } from '@cloud-ru/ds-toolbar';
3
- import { RowSelectionState } from '@tanstack/react-table';
4
- import { CardViewInput, RowActionsConfig, SimpleColumnDef, StatusColumnConfig } from '../../columnUtils';
5
- import { ClientTableProps } from '../../components/types';
6
- type AdminTableSearchConfig = {
7
- placeholder?: string;
8
- onChange?: (value: string) => void;
9
- };
10
- type AdminTableSelectionConfig = {
11
- multiRow?: boolean;
12
- bulkActions?: ClientTableProps<object>['bulkActions'];
13
- onChange?: (state: RowSelectionState) => void;
14
- state?: RowSelectionState;
15
- initialState?: RowSelectionState;
16
- };
17
- /** Входные пропсы `AdminTable` / `useAdminTableProps` */
18
- export type AdminTableInput<TData extends object, TFilters extends FiltersState = Record<string, unknown>> = CardViewInput<TData> & {
19
- data: TData[];
20
- columns: SimpleColumnDef<TData>[];
21
- statusColumn?: StatusColumnConfig<TData>;
22
- rowActions?: RowActionsConfig<TData>;
23
- filters?: FilterRow<TFilters>;
24
- selection?: AdminTableSelectionConfig;
25
- search?: boolean | AdminTableSearchConfig;
26
- pageSize?: number;
27
- getRowId: (row: TData) => string;
28
- } & Omit<ClientTableProps<TData, TFilters>, 'data' | 'columnDefinitions' | 'getRowId' | 'headlineId' | 'search' | 'suppressSearch' | 'columnFilters' | 'rowSelection' | 'bulkActions'>;
29
- /** Маппинг упрощённых пропсов в `ClientTableProps` для `Table` */
30
- export declare function toAdminTableProps<TData extends object, TFilters extends FiltersState = Record<string, unknown>>(input: AdminTableInput<TData, TFilters>): ClientTableProps<TData, TFilters>;
31
- export {};
@@ -1,57 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.toAdminTableProps = toAdminTableProps;
4
- const columnUtils_1 = require("../../columnUtils");
5
- const constants_1 = require("../constants");
6
- const wrapGetRowId_1 = require("../wrapGetRowId");
7
- function mapSearchProps(search) {
8
- if (search === false) {
9
- return { suppressSearch: true };
10
- }
11
- if (search === true || search === undefined) {
12
- return {};
13
- }
14
- return {
15
- search: {
16
- placeholder: search.placeholder,
17
- onChange: search.onChange,
18
- },
19
- };
20
- }
21
- function buildColumnDefinitions({ statusColumn: statusColumnConfig, columns, rowActions, }) {
22
- return [
23
- ...(statusColumnConfig ? [(0, columnUtils_1.statusColumn)(statusColumnConfig)] : []),
24
- ...(0, columnUtils_1.defineColumns)(columns),
25
- ...(rowActions ? [(0, columnUtils_1.actionsColumn)(rowActions)] : []),
26
- ];
27
- }
28
- /** Маппинг упрощённых пропсов в `ClientTableProps` для `Table` */
29
- function toAdminTableProps(input) {
30
- const { data, columns, statusColumn: statusColumnConfig, rowActions, filters, selection, search, pageSize = constants_1.DEFAULT_PRESET_PAGE_SIZE, getRowId, headlineKey, defaultView, view, onViewChange, renderCard, outline, pagination, columnsSettings, onRefresh, ...rest } = input;
31
- return {
32
- ...rest,
33
- ...(0, columnUtils_1.mapCardViewProps)({ headlineKey, defaultView, view, onViewChange, renderCard }),
34
- ...mapSearchProps(search),
35
- data,
36
- columnDefinitions: buildColumnDefinitions({ statusColumn: statusColumnConfig, columns, rowActions }),
37
- outline: outline ?? true,
38
- pageSize,
39
- pagination: pagination ?? { options: [...constants_1.DEFAULT_PRESET_PAGINATION_OPTIONS] },
40
- getRowId: (0, wrapGetRowId_1.wrapGetRowId)(getRowId),
41
- onRefresh,
42
- columnsSettings: columnsSettings ?? { enableSettingsMenu: true },
43
- ...(filters ? { columnFilters: filters } : {}),
44
- ...(selection
45
- ? {
46
- rowSelection: {
47
- enable: true,
48
- multiRow: selection.multiRow ?? true,
49
- onChange: selection.onChange,
50
- state: selection.state,
51
- initialState: selection.initialState,
52
- },
53
- bulkActions: selection.bulkActions,
54
- }
55
- : {}),
56
- };
57
- }
@@ -1,5 +0,0 @@
1
- import { FiltersState } from '@cloud-ru/ds-chips';
2
- import { ClientTableProps } from '../../components/types';
3
- import { AdminTableInput } from './toAdminTableProps';
4
- /** Возвращает готовые пропсы для `Table` из упрощённого API `AdminTable` */
5
- export declare function useAdminTableProps<TData extends object, TFilters extends FiltersState = Record<string, unknown>>(input: AdminTableInput<TData, TFilters>): ClientTableProps<TData, TFilters>;
@@ -1,25 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.useAdminTableProps = useAdminTableProps;
4
- const react_1 = require("react");
5
- const columnUtils_1 = require("../../columnUtils");
6
- const constants_1 = require("../constants");
7
- const wrapGetRowId_1 = require("../wrapGetRowId");
8
- const toAdminTableProps_1 = require("./toAdminTableProps");
9
- /** Возвращает готовые пропсы для `Table` из упрощённого API `AdminTable` */
10
- function useAdminTableProps(input) {
11
- const { columns, statusColumn: statusColumnConfig, rowActions, getRowId, pagination } = input;
12
- const columnDefinitions = (0, react_1.useMemo)(() => [
13
- ...(statusColumnConfig ? [(0, columnUtils_1.statusColumn)(statusColumnConfig)] : []),
14
- ...(0, columnUtils_1.defineColumns)(columns),
15
- ...(rowActions ? [(0, columnUtils_1.actionsColumn)(rowActions)] : []),
16
- ], [statusColumnConfig, columns, rowActions]);
17
- const wrappedGetRowId = (0, react_1.useMemo)(() => (0, wrapGetRowId_1.wrapGetRowId)(getRowId), [getRowId]);
18
- const defaultPagination = (0, react_1.useMemo)(() => ({ options: [...constants_1.DEFAULT_PRESET_PAGINATION_OPTIONS] }), []);
19
- return {
20
- ...(0, toAdminTableProps_1.toAdminTableProps)(input),
21
- columnDefinitions,
22
- getRowId: wrappedGetRowId,
23
- pagination: pagination ?? defaultPagination,
24
- };
25
- }
@@ -1,4 +0,0 @@
1
- import { FiltersState } from '@cloud-ru/ds-chips';
2
- import { ServerAdminTableInput } from './toServerAdminTableProps';
3
- /** Серверная админ-таблица: поиск, фильтры, выбор строк, статус и действия */
4
- export declare function ServerAdminTable<TData extends object, TFilters extends FiltersState = Record<string, unknown>>(props: ServerAdminTableInput<TData, TFilters>): import("react/jsx-runtime").JSX.Element;