@cloud-ru/ds-table 2.2.11 → 2.2.12-preview-2991dba0.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 (143) hide show
  1. package/README.md +27 -334
  2. package/dist/cjs/components/ServerTable/ServerTable.js +1 -1
  3. package/dist/cjs/components/Table/Table.d.ts +1 -1
  4. package/dist/cjs/components/Table/Table.js +9 -3
  5. package/dist/cjs/components/Table/hooks/useTableInstance.d.ts +2 -1
  6. package/dist/cjs/components/Table/hooks/useTableInstance.js +2 -1
  7. package/dist/cjs/components/Table/styles.module.css +1 -0
  8. package/dist/cjs/components/types.d.ts +6 -3
  9. package/dist/cjs/helperComponents/Cells/RowActionsCell/components/RowActionsButton.js +1 -4
  10. package/dist/cjs/helperComponents/Cells/RowActionsCell/styles.module.css +2 -0
  11. package/dist/cjs/helperComponents/Cells/TreeCell/TreeLine/styles.module.css +1 -0
  12. package/dist/cjs/helperComponents/TableEmptyState/hooks.d.ts +2 -1
  13. package/dist/cjs/helperComponents/TableEmptyState/hooks.js +5 -2
  14. package/dist/cjs/helperComponents/TablePagination/TablePagination.js +31 -7
  15. package/dist/cjs/helperComponents/TablePagination/styles.module.css +8 -0
  16. package/dist/cjs/hooks/useCellSizes.js +4 -2
  17. package/dist/cjs/hooks/useColumnsSettingsToolbarSlot/useColumnsSettingsToolbarSlot.js +1 -0
  18. package/dist/cjs/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.js +1 -1
  19. package/dist/cjs/locale/index.d.ts +28 -8
  20. package/dist/cjs/locale/index.js +14 -4
  21. package/dist/cjs/presets/index.d.ts +0 -3
  22. package/dist/cjs/presets/index.js +0 -3
  23. package/dist/cjs/presets/simpleTable/SimpleTable.d.ts +1 -1
  24. package/dist/cjs/presets/simpleTable/SimpleTable.js +1 -1
  25. package/dist/cjs/presets/simpleTable/toSimpleTableProps.d.ts +5 -6
  26. package/dist/cjs/presets/simpleTable/toSimpleTableProps.js +6 -6
  27. package/dist/cjs/presets/simpleTable/useSimpleTableProps.js +1 -4
  28. package/dist/cjs/presets/treeTable/toTreeTableProps.d.ts +7 -7
  29. package/dist/cjs/presets/treeTable/toTreeTableProps.js +2 -3
  30. package/dist/cjs/style.css +12 -0
  31. package/dist/esm/components/ServerTable/ServerTable.js +1 -1
  32. package/dist/esm/components/Table/Table.d.ts +1 -1
  33. package/dist/esm/components/Table/Table.js +9 -3
  34. package/dist/esm/components/Table/hooks/useTableInstance.d.ts +2 -1
  35. package/dist/esm/components/Table/hooks/useTableInstance.js +2 -1
  36. package/dist/esm/components/Table/styles.module.css +1 -0
  37. package/dist/esm/components/types.d.ts +6 -3
  38. package/dist/esm/helperComponents/Cells/RowActionsCell/components/RowActionsButton.js +1 -4
  39. package/dist/esm/helperComponents/Cells/RowActionsCell/styles.module.css +2 -0
  40. package/dist/esm/helperComponents/Cells/TreeCell/TreeLine/styles.module.css +1 -0
  41. package/dist/esm/helperComponents/TableEmptyState/hooks.d.ts +2 -1
  42. package/dist/esm/helperComponents/TableEmptyState/hooks.js +5 -2
  43. package/dist/esm/helperComponents/TablePagination/TablePagination.js +31 -7
  44. package/dist/esm/helperComponents/TablePagination/styles.module.css +8 -0
  45. package/dist/esm/hooks/useCellSizes.js +5 -3
  46. package/dist/esm/hooks/useColumnsSettingsToolbarSlot/useColumnsSettingsToolbarSlot.js +1 -0
  47. package/dist/esm/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.js +1 -1
  48. package/dist/esm/locale/index.d.ts +28 -8
  49. package/dist/esm/locale/index.js +14 -4
  50. package/dist/esm/presets/index.d.ts +0 -3
  51. package/dist/esm/presets/index.js +0 -3
  52. package/dist/esm/presets/simpleTable/SimpleTable.d.ts +1 -1
  53. package/dist/esm/presets/simpleTable/SimpleTable.js +1 -1
  54. package/dist/esm/presets/simpleTable/toSimpleTableProps.d.ts +5 -6
  55. package/dist/esm/presets/simpleTable/toSimpleTableProps.js +7 -7
  56. package/dist/esm/presets/simpleTable/useSimpleTableProps.js +1 -4
  57. package/dist/esm/presets/treeTable/toTreeTableProps.d.ts +7 -7
  58. package/dist/esm/presets/treeTable/toTreeTableProps.js +3 -4
  59. package/dist/esm/style.css +12 -0
  60. package/dist/tsconfig.cjs.tsbuildinfo +1 -1
  61. package/dist/tsconfig.esm.tsbuildinfo +1 -1
  62. package/package.json +20 -20
  63. package/src/components/ServerTable/ServerTable.tsx +1 -0
  64. package/src/components/Table/STRUCTURE.md +12 -6
  65. package/src/components/Table/Table.tsx +9 -2
  66. package/src/components/Table/hooks/useTableInstance.tsx +3 -0
  67. package/src/components/Table/styles.module.scss +2 -3
  68. package/src/components/types.ts +6 -3
  69. package/src/helperComponents/Cells/RowActionsCell/components/RowActionsButton.tsx +1 -3
  70. package/src/helperComponents/Cells/RowActionsCell/styles.module.scss +2 -0
  71. package/src/helperComponents/Cells/TreeCell/TreeLine/styles.module.scss +3 -0
  72. package/src/helperComponents/TableEmptyState/{hooks.ts → hooks.tsx} +7 -1
  73. package/src/helperComponents/TablePagination/TablePagination.tsx +80 -10
  74. package/src/helperComponents/TablePagination/styles.module.scss +9 -0
  75. package/src/hooks/useCellSizes.ts +5 -3
  76. package/src/hooks/useColumnsSettingsToolbarSlot/useColumnsSettingsToolbarSlot.tsx +1 -0
  77. package/src/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.tsx +2 -0
  78. package/src/locale/index.ts +14 -4
  79. package/src/presets/index.ts +0 -3
  80. package/src/presets/simpleTable/SimpleTable.tsx +1 -1
  81. package/src/presets/simpleTable/toSimpleTableProps.ts +35 -30
  82. package/src/presets/simpleTable/useSimpleTableProps.ts +1 -5
  83. package/src/presets/treeTable/toTreeTableProps.ts +24 -23
  84. package/dist/cjs/presets/adminTable/AdminTable.d.ts +0 -4
  85. package/dist/cjs/presets/adminTable/AdminTable.js +0 -11
  86. package/dist/cjs/presets/adminTable/index.d.ts +0 -4
  87. package/dist/cjs/presets/adminTable/index.js +0 -9
  88. package/dist/cjs/presets/adminTable/toAdminTableProps.d.ts +0 -31
  89. package/dist/cjs/presets/adminTable/toAdminTableProps.js +0 -57
  90. package/dist/cjs/presets/adminTable/useAdminTableProps.d.ts +0 -5
  91. package/dist/cjs/presets/adminTable/useAdminTableProps.js +0 -25
  92. package/dist/cjs/presets/serverAdminTable/ServerAdminTable.d.ts +0 -4
  93. package/dist/cjs/presets/serverAdminTable/ServerAdminTable.js +0 -11
  94. package/dist/cjs/presets/serverAdminTable/index.d.ts +0 -4
  95. package/dist/cjs/presets/serverAdminTable/index.js +0 -9
  96. package/dist/cjs/presets/serverAdminTable/toServerAdminTableProps.d.ts +0 -13
  97. package/dist/cjs/presets/serverAdminTable/toServerAdminTableProps.js +0 -25
  98. package/dist/cjs/presets/serverAdminTable/useServerAdminTableProps.d.ts +0 -5
  99. package/dist/cjs/presets/serverAdminTable/useServerAdminTableProps.js +0 -25
  100. package/dist/cjs/presets/serverSimpleTable/ServerSimpleTable.d.ts +0 -3
  101. package/dist/cjs/presets/serverSimpleTable/ServerSimpleTable.js +0 -11
  102. package/dist/cjs/presets/serverSimpleTable/index.d.ts +0 -4
  103. package/dist/cjs/presets/serverSimpleTable/index.js +0 -9
  104. package/dist/cjs/presets/serverSimpleTable/toServerSimpleTableProps.d.ts +0 -13
  105. package/dist/cjs/presets/serverSimpleTable/toServerSimpleTableProps.js +0 -25
  106. package/dist/cjs/presets/serverSimpleTable/useServerSimpleTableProps.d.ts +0 -4
  107. package/dist/cjs/presets/serverSimpleTable/useServerSimpleTableProps.js +0 -21
  108. package/dist/esm/presets/adminTable/AdminTable.d.ts +0 -4
  109. package/dist/esm/presets/adminTable/AdminTable.js +0 -8
  110. package/dist/esm/presets/adminTable/index.d.ts +0 -4
  111. package/dist/esm/presets/adminTable/index.js +0 -3
  112. package/dist/esm/presets/adminTable/toAdminTableProps.d.ts +0 -31
  113. package/dist/esm/presets/adminTable/toAdminTableProps.js +0 -54
  114. package/dist/esm/presets/adminTable/useAdminTableProps.d.ts +0 -5
  115. package/dist/esm/presets/adminTable/useAdminTableProps.js +0 -22
  116. package/dist/esm/presets/serverAdminTable/ServerAdminTable.d.ts +0 -4
  117. package/dist/esm/presets/serverAdminTable/ServerAdminTable.js +0 -8
  118. package/dist/esm/presets/serverAdminTable/index.d.ts +0 -4
  119. package/dist/esm/presets/serverAdminTable/index.js +0 -3
  120. package/dist/esm/presets/serverAdminTable/toServerAdminTableProps.d.ts +0 -13
  121. package/dist/esm/presets/serverAdminTable/toServerAdminTableProps.js +0 -22
  122. package/dist/esm/presets/serverAdminTable/useServerAdminTableProps.d.ts +0 -5
  123. package/dist/esm/presets/serverAdminTable/useServerAdminTableProps.js +0 -22
  124. package/dist/esm/presets/serverSimpleTable/ServerSimpleTable.d.ts +0 -3
  125. package/dist/esm/presets/serverSimpleTable/ServerSimpleTable.js +0 -8
  126. package/dist/esm/presets/serverSimpleTable/index.d.ts +0 -4
  127. package/dist/esm/presets/serverSimpleTable/index.js +0 -3
  128. package/dist/esm/presets/serverSimpleTable/toServerSimpleTableProps.d.ts +0 -13
  129. package/dist/esm/presets/serverSimpleTable/toServerSimpleTableProps.js +0 -22
  130. package/dist/esm/presets/serverSimpleTable/useServerSimpleTableProps.d.ts +0 -4
  131. package/dist/esm/presets/serverSimpleTable/useServerSimpleTableProps.js +0 -18
  132. package/src/presets/adminTable/AdminTable.tsx +0 -14
  133. package/src/presets/adminTable/index.ts +0 -4
  134. package/src/presets/adminTable/toAdminTableProps.ts +0 -140
  135. package/src/presets/adminTable/useAdminTableProps.ts +0 -35
  136. package/src/presets/serverAdminTable/ServerAdminTable.tsx +0 -14
  137. package/src/presets/serverAdminTable/index.ts +0 -4
  138. package/src/presets/serverAdminTable/toServerAdminTableProps.ts +0 -44
  139. package/src/presets/serverAdminTable/useServerAdminTableProps.ts +0 -35
  140. package/src/presets/serverSimpleTable/ServerSimpleTable.tsx +0 -10
  141. package/src/presets/serverSimpleTable/index.ts +0 -4
  142. package/src/presets/serverSimpleTable/toServerSimpleTableProps.ts +0 -56
  143. package/src/presets/serverSimpleTable/useServerSimpleTableProps.ts +0 -27
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloud-ru/ds-table",
3
- "version": "2.2.11",
3
+ "version": "2.2.12-preview-2991dba0.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-card": "^1.0.38",
52
- "@cloud-ru/ds-drag-and-drop": "^1.1.7",
53
- "@cloud-ru/ds-icons": "^1.7.5",
54
- "@cloud-ru/ds-info-block": "^1.0.7",
55
- "@cloud-ru/ds-list": "^3.1.4",
56
- "@cloud-ru/ds-locale": "^1.0.0",
57
- "@cloud-ru/ds-materials": "^2.0.5",
58
- "@cloud-ru/ds-pagination": "^1.1.12",
59
- "@cloud-ru/ds-scroll": "^1.0.9",
60
- "@cloud-ru/ds-skeleton": "^1.0.6",
61
- "@cloud-ru/ds-status": "^1.1.19",
62
- "@cloud-ru/ds-toggles": "^1.1.18",
63
- "@cloud-ru/ds-toolbar": "^2.1.10",
64
- "@cloud-ru/ds-tooltip": "^1.0.21",
65
- "@cloud-ru/ds-truncate-string": "^1.0.22",
66
- "@cloud-ru/ds-utils": "^1.4.2",
67
- "@cloud-ru/ds-adaptive": "^1.0.6",
68
- "@cloud-ru/ds-button": "^1.0.8",
69
- "@cloud-ru/ds-chips": "^1.2.13"
51
+ "@cloud-ru/ds-button": "1.0.8",
52
+ "@cloud-ru/ds-card": "1.0.39-preview-2991dba0.0",
53
+ "@cloud-ru/ds-drag-and-drop": "1.1.7",
54
+ "@cloud-ru/ds-chips": "1.2.14-preview-2991dba0.0",
55
+ "@cloud-ru/ds-info-block": "1.0.7",
56
+ "@cloud-ru/ds-list": "3.1.5-preview-2991dba0.0",
57
+ "@cloud-ru/ds-locale": "1.0.0",
58
+ "@cloud-ru/ds-materials": "2.0.5",
59
+ "@cloud-ru/ds-pagination": "1.1.12",
60
+ "@cloud-ru/ds-skeleton": "1.0.6",
61
+ "@cloud-ru/ds-scroll": "1.0.9",
62
+ "@cloud-ru/ds-status": "1.1.19",
63
+ "@cloud-ru/ds-toggles": "1.1.18",
64
+ "@cloud-ru/ds-tooltip": "1.0.21",
65
+ "@cloud-ru/ds-toolbar": "2.1.11-preview-2991dba0.0",
66
+ "@cloud-ru/ds-truncate-string": "1.0.22",
67
+ "@cloud-ru/ds-adaptive": "1.0.6",
68
+ "@cloud-ru/ds-utils": "1.4.2",
69
+ "@cloud-ru/ds-icons": "1.7.5"
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,
@@ -338,7 +340,12 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
338
340
  savedState,
