@cloud-ru/ds-table 2.0.4 → 2.0.5-preview-f9f03460.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 (44) hide show
  1. package/dist/cjs/components/Table/Table.js +3 -3
  2. package/dist/cjs/components/Table/components/TableToolbar/TableToolbar.d.ts +2 -1
  3. package/dist/cjs/components/Table/components/TableToolbar/TableToolbar.js +2 -2
  4. package/dist/cjs/components/Table/hooks/useTableToolbar.d.ts +0 -1
  5. package/dist/cjs/components/Table/hooks/useTableToolbar.js +1 -2
  6. package/dist/cjs/constants.d.ts +0 -1
  7. package/dist/cjs/constants.js +0 -1
  8. package/dist/cjs/helpers/index.d.ts +0 -1
  9. package/dist/cjs/helpers/index.js +0 -1
  10. package/dist/cjs/hooks/useTableSorting/useTableSorting.js +5 -2
  11. package/dist/cjs/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.d.ts +4 -2
  12. package/dist/cjs/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.js +10 -25
  13. package/dist/cjs/style.css +0 -8
  14. package/dist/esm/components/Table/Table.js +3 -3
  15. package/dist/esm/components/Table/components/TableToolbar/TableToolbar.d.ts +2 -1
  16. package/dist/esm/components/Table/components/TableToolbar/TableToolbar.js +2 -2
  17. package/dist/esm/components/Table/hooks/useTableToolbar.d.ts +0 -1
  18. package/dist/esm/components/Table/hooks/useTableToolbar.js +1 -2
  19. package/dist/esm/constants.d.ts +0 -1
  20. package/dist/esm/constants.js +0 -1
  21. package/dist/esm/helpers/index.d.ts +0 -1
  22. package/dist/esm/helpers/index.js +0 -1
  23. package/dist/esm/hooks/useTableSorting/useTableSorting.js +5 -2
  24. package/dist/esm/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.d.ts +4 -2
  25. package/dist/esm/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.js +10 -22
  26. package/dist/esm/style.css +0 -8
  27. package/dist/tsconfig.cjs.tsbuildinfo +1 -1
  28. package/dist/tsconfig.esm.tsbuildinfo +1 -1
  29. package/package.json +20 -20
  30. package/src/components/Table/Table.tsx +3 -8
  31. package/src/components/Table/components/TableToolbar/TableToolbar.tsx +3 -0
  32. package/src/components/Table/hooks/useTableToolbar.ts +1 -3
  33. package/src/constants.ts +0 -1
  34. package/src/helpers/index.ts +0 -1
  35. package/src/hooks/useTableSorting/useTableSorting.tsx +5 -2
  36. package/src/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.tsx +25 -43
  37. package/dist/cjs/helpers/renderTableSortingOverflowButton.d.ts +0 -9
  38. package/dist/cjs/helpers/renderTableSortingOverflowButton.js +0 -20
  39. package/dist/cjs/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.module.css +0 -8
  40. package/dist/esm/helpers/renderTableSortingOverflowButton.d.ts +0 -9
  41. package/dist/esm/helpers/renderTableSortingOverflowButton.js +0 -17
  42. package/dist/esm/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.module.css +0 -8
  43. package/src/helpers/renderTableSortingOverflowButton.tsx +0 -33
  44. package/src/hooks/useTableSortingToolbarSlot/useTableSortingToolbarSlot.module.scss +0 -13
@@ -198,7 +198,7 @@ function Table({ data, rowPinning = {
198
198
  const multiRow = Boolean(rowSelectionProp?.multiRow);
199
199
  const selectionMode = multiRow ? 'multiple' : 'single';
200
200
  const cardSelection = enableSelection ? selectionMode : 'none';
201
- const { tableToolbarPersistConfig, toolbarBulkProps, dataView, showToolbarSorting, exportToolbarSlot, sortingToolbarSlot, columnsSettingsToolbarSlot, hasMobileToolbarMounts, searchPlaceholder, } = (0, hooks_1.useTableToolbar)({
201
+ const { tableToolbarPersistConfig, toolbarBulkProps, dataView, exportToolbarSlot, sortingToolbarSlot, columnsSettingsToolbarSlot, hasMobileToolbarMounts, searchPlaceholder, } = (0, hooks_1.useTableToolbar)({
202
202
  table,
203
203
  columnDefinitions,
204
204
  sortingProp,
@@ -322,7 +322,7 @@ function Table({ data, rowPinning = {
322
322
  onChange: onGlobalFilterChange,
323
323
  loading: search?.loading,
324
324
  placeholder: search?.placeholder || searchPlaceholder,
325
- }, onRefresh: onRefresh ? handleOnRefresh : undefined, persist: showToolbar ? tableToolbarPersistConfig : undefined, checked: toolbarBulkProps?.checked, indeterminate: toolbarBulkProps?.indeterminate, onCheck: toolbarBulkProps?.onCheck, bulkActions: toolbarBulkProps?.bulkActions, selectedCount: toolbarBulkProps?.selectedCount, totalCount: toolbarBulkProps?.totalCount, showBulkCheckbox: toolbarBulkProps?.showBulkCheckbox, outline: outline, dataView: dataView, after: toolbarAfter || onExport || areColumnsSettingsEnabled || showToolbarSorting ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [toolbarAfter, exportToolbarSlot.afterContent, sortingToolbarSlot.afterContent, columnsSettingsToolbarSlot.afterContent] })) : undefined, moreActions: moreActions, filterRow: patchedFilter }));
325
+ }, onRefresh: onRefresh ? handleOnRefresh : undefined, persist: showToolbar ? tableToolbarPersistConfig : undefined, checked: toolbarBulkProps?.checked, indeterminate: toolbarBulkProps?.indeterminate, onCheck: toolbarBulkProps?.onCheck, bulkActions: toolbarBulkProps?.bulkActions, selectedCount: toolbarBulkProps?.selectedCount, totalCount: toolbarBulkProps?.totalCount, showBulkCheckbox: toolbarBulkProps?.showBulkCheckbox, outline: outline, dataView: dataView, pinnedAfter: sortingToolbarSlot.afterContent, after: toolbarAfter || onExport || areColumnsSettingsEnabled ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [toolbarAfter, exportToolbarSlot.afterContent, columnsSettingsToolbarSlot.afterContent] })) : undefined, moreActions: moreActions, filterRow: patchedFilter }));
326
326
  let toolbarChrome = null;
