@cloud-ru/ds-table 1.0.24-preview-d90ac2be.0 → 1.1.1-preview-0406cbd2.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 (46) hide show
  1. package/CHANGELOG.md +10 -0
  2. package/dist/cjs/components/Table/Table.js +1 -3
  3. package/dist/cjs/components/Table/styles.module.css +60 -60
  4. package/dist/cjs/helperComponents/Cells/HeaderCell/styles.module.css +4 -4
  5. package/dist/cjs/helperComponents/Cells/SelectionCell/styles.module.css +1 -1
  6. package/dist/cjs/helperComponents/Cells/TreeCell/TreeCell.js +2 -2
  7. package/dist/cjs/helperComponents/Cells/TreeCell/TreeLine/styles.module.css +5 -5
  8. package/dist/cjs/helperComponents/Cells/TreeCell/styles.module.css +4 -20
  9. package/dist/cjs/helperComponents/Cells/styles.module.css +3 -3
  10. package/dist/cjs/helperComponents/ControlsChrome/styles.module.css +56 -56
  11. package/dist/cjs/helperComponents/Rows/styles.module.css +16 -16
  12. package/dist/cjs/helperComponents/TableCard/styles.module.css +6 -6
  13. package/dist/cjs/helperComponents/TreeChevronButton/TreeChevronButton.d.ts +9 -0
  14. package/dist/cjs/helperComponents/TreeChevronButton/TreeChevronButton.js +13 -0
  15. package/dist/cjs/helperComponents/TreeChevronButton/index.d.ts +1 -0
  16. package/dist/cjs/helperComponents/TreeChevronButton/index.js +17 -0
  17. package/dist/cjs/helperComponents/TreeChevronButton/styles.module.css +62 -0
  18. package/dist/cjs/style.css +217 -171
  19. package/dist/esm/components/Table/Table.js +1 -3
  20. package/dist/esm/components/Table/styles.module.css +60 -60
  21. package/dist/esm/helperComponents/Cells/HeaderCell/styles.module.css +4 -4
  22. package/dist/esm/helperComponents/Cells/SelectionCell/styles.module.css +1 -1
  23. package/dist/esm/helperComponents/Cells/TreeCell/TreeCell.js +3 -3
  24. package/dist/esm/helperComponents/Cells/TreeCell/TreeLine/styles.module.css +5 -5
  25. package/dist/esm/helperComponents/Cells/TreeCell/styles.module.css +4 -20
  26. package/dist/esm/helperComponents/Cells/styles.module.css +3 -3
  27. package/dist/esm/helperComponents/ControlsChrome/styles.module.css +56 -56
  28. package/dist/esm/helperComponents/Rows/styles.module.css +16 -16
  29. package/dist/esm/helperComponents/TableCard/styles.module.css +6 -6
  30. package/dist/esm/helperComponents/TreeChevronButton/TreeChevronButton.d.ts +9 -0
  31. package/dist/esm/helperComponents/TreeChevronButton/TreeChevronButton.js +7 -0
  32. package/dist/esm/helperComponents/TreeChevronButton/index.d.ts +1 -0
  33. package/dist/esm/helperComponents/TreeChevronButton/index.js +1 -0
  34. package/dist/esm/helperComponents/TreeChevronButton/styles.module.css +62 -0
  35. package/dist/esm/style.css +217 -171
  36. package/dist/tsconfig.cjs.tsbuildinfo +1 -1
  37. package/dist/tsconfig.esm.tsbuildinfo +1 -1
  38. package/package.json +16 -17
  39. package/src/components/Table/Table.tsx +1 -3
  40. package/src/helperComponents/Cells/HeaderCell/styles.module.scss +2 -2
  41. package/src/helperComponents/Cells/TreeCell/TreeCell.tsx +5 -10
  42. package/src/helperComponents/Cells/TreeCell/TreeLine/styles.module.scss +3 -4
  43. package/src/helperComponents/Cells/TreeCell/styles.module.scss +0 -31
  44. package/src/helperComponents/TreeChevronButton/TreeChevronButton.tsx +30 -0
  45. package/src/helperComponents/TreeChevronButton/index.ts +1 -0
  46. package/src/helperComponents/TreeChevronButton/styles.module.scss +73 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloud-ru/ds-table",
3
- "version": "1.0.24-preview-d90ac2be.0",
3
+ "version": "1.1.1-preview-0406cbd2.0",
4
4
  "description": "Таблица данных: клиентская Table, серверная ServerTable и preset-обёртки с упрощённым API.",
