@cloud-ru/ds-table 2.1.0 → 2.2.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/CHANGELOG.md +6 -0
- package/dist/cjs/components/Table/Table.d.ts +1 -1
- package/dist/cjs/components/Table/Table.js +8 -1
- package/dist/cjs/helperComponents/Cells/TreeCell/TreeCell.d.ts +6 -1
- package/dist/cjs/helperComponents/Cells/TreeCell/TreeCell.js +3 -3
- package/dist/esm/components/Table/Table.d.ts +1 -1
- package/dist/esm/components/Table/Table.js +8 -1
- package/dist/esm/helperComponents/Cells/TreeCell/TreeCell.d.ts +6 -1
- package/dist/esm/helperComponents/Cells/TreeCell/TreeCell.js +3 -3
- package/dist/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/tsconfig.esm.tsbuildinfo +1 -1
- package/package.json +10 -10
- package/src/components/Table/Table.tsx +13 -1
- package/src/helperComponents/Cells/TreeCell/TreeCell.tsx +10 -3
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloud-ru/ds-table",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.2.0",
|
|
4
4
|
"description": "Таблица данных: клиентская Table, серверная ServerTable и preset-обёртки с упрощённым API.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -49,24 +49,24 @@
|
|
|
49
49
|
"@tanstack/react-virtual": "^3.14.8",
|
|
50
50
|
"classnames": "^2.5.1",
|
|
51
51
|
"@cloud-ru/ds-adaptive": "^1.0.3",
|
|
52
|
-
"@cloud-ru/ds-
|
|
52
|
+
"@cloud-ru/ds-card": "^1.0.28",
|
|
53
53
|
"@cloud-ru/ds-button": "^1.0.5",
|
|
54
54
|
"@cloud-ru/ds-icons": "^1.7.1",
|
|
55
|
-
"@cloud-ru/ds-
|
|
56
|
-
"@cloud-ru/ds-locale": "^1.0.0",
|
|
57
|
-
"@cloud-ru/ds-card": "^1.0.28",
|
|
55
|
+
"@cloud-ru/ds-chips": "^1.2.4",
|
|
58
56
|
"@cloud-ru/ds-drag-and-drop": "^1.1.4",
|
|
59
57
|
"@cloud-ru/ds-info-block": "^1.0.4",
|
|
58
|
+
"@cloud-ru/ds-list": "^3.0.3",
|
|
59
|
+
"@cloud-ru/ds-locale": "^1.0.0",
|
|
60
60
|
"@cloud-ru/ds-materials": "^2.0.2",
|
|
61
|
+
"@cloud-ru/ds-pagination": "^1.1.8",
|
|
61
62
|
"@cloud-ru/ds-scroll": "^1.0.6",
|
|
62
63
|
"@cloud-ru/ds-status": "^1.1.13",
|
|
63
|
-
"@cloud-ru/ds-pagination": "^1.1.8",
|
|
64
|
-
"@cloud-ru/ds-toolbar": "^2.1.0",
|
|
65
64
|
"@cloud-ru/ds-skeleton": "^1.0.3",
|
|
66
|
-
"@cloud-ru/ds-truncate-string": "^1.0.17",
|
|
67
65
|
"@cloud-ru/ds-toggles": "^1.1.13",
|
|
68
|
-
"@cloud-ru/ds-
|
|
69
|
-
"@cloud-ru/ds-tooltip": "^1.0.16"
|
|
66
|
+
"@cloud-ru/ds-toolbar": "^2.1.0",
|
|
67
|
+
"@cloud-ru/ds-tooltip": "^1.0.16",
|
|
68
|
+
"@cloud-ru/ds-truncate-string": "^1.0.17",
|
|
69
|
+
"@cloud-ru/ds-utils": "^1.3.0"
|
|
70
70
|
},
|
|
71
71
|
"publishConfig": {
|
|
72
72
|
"access": "public"
|
|
@@ -134,7 +134,7 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
|
|
|
134
134
|
getRowId,
|
|
135
135
|
enableFuzzySearch,
|
|
136
136
|
savedState,
|
|
137
|
-
expanding,
|
|
137
|
+
expanding: expandingProp,
|
|
138
138
|
bulkActions: bulkActionsProp,
|
|
139
139
|
rowAutoHeight,
|
|
140
140
|
columnsSettings: columnsSettingsProp,
|
|
@@ -160,6 +160,18 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
|
|
|
160
160
|
const { layoutType } = useAdaptiveLayout();
|
|
161
161
|
const isMobile = isMobileLayout(layoutType);
|
|
162
162
|
|
|
163
|
+
const expanding = useMemo(
|
|
164
|
+
() =>
|
|
165
|
+
expandingProp && {
|
|
166
|
+
...expandingProp,
|
|
167
|
+
expandingColumnDefinition: {
|
|
168
|
+
...expandingProp.expandingColumnDefinition,
|
|
169
|
+
pinned: expandingProp.expandingColumnDefinition.pinned ?? !isMobile,
|
|
170
|
+
},
|
|
171
|
+
},
|
|
172
|
+
[expandingProp, isMobile],
|
|
173
|
+
);
|
|
174
|
+
|
|
163
175
|
const {
|
|
164
176
|
stickyControls,
|
|
165
177
|
fullWidth: resolvedFullWidth,
|
|
@@ -24,6 +24,11 @@ import { TreeLine } from './TreeLine';
|
|
|
24
24
|
type BaseTreeColumnDef = {
|
|
25
25
|
/** Имя ключа соответствующее полю в data */
|
|
26
26
|
accessorKey: string;
|
|
27
|
+
/**
|
|
28
|
+
* Закрепить колонку слева. В Table по умолчанию true на desktop и false на mobile.
|
|
29
|
+
* При прямом вызове getTreeColumnDef по умолчанию true.
|
|
30
|
+
*/
|
|
31
|
+
pinned?: boolean;
|
|
27
32
|
/** Показывать линии-направляющие вложенности (вертикальные и горизонтальные) */
|
|
28
33
|
showLines?: boolean;
|
|
29
34
|
/** Иконка элемента-родителя в открытом состоянии */
|
|
@@ -144,6 +149,7 @@ export function renderTreeColumnLoadingHeader<TData>(
|
|
|
144
149
|
|
|
145
150
|
/** Вспомогательная функция для создания ячейки со статусом */
|
|
146
151
|
export function getTreeColumnDef<TData>({
|
|
152
|
+
pinned = true,
|
|
147
153
|
showToggle = false,
|
|
148
154
|
showLines = true,
|
|
149
155
|
icon = <FileSVG size={24} />,
|
|
@@ -349,9 +355,8 @@ export function getTreeColumnDef<TData>({
|
|
|
349
355
|
);
|
|
350
356
|
};
|
|
351
357
|
|
|
352
|
-
|
|
358
|
+
const columnDefinition = {
|
|
353
359
|
id: TREE_CELL_ID,
|
|
354
|
-
pinned: COLUMN_PIN_POSITION.Left,
|
|
355
360
|
accessorKey,
|
|
356
361
|
noBodyCellPadding: true,
|
|
357
362
|
noHeaderCellPadding: Boolean(enableSelection && showToggle),
|
|
@@ -365,5 +370,7 @@ export function getTreeColumnDef<TData>({
|
|
|
365
370
|
enableSorting: false,
|
|
366
371
|
header: renderTreeColumnHeader(header, { enableSelection, showToggle, masterSelection }),
|
|
367
372
|
cell,
|
|
368
|
-
}
|
|
373
|
+
} satisfies ColumnDefinition<TData>;
|
|
374
|
+
|
|
375
|
+
return pinned ? { ...columnDefinition, pinned: COLUMN_PIN_POSITION.Left } : columnDefinition;
|
|
369
376
|
}
|