@cloud-ru/ds-tabs 1.0.14 → 1.0.15-preview-2e0a6d5c.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 (53) hide show
  1. package/README.md +31 -27
  2. package/dist/cjs/components/ScrollButton/ScrollButton.d.ts +3 -3
  3. package/dist/cjs/components/ScrollButton/ScrollButton.js +2 -2
  4. package/dist/cjs/components/ScrollButton/styles.module.css +16 -16
  5. package/dist/cjs/components/Tab/Tab.d.ts +1 -1
  6. package/dist/cjs/components/Tab/Tab.js +8 -7
  7. package/dist/cjs/components/Tab/styles.module.css +77 -58
  8. package/dist/cjs/components/TabBar/TabBar.d.ts +8 -10
  9. package/dist/cjs/components/TabBar/TabBar.js +16 -11
  10. package/dist/cjs/components/TabBar/hooks.d.ts +5 -1
  11. package/dist/cjs/components/TabBar/hooks.js +5 -2
  12. package/dist/cjs/components/TabBar/styles.module.css +43 -29
  13. package/dist/cjs/components/Tabs/Tabs.d.ts +4 -1
  14. package/dist/cjs/components/Tabs/Tabs.js +3 -9
  15. package/dist/cjs/constants.d.ts +3 -3
  16. package/dist/cjs/constants.js +4 -4
  17. package/dist/cjs/context.d.ts +4 -2
  18. package/dist/cjs/context.js +2 -0
  19. package/dist/cjs/style.css +136 -103
  20. package/dist/cjs/types.d.ts +5 -3
  21. package/dist/esm/components/ScrollButton/ScrollButton.d.ts +3 -3
  22. package/dist/esm/components/ScrollButton/ScrollButton.js +2 -2
  23. package/dist/esm/components/ScrollButton/styles.module.css +16 -16
  24. package/dist/esm/components/Tab/Tab.d.ts +1 -1
  25. package/dist/esm/components/Tab/Tab.js +9 -8
  26. package/dist/esm/components/Tab/styles.module.css +77 -58
  27. package/dist/esm/components/TabBar/TabBar.d.ts +8 -10
  28. package/dist/esm/components/TabBar/TabBar.js +17 -12
  29. package/dist/esm/components/TabBar/hooks.d.ts +5 -1
  30. package/dist/esm/components/TabBar/hooks.js +5 -2
  31. package/dist/esm/components/TabBar/styles.module.css +43 -29
  32. package/dist/esm/components/Tabs/Tabs.d.ts +4 -1
  33. package/dist/esm/components/Tabs/Tabs.js +3 -9
  34. package/dist/esm/constants.d.ts +3 -3
  35. package/dist/esm/constants.js +3 -3
  36. package/dist/esm/context.d.ts +4 -2
  37. package/dist/esm/context.js +2 -0
  38. package/dist/esm/style.css +136 -103
  39. package/dist/esm/types.d.ts +5 -3
  40. package/dist/tsconfig.cjs.tsbuildinfo +1 -1
  41. package/dist/tsconfig.esm.tsbuildinfo +1 -1
  42. package/package.json +8 -7
  43. package/src/components/ScrollButton/ScrollButton.tsx +4 -4
  44. package/src/components/ScrollButton/styles.module.scss +4 -6
  45. package/src/components/Tab/Tab.tsx +15 -13
  46. package/src/components/Tab/styles.module.scss +41 -45
  47. package/src/components/TabBar/TabBar.tsx +36 -35
  48. package/src/components/TabBar/hooks.ts +9 -2
  49. package/src/components/TabBar/styles.module.scss +68 -29
  50. package/src/components/Tabs/Tabs.tsx +13 -14
  51. package/src/constants.ts +3 -3
  52. package/src/context.tsx +2 -0
  53. package/src/types.ts +5 -3