5
5
  "repository": {
6
6
  "type": "git",
@@ -49,24 +49,23 @@
49
49
  "@tanstack/react-virtual": "^3.14.8",
50
50
  "classnames": "^2.5.1",
51
51
  "@cloud-ru/ds-adaptive": "1.0.1",
52
- "@cloud-ru/ds-button": "1.0.2",
53
- "@cloud-ru/ds-drag-and-drop": "1.1.1",
54
- "@cloud-ru/ds-info-block": "1.0.1",
55
- "@cloud-ru/ds-chips": "1.0.20-preview-d90ac2be.0",
56
- "@cloud-ru/ds-card": "1.0.14-preview-d90ac2be.0",
57
- "@cloud-ru/ds-list": "2.2.1-preview-d90ac2be.0",
52
+ "@cloud-ru/ds-button": "1.0.3",
53
+ "@cloud-ru/ds-card": "1.0.14",
54
+ "@cloud-ru/ds-chips": "1.0.21-preview-0406cbd2.0",
55
+ "@cloud-ru/ds-drag-and-drop": "1.1.2",
56
+ "@cloud-ru/ds-icons": "1.2.1",
57
+ "@cloud-ru/ds-info-block": "1.0.2",
58
+ "@cloud-ru/ds-list": "2.2.2-preview-0406cbd2.0",
58
59
  "@cloud-ru/ds-locale": "1.0.0",
59
- "@cloud-ru/ds-icons": "1.2.0",
60
- "@cloud-ru/ds-materials": "1.0.1",
61
- "@cloud-ru/ds-pagination": "1.0.5",
62
- "@cloud-ru/ds-scroll": "1.0.3-preview-d90ac2be.0",
60
+ "@cloud-ru/ds-materials": "2.0.0",
61
+ "@cloud-ru/ds-pagination": "1.1.0",
62
+ "@cloud-ru/ds-scroll": "1.0.3",
63
63
  "@cloud-ru/ds-skeleton": "1.0.1",
64
- "@cloud-ru/ds-status": "1.1.2-preview-d90ac2be.0",
65
- "@cloud-ru/ds-theme": "1.1.0",
66
- "@cloud-ru/ds-toolbar": "1.0.23-preview-d90ac2be.0",
67
- "@cloud-ru/ds-toggles": "1.1.5-preview-d90ac2be.0",
68
- "@cloud-ru/ds-tooltip": "1.0.5",
69
- "@cloud-ru/ds-truncate-string": "1.0.6-preview-d90ac2be.0",
64
+ "@cloud-ru/ds-status": "1.1.2",
65
+ "@cloud-ru/ds-toggles": "1.1.5",
66
+ "@cloud-ru/ds-toolbar": "1.0.24-preview-0406cbd2.0",
67
+ "@cloud-ru/ds-tooltip": "1.0.6",
68
+ "@cloud-ru/ds-truncate-string": "1.0.6",
70
69
  "@cloud-ru/ds-utils": "1.1.0"
71
70
  },
72
71
  "publishConfig": {
@@ -3,7 +3,6 @@ import { isMobileLayout, LayoutPresets, mergePresets, useAdaptiveLayout, useLayo
3
3
  import { FiltersState } from '@cloud-ru/ds-chips';
4
4
  import { DragPreview } from '@cloud-ru/ds-drag-and-drop';
5
5
  import { BACKGROUND_PREDEFINED_FILL } from '@cloud-ru/ds-materials';
6
- import { useThemeClassnames } from '@cloud-ru/ds-theme';
7
6
  import { ToolbarPersistConfig } from '@cloud-ru/ds-toolbar';
8
7
  import { extractSupportProps } from '@cloud-ru/ds-utils';
9
8
  import { flexRender } from '@tanstack/react-table';
@@ -604,7 +603,6 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
604
603
  ],
605
604
  );
606
605
 
607
- const themeClassName = useThemeClassnames({ density: isMobile ? 'comfort' : 'compact' });
608
606
 