327
327
  if (showToolbar) {
328
328
  const stickyToolbarChromeRef = isStickyControls ? stickyToolbarRef : undefined;
@@ -335,7 +335,7 @@ function Table({ data, rowPinning = {
335
335
  paginationChrome =
336
336
  isStickyControls && controlsAcrylic ? ((0, jsx_runtime_1.jsx)(TableChrome_1.TableChrome, { variant: 'footer', acrylic: controlsAcrylic, children: pagination })) : (pagination);
337
337
  }
338
- return ((0, jsx_runtime_1.jsx)("div", { ref: wrapperRef, className: (0, classnames_1.default)(styles_module_scss_1.default.wrapper, className), "data-view": view, "data-layout-type": layoutType, "data-sticky-controls": isStickyControls || undefined, "data-with-toolbar": showToolbar || undefined, "data-empty-body": isEmptyBody || undefined, "data-fit-content": !resolvedFullWidth || undefined, ...(0, utils_1.extractSupportProps)(rest), children: (0, jsx_runtime_1.jsxs)(contexts_1.TableContext.Provider, { value: tableContextValue, children: [toolbarChrome, (0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_1.default.tableView, children: [(0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_1.default.content, "data-outline": !isCardsView && outline ? true : undefined, "data-page-sticky-header": !isCardsView && usePageStickyHeader ? true : undefined, ...(!isCardsView ? TABLE_CONTENT_ACRYLIC : {}), children: [!isCardsView ? (0, jsx_runtime_1.jsx)("span", { className: styles_module_scss_1.default.contentAcrylic, "data-acrylic-background": true, "aria-hidden": true }) : null, hasMobileToolbarMounts ? ((0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_1.default.mobileToolbarMounts, children: [sortingToolbarSlot.mobileMount, columnsSettingsToolbarSlot.mobileMount] })) : null, (0, jsx_runtime_1.jsxs)(core_1.DndContext, { ...dndContextProps, children: [draggingColumnPreview, (0, jsx_runtime_1.jsx)(TableScrollHost_1.TableScrollHost, { view: view, isMobile: isMobile, isCardsView: isCardsView, usePageStickyHeader: usePageStickyHeader, scrollOverflow: scrollOverflow, scrollPaddingAbsolute: scrollPaddingAbsolute, internalScrollRef: internalScrollRef, scrollRef: scrollRef, scrollContainerRef: scrollContainerRef, handleScrollInitialized: handleScrollInitialized, syncHeaderHorizontalScroll: syncHeaderHorizontalScroll, tableHeaderElement: tableHeaderElement, columnSizeVars: columnSizes.vars, children: scrollContent })] }), loadMoreButtonNode, !isCardsView && outline ? (0, jsx_runtime_1.jsx)("span", { className: styles_module_scss_1.default.contentBorder, "aria-hidden": true }) : null] }), paginationChrome] })] }) }));
338
+ return ((0, jsx_runtime_1.jsx)("div", { ref: wrapperRef, className: (0, classnames_1.default)(styles_module_scss_1.default.wrapper, className), "data-view": view, "data-layout-type": layoutType, "data-sticky-controls": isStickyControls || undefined, "data-with-toolbar": showToolbar || undefined, "data-empty-body": isEmptyBody || undefined, "data-fit-content": !resolvedFullWidth || undefined, ...(0, utils_1.extractSupportProps)(rest), children: (0, jsx_runtime_1.jsxs)(contexts_1.TableContext.Provider, { value: tableContextValue, children: [toolbarChrome, (0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_1.default.tableView, children: [(0, jsx_runtime_1.jsxs)("div", { className: styles_module_scss_1.default.content, "data-outline": !isCardsView && outline ? true : undefined, "data-page-sticky-header": !isCardsView && usePageStickyHeader ? true : undefined, ...(!isCardsView ? TABLE_CONTENT_ACRYLIC : {}), children: [!isCardsView ? (0, jsx_runtime_1.jsx)("span", { className: styles_module_scss_1.default.contentAcrylic, "data-acrylic-background": true, "aria-hidden": true }) : null, hasMobileToolbarMounts ? ((0, jsx_runtime_1.jsx)("div", { className: styles_module_scss_1.default.mobileToolbarMounts, children: columnsSettingsToolbarSlot.mobileMount })) : null, (0, jsx_runtime_1.jsxs)(core_1.DndContext, { ...dndContextProps, children: [draggingColumnPreview, (0, jsx_runtime_1.jsx)(TableScrollHost_1.TableScrollHost, { view: view, isMobile: isMobile, isCardsView: isCardsView, usePageStickyHeader: usePageStickyHeader, scrollOverflow: scrollOverflow, scrollPaddingAbsolute: scrollPaddingAbsolute, internalScrollRef: internalScrollRef, scrollRef: scrollRef, scrollContainerRef: scrollContainerRef, handleScrollInitialized: handleScrollInitialized, syncHeaderHorizontalScroll: syncHeaderHorizontalScroll, tableHeaderElement: tableHeaderElement, columnSizeVars: columnSizes.vars, children: scrollContent })] }), loadMoreButtonNode, !isCardsView && outline ? (0, jsx_runtime_1.jsx)("span", { className: styles_module_scss_1.default.contentBorder, "aria-hidden": true }) : null] }), paginationChrome] })] }) }));
339
339
  }
340
340
  Table.getStatusColumnDef = helperComponents_1.getStatusColumnDef;
341
341
  Table.statusAppearances = helperComponents_1.STATUS_APPEARANCE;
@@ -18,9 +18,10 @@ type TableToolbarProps<TFilters extends FiltersState> = {
18
18
  value: 'list' | 'compact';
19
19
  onChange: (value: 'list' | 'compact') => void;
20
20
  };
21
+ pinnedAfter?: ReactNode;
21
22
  after?: ReactNode;
