Skip to content
This repository was archived by the owner on Aug 31, 2022. It is now read-only.

Commit acd71a7

Browse files
committed
style: improve Tab component
1 parent b77d3bc commit acd71a7

File tree

3 files changed

+14
-23
lines changed

3 files changed

+14
-23
lines changed

src/components/Tab/Tab.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ export type TabProps = {
1212
export const Tab: React.FC<TabProps> = ({ text, active, onClick, disabled, className }) => (
1313
<button
1414
className={clsx(
15-
'ui-transition ui-border ui-border-transparent ui-ease-out ui-min-w-button-md ui-rounded-[100px] dark:ui-text-white ui-px-2.5 ui-py-2 ui-whitespace-nowrap',
15+
'ui-transition ui-border ui-border-transparent ui-ease-out ui-min-w-button-md ui-rounded-[100px] ui-px-2 ui-py-1.5 ui-whitespace-nowrap',
1616
{
17-
'ui-text-black-700 ui-bg-primary': active,
17+
'ui-text-primary': !active,
18+
'ui-bg-primary ui-text-white': active,
1819
'ui-cursor-pointer': !disabled,
19-
'hover:ui-border-primary hover:ui-text-primary': !disabled && !active,
20+
'hover:ui-border-primary': !disabled && !active,
2021
'ui-opacity-50 ui-cursor-not-allowed': disabled
2122
},
2223
className
2324
)}
24-
type='button'
2525
onClick={onClick}
2626
>
2727
{text}

src/components/Tabs/Tabs.stories.tsx

+7-17
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,21 @@ Basic.args = {
1515
contentClassName: 'ui-overflow-hidden',
1616
items: [
1717
{
18-
id: 'tab1',
18+
id: 1,
1919
label: 'tab12',
20-
content: (
21-
<div style={{ display: 'flex' }}>
22-
Tab 1 <div>Tab 1</div>
23-
Tab 1 <div>Tab 1</div>Tab 1 <div>Tab 1</div>Tab 1 <div>Tab 1</div>Tab 1 <div>Tab 1</div>
24-
Tab 1 <div>Tab 1</div>Tab 1 <div>Tab 1</div>Tab 1 <div>Tab 1</div>Tab 1 <div>Tab 1</div>
25-
Tab 1 <div>Tab 1</div>Tab 1 <div>Tab 1</div>Tab 1 <div>Tab 1</div>Tab 1 <div>Tab 1</div>
26-
Tab 1 <div>Tab 1</div>Tab 1 <div>Tab 1</div>Tab 1 <div>Tab 1</div>Tab 1 <div>Tab 1</div>
27-
Tab 1 <div>Tab 1</div>Tab 1 <div>Tab 1</div>Tab 1 <div>Tab 1</div>Tab 1 <div>Tab 1</div>
28-
Tab 1 <div>Tab 1</div>Tab 1 <div>Tab 1</div>Tab 1 <div>Tab 1</div>
29-
</div>
30-
)
20+
content: <div style={{ display: 'flex' }}>Tab 1</div>
3121
},
3222
{
33-
id: 'tab2',
23+
id: 2,
3424
label: 'tab2',
35-
content: <div>Tab 2</div>
25+
content: null
3626
},
3727
{
38-
id: 'tab3',
28+
id: 3,
3929
label: 'disabled',
40-
content: <div>Tab 3</div>,
30+
content: null,
4131
disabled: true
4232
}
4333
],
44-
initial: 'tab1'
34+
initial: 2
4535
};

src/components/Tabs/Tabs.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import clsx from 'clsx';
22
import React, { useCallback, useMemo, useState } from 'react';
3+
34
import { Tab } from '../Tab/Tab';
45

56
export interface ITabItem {
@@ -12,9 +13,9 @@ export interface ITabItem {
1213
export type TabsProps = {
1314
className?: string;
1415
contentClassName?: string;
15-
initial: string;
16+
initial: string | number;
1617
items: ITabItem[];
17-
onChange?: (id: string) => void;
18+
onChange?: (id: string | number) => void;
1819
dataActionId?: string;
1920
};
2021

0 commit comments

Comments
 (0)