609
607
  const controlsAcrylic = useMemo(
610
608
  () => (isStickyControls ? getControlsAcrylicAttrs(stickyControlsBackgroundPredefined) : null),
@@ -718,7 +716,7 @@ export function Table<TData extends object, TFilters extends FiltersState = Reco
718
716
  return (
719
717
  <div
720
718
  ref={wrapperRef}
721
- className={cn(styles.wrapper, className, themeClassName)}
719
+ className={cn(styles.wrapper, className)}
722
720
  data-view={view}
723
721
  data-layout-type={layoutType}
724
722
  data-sticky-controls={isStickyControls || undefined}
@@ -186,7 +186,7 @@
186
186
  color: base.$sn-theme-color-available-version-textTertiary;
187
187
 
188
188
  svg {
189
- width: base.$sn-density-size-icon-xs !important;
190
- height: base.$sn-density-size-icon-xs !important;
189
+ width: base.$sn-density-icon-xs !important;
190
+ height: base.$sn-density-icon-xs !important;
191
191
  }
192
192
  }
@@ -1,5 +1,4 @@
1
- import { APPEARANCE, Button, VIEW } from '@cloud-ru/ds-button';
2
- import { ChevronRightSVG, FileSVG, FolderOpenSVG, FolderSVG } from '@cloud-ru/ds-icons/interface/system';
1
+ import { FileSVG, FolderOpenSVG, FolderSVG } from '@cloud-ru/ds-icons/interface/system';
3
2
  import { Checkbox, Radio } from '@cloud-ru/ds-toggles';
4
3
  import { TruncateString } from '@cloud-ru/ds-truncate-string';
5
4
  import { useHierarchicalSelection } from '@cloud-ru/ds-utils';
@@ -16,6 +15,7 @@ import {
16
15
  selectedIdsToRowSelectionState,
17
16
  } from '../../../helpers';
18
17
  import { ColumnDefinition } from '../../../types';
18
+ import { TreeChevronButton } from '../../TreeChevronButton';
19
19
  import { TREE_CELL_ID } from './constants';
20
20
  import { getRowHierarchicalSelectionContext } from './rowHierarchicalSelection';
21
21
  import styles from './styles.module.scss';
@@ -299,15 +299,10 @@ export function getTreeColumnDef<TData>({
299
299
  {lines}
300
300
  {Boolean(parent) && <TreeLine horizontal visible={showLines} extended={shouldExtendHorizontalLine} />}
301
301
  {isExpandable && (
302
- <Button
303
- view={VIEW.Function}
304
- appearance={APPEARANCE.Neutral}
305
- size='s'
306
- data-test-id={TEST_IDS.tree.chevron}
307
- icon={<ChevronRightSVG />}
302
+ <TreeChevronButton
303
+ expanded={Boolean(isExpanded)}
308
304
  onClick={chevronClickHandler}
309
- className={styles.cellExpandButton}
310
- data-expanded={isExpanded || undefined}
305
+ data-test-id={TEST_IDS.tree.chevron}
311
306
  />
312
307
  )}
313
308
  {showToggle && !isToggleHidden && (
@@ -1,13 +1,12 @@
1
1
  // Линия дерева: каждый экземпляр занимает ровно один «уровень вложенности»
2
- // (centeredWrapper.width = 24px) и рисует тонкую линию по центру блока.
2
+ // (childLine.maxWidth = 24px) и рисует тонкую линию по центру блока.
3
3
  // data-visible показывает линию, data-half-height укорачивает до 50% высоты
4
4
  // (последний потомок ветки), data-horizontal — горизонтальный отвод к узлу.
5
5
  @use '@cloud-ru/ds-figma-variables/build/scss/styles/styles.module' as base;
6
6
  @use '@cloud-ru/ds-figma-variables/build/scss/components/table.module' as table;
7
- @use '@cloud-ru/ds-figma-variables/build/scss/components/tree.module' as tree;
8
7
 
9
- $level-width: tree.$sn-tree-anatomy-size-m-treeItem-centeredWrapper-width;
10
- $list-row-gap: tree.$sn-tree-anatomy-size-m-treeItem-centeredWrapper-paddingRight;
8
+ $level-width: table.$sn-table-anatomy-content-tableLine-pinnedWrapper-elementWrapper-treeControl-centeredWrapper-childLine-maxWidth;
9
+ $list-row-gap: table.$sn-table-anatomy-content-tableLine-pinnedWrapper-elementWrapper-treeControl-centeredWrapper-childLine-paddingRight;
11
10
 
12
11
  .treeLine {
13
12
  position: relative;
@@ -95,37 +95,6 @@
95
95
  align-items: center;
96
96
  }
97
97
 
98
- .cellExpandButton {
99
- flex-shrink: 0;
100
- box-sizing: border-box;
101
- width: base.simple-var(
102
- table.$table,
103
- 'anatomy',
104
- 'content',
105
- 'tableLine',
106
- 'pinnedWrapper',
107
- 'elementWrapper',
108
- 'treeControl',
109
- 'centeredWrapper',
110
- 'width'
111
- );
112
-
113
- // `max-*` обязателен: иконки из @cloud-ru/ds-icons приходят с инлайновым размером,
114
- // и он перебивает `width`/`height` из таблицы стилей (приём из @cloud-ru/ds-button).
115
- svg {
116
- width: base.$sn-density-size-icon-s;
117
- max-width: base.$sn-density-size-icon-s;
118
- height: base.$sn-density-size-icon-s;
119
- max-height: base.$sn-density-size-icon-s;
120
-
121
- transition: transform 0.2s ease;
122
- }
123
-
124
- &[data-expanded] svg {
125
- transform: rotate(90deg);
126
- }
127
- }
128
-
129
98
  .treeHeaderContainer {
130
99
  overflow: hidden;
131
100
  height: 100%;
@@ -0,0 +1,30 @@
1
+ import { ChevronRightSVG } from '@cloud-ru/ds-icons/interface/system';
2
+ import { MouseEvent } from 'react';
3
+
4
+ import styles from './styles.module.scss';
5
+
6
+ export type TreeChevronButtonProps = {
7
+ /** Раскрыта ли ветка: шеврон повёрнут вниз */
8
+ expanded: boolean;
9
+ onClick(event: MouseEvent<HTMLButtonElement>): void;
10
+ 'data-test-id'?: string;
11
+ };
12
+
13
+ /** Шеврон раскрытия ветки дерева в ячейке таблицы — Figma `buttonChevronTable`. */
14
+ export function TreeChevronButton({ expanded, onClick, 'data-test-id': dataTestId }: TreeChevronButtonProps) {
15
+ return (
16
+ <button
17
+ type='button'
18
+ className={styles.root}
19
+ onClick={onClick}
20
+ data-expanded={expanded || undefined}
21
+ data-test-id={dataTestId}
22
+ >
23
+ <span className={styles.content}>
24
+ <span className={styles.icon} data-text-opacity>
25
+ <ChevronRightSVG />
26
+ </span>
27
+ </span>
28
+ </button>
29
+ );
30
+ }
@@ -0,0 +1 @@
1
+ export * from './TreeChevronButton';
@@ -0,0 +1,73 @@
1
+ @use '@cloud-ru/ds-figma-variables/build/scss/styles/styles.module' as base;
2
+ @use '@cloud-ru/ds-figma-variables/build/scss/components/table.module' as table;
3
+ @use '@cloud-ru/ds-materials' as m;
4
+
5
+ .root {
6
+ cursor: pointer;
7
+
8
+ position: relative;
9
+
10
+ display: inline-flex;
11
+ flex-shrink: 0;
12
+ align-items: center;
13
+ justify-content: center;
14
+
15
+ box-sizing: border-box;
16
+ margin: 0;
17
+ padding: 0;
18
+ // Обводка мастера — внутренняя и прозрачная: толщина из токена не должна увеличивать кнопку.
19
+ border-style: none;
20
+
21
+ color: base.$sn-theme-color-neutral-text;
22
+
23
+ background-color: transparent;
24
+
25
+ @include base.composite-var(
26
+ table.$table,
27
+ 'anatomy',
28
+ 'content',
29
+ 'tableLine',
30
+ 'pinnedWrapper',
31
+ 'elementWrapper',
32
+ 'treeControl',
33
+ 'centeredWrapper',
34
+ 'buttonChevron',
35
+ 'container'
36
+ );
37
+ @include m.has-content-with-text-opacity(#{content});
38
+
39
+ // Область нажатия на mobile ≥ `density.touchTarget.minSize` (44); на desktop токен 0 — совпадает с кнопкой.
40
+ &::after {
41
+ content: '';
42
+ position: absolute;
43
+ inset: min(0px, calc((100% - #{base.simple-var(base.$sn-density, 'touchTarget', 'minSize')}) / 2));
44
+ }
45
+
46
+ &:focus-visible {
47
+ outline: base.$sn-theme-color-available-complementary solid base.$sn-primitive-strokeWeight-strokeSemiBold;
48
+ outline-offset: calc(0px - #{base.$sn-primitive-strokeWeight-strokeSemiBold});
49
+ }
50
+ }
51
+
52
+ .content {
53
+ display: inline-flex;
54
+ align-items: center;
55
+ justify-content: center;
56
+ }
57
+
58
+ .icon {
59
+ display: inline-flex;
60
+ width: base.$sn-density-icon-xs;
61
+ height: base.$sn-density-icon-xs;
62
+
63
+ // Иконки `@cloud-ru/ds-icons` ставят размер инлайн-стилем — ограничиваем размером слота.
64
+ svg {
65
+ max-width: 100%;
66
+ max-height: 100%;
67
+ transition: transform 0.2s ease;
68
+ }
69
+
70
+ [data-expanded] > .content > & svg {
71
+ transform: rotate(90deg);
72
+ }
73
+ }