22
23
  moreActions?: TableProps<object>['moreActions'];
23
24
  filterRow?: TableProps<object>['columnFilters'];
24
25
  } & Partial<TableToolbarBulkProps>;
25
- export declare function TableToolbar<TFilters extends FiltersState = Record<string, unknown>>({ search, onRefresh, persist, checked, indeterminate, onCheck, bulkActions, selectedCount, totalCount, showBulkCheckbox, outline, dataView, after, moreActions, filterRow, }: TableToolbarProps<TFilters>): import("react/jsx-runtime").JSX.Element;
26
+ export declare function TableToolbar<TFilters extends FiltersState = Record<string, unknown>>({ search, onRefresh, persist, checked, indeterminate, onCheck, bulkActions, selectedCount, totalCount, showBulkCheckbox, outline, dataView, pinnedAfter, after, moreActions, filterRow, }: TableToolbarProps<TFilters>): import("react/jsx-runtime").JSX.Element;
26
27
  export {};
@@ -8,6 +8,6 @@ const jsx_runtime_1 = require("react/jsx-runtime");
8
8
  const toolbar_1 = require("@cloud-ru/ds-toolbar");
9
9
  const constants_1 = require("../../../../constants");
10
10
  const styles_module_scss_1 = __importDefault(require('../../styles.module.css'));
11
- function TableToolbar({ search, onRefresh, persist, checked, indeterminate, onCheck, bulkActions, selectedCount, totalCount, showBulkCheckbox, outline, dataView, after, moreActions, filterRow, }) {
12
- return ((0, jsx_runtime_1.jsx)(toolbar_1.Toolbar, { search: search, className: styles_module_scss_1.default.toolbar, onRefresh: onRefresh, persist: persist, checked: checked, indeterminate: indeterminate, onCheck: onCheck, bulkActions: bulkActions, selectedCount: selectedCount, totalCount: totalCount, showBulkCheckbox: showBulkCheckbox, outline: outline, dataView: dataView, after: after, moreActions: moreActions, filterRow: filterRow, "data-test-id": constants_1.TEST_IDS.toolbar }));
11
+ function TableToolbar({ search, onRefresh, persist, checked, indeterminate, onCheck, bulkActions, selectedCount, totalCount, showBulkCheckbox, outline, dataView, pinnedAfter, after, moreActions, filterRow, }) {
12
+ return ((0, jsx_runtime_1.jsx)(toolbar_1.Toolbar, { search: search, className: styles_module_scss_1.default.toolbar, onRefresh: onRefresh, persist: persist, checked: checked, indeterminate: indeterminate, onCheck: onCheck, bulkActions: bulkActions, selectedCount: selectedCount, totalCount: totalCount, showBulkCheckbox: showBulkCheckbox, outline: outline, dataView: dataView, pinnedAfter: pinnedAfter, after: after, moreActions: moreActions, filterRow: filterRow, "data-test-id": constants_1.TEST_IDS.toolbar }));
13
13
  }
@@ -67,7 +67,6 @@ type UseTableToolbarResult<TFilters extends FiltersState> = {
67
67
  value: ToolbarDataViewValue;
68
68
  onChange: (value: ToolbarDataViewValue) => void;
69
69
  };
70
- showToolbarSorting: boolean;
71
70
  exportToolbarSlot: ExportToolbarSlotResult;
72
71
  sortingToolbarSlot: TableSortingToolbarSlotResult;
73
72
  columnsSettingsToolbarSlot: ColumnsSettingsToolbarSlotResult;
@@ -106,12 +106,11 @@ function useTableToolbar({ table, columnDefinitions, sortingProp, savedState, co
106
106
  setEnabledColumns,
107
107
  setColumnOrder,
108
108
  });
109
- const hasMobileToolbarMounts = Boolean(sortingToolbarSlot.mobileMount || columnsSettingsToolbarSlot.mobileMount);
109
+ const hasMobileToolbarMounts = Boolean(columnsSettingsToolbarSlot.mobileMount);
110
110
  return {
111
111
  tableToolbarPersistConfig: tableToolbarPersistConfig,
112
112
  toolbarBulkProps,
113
113
  dataView,
114
- showToolbarSorting,
115
114
  exportToolbarSlot,
116
115
  sortingToolbarSlot,
117
116
  columnsSettingsToolbarSlot,
@@ -100,7 +100,6 @@ export declare const TEST_IDS: {
100
100
  readonly droplistTrigger: "table__view-sort__droplistTrigger";
101
101
  readonly droplist: "table__view-sort__droplist";
102
102
  readonly option: "table__view-sort__option";
103
- readonly overflowTrigger: "table__view-sort__overflow-trigger";
104
103
  };
105
104
  };
106
105
  export declare const DEFAULT_PAGE_SIZE = 10;
@@ -111,7 +111,6 @@ exports.TEST_IDS = {
111
111
  droplistTrigger: 'table__view-sort__droplistTrigger',
112
112
  droplist: 'table__view-sort__droplist',
113
113
  option: 'table__view-sort__option',
114
- overflowTrigger: 'table__view-sort__overflow-trigger',
115
114
  },
116
115
  };
117
116
  exports.DEFAULT_PAGE_SIZE = 10;
@@ -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';
@@ -20,6 +20,5 @@ __exportStar(require("./rowSelectionState"), exports);
20
20
  __exportStar(require("./tryParseLocalStorage"), exports);
21
21
  __exportStar(require("./renderMasterSelectionToggle"), exports);
22
22
  __exportStar(require("./renderColumnsSettingsOverflowButton"), exports);
23
- __exportStar(require("./renderTableSortingOverflowButton"), exports);
24
23
  __exportStar(require("./renderToolbarAfterOverflowButton"), exports);
25
24
  __exportStar(require("./renderExportToolbarButton"), exports);
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.useTableSorting = useTableSorting;
7
7
  const jsx_runtime_1 = require("react/jsx-runtime");
8
+ const adaptive_1 = require("@cloud-ru/ds-adaptive");
8
9
  const system_1 = require("@cloud-ru/ds-icons/interface/system");
