@cloud-ru/ds-tabs 1.0.13 → 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.
- package/CHANGELOG.md +4 -0
- package/README.md +31 -27
- package/dist/cjs/components/ScrollButton/ScrollButton.d.ts +3 -3
- package/dist/cjs/components/ScrollButton/ScrollButton.js +2 -2
- package/dist/cjs/components/ScrollButton/styles.module.css +16 -16
- package/dist/cjs/components/Tab/Tab.d.ts +1 -1
- package/dist/cjs/components/Tab/Tab.js +8 -7
- package/dist/cjs/components/Tab/styles.module.css +77 -58
- package/dist/cjs/components/TabBar/TabBar.d.ts +8 -10
- package/dist/cjs/components/TabBar/TabBar.js +16 -11
- package/dist/cjs/components/TabBar/hooks.d.ts +5 -1
- package/dist/cjs/components/TabBar/hooks.js +5 -2
- package/dist/cjs/components/TabBar/styles.module.css +43 -29
- package/dist/cjs/components/Tabs/Tabs.d.ts +4 -1
- package/dist/cjs/components/Tabs/Tabs.js +3 -9
- package/dist/cjs/constants.d.ts +3 -3
- package/dist/cjs/constants.js +4 -4
- package/dist/cjs/context.d.ts +4 -2
- package/dist/cjs/context.js +2 -0
- package/dist/cjs/style.css +136 -103
- package/dist/cjs/types.d.ts +5 -3
- package/dist/esm/components/ScrollButton/ScrollButton.d.ts +3 -3
- package/dist/esm/components/ScrollButton/ScrollButton.js +2 -2
- package/dist/esm/components/ScrollButton/styles.module.css +16 -16
- package/dist/esm/components/Tab/Tab.d.ts +1 -1
- package/dist/esm/components/Tab/Tab.js +9 -8
- package/dist/esm/components/Tab/styles.module.css +77 -58
- package/dist/esm/components/TabBar/TabBar.d.ts +8 -10
- package/dist/esm/components/TabBar/TabBar.js +17 -12
- package/dist/esm/components/TabBar/hooks.d.ts +5 -1
- package/dist/esm/components/TabBar/hooks.js +5 -2
- package/dist/esm/components/TabBar/styles.module.css +43 -29
- package/dist/esm/components/Tabs/Tabs.d.ts +4 -1
- package/dist/esm/components/Tabs/Tabs.js +3 -9
- package/dist/esm/constants.d.ts +3 -3
- package/dist/esm/constants.js +3 -3
- package/dist/esm/context.d.ts +4 -2
- package/dist/esm/context.js +2 -0
- package/dist/esm/style.css +136 -103
- package/dist/esm/types.d.ts +5 -3
- package/dist/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/tsconfig.esm.tsbuildinfo +1 -1
- package/package.json +8 -7
- package/src/components/ScrollButton/ScrollButton.tsx +4 -4
- package/src/components/ScrollButton/styles.module.scss +4 -6
- package/src/components/Tab/Tab.tsx +15 -13
- package/src/components/Tab/styles.module.scss +41 -45
- package/src/components/TabBar/TabBar.tsx +36 -35
- package/src/components/TabBar/hooks.ts +9 -2
- package/src/components/TabBar/styles.module.scss +68 -29
- package/src/components/Tabs/Tabs.tsx +13 -14
- package/src/constants.ts +3 -3
- package/src/context.tsx +2 -0
- package/src/types.ts +5 -3
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
@use '@cloud-ru/ds-figma-variables/build/scss/components/tabs.module' as tabs;
|
|
3
3
|
|
|
4
4
|
$orientations: 'vertical', 'horizontal';
|
|
5
|
-
$
|
|
5
|
+
$variant: 'primary', 'secondary';
|
|
6
6
|
|
|
7
7
|
.tabBar {
|
|
8
8
|
position: relative;
|
|
@@ -12,6 +12,8 @@ $sizes: 'l', 'm';
|
|
|
12
12
|
&[data-orientation='vertical'] {
|
|
13
13
|
flex-direction: column;
|
|
14
14
|
align-items: stretch;
|
|
15
|
+
|
|
16
|
+
min-width: 0;
|
|
15
17
|
height: 100%;
|
|
16
18
|
min-height: 0;
|
|
17
19
|
}
|
|
@@ -21,20 +23,18 @@ $sizes: 'l', 'm';
|
|
|
21
23
|
align-items: center;
|
|
22
24
|
}
|
|
23
25
|
|
|
24
|
-
// Зазор между областью списка и слотом действия (`
|
|
25
|
-
@each $
|
|
26
|
-
&[data-
|
|
27
|
-
gap: base.simple-var(tabs.$tabs, 'anatomy',
|
|
26
|
+
// Зазор между областью списка и слотом действия (`afterContent`)
|
|
27
|
+
@each $currentVariant in $variant {
|
|
28
|
+
&[data-variant='#{$currentVariant}'][data-orientation='horizontal'] {
|
|
29
|
+
gap: base.simple-var(tabs.$tabs, 'anatomy', $currentVariant, 'tabsHorizontal', 'gap');
|
|
28
30
|
}
|
|
29
31
|
|
|
30
|
-
&[data-
|
|
31
|
-
gap: base.simple-var(tabs.$tabs, 'anatomy',
|
|
32
|
+
&[data-variant='#{$currentVariant}'][data-orientation='vertical'] {
|
|
33
|
+
gap: base.simple-var(tabs.$tabs, 'anatomy', $currentVariant, 'tabsVertical', 'gap');
|
|
32
34
|
}
|
|
33
35
|
}
|
|
34
36
|
}
|
|
35
37
|
|
|
36
|
-
// Область списка: слот табов, кнопки прокрутки и линия. Линия под слотом действия
|
|
37
|
-
// не продолжается, поэтому её носитель — эта обёртка, а не вся панель.
|
|
38
38
|
.tabListWrapper {
|
|
39
39
|
position: relative;
|
|
40
40
|
|
|
@@ -133,30 +133,31 @@ $sizes: 'l', 'm';
|
|
|
133
133
|
|
|
134
134
|
white-space: nowrap;
|
|
135
135
|
|
|
136
|
-
&[data-
|
|
136
|
+
&[data-variant='primary'] {
|
|
137
137
|
&[data-orientation='horizontal'] {
|
|
138
|
-
gap: base.simple-var(tabs.$tabs, 'anatomy', '
|
|
138
|
+
gap: base.simple-var(tabs.$tabs, 'anatomy', 'primary', 'tabsHorizontal', 'tabListWrapper', 'slot', 'gap');
|
|
139
139
|
}
|
|
140
140
|
|
|
141
141
|
&[data-orientation='vertical'] {
|
|
142
|
-
gap: base.simple-var(tabs.$tabs, 'anatomy', '
|
|
142
|
+
gap: base.simple-var(tabs.$tabs, 'anatomy', 'primary', 'tabsVertical', 'tabListWrapper', 'slot', 'gap');
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
145
|
|
|
146
|
-
&[data-
|
|
146
|
+
&[data-variant='secondary'] {
|
|
147
147
|
&[data-orientation='horizontal'] {
|
|
148
|
-
gap: base.simple-var(tabs.$tabs, 'anatomy', '
|
|
148
|
+
gap: base.simple-var(tabs.$tabs, 'anatomy', 'secondary', 'tabsHorizontal', 'tabListWrapper', 'slot', 'gap');
|
|
149
149
|
}
|
|
150
150
|
|
|
151
151
|
&[data-orientation='vertical'] {
|
|
152
|
-
gap: base.simple-var(tabs.$tabs, 'anatomy', '
|
|
152
|
+
gap: base.simple-var(tabs.$tabs, 'anatomy', 'secondary', 'tabsVertical', 'tabListWrapper', 'slot', 'gap');
|
|
153
153
|
}
|
|
154
154
|
}
|
|
155
155
|
|
|
156
156
|
&[data-orientation='vertical'] {
|
|
157
157
|
flex-direction: column;
|
|
158
158
|
// Ряд тянется на ширину списка: строки табов занимают её целиком, как в макете.
|
|
159
|
-
width:
|
|
159
|
+
width: 100%;
|
|
160
|
+
min-width: 0;
|
|
160
161
|
min-height: min-content;
|
|
161
162
|
}
|
|
162
163
|
|
|
@@ -176,14 +177,30 @@ $sizes: 'l', 'm';
|
|
|
176
177
|
|
|
177
178
|
&[data-orientation='horizontal'] {
|
|
178
179
|
bottom: 0;
|
|
179
|
-
height: base.simple-var(tabs.$tabs, 'anatomy', '
|
|
180
|
-
border-radius: base.simple-var(
|
|
180
|
+
height: base.simple-var(tabs.$tabs, 'anatomy', 'primary', 'tabsHorizontal', 'tabContainer', 'marker', 'height');
|
|
181
|
+
border-radius: base.simple-var(
|
|
182
|
+
tabs.$tabs,
|
|
183
|
+
'anatomy',
|
|
184
|
+
'primary',
|
|
185
|
+
'tabsHorizontal',
|
|
186
|
+
'tabContainer',
|
|
187
|
+
'marker',
|
|
188
|
+
'border-radius'
|
|
189
|
+
);
|
|
181
190
|
}
|
|
182
191
|
|
|
183
192
|
&[data-orientation='vertical'] {
|
|
184
193
|
right: 0;
|
|
185
|
-
width: base.simple-var(tabs.$tabs, 'anatomy', '
|
|
186
|
-
border-radius: base.simple-var(
|
|
194
|
+
width: base.simple-var(tabs.$tabs, 'anatomy', 'primary', 'tabsVertical', 'tabContainer', 'marker', 'height');
|
|
195
|
+
border-radius: base.simple-var(
|
|
196
|
+
tabs.$tabs,
|
|
197
|
+
'anatomy',
|
|
198
|
+
'primary',
|
|
199
|
+
'tabsVertical',
|
|
200
|
+
'tabContainer',
|
|
201
|
+
'marker',
|
|
202
|
+
'border-radius'
|
|
203
|
+
);
|
|
187
204
|
}
|
|
188
205
|
|
|
189
206
|
&[data-position='before'] {
|
|
@@ -197,15 +214,31 @@ $sizes: 'l', 'm';
|
|
|
197
214
|
}
|
|
198
215
|
}
|
|
199
216
|
|
|
200
|
-
.tabsRow[data-
|
|
217
|
+
.tabsRow[data-variant='secondary'] .marker {
|
|
201
218
|
&[data-orientation='horizontal'] {
|
|
202
|
-
height: base.simple-var(tabs.$tabs, 'anatomy', '
|
|
203
|
-
border-radius: base.simple-var(
|
|
219
|
+
height: base.simple-var(tabs.$tabs, 'anatomy', 'secondary', 'tabsHorizontal', 'tabContainer', 'marker', 'height');
|
|
220
|
+
border-radius: base.simple-var(
|
|
221
|
+
tabs.$tabs,
|
|
222
|
+
'anatomy',
|
|
223
|
+
'secondary',
|
|
224
|
+
'tabsHorizontal',
|
|
225
|
+
'tabContainer',
|
|
226
|
+
'marker',
|
|
227
|
+
'border-radius'
|
|
228
|
+
);
|
|
204
229
|
}
|
|
205
230
|
|
|
206
231
|
&[data-orientation='vertical'] {
|
|
207
|
-
width: base.simple-var(tabs.$tabs, 'anatomy', '
|
|
208
|
-
border-radius: base.simple-var(
|
|
232
|
+
width: base.simple-var(tabs.$tabs, 'anatomy', 'secondary', 'tabsVertical', 'tabContainer', 'marker', 'height');
|
|
233
|
+
border-radius: base.simple-var(
|
|
234
|
+
tabs.$tabs,
|
|
235
|
+
'anatomy',
|
|
236
|
+
'secondary',
|
|
237
|
+
'tabsVertical',
|
|
238
|
+
'tabContainer',
|
|
239
|
+
'marker',
|
|
240
|
+
'border-radius'
|
|
241
|
+
);
|
|
209
242
|
}
|
|
210
243
|
}
|
|
211
244
|
|
|
@@ -231,11 +264,17 @@ $sizes: 'l', 'm';
|
|
|
231
264
|
height: 100%;
|
|
232
265
|
}
|
|
233
266
|
|
|
234
|
-
.
|
|
267
|
+
.actionWrapper {
|
|
268
|
+
flex-shrink: 0;
|
|
269
|
+
box-sizing: border-box;
|
|
270
|
+
|
|
235
271
|
&[data-orientation='vertical'] {
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
272
|
+
width: 100%;
|
|
273
|
+
|
|
274
|
+
@each $currentVariant in $variant {
|
|
275
|
+
&[data-variant='#{$currentVariant}'] {
|
|
276
|
+
@include base.composite-var(tabs.$tabs, 'anatomy', $currentVariant, 'tabsVertical', 'actionWrapper');
|
|
277
|
+
}
|
|
239
278
|
}
|
|
240
279
|
}
|
|
241
280
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { useValueControl } from '@cloud-ru/ds-utils';
|
|
2
2
|
import cn from 'classnames';
|
|
3
|
-
import {
|
|
3
|
+
import { ReactNode } from 'react';
|
|
4
4
|
|
|
5
5
|
import { ORIENTATION } from '../../constants';
|
|
6
6
|
import { TabsContext } from '../../context';
|
|
@@ -20,36 +20,35 @@ export type TabsProps<T extends string = string> = {
|
|
|
20
20
|
children?: ReactNode;
|
|
21
21
|
/** Дополнительный класс на корневой контейнер */
|
|
22
22
|
className?: string;
|
|
23
|
+
/** Ориентация вкладок */
|
|
24
|
+
orientation?: Orientation;
|
|
23
25
|
};
|
|
24
26
|
|
|
25
|
-
function
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
export function Tabs<T extends string = string>({ children, onChange, value, defaultValue, className }: TabsProps<T>) {
|
|
27
|
+
export function Tabs<T extends string = string>({
|
|
28
|
+
children,
|
|
29
|
+
onChange,
|
|
30
|
+
value,
|
|
31
|
+
defaultValue,
|
|
32
|
+
className,
|
|
33
|
+
orientation = ORIENTATION.Horizontal,
|
|
34
|
+
}: TabsProps<T>) {
|
|
36
35
|
const [selectedTab, setSelectedTab] = useValueControl({
|
|
37
36
|
value,
|
|
38
37
|
defaultValue,
|
|
39
38
|
onChange: onChange as TabsProps<T>['onChange'],
|
|
40
39
|
});
|
|
41
40
|
|
|
42
|
-
const orientation = getOrientationFromChildren(children);
|
|
43
41
|
const isVertical = orientation === ORIENTATION.Vertical;
|
|
44
42
|
|
|
45
43
|
return (
|
|
46
44
|
<TabsContext.Provider
|
|
47
45
|
value={{
|
|
46
|
+
orientation,
|
|
48
47
|
selectedTab,
|
|
49
48
|
setSelectedTab,
|
|
50
49
|
}}
|
|
51
50
|
>
|
|
52
|
-
<div className={cn(styles.root,
|
|
51
|
+
<div className={cn(styles.root, className, { [styles.rootVertical]: isVertical })}>{children}</div>
|
|
53
52
|
</TabsContext.Provider>
|
|
54
53
|
);
|
|
55
54
|
}
|
package/src/constants.ts
CHANGED
package/src/context.tsx
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { createContext, useContext } from 'react';
|
|
2
2
|
|
|
3
|
+
import { ORIENTATION } from './constants';
|
|
3
4
|
import { TabBarContextValue, TabsContextValue } from './types';
|
|
4
5
|
|
|
5
6
|
export const TabsContext = createContext<TabsContextValue>({
|
|
7
|
+
orientation: ORIENTATION.Horizontal,
|
|
6
8
|
setSelectedTab: function () {},
|
|
7
9
|
});
|
|
8
10
|
|
package/src/types.ts
CHANGED
|
@@ -1,21 +1,23 @@
|
|
|
1
1
|
import { ValueOf } from '@cloud-ru/ds-utils';
|
|
2
2
|
|
|
3
|
-
import { MARKER_POSITION, ORIENTATION,
|
|
3
|
+
import { MARKER_POSITION, ORIENTATION, VARIANT } from './constants';
|
|
4
4
|
|
|
5
|
-
export type
|
|
5
|
+
export type Variant = ValueOf<typeof VARIANT>;
|
|
6
6
|
export type Orientation = ValueOf<typeof ORIENTATION>;
|
|
7
7
|
export type MarkerPosition = ValueOf<typeof MARKER_POSITION>;
|
|
8
8
|
export type Direction = 'left' | 'right' | 'top' | 'bottom';
|
|
9
9
|
|
|
10
10
|
export type TabsContextValue = {
|
|
11
|
+
orientation: Orientation;
|
|
11
12
|
selectedTab?: string;
|
|
12
13
|
setSelectedTab(id: string): void;
|
|
13
14
|
};
|
|
14
15
|
|
|
15
16
|
export type TabBarContextValue = Partial<{
|
|
16
|
-
|
|
17
|
+
variant: Variant;
|
|
17
18
|
orientation: Orientation;
|
|
18
19
|
focusedTab: string;
|
|
19
20
|
onSelect(element: HTMLButtonElement): void;
|
|
20
21
|
onFocus(element: HTMLElement, id: string): void;
|
|
22
|
+
markerPosition: MarkerPosition;
|
|
21
23
|
}>;
|