Skip to content

Commit 77af43a

Browse files
committed
[chore]rebase 후 커밋
1 parent fd37fa7 commit 77af43a

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/app/design-system/page.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,7 @@ function Page() {
4040
<Button variant="purple" type="button">
4141
Button
4242
</Button>
43-
<Button
44-
disabled>
45-
button
46-
</Button>
43+
<Button disabled>button</Button>
4744
<Button type="button" size="sm">
4845
버튼
4946
</Button>

src/components/index.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
function index() {
2+
return <button>버튼</button>;
3+
}
4+
export default index;

src/shared/components/button/Button.tsx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import { ButtonHTMLAttributes, Ref } from 'react';
1010

1111
interface Props extends ButtonHTMLAttributes<HTMLButtonElement> {
1212
size?: 'default' | 'sm';
13-
variant?: 'default' | 'purple'
14-
ref?:Ref<HTMLButtonElement | null>;
15-
disable?:boolean,
13+
variant?: 'default' | 'purple';
14+
ref?: Ref<HTMLButtonElement | null>;
15+
disable?: boolean;
1616
type?: 'submit' | 'button';
1717
children?: React.ReactNode;
1818
className?: string;
@@ -35,12 +35,11 @@ export const ButtonClass = cva(
3535
},
3636
defaultVariants: {
3737
variant: 'default',
38-
size:'default'
39-
}
38+
size: 'default',
39+
},
4040
}
4141
);
4242

43-
4443
function Button({
4544
size,
4645
type = 'button',

0 commit comments

Comments
 (0)