@cloud-ru/ds-table 2.2.12-preview-f18129b6.0 → 2.2.12
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.
- package/CHANGELOG.md +4 -0
- package/README.md +334 -27
- package/dist/cjs/components/ServerTable/ServerTable.js +1 -1
- package/dist/cjs/components/Table/Table.d.ts +1 -1
- package/dist/cjs/components/Table/Table.js +3 -9
- package/dist/cjs/components/Table/hooks/useTableInstance.d.ts +1 -2
- package/dist/cjs/components/Table/hooks/useTableInstance.js +1 -2
- package/dist/cjs/components/Table/styles.module.css +0 -1
- package/dist/cjs/components/types.d.ts +3 -6
- package/dist/cjs/helperComponents/Cells/RowActionsCell/components/RowActionsButton.js +4 -1
- package/dist/cjs/helperComponents/Cells/RowActionsCell/styles.module.css +0 -2
- package/dist/cjs/helperComponents/Cells/TreeCell/TreeLine/styles.module.css +0 -1
- package/dist/cjs/helperComponents/TableEmptyState/hooks.d.ts +1 -2
- package/dist/cjs/helperComponents/TableEmptyState/hooks.js +2 -5
- package/dist/cjs/helperComponents/TablePagination/TablePagination.js +7 -31
- package/dist/cjs/helperComponents/TablePagination/styles.module.css +0 -8
- package/dist/cjs/hooks/useCellSizes.js +2 -4
- package/dist/cjs/hooks/useColumnsSettingsToolbarSlot/useColumnsSettingsToolbarSlot.js +0 -1
- package/dist/cjs/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.js +1 -1
- package/dist/cjs/locale/index.d.ts +8 -28
- package/dist/cjs/locale/index.js +4 -14
- package/dist/cjs/presets/adminTable/AdminTable.d.ts +4 -0
- package/dist/cjs/presets/adminTable/AdminTable.js +11 -0
- package/dist/cjs/presets/adminTable/index.d.ts +4 -0
- package/dist/cjs/presets/adminTable/index.js +9 -0
- package/dist/cjs/presets/adminTable/toAdminTableProps.d.ts +31 -0
- package/dist/cjs/presets/adminTable/toAdminTableProps.js +57 -0
- package/dist/cjs/presets/adminTable/useAdminTableProps.d.ts +5 -0
- package/dist/cjs/presets/adminTable/useAdminTableProps.js +25 -0
- package/dist/cjs/presets/index.d.ts +3 -0
- package/dist/cjs/presets/index.js +3 -0
- package/dist/cjs/presets/serverAdminTable/ServerAdminTable.d.ts +4 -0
- package/dist/cjs/presets/serverAdminTable/ServerAdminTable.js +11 -0
- package/dist/cjs/presets/serverAdminTable/index.d.ts +4 -0
- package/dist/cjs/presets/serverAdminTable/index.js +9 -0
- package/dist/cjs/presets/serverAdminTable/toServerAdminTableProps.d.ts +13 -0
- package/dist/cjs/presets/serverAdminTable/toServerAdminTableProps.js +25 -0
- package/dist/cjs/presets/serverAdminTable/useServerAdminTableProps.d.ts +5 -0
- package/dist/cjs/presets/serverAdminTable/useServerAdminTableProps.js +25 -0
- package/dist/cjs/presets/serverSimpleTable/ServerSimpleTable.d.ts +3 -0
- package/dist/cjs/presets/serverSimpleTable/ServerSimpleTable.js +11 -0
- package/dist/cjs/presets/serverSimpleTable/index.d.ts +4 -0
- package/dist/cjs/presets/serverSimpleTable/index.js +9 -0
- package/dist/cjs/presets/serverSimpleTable/toServerSimpleTableProps.d.ts +13 -0
- package/dist/cjs/presets/serverSimpleTable/toServerSimpleTableProps.js +25 -0
- package/dist/cjs/presets/serverSimpleTable/useServerSimpleTableProps.d.ts +4 -0
- package/dist/cjs/presets/serverSimpleTable/useServerSimpleTableProps.js +21 -0
- package/dist/cjs/presets/simpleTable/SimpleTable.d.ts +1 -1
- package/dist/cjs/presets/simpleTable/SimpleTable.js +1 -1
- package/dist/cjs/presets/simpleTable/toSimpleTableProps.d.ts +6 -5
- package/dist/cjs/presets/simpleTable/toSimpleTableProps.js +6 -6
- package/dist/cjs/presets/simpleTable/useSimpleTableProps.js +4 -1
- package/dist/cjs/presets/treeTable/toTreeTableProps.d.ts +7 -7
- package/dist/cjs/presets/treeTable/toTreeTableProps.js +3 -2
- package/dist/cjs/style.css +0 -12
- package/dist/esm/components/ServerTable/ServerTable.js +1 -1
- package/dist/esm/components/Table/Table.d.ts +1 -1
- package/dist/esm/components/Table/Table.js +3 -9
- package/dist/esm/components/Table/hooks/useTableInstance.d.ts +1 -2
- package/dist/esm/components/Table/hooks/useTableInstance.js +1 -2
- package/dist/esm/components/Table/styles.module.css +0 -1
- package/dist/esm/components/types.d.ts +3 -6
- package/dist/esm/helperComponents/Cells/RowActionsCell/components/RowActionsButton.js +4 -1
- package/dist/esm/helperComponents/Cells/RowActionsCell/styles.module.css +0 -2
- package/dist/esm/helperComponents/Cells/TreeCell/TreeLine/styles.module.css +0 -1
- package/dist/esm/helperComponents/TableEmptyState/hooks.d.ts +1 -2
- package/dist/esm/helperComponents/TableEmptyState/hooks.js +2 -5
- package/dist/esm/helperComponents/TablePagination/TablePagination.js +7 -31
- package/dist/esm/helperComponents/TablePagination/styles.module.css +0 -8
- package/dist/esm/hooks/useCellSizes.js +3 -5
- package/dist/esm/hooks/useColumnsSettingsToolbarSlot/useColumnsSettingsToolbarSlot.js +0 -1
- package/dist/esm/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.js +1 -1
- package/dist/esm/locale/index.d.ts +8 -28
- package/dist/esm/locale/index.js +4 -14
- package/dist/esm/presets/adminTable/AdminTable.d.ts +4 -0
- package/dist/esm/presets/adminTable/AdminTable.js +8 -0
- package/dist/esm/presets/adminTable/index.d.ts +4 -0
- package/dist/esm/presets/adminTable/index.js +3 -0
- package/dist/esm/presets/adminTable/toAdminTableProps.d.ts +31 -0
- package/dist/esm/presets/adminTable/toAdminTableProps.js +54 -0
- package/dist/esm/presets/adminTable/useAdminTableProps.d.ts +5 -0
- package/dist/esm/presets/adminTable/useAdminTableProps.js +22 -0
- package/dist/esm/presets/index.d.ts +3 -0
- package/dist/esm/presets/index.js +3 -0
- package/dist/esm/presets/serverAdminTable/ServerAdminTable.d.ts +4 -0
- package/dist/esm/presets/serverAdminTable/ServerAdminTable.js +8 -0
- package/dist/esm/presets/serverAdminTable/index.d.ts +4 -0
- package/dist/esm/presets/serverAdminTable/index.js +3 -0
- package/dist/esm/presets/serverAdminTable/toServerAdminTableProps.d.ts +13 -0
- package/dist/esm/presets/serverAdminTable/toServerAdminTableProps.js +22 -0
- package/dist/esm/presets/serverAdminTable/useServerAdminTableProps.d.ts +5 -0
- package/dist/esm/presets/serverAdminTable/useServerAdminTableProps.js +22 -0
- package/dist/esm/presets/serverSimpleTable/ServerSimpleTable.d.ts +3 -0
- package/dist/esm/presets/serverSimpleTable/ServerSimpleTable.js +8 -0
- package/dist/esm/presets/serverSimpleTable/index.d.ts +4 -0
- package/dist/esm/presets/serverSimpleTable/index.js +3 -0
- package/dist/esm/presets/serverSimpleTable/toServerSimpleTableProps.d.ts +13 -0
- package/dist/esm/presets/serverSimpleTable/toServerSimpleTableProps.js +22 -0
- package/dist/esm/presets/serverSimpleTable/useServerSimpleTableProps.d.ts +4 -0
- package/dist/esm/presets/serverSimpleTable/useServerSimpleTableProps.js +18 -0
- package/dist/esm/presets/simpleTable/SimpleTable.d.ts +1 -1
- package/dist/esm/presets/simpleTable/SimpleTable.js +1 -1
- package/dist/esm/presets/simpleTable/toSimpleTableProps.d.ts +6 -5
- package/dist/esm/presets/simpleTable/toSimpleTableProps.js +7 -7
- package/dist/esm/presets/simpleTable/useSimpleTableProps.js +4 -1
- package/dist/esm/presets/treeTable/toTreeTableProps.d.ts +7 -7
- package/dist/esm/presets/treeTable/toTreeTableProps.js +4 -3
- package/dist/esm/style.css +0 -12
- package/dist/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/tsconfig.esm.tsbuildinfo +1 -1
- package/package.json +20 -20
- package/src/components/ServerTable/ServerTable.tsx +0 -1
- package/src/components/Table/STRUCTURE.md +6 -12
- package/src/components/Table/Table.tsx +2 -9
- package/src/components/Table/hooks/useTableInstance.tsx +0 -3
- package/src/components/Table/styles.module.scss +3 -2
- package/src/components/types.ts +3 -6
- package/src/helperComponents/Cells/RowActionsCell/components/RowActionsButton.tsx +3 -1
- package/src/helperComponents/Cells/RowActionsCell/styles.module.scss +0 -2
- package/src/helperComponents/Cells/TreeCell/TreeLine/styles.module.scss +0 -3
- package/src/helperComponents/TableEmptyState/{hooks.tsx → hooks.ts} +1 -7
- package/src/helperComponents/TablePagination/TablePagination.tsx +10 -80
- package/src/helperComponents/TablePagination/styles.module.scss +0 -9
- package/src/hooks/useCellSizes.ts +3 -5
- package/src/hooks/useColumnsSettingsToolbarSlot/useColumnsSettingsToolbarSlot.tsx +0 -1
- package/src/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.tsx +0 -2
- package/src/locale/index.ts +4 -14
- package/src/presets/adminTable/AdminTable.tsx +14 -0
- package/src/presets/adminTable/index.ts +4 -0
- package/src/presets/adminTable/toAdminTableProps.ts +140 -0
- package/src/presets/adminTable/useAdminTableProps.ts +35 -0
- package/src/presets/index.ts +3 -0
- package/src/presets/serverAdminTable/ServerAdminTable.tsx +14 -0
- package/src/presets/serverAdminTable/index.ts +4 -0
- package/src/presets/serverAdminTable/toServerAdminTableProps.ts +44 -0
- package/src/presets/serverAdminTable/useServerAdminTableProps.ts +35 -0
- package/src/presets/serverSimpleTable/ServerSimpleTable.tsx +10 -0
- package/src/presets/serverSimpleTable/index.ts +4 -0
- package/src/presets/serverSimpleTable/toServerSimpleTableProps.ts +56 -0
- package/src/presets/serverSimpleTable/useServerSimpleTableProps.ts +27 -0
- package/src/presets/simpleTable/SimpleTable.tsx +1 -1
- package/src/presets/simpleTable/toSimpleTableProps.ts +30 -35
- package/src/presets/simpleTable/useSimpleTableProps.ts +5 -1
- package/src/presets/treeTable/toTreeTableProps.ts +23 -24
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloud-ru/ds-table",
|
|
3
|
-
"version": "2.2.12
|
|
3
|
+
"version": "2.2.12",
|
|
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-
|
|
52
|
-
"@cloud-ru/ds-button": "1.0.8",
|
|
53
|
-
"@cloud-ru/ds-
|
|
54
|
-
"@cloud-ru/ds-
|
|
55
|
-
"@cloud-ru/ds-
|
|
56
|
-
"@cloud-ru/ds-icons": "1.
|
|
57
|
-
"@cloud-ru/ds-
|
|
58
|
-
"@cloud-ru/ds-
|
|
59
|
-
"@cloud-ru/ds-materials": "2.0.5",
|
|
60
|
-
"@cloud-ru/ds-
|
|
61
|
-
"@cloud-ru/ds-
|
|
62
|
-
"@cloud-ru/ds-
|
|
63
|
-
"@cloud-ru/ds-
|
|
64
|
-
"@cloud-ru/ds-
|
|
65
|
-
"@cloud-ru/ds-
|
|
66
|
-
"@cloud-ru/ds-
|
|
67
|
-
"@cloud-ru/ds-
|
|
68
|
-
"@cloud-ru/ds-
|
|
69
|
-
"@cloud-ru/ds-
|
|
51
|
+
"@cloud-ru/ds-card": "^1.0.39",
|
|
52
|
+
"@cloud-ru/ds-button": "^1.0.8",
|
|
53
|
+
"@cloud-ru/ds-drag-and-drop": "^1.1.7",
|
|
54
|
+
"@cloud-ru/ds-info-block": "^1.0.7",
|
|
55
|
+
"@cloud-ru/ds-chips": "^1.2.14",
|
|
56
|
+
"@cloud-ru/ds-icons": "^1.8.0",
|
|
57
|
+
"@cloud-ru/ds-list": "^3.1.5",
|
|
58
|
+
"@cloud-ru/ds-locale": "^1.0.0",
|
|
59
|
+
"@cloud-ru/ds-materials": "^2.0.5",
|
|
60
|
+
"@cloud-ru/ds-pagination": "^1.1.13",
|
|
61
|
+
"@cloud-ru/ds-status": "^1.1.20",
|
|
62
|
+
"@cloud-ru/ds-skeleton": "^1.0.6",
|
|
63
|
+
"@cloud-ru/ds-scroll": "^1.0.9",
|
|
64
|
+
"@cloud-ru/ds-toggles": "^1.1.19",
|
|
65
|
+
"@cloud-ru/ds-adaptive": "^1.0.6",
|
|
66
|
+
"@cloud-ru/ds-toolbar": "^2.1.11",
|
|
67
|
+
"@cloud-ru/ds-utils": "^1.4.2",
|
|
68
|
+
"@cloud-ru/ds-truncate-string": "^1.0.23",
|
|
69
|
+
"@cloud-ru/ds-tooltip": "^1.0.22"
|
|
70
70
|
},
|
|
71
71
|
"publishConfig": {
|
|
72
72
|
"access": "public"
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
# Table — внутренняя структура
|
|
2
2
|
|
|
3
|
-
`Table.tsx`
|
|
3
|
+
`Table.tsx` — оркестратор: пропсы, хуки, `TableContext.Provider` и сборка layout. Вся остальная логика и JSX разнесены по модулям этой папки и соседним пакетным примитивам.
|
|
4
4
|
|
|
5
5
|
Публичный API компонента — в [packages/table/docs/table.mdx](../../../docs/table.mdx).
|
|
6
6
|
|
|
7
|
-
|
|
7
|
+
Preset-ы (`AdminTable`, `ServerTable`, `EntitiesTable`, …) и `helperComponents/` — вне этой папки; здесь только core `Table`.
|
|
8
8
|
|
|
9
9
|
## Архитектура
|
|
10
10
|
|
|
@@ -26,8 +26,6 @@ flowchart TB
|
|
|
26
26
|
CardsBody[TableCardsBody]
|
|
27
27
|
Skeleton[TableSkeletonBody]
|
|
28
28
|
Chrome[TableChrome]
|
|
29
|
-
Pagination[TablePagination]
|
|
30
|
-
LoadMore[LoadMoreButton]
|
|
31
29
|
Helpers[helperComponents]
|
|
32
30
|
|
|
33
31
|
Table --> Adaptive
|
|
@@ -43,10 +41,8 @@ flowchart TB
|
|
|
43
41
|
Table --> ScrollHost
|
|
44
42
|
ScrollHost --> RowsBody
|
|
45
43
|
ScrollHost --> CardsBody
|
|
46
|
-
|
|
47
|
-
ScrollHost --> LoadMore
|
|
44
|
+
Table --> Skeleton
|
|
48
45
|
Table --> Chrome
|
|
49
|
-
Table --> Pagination
|
|
50
46
|
RowsBody --> Helpers
|
|
51
47
|
CardsBody --> Helpers
|
|
52
48
|
ScrollHost --> Helpers
|
|
@@ -69,11 +65,10 @@ flowchart TB
|
|
|
69
65
|
| Page index | `hooks/usePageReset` | сброс `pageIndex`, если страница вне диапазона (client pagination) |
|
|
70
66
|
| Adaptive | `@cloud-ru/ds-adaptive` + `TABLE_LAYOUT_PRESETS` | `layoutType`, mobile-дефолты `stickyControls`, `fullWidth` |
|
|
71
67
|
| Context | `contexts/` (`TableContext`, `CellAutoResizeContext`) | auto-resize ячеек, `fullWidth`, virtualization padding, shared table API для строк/ячеек |
|
|
72
|
-
| Table rows | `components/TableRowsBody` |
|
|
73
|
-
| Cards view | `components/TableCardsBody` | сетка
|
|
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 |
|
|
74
70
|
| Loading | `components/TableSkeletonBody` | skeleton table/cards |
|
|
75
|
-
| Scroll shell | `components/TableScrollHost` |
|
|
76
|
-
| Пагинация | `helperComponents/TablePagination` | кнопки перехода и выбор страницы через BottomSheet на мобильной раскладке |
|
|
71
|
+
| Scroll shell | `components/TableScrollHost` | варианты `Scroll`, sticky header plate, mobile cards container |
|
|
77
72
|
| Chrome | `components/TableChrome` | `ControlsChrome` для toolbar и pagination |
|
|
78
73
|
| Layout shell | `Table.tsx` + `styles.module.scss` | `.wrapper`, grid/flex, `data-fit-content` при `fullWidth={false}`, провайдеры |
|
|
79
74
|
| Утилиты | `utils/` | pinning, column ids, CSS-vars, `getTableColumnsDefinitions`, `saveTableState/*` |
|
|
@@ -96,7 +91,6 @@ packages/table/src/components/Table/
|
|
|
96
91
|
│ ├── useColumnSizes.ts
|
|
97
92
|
│ ├── useTableScroll.ts
|
|
98
93
|
│ ├── useTableToolbar.ts
|
|
99
|
-
│ ├── useTableView.ts
|
|
100
94
|
│ ├── useColumnSettings/
|
|
101
95
|
│ ├── useFilters/
|
|
102
96
|
│ ├── useRowVirtualizer.ts
|
|
@@ -104,7 +104,6 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
|
|
|
104
104
|
onRefresh,
|
|
105
105
|
pageSize = DEFAULT_PAGE_SIZE,
|
|
106
106
|
pageCount,
|
|
107
|
-
rowCount,
|
|
108
107
|
loading = false,
|
|
109
108
|
infiniteLoading = false,
|
|
110
109
|
onLoadMore,
|
|
@@ -295,7 +294,6 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
|
|
|
295
294
|
pagination,
|
|
296
295
|
onPaginationChange,
|
|
297
296
|
pageCount,
|
|
298
|
-
rowCount,
|
|
299
297
|
pageSize,
|
|
300
298
|
manualSorting,
|
|
301
299
|
manualPagination,
|
|
@@ -340,12 +338,7 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
|
|
|
340
338
|
savedState,
|
|
341
339
|
});
|
|
342
340
|
|
|
343
|
-
const emptyStates = useEmptyState({
|
|
344
|
-
noDataState,
|
|
345
|
-
noResultsState,
|
|
346
|
-
errorDataState,
|
|
347
|
-
onRefresh: onRefresh ? handleOnRefresh : undefined,
|
|
348
|
-
});
|
|
341
|
+
const emptyStates = useEmptyState({ noDataState, noResultsState, errorDataState });
|
|
349
342
|
|
|
350
343
|
usePageReset({
|
|
351
344
|
manualPagination,
|
|
@@ -777,9 +770,9 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
|
|
|
777
770
|
columnSizeVars={columnSizes.vars as CSSProperties}
|
|
778
771
|
>
|
|
779
772
|
{scrollContent}
|
|
780
|
-
{loadMoreButtonNode}
|
|
781
773
|
</TableScrollHost>
|
|
782
774
|
</DndContext>
|
|
775
|
+
{loadMoreButtonNode}
|
|
783
776
|
{!isCardsView && outline ? <span className={styles.contentBorder} aria-hidden /> : null}
|
|
784
777
|
</div>
|
|
785
778
|
|
|
@@ -43,7 +43,6 @@ type UseTableInstanceParams<TData extends object> = {
|
|
|
43
43
|
pagination: PaginationState;
|
|
44
44
|
onPaginationChange: OnChangeFn<PaginationState>;
|
|
45
45
|
pageCount?: number;
|
|
46
|
-
rowCount?: number;
|
|
47
46
|
pageSize: number;
|
|
48
47
|
manualSorting: boolean;
|
|
49
48
|
manualPagination: boolean;
|
|
@@ -83,7 +82,6 @@ export function useTableInstance<TData extends object>({
|
|
|
83
82
|
pagination,
|
|
84
83
|
onPaginationChange,
|
|
85
84
|
pageCount,
|
|
86
|
-
rowCount,
|
|
87
85
|
pageSize,
|
|
88
86
|
manualSorting,
|
|
89
87
|
manualPagination,
|
|
@@ -139,7 +137,6 @@ export function useTableInstance<TData extends object>({
|
|
|
139
137
|
expanded,
|
|
140
138
|
},
|
|
141
139
|
pageCount,
|
|
142
|
-
rowCount,
|
|
143
140
|
defaultColumn: {
|
|
144
141
|
enableSorting: false,
|
|
145
142
|
enableResizing: false,
|
|
@@ -33,7 +33,6 @@ $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;
|
|
37
36
|
width: 100%;
|
|
38
37
|
max-width: 100%;
|
|
39
38
|
min-height: 0;
|
|
@@ -209,7 +208,9 @@ $divider-width: base.simple-var(
|
|
|
209
208
|
.stickyTableHeader {
|
|
210
209
|
position: sticky;
|
|
211
210
|
z-index: 3;
|
|
212
|
-
top: calc(
|
|
211
|
+
top: calc(
|
|
212
|
+
var(--table-sticky-controls-offset-top, 0px) + var(--table-sticky-toolbar-offset, 0px)
|
|
213
|
+
);
|
|
213
214
|
|
|
214
215
|
// Фон на обёртке: покрывает всю ширину/высоту chrome (в т.ч. пустое место у pinned),
|
|
215
216
|
// без второго acrylic-слоя ControlsChrome.
|
package/src/components/types.ts
CHANGED
|
@@ -373,7 +373,6 @@ export type InfiniteTableProps<
|
|
|
373
373
|
pagination?: never;
|
|
374
374
|
autoResetPageIndex?: never;
|
|
375
375
|
pageCount?: never;
|
|
376
|
-
rowCount?: never;
|
|
377
376
|
/** Режим работы "бесконечной" загрузки */
|
|
378
377
|
infiniteLoading?: boolean;
|
|
379
378
|
suppressPagination?: never;
|
|
@@ -382,7 +381,7 @@ export type InfiniteTableProps<
|
|
|
382
381
|
/**
|
|
383
382
|
* Колбэк дозагрузки следующей порции данных.
|
|
384
383
|
* В режиме `loadMoreTrigger='scroll'` вызывается автоматически при достижении конца списка;
|
|
385
|
-
* в режиме `loadMoreTrigger='button'` — по нажатию кнопки
|
|
384
|
+
* в режиме `loadMoreTrigger='button'` — по нажатию кнопки «Загрузить ещё».
|
|
386
385
|
*/
|
|
387
386
|
onLoadMore?: () => void;
|
|
388
387
|
/** Есть ли ещё данные для загрузки. Управляет видимостью кнопки / активностью observer-а. */
|
|
@@ -390,7 +389,7 @@ export type InfiniteTableProps<
|
|
|
390
389
|
/**
|
|
391
390
|
* Механизм подгрузки следующей порции данных.
|
|
392
391
|
* - `'scroll'` (по умолчанию) — IntersectionObserver на scroll-stub в конце списка.
|
|
393
|
-
* - `'button'` — кнопка
|
|
392
|
+
* - `'button'` — кнопка «Загрузить ещё» под таблицей.
|
|
394
393
|
*/
|
|
395
394
|
loadMoreTrigger?: LoadMoreTrigger;
|
|
396
395
|
};
|
|
@@ -413,8 +412,6 @@ export type ClientTableProps<
|
|
|
413
412
|
autoResetPageIndex?: boolean;
|
|
414
413
|
/** Кол-во страниц (для внешнего управления) */
|
|
415
414
|
pageCount?: number;
|
|
416
|
-
/** Общее количество строк при внешнем управлении пагинацией. */
|
|
417
|
-
rowCount?: number;
|
|
418
415
|
/** Отключение пагинации */
|
|
419
416
|
suppressPagination?: boolean;
|
|
420
417
|
manualPagination?: boolean;
|
|
@@ -431,7 +428,7 @@ export type TableProps<TData extends object, TFilters extends FiltersState = Rec
|
|
|
431
428
|
|
|
432
429
|
export type ServerTableProps<TData extends object, TFilters extends FiltersState = Record<string, unknown>> = Omit<
|
|
433
430
|
ClientTableProps<TData, TFilters>,
|
|
434
|
-
'pageSize' | 'pageCount' | '
|
|
431
|
+
'pageSize' | 'pageCount' | 'pagination' | 'search' | 'data' | 'toolbarCheckBoxMode'
|
|
435
432
|
> & {
|
|
436
433
|
/** Данные для отрисовки */
|
|
437
434
|
items?: TData[];
|
|
@@ -16,7 +16,9 @@ export function RowActionsButton({ variant = 'cell', size, ...rest }: RowActions
|
|
|
16
16
|
return (
|
|
17
17
|
<Button
|
|
18
18
|
{...rest}
|
|
19
|
-
|
|
19
|
+
// В table-строке мастер (actionWrapper 16236:23147) — кнопка size=l (40×40). В карточке
|
|
20
|
+
// размещение действий макетом не задано, оставляем дефолт.
|
|
21
|
+
size={size ?? (isCardsView ? undefined : SIZE.L)}
|
|
20
22
|
appearance='neutral'
|
|
21
23
|
view={VIEW.Function}
|
|
22
24
|
style={
|
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
// слева рисует sticky-обёртка закреплённого блока (.rowPinnedCells[data-position='right']::after).
|
|
5
5
|
|
|
6
6
|
.rowActionsHeader {
|
|
7
|
-
min-width: table.$sn-table-anatomy-content-headLine-actionWrapper-maxWidth;
|
|
8
7
|
max-width: table.$sn-table-anatomy-content-headLine-actionWrapper-maxWidth;
|
|
9
8
|
padding: 0 !important;
|
|
10
9
|
}
|
|
@@ -16,7 +15,6 @@
|
|
|
16
15
|
|
|
17
16
|
.rowActionsCell {
|
|
18
17
|
position: relative;
|
|
19
|
-
min-width: table.$sn-table-anatomy-content-tableLine-actionWrapper-maxWidth;
|
|
20
18
|
max-width: table.$sn-table-anatomy-content-tableLine-actionWrapper-maxWidth;
|
|
21
19
|
}
|
|
22
20
|
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Button } from '@cloud-ru/ds-button';
|
|
2
1
|
import { CrossSVG, SearchSVG } from '@cloud-ru/ds-icons/interface/system';
|
|
3
2
|
import { useMemo } from 'react';
|
|
4
3
|
|
|
@@ -9,12 +8,10 @@ export function useEmptyState({
|
|
|
9
8
|
noDataState: noDataStateProp,
|
|
10
9
|
noResultsState: noResultsStateProp,
|
|
11
10
|
errorDataState: errorDataStateProp,
|
|
12
|
-
onRefresh,
|
|
13
11
|
}: {
|
|
14
12
|
noDataState?: EmptyStateProps;
|
|
15
13
|
noResultsState?: EmptyStateProps;
|
|
16
14
|
errorDataState?: EmptyStateProps;
|
|
17
|
-
onRefresh?(): void;
|
|
18
15
|
}): {
|
|
19
16
|
noDataState: EmptyStateProps;
|
|
20
17
|
noResultsState: EmptyStateProps;
|
|
@@ -40,9 +37,6 @@ export function useEmptyState({
|
|
|
40
37
|
icon: { icon: CrossSVG, appearance: 'neutral', background: true },
|
|
41
38
|
title: t('errorData.title'),
|
|
42
39
|
content: t('errorData.content'),
|
|
43
|
-
footer: onRefresh ? (
|
|
44
|
-
<Button label={t('refresh')} onClick={onRefresh} size='s' appearance='neutral' view='outline' />
|
|
45
|
-
) : undefined,
|
|
46
40
|
...errorDataStateProp,
|
|
47
41
|
};
|
|
48
42
|
|
|
@@ -51,5 +45,5 @@ export function useEmptyState({
|
|
|
51
45
|
noResultsState,
|
|
52
46
|
errorDataState,
|
|
53
47
|
};
|
|
54
|
-
}, [errorDataStateProp, noDataStateProp, noResultsStateProp,
|
|
48
|
+
}, [errorDataStateProp, noDataStateProp, noResultsStateProp, t]);
|
|
55
49
|
}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
import { isMobileLayout, useAdaptiveLayout } from '@cloud-ru/ds-adaptive';
|
|
2
|
-
import { Button } from '@cloud-ru/ds-button';
|
|
3
1
|
import { ChipChoice } from '@cloud-ru/ds-chips';
|
|
4
|
-
import { ChevronLeftSVG, ChevronRightSVG } from '@cloud-ru/ds-icons/interface/system';
|
|
5
2
|
import { Pagination } from '@cloud-ru/ds-pagination';
|
|
6
3
|
import { Table } from '@tanstack/react-table';
|
|
7
4
|
import { useCallback, useMemo } from 'react';
|
|
@@ -10,8 +7,6 @@ import { View } from '../../constants';
|
|
|
10
7
|
import { tableLocale } from '../../locale';
|
|
11
8
|
import styles from './styles.module.scss';
|
|
12
9
|
|
|
13
|
-
const MAX_PAGE_OPTIONS = 1000;
|
|
14
|
-
|
|
15
10
|
export type TablePaginationProps<TData> = {
|
|
16
11
|
table: Table<TData>;
|
|
17
12
|
options?: number[];
|
|
@@ -29,8 +24,6 @@ export function TablePagination<TData>({
|
|
|
29
24
|
optionsRender,
|
|
30
25
|
view,
|
|
31
26
|
}: TablePaginationProps<TData>) {
|
|
32
|
-
const { layoutType } = useAdaptiveLayout();
|
|
33
|
-
const mobile = isMobileLayout(layoutType);
|
|
34
27
|
const { t } = tableLocale.useTranslations();
|
|
35
28
|
const optionsLabel = optionsLabelProp ?? t('rowsOptionsLabel');
|
|
36
29
|
|
|
@@ -48,98 +41,37 @@ export function TablePagination<TData>({
|
|
|
48
41
|
[table],
|
|
49
42
|
);
|
|
50
43
|
|
|
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
|
-
|
|
64
44
|
const options = useMemo(
|
|
65
45
|
() =>
|
|
66
|
-
|
|
67
|
-
?.
|
|
46
|
+
optionsProp
|
|
47
|
+
?.slice()
|
|
48
|
+
.sort((a, b) => a - b)
|
|
68
49
|
.map((value, idx) => ({
|
|
69
50
|
label: String(optionsRender ? optionsRender(value, idx) : value),
|
|
70
51
|
value: String(value),
|
|
71
52
|
})),
|
|
72
|
-
[optionsProp, optionsRender
|
|
53
|
+
[optionsProp, optionsRender],
|
|
73
54
|
);
|
|
74
55
|
|
|
75
|
-
const
|
|
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
|
-
);
|
|
56
|
+
const tablePaginationState = table.getState().pagination;
|
|
91
57
|
|
|
92
|
-
if (
|
|
58
|
+
if (table.getPageCount() <= 1 && !options) {
|
|
93
59
|
return null;
|
|
94
60
|
}
|
|
95
61
|
|
|
96
62
|
return (
|
|
97
63
|
<div className={styles.footer} data-view={view}>
|
|
98
|
-
{
|
|
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 && (
|
|
64
|
+
{table.getPageCount() > 1 && (
|
|
133
65
|
<Pagination
|
|
134
|
-
total={
|
|
135
|
-
page={
|
|
66
|
+
total={table.getPageCount()}
|
|
67
|
+
page={tablePaginationState.pageIndex + 1}
|
|
136
68
|
onChange={handlePaginationOnChange}
|
|
137
69
|
size='s'
|
|
138
70
|
className={styles.pagination}
|
|
139
71
|
/>
|
|
140
72
|
)}
|
|
141
73
|
|
|
142
|
-
{options &&
|
|
74
|
+
{options && table.getRowModel().rows.length >= Number(options[0].value) && (
|
|
143
75
|
<ChipChoice.Single
|
|
144
76
|
value={String(tablePaginationState.pageSize)}
|
|
145
77
|
onChange={value => handleRowsVolumeOnChange(String(value))}
|
|
@@ -148,8 +80,6 @@ export function TablePagination<TData>({
|
|
|
148
80
|
label={optionsLabel}
|
|
149
81
|
widthStrategy='eq'
|
|
150
82
|
size='s'
|
|
151
|
-
droplistSize='s'
|
|
152
|
-
withDividers={false}
|
|
153
83
|
/>
|
|
154
84
|
)}
|
|
155
85
|
</div>
|
|
@@ -9,8 +9,6 @@
|
|
|
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;
|
|
14
12
|
}
|
|
15
13
|
|
|
16
14
|
// Мастер table-view (16097:44286): пагинация у левого края, чип объёма строк у правого
|
|
@@ -23,10 +21,3 @@
|
|
|
23
21
|
.footer[data-view='cards'] .pagination {
|
|
24
22
|
flex: 1;
|
|
25
23
|
}
|
|
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 {
|
|
5
|
+
import { TABLE_COLUMN_CSS_VARS } from '../constants';
|
|
6
6
|
|
|
7
7
|
type CellSizesOptions = {
|
|
8
8
|
isDraggable?: boolean;
|
|
@@ -16,10 +16,8 @@ export function useCellSizes<TData>(
|
|
|
16
16
|
const column = element.column;
|
|
17
17
|
const transform = options?.transform ?? null;
|
|
18
18
|
|
|
19
|
-
|
|
20
|
-
const
|
|
21
|
-
const minWidth = isRowActions ? undefined : column.columnDef.minSize;
|
|
22
|
-
const maxWidth = isRowActions ? undefined : column.columnDef.maxSize;
|
|
19
|
+
const minWidth = column.columnDef.minSize;
|
|
20
|
+
const maxWidth = column.columnDef.maxSize;
|
|
23
21
|
const width = `var(${TABLE_COLUMN_CSS_VARS.size(column.id)})`;
|
|
24
22
|
const flexShrink = `var(${TABLE_COLUMN_CSS_VARS.flex(column.id)})`;
|
|
25
23
|
const isHeaderCell = 'headerGroup' in element;
|
package/src/locale/index.ts
CHANGED
|
@@ -3,17 +3,12 @@ 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',
|
|
7
|
-
pagination: 'Pagination',
|
|
8
|
-
page: 'Page',
|
|
9
|
-
previousPage: 'Previous page',
|
|
10
|
-
nextPage: 'Next page',
|
|
6
|
+
rowsOptionsLabel: 'Rows volume',
|
|
11
7
|
settingsHeaderLabel: 'Columns settings',
|
|
12
8
|
sort: 'Sort',
|
|
13
9
|
clearSort: 'Clear sorting',
|
|
14
10
|
export: 'Export',
|
|
15
|
-
loadMore: '
|
|
16
|
-
refresh: 'Refresh',
|
|
11
|
+
loadMore: 'Load more',
|
|
17
12
|
groupSelectButton: {
|
|
18
13
|
show: 'Show all',
|
|
19
14
|
hide: 'Hide all',
|
|
@@ -32,17 +27,12 @@ const TABLE_MESSAGES = defineMessages({
|
|
|
32
27
|
},
|
|
33
28
|
'ru-RU': {
|
|
34
29
|
searchPlaceholder: 'Поиск',
|
|
35
|
-
rowsOptionsLabel: '
|
|
36
|
-
pagination: 'Навигация по страницам',
|
|
37
|
-
page: 'Страница',
|
|
38
|
-
previousPage: 'Предыдущая страница',
|
|
39
|
-
nextPage: 'Следующая страница',
|
|
30
|
+
rowsOptionsLabel: 'Строк на странице',
|
|
40
31
|
settingsHeaderLabel: 'Настройки колонок',
|
|
41
32
|
sort: 'Сортировка',
|
|
42
33
|
clearSort: 'Сбросить сортировку',
|
|
43
34
|
export: 'Экспорт',
|
|
44
|
-
loadMore: '
|
|
45
|
-
refresh: 'Обновить',
|
|
35
|
+
loadMore: 'Загрузить ещё',
|
|
46
36
|
groupSelectButton: {
|
|
47
37
|
show: 'Показать все',
|
|
48
38
|
hide: 'Скрыть все',
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { FiltersState } from '@cloud-ru/ds-chips';
|
|
2
|
+
|
|
3
|
+
import { Table } from '../../components/Table';
|
|
4
|
+
import { AdminTableInput } from './toAdminTableProps';
|
|
5
|
+
import { useAdminTableProps } from './useAdminTableProps';
|
|
6
|
+
|
|
7
|
+
/** Стандартная админ-таблица: поиск, фильтры, выбор строк, статус и действия */
|
|
8
|
+
export function AdminTable<TData extends object, TFilters extends FiltersState = Record<string, unknown>>(
|
|
9
|
+
props: AdminTableInput<TData, TFilters>,
|
|
10
|
+
) {
|
|
11
|
+
const tableProps = useAdminTableProps(props);
|
|
12
|
+
|
|
13
|
+
return <Table {...tableProps} />;
|
|
14
|
+
}
|