9
10
  const list_1 = require("@cloud-ru/ds-list");
10
11
  const react_1 = require("react");
@@ -18,6 +19,8 @@ const utils_1 = require("./utils");
18
19
  const SERVICE_COLUMN_IDS = new Set([constants_1.DefaultColumns.Selection, constants_1.DefaultColumns.RowActions, constants_2.TREE_CELL_ID]);
19
20
  function useTableSorting({ table, sorting: sortingProp, columnDefinitions, enabledColumns, areColumnsSettingsEnabled = false, }) {
20
21
  const { t } = locale_1.tableLocale.useTranslations();
22
+ const { layoutType } = (0, adaptive_1.useAdaptiveLayout)();
23
+ const isMobile = (0, adaptive_1.isMobileLayout)(layoutType);
21
24
  const sorting = sortingProp ?? table.getState().sorting;
22
25
  const columnDefMap = (0, react_1.useMemo)(() => (0, utils_1.createColumnDefMap)(columnDefinitions), [columnDefinitions]);
23
26
  const hiddenColumnsBySettings = (0, react_1.useMemo)(() => {
@@ -161,14 +164,14 @@ function useTableSorting({ table, sorting: sortingProp, columnDefinitions, enabl
161
164
  ];
162
165
  const mainGroup = {
163
166
  type: list_1.ITEM_TYPE.Group,
164
- label: t('sort'),
167
+ label: isMobile ? undefined : t('sort'),
165
168
  items: groups,
166
169
  };
167
170
  return {
168
171
  items: [mainGroup],
169
172
  pinBottom: clearItem,
170
173
  };
171
- }, [groupSortableHeadersByPinned, createSortItem, sorting, handleClearSort, t]);
174
+ }, [groupSortableHeadersByPinned, createSortItem, sorting, handleClearSort, t, isMobile]);
172
175
  const handleSelectionChange = (0, react_1.useCallback)((selectedId) => {
173
176
  const id = String(selectedId);
174
177
  const match = id.match(/^sort-(.+)$/);
@@ -18,7 +18,9 @@ export type TableSortingToolbarSlotParams<TData extends object> = TableSortingPr
18
18
  };
19
19
  export type TableSortingToolbarSlotResult = {
20
20
  afterContent: ReactNode;
21
- mobileMount: ReactNode;
22
21
  };
23
- /** Слот сортировки в тулбаре: `afterContent` — в `after`, `mobileMount` — BottomSheet вне строки тулбара. */
22
+ /**
23
+ * Слот сортировки в тулбаре: `afterContent` — в `pinnedAfter`, поэтому на mobile кнопка остаётся в строке
24
+ * тулбара. Список открывается в `BottomSheet` (surface-swap `Droplist`).
25
+ */
24
26
  export declare function useTableSortingToolbarSlot<TData extends object>({ enabled, table, sorting, columnDefinitions, enabledColumns, areColumnsSettingsEnabled, }: TableSortingToolbarSlotParams<TData>): TableSortingToolbarSlotResult;
@@ -1,26 +1,21 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
3
  exports.useTableSortingToolbarSlot = useTableSortingToolbarSlot;
7
4
  const jsx_runtime_1 = require("react/jsx-runtime");
8
- const adaptive_1 = require("@cloud-ru/ds-adaptive");
9
5
  const button_1 = require("@cloud-ru/ds-button");
10
6
  const product_1 = require("@cloud-ru/ds-icons/interface/product");
11
7
  const system_1 = require("@cloud-ru/ds-icons/interface/system");
12
8
  const list_1 = require("@cloud-ru/ds-list");
13
9
  const react_1 = require("react");
14
10
  const constants_1 = require("../../constants");
15
- const helpers_1 = require("../../helpers");
16
11
  const locale_1 = require("../../locale");
17
12
  const useTableSorting_1 = require("../useTableSorting");
18
- const useTableSortingToolbarSlot_module_scss_1 = __importDefault(require('./useTableSortingToolbarSlot.module.css'));
19
- /** Слот сортировки в тулбаре: `afterContent` — в `after`, `mobileMount` — BottomSheet вне строки тулбара. */
13
+ /**
14
+ * Слот сортировки в тулбаре: `afterContent` — в `pinnedAfter`, поэтому на mobile кнопка остаётся в строке
15
+ * тулбара. Список открывается в `BottomSheet` (surface-swap `Droplist`).
16
+ */
20
17
  function useTableSortingToolbarSlot({ enabled = true, table, sorting, columnDefinitions, enabledColumns, areColumnsSettingsEnabled = false, }) {
21
18
  const { t } = locale_1.tableLocale.useTranslations();
22
- const { layoutType } = (0, adaptive_1.useAdaptiveLayout)();
23
- const isMobile = (0, adaptive_1.isMobileLayout)(layoutType);
24
19
  const [open, setOpen] = (0, react_1.useState)(false);
25
20
  const { items, pinBottom, selection, currentSort, selectedSortId, handleClearSort } = (0, useTableSorting_1.useTableSorting)({
26
21
  table,
@@ -29,6 +24,9 @@ function useTableSortingToolbarSlot({ enabled = true, table, sorting, columnDefi
29
24
  enabledColumns,
30
25
  areColumnsSettingsEnabled,
31
26
  });
27
+ if (!enabled) {
28
+ return { afterContent: null };
29
+ }
32
30
  const handleClear = () => {
33
31
  handleClearSort();
34
32
  setOpen(false);
@@ -38,20 +36,7 @@ function useTableSortingToolbarSlot({ enabled = true, table, sorting, columnDefi
38
36
  if (currentSort) {
39
37
  SortIcon = currentSort.desc ? system_1.ArrowDownSVG : system_1.ArrowUpSVG;
40
38
  }
41
- const droplist = ((0, jsx_runtime_1.jsx)(list_1.Droplist, { scroll: true, items: items, selection: selection, virtualized: items.length > 10, pinBottom: clearItem, open: open, onOpenChange: setOpen, label: t('sort'), "data-test-id": constants_1.TEST_IDS.viewSort.droplist, children: isMobile ? ((0, jsx_runtime_1.jsx)("span", { className: useTableSortingToolbarSlot_module_scss_1.default.hiddenTrigger, "aria-hidden": true })) : ((0, jsx_runtime_1.jsx)(button_1.Button, { size: 'm', view: button_1.VIEW.Function, icon: (0, jsx_runtime_1.jsx)(SortIcon, {}), appearance: selectedSortId ? button_1.APPEARANCE.Primary : button_1.APPEARANCE.Neutral, "data-test-id": constants_1.TEST_IDS.viewSort.droplistTrigger })) }));
42
- if (!enabled) {
43
- return { afterContent: null, mobileMount: null };
44
- }
45
- if (isMobile) {
46
- return {
47
- afterContent: (0, helpers_1.renderTableSortingOverflowButton)({
48
- ariaLabel: t('sort'),
49
- onClick: () => setOpen(true),
50
- selectedSortId,
51
- currentSortDesc: currentSort?.desc,
52
- }),
53
- mobileMount: droplist,
54
- };
55
- }
56
- return { afterContent: droplist, mobileMount: null };
39
+ return {
40
+ afterContent: ((0, jsx_runtime_1.jsx)(list_1.Droplist, { scroll: true, items: items, selection: selection, virtualized: items.length > 10, pinBottom: clearItem, open: open, onOpenChange: setOpen, label: t('sort'), "data-test-id": constants_1.TEST_IDS.viewSort.droplist, children: (0, jsx_runtime_1.jsx)(button_1.Button, { size: 'm', view: button_1.VIEW.Function, icon: (0, jsx_runtime_1.jsx)(SortIcon, {}), appearance: selectedSortId ? button_1.APPEARANCE.Primary : button_1.APPEARANCE.Neutral, "aria-label": t('sort'), "data-test-id": constants_1.TEST_IDS.viewSort.droplistTrigger }) })),
41
+ };
57
42
  }
@@ -1642,12 +1642,4 @@
1642
1642
  }
1643
1643
  .clearSortItem[data-disabled=true] svg{
1644
1644
  color:var(--sn-theme-color-available-version-textDisabled, var(--sn-brand-color-text-version-disabled, rgba(0, 0, 0, 0.3803921569)));
1645
- }
1646
- .hiddenTrigger{
1647
- position:absolute;
1648
- overflow:hidden;
1649
- width:1px;
1650
- height:1px;
1651
- white-space:nowrap;
1652
- clip-path:rect(0, 0, 0, 0);
1653
1645
  }
@@ -191,7 +191,7 @@ export function Table({ data, rowPinning = {
191
191
  const multiRow = Boolean(rowSelectionProp?.multiRow);
192
192
  const selectionMode = multiRow ? 'multiple' : 'single';
193
193
  const cardSelection = enableSelection ? selectionMode : 'none';
194
- const { tableToolbarPersistConfig, toolbarBulkProps, dataView, showToolbarSorting, exportToolbarSlot, sortingToolbarSlot, columnsSettingsToolbarSlot, hasMobileToolbarMounts, searchPlaceholder, } = useTableToolbar({
194
+ const { tableToolbarPersistConfig, toolbarBulkProps, dataView, exportToolbarSlot, sortingToolbarSlot, columnsSettingsToolbarSlot, hasMobileToolbarMounts, searchPlaceholder, } = useTableToolbar({
195
195
  table,
196
196
  columnDefinitions,
197
197
  sortingProp,
@@ -315,7 +315,7 @@ export function Table({ data, rowPinning = {
315
315
  onChange: onGlobalFilterChange,
316
316
  loading: search?.loading,
317
317
  placeholder: search?.placeholder || searchPlaceholder,
318
- }, onRefresh: onRefresh ? handleOnRefresh : undefined, persist: showToolbar ? tableToolbarPersistConfig : undefined, checked: toolbarBulkProps?.checked, indeterminate: toolbarBulkProps?.indeterminate, onCheck: toolbarBulkProps?.onCheck, bulkActions: toolbarBulkProps?.bulkActions, selectedCount: toolbarBulkProps?.selectedCount, totalCount: toolbarBulkProps?.totalCount, showBulkCheckbox: toolbarBulkProps?.showBulkCheckbox, outline: outline, dataView: dataView, after: toolbarAfter || onExport || areColumnsSettingsEnabled || showToolbarSorting ? (_jsxs(_Fragment, { children: [toolbarAfter, exportToolbarSlot.afterContent, sortingToolbarSlot.afterContent, columnsSettingsToolbarSlot.afterContent] })) : undefined, moreActions: moreActions, filterRow: patchedFilter }));
318
+ }, onRefresh: onRefresh ? handleOnRefresh : undefined, persist: showToolbar ? tableToolbarPersistConfig : undefined, checked: toolbarBulkProps?.checked, indeterminate: toolbarBulkProps?.indeterminate, onCheck: toolbarBulkProps?.onCheck, bulkActions: toolbarBulkProps?.bulkActions, selectedCount: toolbarBulkProps?.selectedCount, totalCount: toolbarBulkProps?.totalCount, showBulkCheckbox: toolbarBulkProps?.showBulkCheckbox, outline: outline, dataView: dataView, pinnedAfter: sortingToolbarSlot.afterContent, after: toolbarAfter || onExport || areColumnsSettingsEnabled ? (_jsxs(_Fragment, { children: [toolbarAfter, exportToolbarSlot.afterContent, columnsSettingsToolbarSlot.afterContent] })) : undefined, moreActions: moreActions, filterRow: patchedFilter }));
319
319
  let toolbarChrome = null;
320
320
  if (showToolbar) {
321
321
  const stickyToolbarChromeRef = isStickyControls ? stickyToolbarRef : undefined;
@@ -328,7 +328,7 @@ export function Table({ data, rowPinning = {
328
328
  paginationChrome =
329
329
  isStickyControls && controlsAcrylic ? (_jsx(TableChrome, { variant: 'footer', acrylic: controlsAcrylic, children: pagination })) : (pagination);
330
330
  }
331
- return (_jsx("div", { ref: wrapperRef, className: cn(styles.wrapper, className), "data-view": view, "data-layout-type": layoutType, "data-sticky-controls": isStickyControls || undefined, "data-with-toolbar": showToolbar || undefined, "data-empty-body": isEmptyBody || undefined, "data-fit-content": !resolvedFullWidth || undefined, ...extractSupportProps(rest), children: _jsxs(TableContext.Provider, { value: tableContextValue, children: [toolbarChrome, _jsxs("div", { className: styles.tableView, children: [_jsxs("div", { className: styles.content, "data-outline": !isCardsView && outline ? true : undefined, "data-page-sticky-header": !isCardsView && usePageStickyHeader ? true : undefined, ...(!isCardsView ? TABLE_CONTENT_ACRYLIC : {}), children: [!isCardsView ? _jsx("span", { className: styles.contentAcrylic, "data-acrylic-background": true, "aria-hidden": true }) : null, hasMobileToolbarMounts ? (_jsxs("div", { className: styles.mobileToolbarMounts, children: [sortingToolbarSlot.mobileMount, columnsSettingsToolbarSlot.mobileMount] })) : null, _jsxs(DndContext, { ...dndContextProps, children: [draggingColumnPreview, _jsx(TableScrollHost, { view: view, isMobile: isMobile, isCardsView: isCardsView, usePageStickyHeader: usePageStickyHeader, scrollOverflow: scrollOverflow, scrollPaddingAbsolute: scrollPaddingAbsolute, internalScrollRef: internalScrollRef, scrollRef: scrollRef, scrollContainerRef: scrollContainerRef, handleScrollInitialized: handleScrollInitialized, syncHeaderHorizontalScroll: syncHeaderHorizontalScroll, tableHeaderElement: tableHeaderElement, columnSizeVars: columnSizes.vars, children: scrollContent })] }), loadMoreButtonNode, !isCardsView && outline ? _jsx("span", { className: styles.contentBorder, "aria-hidden": true }) : null] }), paginationChrome] })] }) }));
331
+ return (_jsx("div", { ref: wrapperRef, className: cn(styles.wrapper, className), "data-view": view, "data-layout-type": layoutType, "data-sticky-controls": isStickyControls || undefined, "data-with-toolbar": showToolbar || undefined, "data-empty-body": isEmptyBody || undefined, "data-fit-content": !resolvedFullWidth || undefined, ...extractSupportProps(rest), children: _jsxs(TableContext.Provider, { value: tableContextValue, children: [toolbarChrome, _jsxs("div", { className: styles.tableView, children: [_jsxs("div", { className: styles.content, "data-outline": !isCardsView && outline ? true : undefined, "data-page-sticky-header": !isCardsView && usePageStickyHeader ? true : undefined, ...(!isCardsView ? TABLE_CONTENT_ACRYLIC : {}), children: [!isCardsView ? _jsx("span", { className: styles.contentAcrylic, "data-acrylic-background": true, "aria-hidden": true }) : null, hasMobileToolbarMounts ? (_jsx("div", { className: styles.mobileToolbarMounts, children: columnsSettingsToolbarSlot.mobileMount })) : null, _jsxs(DndContext, { ...dndContextProps, children: [draggingColumnPreview, _jsx(TableScrollHost, { view: view, isMobile: isMobile, isCardsView: isCardsView, usePageStickyHeader: usePageStickyHeader, scrollOverflow: scrollOverflow, scrollPaddingAbsolute: scrollPaddingAbsolute, internalScrollRef: internalScrollRef, scrollRef: scrollRef, scrollContainerRef: scrollContainerRef, handleScrollInitialized: handleScrollInitialized, syncHeaderHorizontalScroll: syncHeaderHorizontalScroll, tableHeaderElement: tableHeaderElement, columnSizeVars: columnSizes.vars, children: scrollContent })] }), loadMoreButtonNode, !isCardsView && outline ? _jsx("span", { className: styles.contentBorder, "aria-hidden": true }) : null] }), paginationChrome] })] }) }));
332
332
  }
333
333
  Table.getStatusColumnDef = getStatusColumnDef;
334
334
  Table.statusAppearances = STATUS_APPEARANCE;
@@ -18,9 +18,10 @@ type TableToolbarProps<TFilters extends FiltersState> = {
18
18
  value: 'list' | 'compact';
19
19
  onChange: (value: 'list' | 'compact') => void;
20
20
  };
21
+ pinnedAfter?: ReactNode;
21
22
  after?: ReactNode;
22
23
  moreActions?: TableProps<object>['moreActions'];
23
24
  filterRow?: TableProps<object>['columnFilters'];
24
25
  } & Partial<TableToolbarBulkProps>;
25
- export declare function TableToolbar<TFilters extends FiltersState = Record<string, unknown>>({ search, onRefresh, persist, checked, indeterminate, onCheck, bulkActions, selectedCount, totalCount, showBulkCheckbox, outline, dataView, after, moreActions, filterRow, }: TableToolbarProps<TFilters>): import("react/jsx-runtime").JSX.Element;
26
+ export declare function TableToolbar<TFilters extends FiltersState = Record<string, unknown>>({ search, onRefresh, persist, checked, indeterminate, onCheck, bulkActions, selectedCount, totalCount, showBulkCheckbox, outline, dataView, pinnedAfter, after, moreActions, filterRow, }: TableToolbarProps<TFilters>): import("react/jsx-runtime").JSX.Element;
26
27
  export {};
@@ -2,6 +2,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
2
2
  import { Toolbar } from '@cloud-ru/ds-toolbar';
3
3
  import { TEST_IDS } from '../../../../constants.js';
4
4
  import styles from '../../styles.module.css';
5
- export function TableToolbar({ search, onRefresh, persist, checked, indeterminate, onCheck, bulkActions, selectedCount, totalCount, showBulkCheckbox, outline, dataView, after, moreActions, filterRow, }) {
6
- return (_jsx(Toolbar, { search: search, className: styles.toolbar, onRefresh: onRefresh, persist: persist, checked: checked, indeterminate: indeterminate, onCheck: onCheck, bulkActions: bulkActions, selectedCount: selectedCount, totalCount: totalCount, showBulkCheckbox: showBulkCheckbox, outline: outline, dataView: dataView, after: after, moreActions: moreActions, filterRow: filterRow, "data-test-id": TEST_IDS.toolbar }));
5
+ export function TableToolbar({ search, onRefresh, persist, checked, indeterminate, onCheck, bulkActions, selectedCount, totalCount, showBulkCheckbox, outline, dataView, pinnedAfter, after, moreActions, filterRow, }) {
6
+ return (_jsx(Toolbar, { search: search, className: styles.toolbar, onRefresh: onRefresh, persist: persist, checked: checked, indeterminate: indeterminate, onCheck: onCheck, bulkActions: bulkActions, selectedCount: selectedCount, totalCount: totalCount, showBulkCheckbox: showBulkCheckbox, outline: outline, dataView: dataView, pinnedAfter: pinnedAfter, after: after, moreActions: moreActions, filterRow: filterRow, "data-test-id": TEST_IDS.toolbar }));
7
7
  }
@@ -67,7 +67,6 @@ type UseTableToolbarResult<TFilters extends FiltersState> = {
67
67
  value: ToolbarDataViewValue;
68
68
  onChange: (value: ToolbarDataViewValue) => void;
69
69
  };
70
- showToolbarSorting: boolean;
71
70
  exportToolbarSlot: ExportToolbarSlotResult;
72
71
  sortingToolbarSlot: TableSortingToolbarSlotResult;
73
72
  columnsSettingsToolbarSlot: ColumnsSettingsToolbarSlotResult;
@@ -103,12 +103,11 @@ export function useTableToolbar({ table, columnDefinitions, sortingProp, savedSt
103
103
  setEnabledColumns,
104
104
  setColumnOrder,
105
105
  });
106
- const hasMobileToolbarMounts = Boolean(sortingToolbarSlot.mobileMount || columnsSettingsToolbarSlot.mobileMount);
106
+ const hasMobileToolbarMounts = Boolean(columnsSettingsToolbarSlot.mobileMount);
107
107
  return {
108
108
  tableToolbarPersistConfig: tableToolbarPersistConfig,
109
109
  toolbarBulkProps,
110
110
  dataView,
111
- showToolbarSorting,
112
111
  exportToolbarSlot,
113
112
  sortingToolbarSlot,
114
113
  columnsSettingsToolbarSlot,
@@ -100,7 +100,6 @@ export declare const TEST_IDS: {
100
100
  readonly droplistTrigger: "table__view-sort__droplistTrigger";
101
101
  readonly droplist: "table__view-sort__droplist";
102
102
  readonly option: "table__view-sort__option";
103
- readonly overflowTrigger: "table__view-sort__overflow-trigger";
104
103
  };
105
104
  };
106
105
  export declare const DEFAULT_PAGE_SIZE = 10;
@@ -108,7 +108,6 @@ export const TEST_IDS = {
108
108
  droplistTrigger: 'table__view-sort__droplistTrigger',
109
109
  droplist: 'table__view-sort__droplist',
110
110
  option: 'table__view-sort__option',
111
- overflowTrigger: 'table__view-sort__overflow-trigger',
112
111
  },
113
112
  };
114
113
  export const DEFAULT_PAGE_SIZE = 10;
@@ -4,6 +4,5 @@ export * from './rowSelectionState.js';
4
4
  export * from './tryParseLocalStorage.js';
5
5
  export * from './renderMasterSelectionToggle.js';
6
6
  export * from './renderColumnsSettingsOverflowButton.js';
7
- export * from './renderTableSortingOverflowButton.js';
8
7
  export * from './renderToolbarAfterOverflowButton.js';
9
8
  export * from './renderExportToolbarButton.js';
@@ -4,6 +4,5 @@ export * from './rowSelectionState.js';
4
4
  export * from './tryParseLocalStorage.js';
5
5
  export * from './renderMasterSelectionToggle.js';
6
6
  export * from './renderColumnsSettingsOverflowButton.js';
7
- export * from './renderTableSortingOverflowButton.js';
8
7
  export * from './renderToolbarAfterOverflowButton.js';
9
8
  export * from './renderExportToolbarButton.js';
@@ -1,4 +1,5 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
+ import { isMobileLayout, useAdaptiveLayout } from '@cloud-ru/ds-adaptive';
2
3
  import { ArrowDownSVG, ArrowUpSVG, UpdateSVG } from '@cloud-ru/ds-icons/interface/system';
3
4
  import { ITEM_TYPE } from '@cloud-ru/ds-list';
4
5
  import { useCallback, useMemo } from 'react';
@@ -12,6 +13,8 @@ import { createColumnDefMap, getHeaderLabel, groupHeadersByPinned } from './util
12
13
  const SERVICE_COLUMN_IDS = new Set([DefaultColumns.Selection, DefaultColumns.RowActions, TREE_CELL_ID]);
13
14
  export function useTableSorting({ table, sorting: sortingProp, columnDefinitions, enabledColumns, areColumnsSettingsEnabled = false, }) {
14
15
  const { t } = tableLocale.useTranslations();
16
+ const { layoutType } = useAdaptiveLayout();
17
+ const isMobile = isMobileLayout(layoutType);
15
18
  const sorting = sortingProp ?? table.getState().sorting;
16
19
  const columnDefMap = useMemo(() => createColumnDefMap(columnDefinitions), [columnDefinitions]);
17
20
  const hiddenColumnsBySettings = useMemo(() => {
@@ -155,14 +158,14 @@ export function useTableSorting({ table, sorting: sortingProp, columnDefinitions
155
158
  ];
156
159
  const mainGroup = {
157
160
  type: ITEM_TYPE.Group,
158
- label: t('sort'),
161
+ label: isMobile ? undefined : t('sort'),
159
162
  items: groups,
160
163
  };
161
164
  return {
162
165
  items: [mainGroup],
163
166
  pinBottom: clearItem,
164
167
  };
165
- }, [groupSortableHeadersByPinned, createSortItem, sorting, handleClearSort, t]);
168
+ }, [groupSortableHeadersByPinned, createSortItem, sorting, handleClearSort, t, isMobile]);
166
169
  const handleSelectionChange = useCallback((selectedId) => {
167
170
  const id = String(selectedId);
168
171
  const match = id.match(/^sort-(.+)$/);
@@ -18,7 +18,9 @@ export type TableSortingToolbarSlotParams<TData extends object> = TableSortingPr
18
18
  };
19
19
  export type TableSortingToolbarSlotResult = {
20
20
  afterContent: ReactNode;
21
- mobileMount: ReactNode;
22
21
  };
23
- /** Слот сортировки в тулбаре: `afterContent` — в `after`, `mobileMount` — BottomSheet вне строки тулбара. */
22
+ /**
23
+ * Слот сортировки в тулбаре: `afterContent` — в `pinnedAfter`, поэтому на mobile кнопка остаётся в строке
24
+ * тулбара. Список открывается в `BottomSheet` (surface-swap `Droplist`).
25
+ */
24
26
  export declare function useTableSortingToolbarSlot<TData extends object>({ enabled, table, sorting, columnDefinitions, enabledColumns, areColumnsSettingsEnabled, }: TableSortingToolbarSlotParams<TData>): TableSortingToolbarSlotResult;
@@ -1,20 +1,18 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
- import { isMobileLayout, useAdaptiveLayout } from '@cloud-ru/ds-adaptive';
3
2
  import { APPEARANCE, Button, VIEW as BUTTON_VIEW } from '@cloud-ru/ds-button';
4
3
  import { SortSVG } from '@cloud-ru/ds-icons/interface/product';
5
4
  import { ArrowDownSVG, ArrowUpSVG } from '@cloud-ru/ds-icons/interface/system';
6
5
  import { Droplist } from '@cloud-ru/ds-list';
7
6
  import { useState } from 'react';
8
7
  import { TEST_IDS } from '../../constants.js';
9
- import { renderTableSortingOverflowButton } from '../../helpers/index.js';
10
8
  import { tableLocale } from '../../locale/index.js';
11
9
  import { useTableSorting } from '../useTableSorting/index.js';
12
- import styles from './useTableSortingToolbarSlot.module.css';
13
- /** Слот сортировки в тулбаре: `afterContent` — в `after`, `mobileMount` — BottomSheet вне строки тулбара. */
10
+ /**
11
+ * Слот сортировки в тулбаре: `afterContent` — в `pinnedAfter`, поэтому на mobile кнопка остаётся в строке
12
+ * тулбара. Список открывается в `BottomSheet` (surface-swap `Droplist`).
13
+ */
14
14
  export function useTableSortingToolbarSlot({ enabled = true, table, sorting, columnDefinitions, enabledColumns, areColumnsSettingsEnabled = false, }) {
15
15
  const { t } = tableLocale.useTranslations();
16
- const { layoutType } = useAdaptiveLayout();
17
- const isMobile = isMobileLayout(layoutType);
18
16
  const [open, setOpen] = useState(false);
19
17
  const { items, pinBottom, selection, currentSort, selectedSortId, handleClearSort } = useTableSorting({
20
18
  table,
@@ -23,6 +21,9 @@ export function useTableSortingToolbarSlot({ enabled = true, table, sorting, col
23
21
  enabledColumns,
24
22
  areColumnsSettingsEnabled,
25
23
  });
24
+ if (!enabled) {
25
+ return { afterContent: null };
26
+ }
26
27
  const handleClear = () => {
27
28
  handleClearSort();
28
29
  setOpen(false);
@@ -32,20 +33,7 @@ export function useTableSortingToolbarSlot({ enabled = true, table, sorting, col
32
33
  if (currentSort) {
33
34
  SortIcon = currentSort.desc ? ArrowDownSVG : ArrowUpSVG;
34
35
  }
35
- const droplist = (_jsx(Droplist, { scroll: true, items: items, selection: selection, virtualized: items.length > 10, pinBottom: clearItem, open: open, onOpenChange: setOpen, label: t('sort'), "data-test-id": TEST_IDS.viewSort.droplist, children: isMobile ? (_jsx("span", { className: styles.hiddenTrigger, "aria-hidden": true })) : (_jsx(Button, { size: 'm', view: BUTTON_VIEW.Function, icon: _jsx(SortIcon, {}), appearance: selectedSortId ? APPEARANCE.Primary : APPEARANCE.Neutral, "data-test-id": TEST_IDS.viewSort.droplistTrigger })) }));
36
- if (!enabled) {
37
- return { afterContent: null, mobileMount: null };
38
- }
39
- if (isMobile) {
40
- return {
41
- afterContent: renderTableSortingOverflowButton({
42
- ariaLabel: t('sort'),
43
- onClick: () => setOpen(true),
44
- selectedSortId,
45
- currentSortDesc: currentSort?.desc,
46
- }),
47
- mobileMount: droplist,
48
- };
49
- }
50
- return { afterContent: droplist, mobileMount: null };
36
+ return {
37
+ afterContent: (_jsx(Droplist, { scroll: true, items: items, selection: selection, virtualized: items.length > 10, pinBottom: clearItem, open: open, onOpenChange: setOpen, label: t('sort'), "data-test-id": TEST_IDS.viewSort.droplist, children: _jsx(Button, { size: 'm', view: BUTTON_VIEW.Function, icon: _jsx(SortIcon, {}), appearance: selectedSortId ? APPEARANCE.Primary : APPEARANCE.Neutral, "aria-label": t('sort'), "data-test-id": TEST_IDS.viewSort.droplistTrigger }) })),
38
+ };
51
39
  }
@@ -1642,12 +1642,4 @@
1642
1642
  }
1643
1643
  .clearSortItem[data-disabled=true] svg{
1644
1644
  color:var(--sn-theme-color-available-version-textDisabled, var(--sn-brand-color-text-version-disabled, rgba(0, 0, 0, 0.3803921569)));
1645
- }
1646
- .hiddenTrigger{
1647
- position:absolute;
1648
- overflow:hidden;
1649
- width:1px;
1650
- height:1px;
1651
- white-space:nowrap;
1652
- clip-path:rect(0, 0, 0, 0);
1653
1645
  }