@cloud-ru/ds-table 2.0.1-preview-7ecd2833.0 → 2.0.2
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 +8 -0
- package/dist/cjs/components/Table/Table.js +3 -3
- package/dist/cjs/components/Table/components/TableToolbar/TableToolbar.d.ts +1 -2
- package/dist/cjs/components/Table/components/TableToolbar/TableToolbar.js +2 -2
- package/dist/cjs/components/Table/hooks/useTableToolbar.d.ts +1 -0
- package/dist/cjs/components/Table/hooks/useTableToolbar.js +2 -1
- package/dist/cjs/constants.d.ts +1 -0
- package/dist/cjs/constants.js +1 -0
- package/dist/cjs/helpers/index.d.ts +1 -0
- package/dist/cjs/helpers/index.js +1 -0
- package/dist/cjs/helpers/renderTableSortingOverflowButton.d.ts +9 -0
- package/dist/cjs/helpers/renderTableSortingOverflowButton.js +20 -0
- package/dist/cjs/hooks/useTableSorting/useTableSorting.js +2 -5
- package/dist/cjs/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.d.ts +2 -4
- package/dist/cjs/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.js +25 -10
- package/dist/cjs/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.module.css +8 -0
- package/dist/cjs/style.css +8 -0
- package/dist/esm/components/Table/Table.js +3 -3
- package/dist/esm/components/Table/components/TableToolbar/TableToolbar.d.ts +1 -2
- package/dist/esm/components/Table/components/TableToolbar/TableToolbar.js +2 -2
- package/dist/esm/components/Table/hooks/useTableToolbar.d.ts +1 -0
- package/dist/esm/components/Table/hooks/useTableToolbar.js +2 -1
- package/dist/esm/constants.d.ts +1 -0
- package/dist/esm/constants.js +1 -0
- package/dist/esm/helpers/index.d.ts +1 -0
- package/dist/esm/helpers/index.js +1 -0
- package/dist/esm/helpers/renderTableSortingOverflowButton.d.ts +9 -0
- package/dist/esm/helpers/renderTableSortingOverflowButton.js +17 -0
- package/dist/esm/hooks/useTableSorting/useTableSorting.js +2 -5
- package/dist/esm/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.d.ts +2 -4
- package/dist/esm/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.js +22 -10
- package/dist/esm/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.module.css +8 -0
- package/dist/esm/style.css +8 -0
- package/dist/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/tsconfig.esm.tsbuildinfo +1 -1
- package/package.json +20 -20
- package/src/components/Table/Table.tsx +8 -3
- package/src/components/Table/components/TableToolbar/TableToolbar.tsx +0 -3
- package/src/components/Table/hooks/useTableToolbar.ts +3 -1
- package/src/constants.ts +1 -0
- package/src/helpers/index.ts +1 -0
- package/src/helpers/renderTableSortingOverflowButton.tsx +33 -0
- package/src/hooks/useTableSorting/useTableSorting.tsx +2 -5
- package/src/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.module.scss +13 -0
- package/src/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.tsx +43 -25
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloud-ru/ds-table",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.2",
|
|
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-chips": "1.2.
|
|
53
|
-
"@cloud-ru/ds-button": "1.0.4",
|
|
54
|
-
"@cloud-ru/ds-
|
|
55
|
-
"@cloud-ru/ds-
|
|
56
|
-
"@cloud-ru/ds-info-block": "1.0.3",
|
|
57
|
-
"@cloud-ru/ds-
|
|
58
|
-
"@cloud-ru/ds-
|
|
59
|
-
"@cloud-ru/ds-locale": "1.0.0",
|
|
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-utils": "1.2.0"
|
|
51
|
+
"@cloud-ru/ds-card": "^1.0.26",
|
|
52
|
+
"@cloud-ru/ds-chips": "^1.2.2",
|
|
53
|
+
"@cloud-ru/ds-button": "^1.0.4",
|
|
54
|
+
"@cloud-ru/ds-adaptive": "^1.0.2",
|
|
55
|
+
"@cloud-ru/ds-icons": "^1.7.0",
|
|
56
|
+
"@cloud-ru/ds-info-block": "^1.0.3",
|
|
57
|
+
"@cloud-ru/ds-materials": "^2.0.1",
|
|
58
|
+
"@cloud-ru/ds-pagination": "^1.1.7",
|
|
59
|
+
"@cloud-ru/ds-locale": "^1.0.0",
|
|
60
|
+
"@cloud-ru/ds-drag-and-drop": "^1.1.3",
|
|
61
|
+
"@cloud-ru/ds-skeleton": "^1.0.2",
|
|
62
|
+
"@cloud-ru/ds-list": "^3.0.1",
|
|
63
|
+
"@cloud-ru/ds-scroll": "^1.0.5",
|
|
64
|
+
"@cloud-ru/ds-status": "^1.1.11",
|
|
65
|
+
"@cloud-ru/ds-toggles": "^1.1.12",
|
|
66
|
+
"@cloud-ru/ds-tooltip": "^1.0.14",
|
|
67
|
+
"@cloud-ru/ds-truncate-string": "^1.0.15",
|
|
68
|
+
"@cloud-ru/ds-toolbar": "^2.0.2",
|
|
69
|
+
"@cloud-ru/ds-utils": "^1.2.0"
|
|
70
70
|
},
|
|
71
71
|
"publishConfig": {
|
|
72
72
|
"access": "public"
|
|
@@ -372,6 +372,7 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
|
|
|
372
372
|
tableToolbarPersistConfig,
|
|
373
373
|
toolbarBulkProps,
|
|
374
374
|
dataView,
|
|
375
|
+
showToolbarSorting,
|
|
375
376
|
exportToolbarSlot,
|
|
376
377
|
sortingToolbarSlot,
|
|
377
378
|
columnsSettingsToolbarSlot,
|
|
@@ -602,6 +603,7 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
|
|
|
602
603
|
],
|
|
603
604
|
);
|
|
604
605
|
|
|
606
|
+
|
|
605
607
|
const controlsAcrylic = useMemo(
|
|
606
608
|
() => (isStickyControls ? getControlsAcrylicAttrs(stickyControlsBackgroundPredefined) : null),
|
|
607
609
|
[isStickyControls, stickyControlsBackgroundPredefined],
|
|
@@ -656,12 +658,12 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
|
|
|
656
658
|
showBulkCheckbox={toolbarBulkProps?.showBulkCheckbox}
|
|
657
659
|
outline={outline}
|
|
658
660
|
dataView={dataView}
|
|
659
|
-
pinnedAfter={sortingToolbarSlot.afterContent}
|
|
660
661
|
after={
|
|
661
|
-
toolbarAfter || onExport || areColumnsSettingsEnabled ? (
|
|
662
|
+
toolbarAfter || onExport || areColumnsSettingsEnabled || showToolbarSorting ? (
|
|
662
663
|
<>
|
|
663
664
|
{toolbarAfter}
|
|
664
665
|
{exportToolbarSlot.afterContent}
|
|
666
|
+
{sortingToolbarSlot.afterContent}
|
|
665
667
|
{columnsSettingsToolbarSlot.afterContent}
|
|
666
668
|
</>
|
|
667
669
|
) : undefined
|
|
@@ -735,7 +737,10 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
|
|
|
735
737
|
>
|
|
736
738
|
{!isCardsView ? <span className={styles.contentAcrylic} data-acrylic-background aria-hidden /> : null}
|
|
737
739
|
{hasMobileToolbarMounts ? (
|
|
738
|
-
<div className={styles.mobileToolbarMounts}>
|
|
740
|
+
<div className={styles.mobileToolbarMounts}>
|
|
741
|
+
{sortingToolbarSlot.mobileMount}
|
|
742
|
+
{columnsSettingsToolbarSlot.mobileMount}
|
|
743
|
+
</div>
|
|
739
744
|
) : null}
|
|
740
745
|
|
|
741
746
|
{/* Накрывает и шапку, и тело: sticky-шапка рендерится вне скролла. */}
|
|
@@ -26,7 +26,6 @@ type TableToolbarProps<TFilters extends FiltersState> = {
|
|
|
26
26
|
value: 'list' | 'compact';
|
|
27
27
|
onChange: (value: 'list' | 'compact') => void;
|
|
28
28
|
};
|
|
29
|
-
pinnedAfter?: ReactNode;
|
|
30
29
|
after?: ReactNode;
|
|
31
30
|
moreActions?: TableProps<object>['moreActions'];
|
|
32
31
|
filterRow?: TableProps<object>['columnFilters'];
|
|
@@ -45,7 +44,6 @@ export function TableToolbar<TFilters extends FiltersState = Record<string, unkn
|
|
|
45
44
|
showBulkCheckbox,
|
|
46
45
|
outline,
|
|
47
46
|
dataView,
|
|
48
|
-
pinnedAfter,
|
|
49
47
|
after,
|
|
50
48
|
moreActions,
|
|
51
49
|
filterRow,
|
|
@@ -65,7 +63,6 @@ export function TableToolbar<TFilters extends FiltersState = Record<string, unkn
|
|
|
65
63
|
showBulkCheckbox={showBulkCheckbox}
|
|
66
64
|
outline={outline}
|
|
67
65
|
dataView={dataView}
|
|
68
|
-
pinnedAfter={pinnedAfter}
|
|
69
66
|
after={after}
|
|
70
67
|
moreActions={moreActions}
|
|
71
68
|
filterRow={filterRow}
|
|
@@ -81,6 +81,7 @@ type UseTableToolbarResult<TFilters extends FiltersState> = {
|
|
|
81
81
|
value: ToolbarDataViewValue;
|
|
82
82
|
onChange: (value: ToolbarDataViewValue) => void;
|
|
83
83
|
};
|
|
84
|
+
showToolbarSorting: boolean;
|
|
84
85
|
exportToolbarSlot: ExportToolbarSlotResult;
|
|
85
86
|
sortingToolbarSlot: TableSortingToolbarSlotResult;
|
|
86
87
|
columnsSettingsToolbarSlot: ColumnsSettingsToolbarSlotResult;
|
|
@@ -250,12 +251,13 @@ export function useTableToolbar<TData extends object, TFilters extends FiltersSt
|
|
|
250
251
|
setColumnOrder,
|
|
251
252
|
});
|
|
252
253
|
|
|
253
|
-
const hasMobileToolbarMounts = Boolean(columnsSettingsToolbarSlot.mobileMount);
|
|
254
|
+
const hasMobileToolbarMounts = Boolean(sortingToolbarSlot.mobileMount || columnsSettingsToolbarSlot.mobileMount);
|
|
254
255
|
|
|
255
256
|
return {
|
|
256
257
|
tableToolbarPersistConfig: tableToolbarPersistConfig as ToolbarPersistConfig<TFilters> | undefined,
|
|
257
258
|
toolbarBulkProps,
|
|
258
259
|
dataView,
|
|
260
|
+
showToolbarSorting,
|
|
259
261
|
exportToolbarSlot,
|
|
260
262
|
sortingToolbarSlot,
|
|
261
263
|
columnsSettingsToolbarSlot,
|
package/src/constants.ts
CHANGED
package/src/helpers/index.ts
CHANGED
|
@@ -4,5 +4,6 @@ export * from './rowSelectionState';
|
|
|
4
4
|
export * from './tryParseLocalStorage';
|
|
5
5
|
export * from './renderMasterSelectionToggle';
|
|
6
6
|
export * from './renderColumnsSettingsOverflowButton';
|
|
7
|
+
export * from './renderTableSortingOverflowButton';
|
|
7
8
|
export * from './renderToolbarAfterOverflowButton';
|
|
8
9
|
export * from './renderExportToolbarButton';
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { SortSVG } from '@cloud-ru/ds-icons/interface/product';
|
|
2
|
+
import { ArrowDownSVG, ArrowUpSVG } from '@cloud-ru/ds-icons/interface/system';
|
|
3
|
+
import { ComponentType, MouseEvent, ReactNode } from 'react';
|
|
4
|
+
|
|
5
|
+
import { TEST_IDS } from '../constants';
|
|
6
|
+
import { renderToolbarAfterOverflowButton } from './renderToolbarAfterOverflowButton';
|
|
7
|
+
|
|
8
|
+
type RenderTableSortingOverflowButtonParams = {
|
|
9
|
+
ariaLabel: string;
|
|
10
|
+
onClick: (event: MouseEvent<HTMLElement>) => void;
|
|
11
|
+
selectedSortId?: string;
|
|
12
|
+
currentSortDesc?: boolean;
|
|
13
|
+
};
|
|
14
|
+
|
|
15
|
+
export function renderTableSortingOverflowButton({
|
|
16
|
+
ariaLabel,
|
|
17
|
+
onClick,
|
|
18
|
+
selectedSortId,
|
|
19
|
+
currentSortDesc,
|
|
20
|
+
}: RenderTableSortingOverflowButtonParams): ReactNode {
|
|
21
|
+
let SortIcon: ComponentType = SortSVG;
|
|
22
|
+
|
|
23
|
+
if (selectedSortId) {
|
|
24
|
+
SortIcon = currentSortDesc ? ArrowDownSVG : ArrowUpSVG;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
return renderToolbarAfterOverflowButton({
|
|
28
|
+
'aria-label': ariaLabel,
|
|
29
|
+
icon: <SortIcon />,
|
|
30
|
+
onClick,
|
|
31
|
+
'data-test-id': TEST_IDS.viewSort.overflowTrigger,
|
|
32
|
+
});
|
|
33
|
+
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { isMobileLayout, useAdaptiveLayout } from '@cloud-ru/ds-adaptive';
|
|
2
1
|
import { ArrowDownSVG, ArrowUpSVG, UpdateSVG } from '@cloud-ru/ds-icons/interface/system';
|
|
3
2
|
import { DroplistProps, ITEM_TYPE, SelectionSingleState } from '@cloud-ru/ds-list';
|
|
4
3
|
import { Header, SortingState, Table } from '@tanstack/react-table';
|
|
@@ -46,8 +45,6 @@ export function useTableSorting<TData extends object>({
|
|
|
46
45
|
areColumnsSettingsEnabled = false,
|
|
47
46
|
}: UseTableSortingParams<TData>): UseTableSortingReturn {
|
|
48
47
|
const { t } = tableLocale.useTranslations();
|
|
49
|
-
const { layoutType } = useAdaptiveLayout();
|
|
50
|
-
const isMobile = isMobileLayout(layoutType);
|
|
51
48
|
const sorting = sortingProp ?? table.getState().sorting;
|
|
52
49
|
const columnDefMap = useMemo(() => createColumnDefMap(columnDefinitions), [columnDefinitions]);
|
|
53
50
|
|
|
@@ -230,7 +227,7 @@ export function useTableSorting<TData extends object>({
|
|
|
230
227
|
|
|
231
228
|
const mainGroup = {
|
|
232
229
|
type: ITEM_TYPE.Group,
|
|
233
|
-
label:
|
|
230
|
+
label: t('sort'),
|
|
234
231
|
items: groups,
|
|
235
232
|
};
|
|
236
233
|
|
|
@@ -238,7 +235,7 @@ export function useTableSorting<TData extends object>({
|
|
|
238
235
|
items: [mainGroup] as DroplistItems,
|
|
239
236
|
pinBottom: clearItem,
|
|
240
237
|
};
|
|
241
|
-
}, [groupSortableHeadersByPinned, createSortItem, sorting, handleClearSort, t
|
|
238
|
+
}, [groupSortableHeadersByPinned, createSortItem, sorting, handleClearSort, t]);
|
|
242
239
|
|
|
243
240
|
const handleSelectionChange = useCallback(
|
|
244
241
|
(selectedId: string | number) => {
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isMobileLayout, useAdaptiveLayout } from '@cloud-ru/ds-adaptive';
|
|
1
2
|
import { APPEARANCE, Button, VIEW as BUTTON_VIEW } from '@cloud-ru/ds-button';
|
|
2
3
|
import { SortSVG } from '@cloud-ru/ds-icons/interface/product';
|
|
3
4
|
import { ArrowDownSVG, ArrowUpSVG } from '@cloud-ru/ds-icons/interface/system';
|
|
@@ -6,9 +7,11 @@ import { SortingState, Table } from '@tanstack/react-table';
|
|
|
6
7
|
import { ComponentType, ReactNode, useState } from 'react';
|
|
7
8
|
|
|
8
9
|
import { TEST_IDS } from '../../constants';
|
|
10
|
+
import { renderTableSortingOverflowButton } from '../../helpers';
|
|
9
11
|
import { tableLocale } from '../../locale';
|
|
10
12
|
import { ColumnDefinition } from '../../types';
|
|
11
13
|
import { useTableSorting } from '../useTableSorting';
|
|
14
|
+
import styles from './useTableSortingToolbarSlot.module.scss';
|
|
12
15
|
|
|
13
16
|
export type TableSortingProps<TData extends object> = {
|
|
14
17
|
/** Инстанс tanstack-таблицы */
|
|
@@ -29,12 +32,10 @@ export type TableSortingToolbarSlotParams<TData extends object> = TableSortingPr
|
|
|
29
32
|
|
|
30
33
|
export type TableSortingToolbarSlotResult = {
|
|
31
34
|
afterContent: ReactNode;
|
|
35
|
+
mobileMount: ReactNode;
|
|
32
36
|
};
|
|
33
37
|
|
|
34
|
-
/**
|
|
35
|
-
* Слот сортировки в тулбаре: `afterContent` — в `pinnedAfter`, поэтому на mobile кнопка остаётся в строке
|
|
36
|
-
* тулбара. Список открывается в `BottomSheet` (surface-swap `Droplist`).
|
|
37
|
-
*/
|
|
38
|
+
/** Слот сортировки в тулбаре: `afterContent` — в `after`, `mobileMount` — BottomSheet вне строки тулбара. */
|
|
38
39
|
export function useTableSortingToolbarSlot<TData extends object>({
|
|
39
40
|
enabled = true,
|
|
40
41
|
table,
|
|
@@ -44,6 +45,8 @@ export function useTableSortingToolbarSlot<TData extends object>({
|
|
|
44
45
|
areColumnsSettingsEnabled = false,
|
|
45
46
|
}: TableSortingToolbarSlotParams<TData>): TableSortingToolbarSlotResult {
|
|
46
47
|
const { t } = tableLocale.useTranslations();
|
|
48
|
+
const { layoutType } = useAdaptiveLayout();
|
|
49
|
+
const isMobile = isMobileLayout(layoutType);
|
|
47
50
|
const [open, setOpen] = useState(false);
|
|
48
51
|
|
|
49
52
|
const { items, pinBottom, selection, currentSort, selectedSortId, handleClearSort } = useTableSorting({
|
|
@@ -54,10 +57,6 @@ export function useTableSortingToolbarSlot<TData extends object>({
|
|
|
54
57
|
areColumnsSettingsEnabled,
|
|
55
58
|
});
|
|
56
59
|
|
|
57
|
-
if (!enabled) {
|
|
58
|
-
return { afterContent: null };
|
|
59
|
-
}
|
|
60
|
-
|
|
61
60
|
const handleClear = () => {
|
|
62
61
|
handleClearSort();
|
|
63
62
|
setOpen(false);
|
|
@@ -71,28 +70,47 @@ export function useTableSortingToolbarSlot<TData extends object>({
|
|
|
71
70
|
SortIcon = currentSort.desc ? ArrowDownSVG : ArrowUpSVG;
|
|
72
71
|
}
|
|
73
72
|
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
73
|
+
const droplist = (
|
|
74
|
+
<Droplist
|
|
75
|
+
scroll
|
|
76
|
+
items={items}
|
|
77
|
+
selection={selection}
|
|
78
|
+
virtualized={items.length > 10}
|
|
79
|
+
pinBottom={clearItem}
|
|
80
|
+
open={open}
|
|
81
|
+
onOpenChange={setOpen}
|
|
82
|
+
label={t('sort')}
|
|
83
|
+
data-test-id={TEST_IDS.viewSort.droplist}
|
|
84
|
+
>
|
|
85
|
+
{isMobile ? (
|
|
86
|
+
<span className={styles.hiddenTrigger} aria-hidden />
|
|
87
|
+
) : (
|
|
87
88
|
<Button
|
|
88
89
|
size='m'
|
|
89
90
|
view={BUTTON_VIEW.Function}
|
|
90
91
|
icon={<SortIcon />}
|
|
91
92
|
appearance={selectedSortId ? APPEARANCE.Primary : APPEARANCE.Neutral}
|
|
92
|
-
aria-label={t('sort')}
|
|
93
93
|
data-test-id={TEST_IDS.viewSort.droplistTrigger}
|
|
94
94
|
/>
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
95
|
+
)}
|
|
96
|
+
</Droplist>
|
|
97
|
+
);
|
|
98
|
+
|
|
99
|
+
if (!enabled) {
|
|
100
|
+
return { afterContent: null, mobileMount: null };
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
if (isMobile) {
|
|
104
|
+
return {
|
|
105
|
+
afterContent: renderTableSortingOverflowButton({
|
|
106
|
+
ariaLabel: t('sort'),
|
|
107
|
+
onClick: () => setOpen(true),
|
|
108
|
+
selectedSortId,
|
|
109
|
+
currentSortDesc: currentSort?.desc,
|
|
110
|
+
}),
|
|
111
|
+
mobileMount: droplist,
|
|
112
|
+
};
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
return { afterContent: droplist, mobileMount: null };
|
|
98
116
|
}
|