@@ -10,7 +10,7 @@ const defaultOverflowState = {
10
10
  left: false,
11
11
  right: false,
12
12
  };
13
- function useScrollContainer(container) {
13
+ function useScrollContainer({ container, tabsRow }) {
14
14
  const [hasOverflow, setHasOverflow] = (0, react_1.useState)(defaultOverflowState);
15
15
  (0, utils_1.useLayoutEffect)(() => {
16
16
  const recheck = () => {
@@ -43,6 +43,9 @@ function useScrollContainer(container) {
43
43
  }
44
44
  const resizeObserver = new ResizeObserver(recheck);
45
45
  resizeObserver.observe(element);
46
+ // Размер содержимого меняется при переключении типа и плотности без изменения viewport.
47
+ if (tabsRow.current)
48
+ resizeObserver.observe(tabsRow.current);
46
49
  element.addEventListener('scroll', recheck);
47
50
  element.addEventListener('wheel', onWheel);
48
51
  // Первичная проверка и после layout (важно для вертикального скролла)
@@ -56,7 +59,7 @@ function useScrollContainer(container) {
56
59
  element.removeEventListener('scroll', recheck);
57
60
  element.removeEventListener('wheel', onWheel);
58
61
  };
59
- }, [container]);
62
+ }, [container, tabsRow]);
60
63
  const [scrollLeft, scrollRight, scrollTop, scrollBottom] = (0, react_1.useMemo)(() => {
61
64
  function scroll(direction) {
62
65
  const containerElement = container.current;
@@ -6,6 +6,7 @@
6
6
  .tabBar[data-orientation=vertical]{
7
7
  flex-direction:column;
8
8
  align-items:stretch;
9
+ min-width:0;
9
10
  height:100%;
10
11
  min-height:0;
11
12
  }
@@ -13,17 +14,17 @@
13
14
  flex-direction:row;
14
15
  align-items:center;
15
16
  }
16
- .tabBar[data-size=l][data-orientation=horizontal]{
17
- gap:var(--sn-tabs-anatomy-size-l-tabsHorizontal-actionSlot-gap, var(--sn-primitive-dimension-16, 16px));
17
+ .tabBar[data-variant=primary][data-orientation=horizontal]{
18
+ gap:var(--sn-tabs-anatomy-primary-tabsHorizontal-gap, var(--sn-primitive-dimension-8, 8px));
18
19
  }
19
- .tabBar[data-size=l][data-orientation=vertical]{
20
- gap:var(--sn-tabs-anatomy-size-l-tabsVertical-actionSlot-gap, var(--sn-primitive-dimension-16, 16px));
20
+ .tabBar[data-variant=primary][data-orientation=vertical]{
21
+ gap:var(--sn-tabs-anatomy-primary-tabsVertical-gap, var(--sn-primitive-dimension-8, 8px));
21
22
  }
22
- .tabBar[data-size=m][data-orientation=horizontal]{
23
- gap:var(--sn-tabs-anatomy-size-m-tabsHorizontal-actionSlot-gap, var(--sn-primitive-dimension-16, 16px));
23
+ .tabBar[data-variant=secondary][data-orientation=horizontal]{
24
+ gap:var(--sn-tabs-anatomy-secondary-tabsHorizontal-gap, var(--sn-primitive-dimension-8, 8px));
24
25
  }
25
- .tabBar[data-size=m][data-orientation=vertical]{
26
- gap:var(--sn-tabs-anatomy-size-m-tabsVertical-actionSlot-gap, var(--sn-primitive-dimension-16, 16px));
26
+ .tabBar[data-variant=secondary][data-orientation=vertical]{
27
+ gap:var(--sn-tabs-anatomy-secondary-tabsVertical-gap, var(--sn-primitive-dimension-8, 8px));
27
28
  }
28
29
 
29
30
  .tabListWrapper{
@@ -107,21 +108,22 @@
107
108
  width:fit-content;
108
109
  white-space:nowrap;
109
110
  }
110
- .tabsRow[data-size=l][data-orientation=horizontal]{
111
- gap:var(--sn-tabs-anatomy-size-l-tabsHorizontal-gap, var(--sn-primitive-dimension-0, 0px));
111
+ .tabsRow[data-variant=primary][data-orientation=horizontal]{
112
+ gap:var(--sn-tabs-anatomy-primary-tabsHorizontal-tabListWrapper-slot-gap, var(--sn-primitive-dimension-0, 0px));
112
113
  }
113
- .tabsRow[data-size=l][data-orientation=vertical]{
114
- gap:var(--sn-tabs-anatomy-size-l-tabsVertical-gap, var(--sn-primitive-dimension-0, 0px));
114
+ .tabsRow[data-variant=primary][data-orientation=vertical]{
115
+ gap:var(--sn-tabs-anatomy-primary-tabsVertical-tabListWrapper-slot-gap, var(--sn-primitive-dimension-0, 0px));
115
116
  }
116
- .tabsRow[data-size=m][data-orientation=horizontal]{
117
- gap:var(--sn-tabs-anatomy-size-m-tabsHorizontal-gap, var(--sn-density-spacing-interval-l, var(--sn-platform-comfort-spacing-interval-l, var(--sn-primitive-dimension-32, 32px))));
117
+ .tabsRow[data-variant=secondary][data-orientation=horizontal]{
118
+ gap:var(--sn-tabs-anatomy-secondary-tabsHorizontal-tabListWrapper-slot-gap, var(--sn-density-spacing-interval-l, var(--sn-platform-comfort-spacing-interval-l, var(--sn-primitive-dimension-32, 32px))));
118
119
  }
119
- .tabsRow[data-size=m][data-orientation=vertical]{
120
- gap:var(--sn-tabs-anatomy-size-m-tabsVertical-gap, var(--sn-primitive-dimension-0, 0px));
120
+ .tabsRow[data-variant=secondary][data-orientation=vertical]{
121
+ gap:var(--sn-tabs-anatomy-secondary-tabsVertical-tabListWrapper-slot-gap, var(--sn-primitive-dimension-0, 0px));
121
122
  }
122
123
  .tabsRow[data-orientation=vertical]{
123
124
  flex-direction:column;
124
- width:auto;
125
+ width:100%;
126
+ min-width:0;
125
127
  min-height:-moz-min-content;
126
128
  min-height:min-content;
127
129
  }
@@ -136,13 +138,13 @@
136
138
  }
137
139
  .marker[data-orientation=horizontal]{
138
140
  bottom:0;
139
- height:var(--sn-tabs-anatomy-size-l-tabsHorizontal-selected-height, var(--sn-primitive-dimension-2, 2px));
140
- border-radius:var(--sn-tabs-anatomy-size-l-tabsHorizontal-selected-borderRadius, var(--sn-brand-anatomy-radius-button-l, var(--sn-primitive-dimension-2, 2px)));
141
+ height:var(--sn-tabs-anatomy-primary-tabsHorizontal-tabContainer-marker-height, var(--sn-primitive-dimension-2, 2px));
142
+ border-radius:var(--sn-tabs-anatomy-primary-tabsHorizontal-tabContainer-marker-borderRadius, var(--sn-brand-anatomy-radius-button-l, var(--sn-primitive-dimension-2, 2px)));
141
143
  }
142
144
  .marker[data-orientation=vertical]{
143
145
  right:0;
144
- width:var(--sn-tabs-anatomy-size-l-tabsVertical-selected-height, var(--sn-primitive-dimension-2, 2px));
145
- border-radius:var(--sn-tabs-anatomy-size-l-tabsVertical-selected-borderRadius, var(--sn-brand-anatomy-radius-button-l, var(--sn-primitive-dimension-2, 2px)));
146
+ width:var(--sn-tabs-anatomy-primary-tabsVertical-tabContainer-marker-height, var(--sn-primitive-dimension-2, 2px));
147
+ border-radius:var(--sn-tabs-anatomy-primary-tabsVertical-tabContainer-marker-borderRadius, var(--sn-brand-anatomy-radius-button-l, var(--sn-primitive-dimension-2, 2px)));
146
148
  }
147
149
  .marker[data-position=before]{
148
150
  top:0;
@@ -153,13 +155,13 @@
153
155
  bottom:0;
154
156
  }
155
157
 
156
- .tabsRow[data-size=m] .marker[data-orientation=horizontal]{
157
- height:var(--sn-tabs-anatomy-size-m-tabsHorizontal-selected-height, var(--sn-primitive-dimension-2, 2px));
158
- border-radius:var(--sn-tabs-anatomy-size-m-tabsHorizontal-selected-borderRadius, var(--sn-brand-anatomy-radius-button-m, var(--sn-primitive-dimension-2, 2px)));
158
+ .tabsRow[data-variant=secondary] .marker[data-orientation=horizontal]{
159
+ height:var(--sn-tabs-anatomy-secondary-tabsHorizontal-tabContainer-marker-height, var(--sn-primitive-dimension-2, 2px));
160
+ border-radius:var(--sn-tabs-anatomy-secondary-tabsHorizontal-tabContainer-marker-borderRadius, var(--sn-brand-anatomy-radius-button-m, var(--sn-primitive-dimension-2, 2px)));
159
161
  }
160
- .tabsRow[data-size=m] .marker[data-orientation=vertical]{
161
- width:var(--sn-tabs-anatomy-size-m-tabsVertical-selected-height, var(--sn-primitive-dimension-2, 2px));
162
- border-radius:var(--sn-tabs-anatomy-size-m-tabsVertical-selected-borderRadius, var(--sn-brand-anatomy-radius-button-m, var(--sn-primitive-dimension-2, 2px)));
162
+ .tabsRow[data-variant=secondary] .marker[data-orientation=vertical]{
163
+ width:var(--sn-tabs-anatomy-secondary-tabsVertical-tabContainer-marker-height, var(--sn-primitive-dimension-2, 2px));
164
+ border-radius:var(--sn-tabs-anatomy-secondary-tabsVertical-tabContainer-marker-borderRadius, var(--sn-brand-anatomy-radius-button-m, var(--sn-primitive-dimension-2, 2px)));
163
165
  }
164
166
 
165
167
  .divider{
@@ -182,6 +184,18 @@
182
184
  height:100%;
183
185
  }
184
186
 
185
- .tabBarAfter[data-orientation=vertical][data-size=l], .tabBarAfter[data-orientation=vertical][data-size=m]{
186
- min-height:auto;
187
+ .actionWrapper{
188
+ flex-shrink:0;
189
+ box-sizing:border-box;
190
+ }
191
+ .actionWrapper[data-orientation=vertical]{
192
+ width:100%;
193
+ }
194
+ .actionWrapper[data-orientation=vertical][data-variant=primary]{
195
+ padding-left:var(--sn-tabs-anatomy-primary-tabsVertical-actionWrapper-paddingHorizontal, var(--sn-tabs-anatomy-primary-tabsVertical-tabContainer-paddingHorizontal, var(--sn-density-spacing-control-container-horizontal-l, var(--sn-platform-comfort-spacing-control-container-horizontal-l, var(--sn-platform-comfort-scale-050-s, var(--sn-primitive-dimension-12, 12px))))));
196
+ padding-right:var(--sn-tabs-anatomy-primary-tabsVertical-actionWrapper-paddingHorizontal, var(--sn-tabs-anatomy-primary-tabsVertical-tabContainer-paddingHorizontal, var(--sn-density-spacing-control-container-horizontal-l, var(--sn-platform-comfort-spacing-control-container-horizontal-l, var(--sn-platform-comfort-scale-050-s, var(--sn-primitive-dimension-12, 12px))))));
197
+ }
198
+ .actionWrapper[data-orientation=vertical][data-variant=secondary]{
199
+ padding-left:var(--sn-tabs-anatomy-secondary-tabsVertical-actionWrapper-paddingHorizontal, var(--sn-tabs-anatomy-secondary-tabsVertical-tabContainer-paddingHorizontal, var(--sn-density-spacing-control-container-horizontal-m, var(--sn-platform-comfort-spacing-control-container-horizontal-m, var(--sn-platform-comfort-scale-050-xs, var(--sn-primitive-dimension-8, 8px))))));
200
+ padding-right:var(--sn-tabs-anatomy-secondary-tabsVertical-actionWrapper-paddingHorizontal, var(--sn-tabs-anatomy-secondary-tabsVertical-tabContainer-paddingHorizontal, var(--sn-density-spacing-control-container-horizontal-m, var(--sn-platform-comfort-spacing-control-container-horizontal-m, var(--sn-platform-comfort-scale-050-xs, var(--sn-primitive-dimension-8, 8px))))));
187
201
  }
@@ -1,4 +1,5 @@
1
1
  import { ReactNode } from 'react';
2
+ import { Orientation } from '../../types';
2
3
  import { Tab as TabComponent } from '../Tab';
3
4
  import { TabBar as TabBarComponent } from '../TabBar';
4
5
  import { TabContent as TabContentComponent } from '../TabContent';
@@ -12,8 +13,10 @@ export type TabsProps<T extends string = string> = {
12
13
  children?: ReactNode;
13
14
  /** Дополнительный класс на корневой контейнер */
14
15
  className?: string;
16
+ /** Ориентация вкладок */
17
+ orientation?: Orientation;
15
18
  };
16
- export declare function Tabs<T extends string = string>({ children, onChange, value, defaultValue, className }: TabsProps<T>): import("react/jsx-runtime").JSX.Element;
19
+ export declare function Tabs<T extends string = string>({ children, onChange, value, defaultValue, className, orientation, }: TabsProps<T>): import("react/jsx-runtime").JSX.Element;
17
20
  export declare namespace Tabs {
18
21
  const Tab: typeof TabComponent;
19
22
  const TabBar: typeof TabBarComponent;
@@ -7,30 +7,24 @@ exports.Tabs = Tabs;
7
7
  const jsx_runtime_1 = require("react/jsx-runtime");
8
8
  const utils_1 = require("@cloud-ru/ds-utils");
9
9
  const classnames_1 = __importDefault(require("classnames"));
10
- const react_1 = require("react");
11
10
  const constants_1 = require("../../constants");
12
11
  const context_1 = require("../../context");
13
12
  const Tab_1 = require("../Tab");
14
13
  const TabBar_1 = require("../TabBar");
15
14
  const TabContent_1 = require("../TabContent");
16
15
  const styles_module_scss_1 = __importDefault(require('./styles.module.css'));
17
- function getOrientationFromChildren(children) {
18
- const array = react_1.Children.toArray(children);
19
- const tabBar = array.find((child) => (0, react_1.isValidElement)(child) && child.type === TabBar_1.TabBar);
20
- return tabBar?.props?.orientation === constants_1.ORIENTATION.Vertical ? constants_1.ORIENTATION.Vertical : constants_1.ORIENTATION.Horizontal;
21
- }
22
- function Tabs({ children, onChange, value, defaultValue, className }) {
16
+ function Tabs({ children, onChange, value, defaultValue, className, orientation = constants_1.ORIENTATION.Horizontal, }) {
23
17
  const [selectedTab, setSelectedTab] = (0, utils_1.useValueControl)({
24
18
  value,
25
19
  defaultValue,
26
20
  onChange: onChange,
27
21
  });
28
- const orientation = getOrientationFromChildren(children);
29
22
  const isVertical = orientation === constants_1.ORIENTATION.Vertical;
30
23
  return ((0, jsx_runtime_1.jsx)(context_1.TabsContext.Provider, { value: {
24
+ orientation,
31
25
  selectedTab,
32
26
  setSelectedTab,
33
- }, children: (0, jsx_runtime_1.jsx)("div", { className: (0, classnames_1.default)(styles_module_scss_1.default.root, isVertical && styles_module_scss_1.default.rootVertical, className), children: children }) }));
27
+ }, children: (0, jsx_runtime_1.jsx)("div", { className: (0, classnames_1.default)(styles_module_scss_1.default.root, className, { [styles_module_scss_1.default.rootVertical]: isVertical }), children: children }) }));
34
28
  }
35
29
  (function (Tabs) {
36
30
  Tabs.Tab = Tab_1.Tab;
@@ -6,9 +6,9 @@ export declare const MARKER_POSITION: {
6
6
  readonly Before: "before";
7
7
  readonly After: "after";
8
8
  };
9
- export declare const SIZE: {
10
- readonly L: "l";
11
- readonly M: "m";
9
+ export declare const VARIANT: {
10
+ readonly Primary: "primary";
11
+ readonly Secondary: "secondary";
12
12
  };
13
13
  /**
14
14
  * Канонические `data-test-id` для слотов Tabs-стека. Реализация
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.TEST_IDS = exports.SIZE = exports.MARKER_POSITION = exports.ORIENTATION = void 0;
3
+ exports.TEST_IDS = exports.VARIANT = exports.MARKER_POSITION = exports.ORIENTATION = void 0;
4
4
  exports.ORIENTATION = {
5
5
  Horizontal: 'horizontal',
6
6
  Vertical: 'vertical',
@@ -9,9 +9,9 @@ exports.MARKER_POSITION = {
9
9
  Before: 'before',
10
10
  After: 'after',
11
11
  };
12
- exports.SIZE = {
13
- L: 'l',
14
- M: 'm',
12
+ exports.VARIANT = {
13
+ Primary: 'primary',
14
+ Secondary: 'secondary',
15
15
  };
16
16
  /**
17
17
  * Канонические `data-test-id` для слотов Tabs-стека. Реализация
@@ -2,16 +2,18 @@ import { TabsContextValue } from './types';
2
2
  export declare const TabsContext: import("react").Context<TabsContextValue>;
3
3
  export declare const useTabsContext: () => TabsContextValue;
4
4
  export declare const TabBarContext: import("react").Context<Partial<{
5
- size: import("./types").Size;
5
+ variant: import("./types").Variant;
6
6
  orientation: import("./types").Orientation;
7
7
  focusedTab: string;
8
8
  onSelect(element: HTMLButtonElement): void;
9
9
  onFocus(element: HTMLElement, id: string): void;
10
+ markerPosition: import("./types").MarkerPosition;
10
11
  }>>;
11
12
  export declare const useTabBarContext: () => Partial<{
12
- size: import("./types").Size;
13
+ variant: import("./types").Variant;
13
14
  orientation: import("./types").Orientation;
14
15
  focusedTab: string;
15
16
  onSelect(element: HTMLButtonElement): void;
16
17
  onFocus(element: HTMLElement, id: string): void;
18
+ markerPosition: import("./types").MarkerPosition;
17
19
  }>;
@@ -2,7 +2,9 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.useTabBarContext = exports.TabBarContext = exports.useTabsContext = exports.TabsContext = void 0;
4
4
  const react_1 = require("react");
5
+ const constants_1 = require("./constants");
5
6
  exports.TabsContext = (0, react_1.createContext)({
7
+ orientation: constants_1.ORIENTATION.Horizontal,
6
8
  setSelectedTab: function () { },
7
9
  });
8
10
  const useTabsContext = () => (0, react_1.useContext)(exports.TabsContext);