339
341
  });
340
342
 
341
- const emptyStates = useEmptyState({ noDataState, noResultsState, errorDataState });
343
+ const emptyStates = useEmptyState({
344
+ noDataState,
345
+ noResultsState,
346
+ errorDataState,
347
+ onRefresh: onRefresh ? handleOnRefresh : undefined,
348
+ });
342
349
 
343
350
  usePageReset({
344
351
  manualPagination,
@@ -770,9 +777,9 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
770
777
  columnSizeVars={columnSizes.vars as CSSProperties}
771
778
  >
772
779
  {scrollContent}
780
+ {loadMoreButtonNode}
773
781
  </TableScrollHost>
774
782
  </DndContext>
775
- {loadMoreButtonNode}
776
783
  {!isCardsView && outline ? <span className={styles.contentBorder} aria-hidden /> : null}
777
784
  </div>
778
785
 
@@ -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,
@@ -33,6 +33,7 @@ $divider-width: base.simple-var(
33
33
  display: grid;
34
34
  grid-template-rows: minmax(0, 100%) max-content;
35
35
 
36
+ box-sizing: border-box;
36
37
  width: 100%;
37
38
  max-width: 100%;
38
39
  min-height: 0;
@@ -208,9 +209,7 @@ $divider-width: base.simple-var(
208
209
  .stickyTableHeader {
209
210
  position: sticky;
210
211
  z-index: 3;
211
- top: calc(
212
- var(--table-sticky-controls-offset-top, 0px) + var(--table-sticky-toolbar-offset, 0px)
213
- );
212
+ top: calc(var(--table-sticky-controls-offset-top, 0px) + var(--table-sticky-toolbar-offset, 0px));
214
213
 
215
214
  // Фон на обёртке: покрывает всю ширину/высоту chrome (в т.ч. пустое место у pinned),
216
215
  // без второго acrylic-слоя ControlsChrome.
@@ -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;
@@ -381,7 +382,7 @@ export type InfiniteTableProps<
381
382
  /**
382
383
  * Колбэк дозагрузки следующей порции данных.
383
384
  * В режиме `loadMoreTrigger='scroll'` вызывается автоматически при достижении конца списка;
384
- * в режиме `loadMoreTrigger='button'` — по нажатию кнопки «Загрузить ещё».
385
+ * в режиме `loadMoreTrigger='button'` — по нажатию кнопки «Показать ещё».
385
386
  */
386
387
  onLoadMore?: () => void;
387
388
  /** Есть ли ещё данные для загрузки. Управляет видимостью кнопки / активностью observer-а. */
@@ -389,7 +390,7 @@ export type InfiniteTableProps<
389
390
  /**
390
391
  * Механизм подгрузки следующей порции данных.
391
392
  * - `'scroll'` (по умолчанию) — IntersectionObserver на scroll-stub в конце списка.
392
- * - `'button'` — кнопка «Загрузить ещё» под таблицей.
393
+ * - `'button'` — кнопка «Показать ещё» под таблицей.
393
394
  */
394
395
  loadMoreTrigger?: LoadMoreTrigger;
395
396
  };
@@ -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[];
@@ -16,9 +16,7 @@ export function RowActionsButton({ variant = 'cell', size, ...rest }: RowActions
16
16
  return (
17
17
  <Button
18
18
  {...rest}
19
- // В table-строке мастер (actionWrapper 16236:23147) — кнопка size=l (40×40). В карточке
20
- // размещение действий макетом не задано, оставляем дефолт.
21
- size={size ?? (isCardsView ? undefined : SIZE.L)}
19
+ size={size ?? (isCardsView ? undefined : SIZE.S)}
22
20
  appearance='neutral'
23
21
  view={VIEW.Function}
24
22
  style={
@@ -4,6 +4,7 @@
4
4
  // слева рисует sticky-обёртка закреплённого блока (.rowPinnedCells[data-position='right']::after).
5
5
 
6
6
  .rowActionsHeader {
7
+ min-width: table.$sn-table-anatomy-content-headLine-actionWrapper-maxWidth;
7
8
  max-width: table.$sn-table-anatomy-content-headLine-actionWrapper-maxWidth;
8
9
  padding: 0 !important;
9
10
  }
@@ -15,6 +16,7 @@
15
16
 
16
17
  .rowActionsCell {
17
18
  position: relative;
19
+ min-width: table.$sn-table-anatomy-content-tableLine-actionWrapper-maxWidth;
18
20
  max-width: table.$sn-table-anatomy-content-tableLine-actionWrapper-maxWidth;
19
21
  }
20
22
 
@@ -10,7 +10,10 @@ $list-row-gap: table.$sn-table-anatomy-content-tableLine-pinnedWrapper-elementWr
10
10
 
11
11
  .treeLine {
12
12
  position: relative;
13
+
13
14
  flex-shrink: 0;
15
+
16
+ box-sizing: border-box;
14
17
  width: $level-width;
15
18
  height: 100%;
16
19
 
@@ -1,3 +1,4 @@
1
+ import { Button } from '@cloud-ru/ds-button';
1
2
  import { CrossSVG, SearchSVG } from '@cloud-ru/ds-icons/interface/system';
2
3
  import { useMemo } from 'react';
3
4
 
@@ -8,10 +9,12 @@ export function useEmptyState({
8
9
  noDataState: noDataStateProp,
9
10
  noResultsState: noResultsStateProp,
10
11
  errorDataState: errorDataStateProp,
12
+ onRefresh,
11
13
  }: {
12
14
  noDataState?: EmptyStateProps;
13
15
  noResultsState?: EmptyStateProps;
14
16
  errorDataState?: EmptyStateProps;
17
+ onRefresh?(): void;
15
18
  }): {
16
19
  noDataState: EmptyStateProps;
17
20
  noResultsState: EmptyStateProps;
@@ -37,6 +40,9 @@ export function useEmptyState({
37
40
  icon: { icon: CrossSVG, appearance: 'neutral', background: true },
38
41
  title: t('errorData.title'),
39
42
  content: t('errorData.content'),
43
+ footer: onRefresh ? (
44
+ <Button label={t('refresh')} onClick={onRefresh} size='s' appearance='neutral' view='outline' />
45
+ ) : undefined,
40
46
  ...errorDataStateProp,
41
47
  };
42
48
 
@@ -45,5 +51,5 @@ export function useEmptyState({
45
51
  noResultsState,
46
52
  errorDataState,
47
53
  };
48
- }, [errorDataStateProp, noDataStateProp, noResultsStateProp, t]);
54
+ }, [errorDataStateProp, noDataStateProp, noResultsStateProp, onRefresh, t]);
49
55
  }
@@ -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
 
@@ -41,37 +48,98 @@ export function TablePagination<TData>({
41
48
  [table],
42
49
  );
43
50
 
51
+ const handlePreviousPage = useCallback(() => table.previousPage(), [table]);
52
+ const handleNextPage = useCallback(() => table.nextPage(), [table]);
53
+ const handlePageSelect = useCallback(
54
+ (value: string | number | undefined) => {
55
+ if (value !== undefined) {
56
+ handlePaginationOnChange(Number(value));
57
+ }
58
+ },
59
+ [handlePaginationOnChange],
60
+ );
61
+
62
+ const tablePaginationState = table.getState().pagination;
63
+
44
64
  const options = useMemo(
45
65
  () =>
46
- optionsProp
47
- ?.slice()
48
- .sort((a, b) => a - b)
66
+ (optionsProp?.length ? Array.from(new Set([...optionsProp, tablePaginationState.pageSize])) : undefined)
67
+ ?.sort((a, b) => a - b)
49
68
  .map((value, idx) => ({
50
69
  label: String(optionsRender ? optionsRender(value, idx) : value),
51
70
  value: String(value),
52
71
  })),
53
- [optionsProp, optionsRender],
72
+ [optionsProp, optionsRender, tablePaginationState.pageSize],
54
73
  );
55
74
 
56
- const tablePaginationState = table.getState().pagination;
75
+ const pageCount = table.getPageCount();
76
+ const currentPage = tablePaginationState.pageIndex + 1;
77
+ const hasKnownPageCount = Number.isSafeInteger(pageCount) && pageCount >= 0;
78
+ const showPagination = !hasKnownPageCount || pageCount > 1;
79
+ const showPagePicker = mobile && hasKnownPageCount && pageCount > 1 && pageCount <= MAX_PAGE_OPTIONS;
80
+ const useCompactPagination = mobile || !hasKnownPageCount;
81
+ const pageOptions = useMemo(
82
+ () =>
83
+ showPagePicker
84
+ ? Array.from({ length: pageCount }, (_, index) => {
85
+ const page = String(index + 1);
86
+ return { label: page, value: page };
87
+ })
88
+ : [],
89
+ [showPagePicker, pageCount],
90
+ );
57
91
 
58
- if (table.getPageCount() <= 1 && !options) {
92
+ if (!showPagination && !options?.length) {
59
93
  return null;
60
94
  }
61
95
 
62
96
  return (
63
97
  <div className={styles.footer} data-view={view}>
64
- {table.getPageCount() > 1 && (
98
+ {showPagination && useCompactPagination && (
99
+ <nav className={styles.mobilePagination} aria-label={t('pagination')}>
100
+ <Button
101
+ size='s'
102
+ view='outline'
103
+ appearance='neutral'
104
+ icon={<ChevronLeftSVG />}
105
+ aria-label={t('previousPage')}
106
+ disabled={!table.getCanPreviousPage()}
107
+ onClick={handlePreviousPage}
108
+ />
109
+ {showPagePicker && (
110
+ <ChipChoice.Single
111
+ label={t('page')}
112
+ value={String(currentPage)}
113
+ options={pageOptions}
114
+ onChange={handlePageSelect}
115
+ size='s'
116
+ droplistSize='s'
117
+ withDividers={false}
118
+ />
119
+ )}
120
+ <Button
121
+ size='s'
122
+ view='outline'
123
+ appearance='neutral'
124
+ icon={<ChevronRightSVG />}
125
+ aria-label={t('nextPage')}
126
+ disabled={!table.getCanNextPage()}
127
+ onClick={handleNextPage}
128
+ />
129
+ </nav>
130
+ )}
131
+
132
+ {showPagination && !useCompactPagination && (
65
133
  <Pagination
66
- total={table.getPageCount()}
67
- page={tablePaginationState.pageIndex + 1}
134
+ total={pageCount}
135
+ page={currentPage}
68
136
  onChange={handlePaginationOnChange}
69
137
  size='s'
70
138
  className={styles.pagination}
71
139
  />
72
140
  )}
73
141
 
74
- {options && table.getRowModel().rows.length >= Number(options[0].value) && (
142
+ {options && options.length > 0 && (mobile || table.getRowCount() >= Number(options[0].value)) && (
75
143
  <ChipChoice.Single
76
144
  value={String(tablePaginationState.pageSize)}
77
145
  onChange={value => handleRowsVolumeOnChange(String(value))}
@@ -80,6 +148,8 @@ export function TablePagination<TData>({
80
148
  label={optionsLabel}
81
149
  widthStrategy='eq'
82
150
  size='s'
151
+ droplistSize='s'
152
+ withDividers={false}
83
153
  />
84
154
  )}
85
155
  </div>
@@ -9,6 +9,8 @@
9
9
  gap: base.$sn-primitive-dimension-8;
10
10
  align-items: center;
11
11
  justify-content: flex-end;
12
+
13
+ box-sizing: border-box;
12
14
  }
13
15
 
14
16
  // Мастер table-view (16097:44286): пагинация у левого края, чип объёма строк у правого
@@ -21,3 +23,10 @@
21
23
  .footer[data-view='cards'] .pagination {
22
24
  flex: 1;
23
25
  }
26
+
27
+ .mobilePagination {
28
+ display: flex;
29
+ gap: base.$sn-primitive-dimension-4;
30
+ align-items: center;
31
+ margin-right: auto;
32
+ }
@@ -2,7 +2,7 @@ import { CSS, Transform } from '@dnd-kit/utilities';
2
2
  import { Cell, Header } from '@tanstack/react-table';
3
3
  import { CSSProperties, useMemo } from 'react';
4
4
 
5
- import { TABLE_COLUMN_CSS_VARS } from '../constants';
5
+ import { DefaultColumns, TABLE_COLUMN_CSS_VARS } from '../constants';
6
6
 
7
7
  type CellSizesOptions = {
8
8
  isDraggable?: boolean;
@@ -16,8 +16,10 @@ export function useCellSizes<TData>(
16
16
  const column = element.column;
17
17
  const transform = options?.transform ?? null;
18
18
 
19
- const minWidth = column.columnDef.minSize;
20
- const maxWidth = column.columnDef.maxSize;
19
+ // Ширину служебной колонки действий задаёт токен actionWrapper в SCSS.
20
+ const isRowActions = column.id === DefaultColumns.RowActions;
21
+ const minWidth = isRowActions ? undefined : column.columnDef.minSize;
22
+ const maxWidth = isRowActions ? undefined : column.columnDef.maxSize;
21
23
  const width = `var(${TABLE_COLUMN_CSS_VARS.size(column.id)})`;
22
24
  const flexShrink = `var(${TABLE_COLUMN_CSS_VARS.flex(column.id)})`;
23
25
  const isHeaderCell = 'headerGroup' in element;
@@ -100,6 +100,7 @@ export function useColumnsSettingsToolbarSlot({
100
100
  scroll: true,
101
101
  className: styles.columnsSettings,
102
102
  size: SIZE.M,
103
+ withDividers: false,
103
104
  selection,
104
105
  placement: 'bottom-end',
105
106
  open,
@@ -75,6 +75,8 @@ export function useTableSortingToolbarSlot<TData extends object>({
75
75
  afterContent: (
76
76
  <Droplist
77
77
  scroll
78
+ size='m'
79
+ withDividers={false}
78
80
  items={items}
79
81
  selection={selection}
80
82
  virtualized={items.length > 10}
@@ -3,12 +3,17 @@ import { defineLocale, defineMessages } from '@cloud-ru/ds-locale';
3
3
  const TABLE_MESSAGES = defineMessages({
4
4
  'en-GB': {
5
5
  searchPlaceholder: 'Search',
6
- rowsOptionsLabel: 'Rows volume',
6
+ rowsOptionsLabel: 'Rows',
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',
10
14
  export: 'Export',
11
- loadMore: 'Load more',
15
+ loadMore: 'Show more',
16
+ refresh: 'Refresh',
12
17
  groupSelectButton: {
13
18
  show: 'Show all',
14
19
  hide: 'Hide all',
@@ -27,12 +32,17 @@ const TABLE_MESSAGES = defineMessages({
27
32
  },
28
33
  'ru-RU': {
29
34
  searchPlaceholder: 'Поиск',
30
- rowsOptionsLabel: 'Строк на странице',
35
+ rowsOptionsLabel: 'Строки',
36
+ pagination: 'Навигация по страницам',
37
+ page: 'Страница',
38
+ previousPage: 'Предыдущая страница',
39
+ nextPage: 'Следующая страница',
31
40
  settingsHeaderLabel: 'Настройки колонок',
32
41
  sort: 'Сортировка',
33
42
  clearSort: 'Сбросить сортировку',
34
43
  export: 'Экспорт',
35
- loadMore: 'Загрузить ещё',
44
+ loadMore: 'Показать ещё',
45
+ refresh: 'Обновить',
36
46
  groupSelectButton: {
37
47
  show: 'Показать все',
38
48
  hide: 'Скрыть все',
@@ -1,7 +1,4 @@
1
- export * from './adminTable';
2
1
  export * from './entitiesTable';
3
2
  export * from './infiniteTable';
4
- export * from './serverAdminTable';
5
- export * from './serverSimpleTable';
6
3
  export * from './simpleTable';
7
4
  export * from './treeTable';
@@ -2,7 +2,7 @@ import { Table } from '../../components/Table';
2
2
  import { SimpleTableInput } from './toSimpleTableProps';
3
3
  import { useSimpleTableProps } from './useSimpleTableProps';
4
4
 
5
- /** Минимальная клиентская таблица: данные, колонки, пагинация */
5
+ /** Клиентская таблица с декларативными колонками, без панели инструментов и пагинации. */
6
6
  export function SimpleTable<TData extends object>(props: SimpleTableInput<TData>) {
7
7
  const tableProps = useSimpleTableProps(props);
8
8