refactor(badge): redesign badge component #195
+420
−201
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| export const BadgeSize = { | ||
| small: 'small', | ||
| large: 'large', | ||
| } as const; | ||
|
|
||
| export const BadgeVariant = { | ||
| solid: 'solid', | ||
| default: 'default', | ||
| } as const; | ||
|
|
||
| export const BadgeColor = { | ||
| white: 'white', | ||
| gray: 'gray', | ||
| danger: 'danger', | ||
| general: 'general', | ||
| '1st': '1st', | ||
| '2nd': '2nd', | ||
| '3rd': '3rd', | ||
| '4th': '4th', | ||
| } as const; | ||
|
|
||
| export const BadgeIconPosition = { | ||
| none: 'none', | ||
| left: 'left', | ||
| right: 'right', | ||
| both: 'both', | ||
| } as const; | ||
|
|
||
| export type BadgeSize = (typeof BadgeSize)[keyof typeof BadgeSize]; | ||
| export type BadgeVariant = (typeof BadgeVariant)[keyof typeof BadgeVariant]; | ||
| export type BadgeColor = (typeof BadgeColor)[keyof typeof BadgeColor]; | ||
| export type BadgeIconPosition = (typeof BadgeIconPosition)[keyof typeof BadgeIconPosition]; | ||
|
|
||
| import type React from 'react'; | ||
|
|
||
| export interface BadgeProps extends React.ComponentPropsWithoutRef<'div'> { | ||
| size?: BadgeSize; | ||
| variant?: BadgeVariant; | ||
| color?: BadgeColor; | ||
| asChild?: boolean; | ||
| icon?: BadgeIconPosition; | ||
| leftIcon?: React.ReactNode; | ||
| rightIcon?: React.ReactNode; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,71 +1,177 @@ | ||
| import { color as colorToken, fontSize as fontSizeToken } from '@sipe-team/tokens'; | ||
|
|
||
| import { recipe } from '@vanilla-extract/recipes'; | ||
|
|
||
| import { BadgeColor, BadgeSize, BadgeVariant } from './Badge.constants'; | ||
|
|
||
| export const badge = recipe({ | ||
| base: { | ||
| display: 'inline-flex', | ||
| alignItems: 'center', | ||
| justifyContent: 'center', | ||
| borderRadius: 6, | ||
| fontWeight: 600, | ||
| whiteSpace: 'nowrap', | ||
| transition: 'all 0.2s ease-in-out', | ||
| userSelect: 'none', | ||
| gap: '4px', | ||
| }, | ||
| variants: { | ||
| size: { | ||
| [BadgeSize.small]: { | ||
| padding: '2px 8px', | ||
| fontSize: fontSizeToken[12], | ||
| lineHeight: '16px', | ||
| height: '20px', | ||
| }, | ||
| [BadgeSize.large]: { | ||
| padding: '4px 12px', | ||
| fontSize: fontSizeToken[14], | ||
| lineHeight: '20px', | ||
| height: '24px', | ||
| }, | ||
| }, | ||
| color: { | ||
| [BadgeColor.white]: {}, | ||
| [BadgeColor.gray]: {}, | ||
| [BadgeColor.danger]: {}, | ||
| [BadgeColor.general]: {}, | ||
| [BadgeColor['1st']]: {}, | ||
| [BadgeColor['2nd']]: {}, | ||
| [BadgeColor['3rd']]: {}, | ||
| [BadgeColor['4th']]: {}, | ||
| }, | ||
| variant: { | ||
| [BadgeVariant.solid]: {}, | ||
| [BadgeVariant.default]: {}, | ||
| }, | ||
| }, | ||
| compoundVariants: [ | ||
| // White variants | ||
| { | ||
| variants: { color: BadgeColor.white, variant: BadgeVariant.solid }, | ||
| style: { | ||
| backgroundColor: colorToken.white, | ||
| color: colorToken.gray900, | ||
| }, | ||
| }, | ||
| { | ||
| variants: { color: BadgeColor.white, variant: BadgeVariant.default }, | ||
| style: { | ||
| backgroundColor: 'transparent', | ||
| color: colorToken.white, | ||
| border: `1px solid ${colorToken.white}`, | ||
| }, | ||
| }, | ||
| // Gray variants | ||
| { | ||
| variants: { color: BadgeColor.gray, variant: BadgeVariant.solid }, | ||
| style: { | ||
| backgroundColor: colorToken.gray700, | ||
| color: colorToken.white, | ||
| }, | ||
| }, | ||
| { | ||
| variants: { color: BadgeColor.gray, variant: BadgeVariant.default }, | ||
| style: { | ||
| backgroundColor: colorToken.gray100, | ||
| color: colorToken.gray700, | ||
| }, | ||
| }, | ||
| // Danger variants | ||
| { | ||
| variants: { color: BadgeColor.danger, variant: BadgeVariant.solid }, | ||
| style: { | ||
| backgroundColor: colorToken.red500, | ||
| color: colorToken.white, | ||
| }, | ||
| }, | ||
| { | ||
| variants: { color: BadgeColor.danger, variant: BadgeVariant.default }, | ||
| style: { | ||
| backgroundColor: colorToken.red100, | ||
| color: colorToken.red700, | ||
| }, | ||
| }, | ||
| // General variants | ||
| { | ||
| variants: { color: BadgeColor.general, variant: BadgeVariant.solid }, | ||
| style: { | ||
| backgroundColor: colorToken.blue500, | ||
| color: colorToken.white, | ||
| }, | ||
| }, | ||
| { | ||
| variants: { color: BadgeColor.general, variant: BadgeVariant.default }, | ||
| style: { | ||
| backgroundColor: colorToken.blue100, | ||
| color: colorToken.blue700, | ||
| }, | ||
| }, | ||
| // 1st variants | ||
| { | ||
| variants: { color: BadgeColor['1st'], variant: BadgeVariant.solid }, | ||
| style: { | ||
| backgroundColor: colorToken.green500, | ||
| color: colorToken.white, | ||
| }, | ||
| }, | ||
| { | ||
| variants: { color: BadgeColor['1st'], variant: BadgeVariant.default }, | ||
| style: { | ||
| backgroundColor: colorToken.green100, | ||
| color: colorToken.green700, | ||
| }, | ||
| }, | ||
| // 2nd variants | ||
| { | ||
| variants: { color: BadgeColor['2nd'], variant: BadgeVariant.solid }, | ||
| style: { | ||
| backgroundColor: colorToken.purple500, | ||
| color: colorToken.white, | ||
| }, | ||
| }, | ||
| { | ||
| variants: { color: BadgeColor['2nd'], variant: BadgeVariant.default }, | ||
| style: { | ||
| backgroundColor: colorToken.purple100, | ||
| color: colorToken.purple700, | ||
| }, | ||
| }, | ||
| // 3rd variants | ||
| { | ||
| variants: { color: BadgeColor['3rd'], variant: BadgeVariant.solid }, | ||
| style: { | ||
| backgroundColor: colorToken.orange500, | ||
| color: colorToken.white, | ||
| }, | ||
| }, | ||
| { | ||
| variants: { color: BadgeColor['3rd'], variant: BadgeVariant.default }, | ||
| style: { | ||
| backgroundColor: colorToken.orange100, | ||
| color: colorToken.orange700, | ||
| }, | ||
| }, | ||
| // 4th variants | ||
| { | ||
| variants: { color: BadgeColor['4th'], variant: BadgeVariant.solid }, | ||
| style: { | ||
| backgroundColor: colorToken.cyan500, | ||
| color: colorToken.white, | ||
| }, | ||
| }, | ||
| { | ||
| variants: { color: BadgeColor['4th'], variant: BadgeVariant.default }, | ||
| style: { | ||
| backgroundColor: colorToken.cyan100, | ||
| color: colorToken.cyan700, | ||
| }, | ||
| }, | ||
|
Comment on lines
+120
to
+170
Contributor
There was a problem hiding this comment. 색상이 어떤기준으로 잡힌지 모르겠어요 ~
디자인 이슈라면 디자이너 호출 필요할듯 |
||
| ], | ||
| defaultVariants: { | ||
| size: BadgeSize.small, | ||
| color: BadgeColor.gray, | ||
| variant: BadgeVariant.default, | ||
| }, | ||
| }); | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
react-slot가 devDependencies에 들어가있네욤