@cloud-ru/ds-table 2.2.11-preview-2f5fa273.0 → 2.2.11-preview-8ecff793.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.
- package/README.md +286 -14
- 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 +2 -3
- 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/types.d.ts +1 -4
- package/dist/cjs/helperComponents/TablePagination/TablePagination.js +2 -24
- package/dist/cjs/helperComponents/TablePagination/styles.module.css +0 -7
- package/dist/cjs/locale/index.d.ts +0 -16
- package/dist/cjs/locale/index.js +0 -8
- 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 +2 -0
- package/dist/cjs/presets/index.js +2 -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/simpleTable/toSimpleTableProps.d.ts +3 -1
- package/dist/cjs/presets/simpleTable/toSimpleTableProps.js +5 -5
- package/dist/cjs/presets/simpleTable/useSimpleTableProps.js +4 -1
- package/dist/cjs/style.css +0 -7
- 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 +2 -3
- 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/types.d.ts +1 -4
- package/dist/esm/helperComponents/TablePagination/TablePagination.js +2 -24
- package/dist/esm/helperComponents/TablePagination/styles.module.css +0 -7
- package/dist/esm/locale/index.d.ts +0 -16
- package/dist/esm/locale/index.js +0 -8
- 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 +2 -0
- package/dist/esm/presets/index.js +2 -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/simpleTable/toSimpleTableProps.d.ts +3 -1
- package/dist/esm/presets/simpleTable/toSimpleTableProps.js +5 -5
- package/dist/esm/presets/simpleTable/useSimpleTableProps.js +4 -1
- package/dist/esm/style.css +0 -7
- package/dist/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/tsconfig.esm.tsbuildinfo +1 -1
- package/package.json +19 -19
- package/src/components/ServerTable/ServerTable.tsx +0 -1
- package/src/components/Table/STRUCTURE.md +6 -12
- package/src/components/Table/Table.tsx +1 -3
- package/src/components/Table/hooks/useTableInstance.tsx +0 -3
- package/src/components/types.ts +1 -4
- package/src/helperComponents/TablePagination/TablePagination.tsx +5 -64
- package/src/helperComponents/TablePagination/styles.module.scss +0 -7
- package/src/locale/index.ts +0 -8
- 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 +2 -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/simpleTable/toSimpleTableProps.ts +21 -6
- package/src/presets/simpleTable/useSimpleTableProps.ts +5 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloud-ru/ds-table",
|
|
3
|
-
"version": "2.2.11-preview-
|
|
3
|
+
"version": "2.2.11-preview-8ecff793.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-adaptive": "1.0.6-preview-
|
|
52
|
-
"@cloud-ru/ds-
|
|
53
|
-
"@cloud-ru/ds-
|
|
54
|
-
"@cloud-ru/ds-
|
|
55
|
-
"@cloud-ru/ds-
|
|
56
|
-
"@cloud-ru/ds-
|
|
51
|
+
"@cloud-ru/ds-adaptive": "1.0.6-preview-8ecff793.0",
|
|
52
|
+
"@cloud-ru/ds-button": "1.0.8-preview-8ecff793.0",
|
|
53
|
+
"@cloud-ru/ds-drag-and-drop": "1.1.7-preview-8ecff793.0",
|
|
54
|
+
"@cloud-ru/ds-icons": "1.7.5-preview-8ecff793.0",
|
|
55
|
+
"@cloud-ru/ds-info-block": "1.0.7-preview-8ecff793.0",
|
|
56
|
+
"@cloud-ru/ds-list": "3.1.4-preview-8ecff793.0",
|
|
57
57
|
"@cloud-ru/ds-locale": "1.0.0",
|
|
58
|
-
"@cloud-ru/ds-
|
|
59
|
-
"@cloud-ru/ds-
|
|
60
|
-
"@cloud-ru/ds-pagination": "1.1.12-preview-
|
|
61
|
-
"@cloud-ru/ds-
|
|
62
|
-
"@cloud-ru/ds-scroll": "1.0.9-preview-
|
|
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-
|
|
58
|
+
"@cloud-ru/ds-chips": "1.2.13-preview-8ecff793.0",
|
|
59
|
+
"@cloud-ru/ds-materials": "2.0.5-preview-8ecff793.0",
|
|
60
|
+
"@cloud-ru/ds-pagination": "1.1.12-preview-8ecff793.0",
|
|
61
|
+
"@cloud-ru/ds-skeleton": "1.0.6-preview-8ecff793.0",
|
|
62
|
+
"@cloud-ru/ds-scroll": "1.0.9-preview-8ecff793.0",
|
|
63
|
+
"@cloud-ru/ds-status": "1.1.19-preview-8ecff793.0",
|
|
64
|
+
"@cloud-ru/ds-toggles": "1.1.18-preview-8ecff793.0",
|
|
65
|
+
"@cloud-ru/ds-toolbar": "2.1.10-preview-8ecff793.0",
|
|
66
|
+
"@cloud-ru/ds-tooltip": "1.0.21-preview-8ecff793.0",
|
|
67
|
+
"@cloud-ru/ds-truncate-string": "1.0.22-preview-8ecff793.0",
|
|
68
|
+
"@cloud-ru/ds-utils": "1.4.2-preview-8ecff793.0",
|
|
69
|
+
"@cloud-ru/ds-card": "1.0.38-preview-8ecff793.0"
|
|
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,
|
|
@@ -772,9 +770,9 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
|
|
|
772
770
|
columnSizeVars={columnSizes.vars as CSSProperties}
|
|
773
771
|
>
|
|
774
772
|
{scrollContent}
|
|
775
|
-
{loadMoreButtonNode}
|
|
776
773
|
</TableScrollHost>
|
|
777
774
|
</DndContext>
|
|
775
|
+
{loadMoreButtonNode}
|
|
778
776
|
{!isCardsView && outline ? <span className={styles.contentBorder} aria-hidden /> : null}
|
|
779
777
|
</div>
|
|
780
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,
|
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;
|
|
@@ -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[];
|
|
@@ -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
|
|
|
@@ -61,76 +54,24 @@ export function TablePagination<TData>({
|
|
|
61
54
|
);
|
|
62
55
|
|
|
63
56
|
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
|
-
);
|
|
80
57
|
|
|
81
|
-
if (
|
|
58
|
+
if (table.getPageCount() <= 1 && !options) {
|
|
82
59
|
return null;
|
|
83
60
|
}
|
|
84
61
|
|
|
85
62
|
return (
|
|
86
63
|
<div className={styles.footer} data-view={view}>
|
|
87
|
-
{
|
|
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 && (
|
|
64
|
+
{table.getPageCount() > 1 && (
|
|
124
65
|
<Pagination
|
|
125
|
-
total={
|
|
126
|
-
page={
|
|
66
|
+
total={table.getPageCount()}
|
|
67
|
+
page={tablePaginationState.pageIndex + 1}
|
|
127
68
|
onChange={handlePaginationOnChange}
|
|
128
69
|
size='s'
|
|
129
70
|
className={styles.pagination}
|
|
130
71
|
/>
|
|
131
72
|
)}
|
|
132
73
|
|
|
133
|
-
{options &&
|
|
74
|
+
{options && table.getRowModel().rows.length >= Number(options[0].value) && (
|
|
134
75
|
<ChipChoice.Single
|
|
135
76
|
value={String(tablePaginationState.pageSize)}
|
|
136
77
|
onChange={value => handleRowsVolumeOnChange(String(value))}
|
package/src/locale/index.ts
CHANGED
|
@@ -4,10 +4,6 @@ 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',
|
|
11
7
|
settingsHeaderLabel: 'Columns settings',
|
|
12
8
|
sort: 'Sort',
|
|
13
9
|
clearSort: 'Clear sorting',
|
|
@@ -32,10 +28,6 @@ const TABLE_MESSAGES = defineMessages({
|
|
|
32
28
|
'ru-RU': {
|
|
33
29
|
searchPlaceholder: 'Поиск',
|
|
34
30
|
rowsOptionsLabel: 'Строк на странице',
|
|
35
|
-
pagination: 'Навигация по страницам',
|
|
36
|
-
page: 'Страница',
|
|
37
|
-
previousPage: 'Предыдущая страница',
|
|
38
|
-
nextPage: 'Следующая страница',
|
|
39
31
|
settingsHeaderLabel: 'Настройки колонок',
|
|
40
32
|
sort: 'Сортировка',
|
|
41
33
|
clearSort: 'Сбросить сортировку',
|
|
@@ -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
|
+
}
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
import { FiltersState } from '@cloud-ru/ds-chips';
|
|
2
|
+
import { FilterRow } from '@cloud-ru/ds-toolbar';
|
|
3
|
+
import { RowSelectionState } from '@tanstack/react-table';
|
|
4
|
+
|
|
5
|
+
import {
|
|
6
|
+
actionsColumn,
|
|
7
|
+
CardViewInput,
|
|
8
|
+
defineColumns,
|
|
9
|
+
mapCardViewProps,
|
|
10
|
+
RowActionsConfig,
|
|
11
|
+
SimpleColumnDef,
|
|
12
|
+
statusColumn,
|
|
13
|
+
StatusColumnConfig,
|
|
14
|
+
} from '../../columnUtils';
|
|
15
|
+
import { ClientTableProps } from '../../components/types';
|
|
16
|
+
import { DEFAULT_PRESET_PAGE_SIZE, DEFAULT_PRESET_PAGINATION_OPTIONS } from '../constants';
|
|
17
|
+
import { wrapGetRowId } from '../wrapGetRowId';
|
|
18
|
+
|
|
19
|
+
type AdminTableSearchConfig = {
|
|
20
|
+
placeholder?: string;
|
|
21
|
+
onChange?: (value: string) => void;
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
type AdminTableSelectionConfig = {
|
|
25
|
+
multiRow?: boolean;
|
|
26
|
+
bulkActions?: ClientTableProps<object>['bulkActions'];
|
|
27
|
+
onChange?: (state: RowSelectionState) => void;
|
|
28
|
+
state?: RowSelectionState;
|
|
29
|
+
initialState?: RowSelectionState;
|
|
30
|
+
};
|
|
31
|
+
|
|
32
|
+
/** Входные пропсы `AdminTable` / `useAdminTableProps` */
|
|
33
|
+
export type AdminTableInput<
|
|
34
|
+
TData extends object,
|
|
35
|
+
TFilters extends FiltersState = Record<string, unknown>,
|
|
36
|
+
> = CardViewInput<TData> & {
|
|
37
|
+
data: TData[];
|
|
38
|
+
columns: SimpleColumnDef<TData>[];
|
|
39
|
+
statusColumn?: StatusColumnConfig<TData>;
|
|
40
|
+
rowActions?: RowActionsConfig<TData>;
|
|
41
|
+
filters?: FilterRow<TFilters>;
|
|
42
|
+
selection?: AdminTableSelectionConfig;
|
|
43
|
+
search?: boolean | AdminTableSearchConfig;
|
|
44
|
+
pageSize?: number;
|
|
45
|
+
getRowId: (row: TData) => string;
|
|
46
|
+
} & Omit<
|
|
47
|
+
ClientTableProps<TData, TFilters>,
|
|
48
|
+
| 'data'
|
|
49
|
+
| 'columnDefinitions'
|
|
50
|
+
| 'getRowId'
|
|
51
|
+
| 'headlineId'
|
|
52
|
+
| 'search'
|
|
53
|
+
| 'suppressSearch'
|
|
54
|
+
| 'columnFilters'
|
|
55
|
+
| 'rowSelection'
|
|
56
|
+
| 'bulkActions'
|
|
57
|
+
>;
|
|
58
|
+
|
|
59
|
+
function mapSearchProps(search?: boolean | AdminTableSearchConfig) {
|
|
60
|
+
if (search === false) {
|
|
61
|
+
return { suppressSearch: true as const };
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
if (search === true || search === undefined) {
|
|
65
|
+
return {};
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
return {
|
|
69
|
+
search: {
|
|
70
|
+
placeholder: search.placeholder,
|
|
71
|
+
onChange: search.onChange,
|
|
72
|
+
},
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
function buildColumnDefinitions<TData extends object>({
|
|
77
|
+
statusColumn: statusColumnConfig,
|
|
78
|
+
columns,
|
|
79
|
+
rowActions,
|
|
80
|
+
}: Pick<AdminTableInput<TData>, 'statusColumn' | 'columns' | 'rowActions'>) {
|
|
81
|
+
return [
|
|
82
|
+
...(statusColumnConfig ? [statusColumn(statusColumnConfig)] : []),
|
|
83
|
+
...defineColumns(columns),
|
|
84
|
+
...(rowActions ? [actionsColumn(rowActions)] : []),
|
|
85
|
+
];
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
/** Маппинг упрощённых пропсов в `ClientTableProps` для `Table` */
|
|
89
|
+
export function toAdminTableProps<TData extends object, TFilters extends FiltersState = Record<string, unknown>>(
|
|
90
|
+
input: AdminTableInput<TData, TFilters>,
|
|
91
|
+
): ClientTableProps<TData, TFilters> {
|
|
92
|
+
const {
|
|
93
|
+
data,
|
|
94
|
+
columns,
|
|
95
|
+
statusColumn: statusColumnConfig,
|
|
96
|
+
rowActions,
|
|
97
|
+
filters,
|
|
98
|
+
selection,
|
|
99
|
+
search,
|
|
100
|
+
pageSize = DEFAULT_PRESET_PAGE_SIZE,
|
|
101
|
+
getRowId,
|
|
102
|
+
headlineKey,
|
|
103
|
+
defaultView,
|
|
104
|
+
view,
|
|
105
|
+
onViewChange,
|
|
106
|
+
renderCard,
|
|
107
|
+
outline,
|
|
108
|
+
pagination,
|
|
109
|
+
columnsSettings,
|
|
110
|
+
onRefresh,
|
|
111
|
+
...rest
|
|
112
|
+
} = input;
|
|
113
|
+
|
|
114
|
+
return {
|
|
115
|
+
...rest,
|
|
116
|
+
...mapCardViewProps({ headlineKey, defaultView, view, onViewChange, renderCard }),
|
|
117
|
+
...mapSearchProps(search),
|
|
118
|
+
data,
|
|
119
|
+
columnDefinitions: buildColumnDefinitions({ statusColumn: statusColumnConfig, columns, rowActions }),
|
|
120
|
+
outline: outline ?? true,
|
|
121
|
+
pageSize,
|
|
122
|
+
pagination: pagination ?? { options: [...DEFAULT_PRESET_PAGINATION_OPTIONS] },
|
|
123
|
+
getRowId: wrapGetRowId(getRowId),
|
|
124
|
+
onRefresh,
|
|
125
|
+
columnsSettings: columnsSettings ?? { enableSettingsMenu: true },
|
|
126
|
+
...(filters ? { columnFilters: filters } : {}),
|
|
127
|
+
...(selection
|
|
128
|
+
? {
|
|
129
|
+
rowSelection: {
|
|
130
|
+
enable: true,
|
|
131
|
+
multiRow: selection.multiRow ?? true,
|
|
132
|
+
onChange: selection.onChange,
|
|
133
|
+
state: selection.state,
|
|
134
|
+
initialState: selection.initialState,
|
|
135
|
+
},
|
|
136
|
+
bulkActions: selection.bulkActions,
|
|
137
|
+
}
|
|
138
|
+
: {}),
|
|
139
|
+
};
|
|
140
|
+
}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { FiltersState } from '@cloud-ru/ds-chips';
|
|
2
|
+
import { useMemo } from 'react';
|
|
3
|
+
|
|
4
|
+
import { actionsColumn, defineColumns, statusColumn } from '../../columnUtils';
|
|
5
|
+
import { ClientTableProps } from '../../components/types';
|
|
6
|
+
import { DEFAULT_PRESET_PAGINATION_OPTIONS } from '../constants';
|
|
7
|
+
import { wrapGetRowId } from '../wrapGetRowId';
|
|
8
|
+
import { AdminTableInput, toAdminTableProps } from './toAdminTableProps';
|
|
9
|
+
|
|
10
|
+
/** Возвращает готовые пропсы для `Table` из упрощённого API `AdminTable` */
|
|
11
|
+
export function useAdminTableProps<TData extends object, TFilters extends FiltersState = Record<string, unknown>>(
|
|
12
|
+
input: AdminTableInput<TData, TFilters>,
|
|
13
|
+
): ClientTableProps<TData, TFilters> {
|
|
14
|
+
const { columns, statusColumn: statusColumnConfig, rowActions, getRowId, pagination } = input;
|
|
15
|
+
|
|
16
|
+
const columnDefinitions = useMemo(
|
|
17
|
+
() => [
|
|
18
|
+
...(statusColumnConfig ? [statusColumn(statusColumnConfig)] : []),
|
|
19
|
+
...defineColumns(columns),
|
|
20
|
+
...(rowActions ? [actionsColumn(rowActions)] : []),
|
|
21
|
+
],
|
|
22
|
+
[statusColumnConfig, columns, rowActions],
|
|
23
|
+
);
|
|
24
|
+
|
|
25
|
+
const wrappedGetRowId = useMemo(() => wrapGetRowId(getRowId), [getRowId]);
|
|
26
|
+
|
|
27
|
+
const defaultPagination = useMemo(() => ({ options: [...DEFAULT_PRESET_PAGINATION_OPTIONS] }), []);
|
|
28
|
+
|
|
29
|
+
return {
|
|
30
|
+
...toAdminTableProps(input),
|
|
31
|
+
columnDefinitions,
|
|
32
|
+
getRowId: wrappedGetRowId,
|
|
33
|
+
pagination: pagination ?? defaultPagination,
|
|
34
|
+
};
|
|
35
|
+
}
|
package/src/presets/index.ts
CHANGED
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { FiltersState } from '@cloud-ru/ds-chips';
|
|
2
|
+
|
|
3
|
+
import { ServerTable } from '../../components/ServerTable';
|
|
4
|
+
import { ServerAdminTableInput } from './toServerAdminTableProps';
|
|
5
|
+
import { useServerAdminTableProps } from './useServerAdminTableProps';
|
|
6
|
+
|
|
7
|
+
/** Серверная админ-таблица: поиск, фильтры, выбор строк, статус и действия */
|
|
8
|
+
export function ServerAdminTable<TData extends object, TFilters extends FiltersState = Record<string, unknown>>(
|
|
9
|
+
props: ServerAdminTableInput<TData, TFilters>,
|
|
10
|
+
) {
|
|
11
|
+
const tableProps = useServerAdminTableProps(props);
|
|
12
|
+
|
|
13
|
+
return <ServerTable {...tableProps} />;
|
|
14
|
+
}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { FiltersState } from '@cloud-ru/ds-chips';
|
|
2
|
+
|
|
3
|
+
import { ServerTableProps } from '../../components/types';
|
|
4
|
+
import { AdminTableInput, toAdminTableProps } from '../adminTable/toAdminTableProps';
|
|
5
|
+
import { DEFAULT_PRESET_PAGE_SIZE, DEFAULT_PRESET_PAGINATION_OPTIONS } from '../constants';
|
|
6
|
+
|
|
7
|
+
/** Входные пропсы `ServerAdminTable` / `useServerAdminTableProps` */
|
|
8
|
+
export type ServerAdminTableInput<TData extends object, TFilters extends FiltersState = Record<string, unknown>> = Omit<
|
|
9
|
+
AdminTableInput<TData, TFilters>,
|
|
10
|
+
'data' | 'search'
|
|
11
|
+
> & {
|
|
12
|
+
items?: TData[];
|
|
13
|
+
pageSize?: number;
|
|
14
|
+
limit?: number;
|
|
15
|
+
onChangePage(offset: number, limit: number): void;
|
|
16
|
+
search: NonNullable<ServerTableProps<TData, TFilters>['search']>;
|
|
17
|
+
} & Omit<
|
|
18
|
+
ServerTableProps<TData, TFilters>,
|
|
19
|
+
'items' | 'columnDefinitions' | 'getRowId' | 'headlineId' | 'search' | 'onChangePage' | 'limit'
|
|
20
|
+
>;
|
|
21
|
+
|
|
22
|
+
/** Маппинг упрощённых пропсов в `ServerTableProps` */
|
|
23
|
+
export function toServerAdminTableProps<TData extends object, TFilters extends FiltersState = Record<string, unknown>>(
|
|
24
|
+
input: ServerAdminTableInput<TData, TFilters>,
|
|
25
|
+
): ServerTableProps<TData, TFilters> {
|
|
26
|
+
const { items, onChangePage, search, pageSize, limit, ...adminInput } = input;
|
|
27
|
+
const pageLimit = limit ?? pageSize ?? DEFAULT_PRESET_PAGE_SIZE;
|
|
28
|
+
const clientProps = toAdminTableProps({ ...adminInput, data: items ?? [], pageSize: pageLimit, search: false });
|
|
29
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars -- strip client-only fields
|
|
30
|
+
const { data, search: clientSearch, suppressSearch, pagination, ...rest } = clientProps;
|
|
31
|
+
|
|
32
|
+
return {
|
|
33
|
+
...rest,
|
|
34
|
+
items,
|
|
35
|
+
onChangePage,
|
|
36
|
+
search,
|
|
37
|
+
limit: pageLimit,
|
|
38
|
+
pagination: pagination ?? { options: [...DEFAULT_PRESET_PAGINATION_OPTIONS] },
|
|
39
|
+
manualSorting: true,
|
|
40
|
+
manualPagination: true,
|
|
41
|
+
manualFiltering: true,
|
|
42
|
+
...(suppressSearch ? { suppressSearch } : {}),
|
|
43
|
+
};
|
|
44
|
+
}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { FiltersState } from '@cloud-ru/ds-chips';
|
|
2
|
+
import { useMemo } from 'react';
|
|
3
|
+
|
|
4
|
+
import { actionsColumn, defineColumns, statusColumn } from '../../columnUtils';
|
|
5
|
+
import { ServerTableProps } from '../../components/types';
|
|
6
|
+
import { DEFAULT_PRESET_PAGINATION_OPTIONS } from '../constants';
|
|
7
|
+
import { wrapGetRowId } from '../wrapGetRowId';
|
|
8
|
+
import { ServerAdminTableInput, toServerAdminTableProps } from './toServerAdminTableProps';
|
|
9
|
+
|
|
10
|
+
/** Возвращает готовые пропсы для `ServerTable` из упрощённого API `ServerAdminTable` */
|
|
11
|
+
export function useServerAdminTableProps<TData extends object, TFilters extends FiltersState = Record<string, unknown>>(
|
|
12
|
+
input: ServerAdminTableInput<TData, TFilters>,
|
|
13
|
+
): ServerTableProps<TData, TFilters> {
|
|
14
|
+
const { columns, statusColumn: statusColumnConfig, rowActions, getRowId, pagination } = input;
|
|
15
|
+
|
|
16
|
+
const columnDefinitions = useMemo(
|
|
17
|
+
() => [
|
|
18
|
+
...(statusColumnConfig ? [statusColumn(statusColumnConfig)] : []),
|
|
19
|
+
...defineColumns(columns),
|
|
20
|
+
...(rowActions ? [actionsColumn(rowActions)] : []),
|
|
21
|
+
],
|
|
22
|
+
[statusColumnConfig, columns, rowActions],
|
|
23
|
+
);
|
|
24
|
+
|
|
25
|
+
const wrappedGetRowId = useMemo(() => wrapGetRowId(getRowId), [getRowId]);
|
|
26
|
+
|
|
27
|
+
const defaultPagination = useMemo(() => ({ options: [...DEFAULT_PRESET_PAGINATION_OPTIONS] }), []);
|
|
28
|
+
|
|
29
|
+
return {
|
|
30
|
+
...toServerAdminTableProps(input),
|
|
31
|
+
columnDefinitions,
|
|
32
|
+
getRowId: wrappedGetRowId,
|
|
33
|
+
pagination: pagination ?? defaultPagination,
|
|
34
|
+
};
|
|
35
|
+
}
|