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