From 864fd71ad8862a126137099a611026400170a603 Mon Sep 17 00:00:00 2001 From: kangnayeon Date: Sat, 18 Jan 2025 16:07:51 +0900 Subject: [PATCH] =?UTF-8?q?fix(packages/ui):=20Chip=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/src/app/page.module.css | 5 ++- apps/web/src/app/page.tsx | 30 +++++++++++------ packages/ui/src/assets/icons/_IconX.svg | 4 --- packages/ui/src/components/Chip/Chip.css.ts | 36 +++++++++++++-------- packages/ui/src/components/Chip/Chip.tsx | 24 ++++++++++---- 5 files changed, 66 insertions(+), 33 deletions(-) delete mode 100644 packages/ui/src/assets/icons/_IconX.svg diff --git a/apps/web/src/app/page.module.css b/apps/web/src/app/page.module.css index 8a460419..ee9b8e63 100644 --- a/apps/web/src/app/page.module.css +++ b/apps/web/src/app/page.module.css @@ -68,7 +68,10 @@ padding: 0 20px; border: none; border: 1px solid transparent; - transition: background 0.2s, color 0.2s, border-color 0.2s; + transition: + background 0.2s, + color 0.2s, + border-color 0.2s; cursor: pointer; display: flex; align-items: center; diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/page.tsx index 9861c079..facfb066 100644 --- a/apps/web/src/app/page.tsx +++ b/apps/web/src/app/page.tsx @@ -141,7 +141,7 @@ export default function Home() { 주제 AI 업그레이드 @@ -167,7 +167,7 @@ export default function Home() { AI 업그레이드 @@ -204,14 +204,26 @@ export default function Home() {
- - hihi + }> + 업로드할 글 - - hihi + }> + 생성된 글 + + }> + 수정 중인 글 + + + 무작위로 업로드 돼요 + + } + closable + > + 전체선택 - hihi - hihi
); diff --git a/packages/ui/src/assets/icons/_IconX.svg b/packages/ui/src/assets/icons/_IconX.svg deleted file mode 100644 index 2829cf1e..00000000 --- a/packages/ui/src/assets/icons/_IconX.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/ui/src/components/Chip/Chip.css.ts b/packages/ui/src/components/Chip/Chip.css.ts index ad312a5e..8a398b5c 100644 --- a/packages/ui/src/components/Chip/Chip.css.ts +++ b/packages/ui/src/components/Chip/Chip.css.ts @@ -1,5 +1,5 @@ import { tokens } from '@repo/theme'; -import { style, styleVariants } from '@vanilla-extract/css'; +import { style } from '@vanilla-extract/css'; import { recipe, RecipeVariants } from '@vanilla-extract/recipes'; export const chipRecipe = recipe({ @@ -24,13 +24,12 @@ export const chipRecipe = recipe({ color: tokens.colors.grey600, }, purple: { - backgroundColor: tokens.colors.violet200, - color: tokens.colors.violet800, + backgroundColor: tokens.colors.purple200, + color: tokens.colors.purple800, }, green: { backgroundColor: tokens.colors.green200, - // TODO green800으로 수정 예정 - color: tokens.colors.green400, + color: tokens.colors.green800, }, }, }, @@ -38,19 +37,30 @@ export const chipRecipe = recipe({ export type ChipRecipeVariants = RecipeVariants; -export const addonRootStyle = styleVariants({ - grey: { - color: tokens.colors.grey400, - }, - purple: { - color: tokens.colors.violet400, +export const addonRootRecipe = recipe({ + base: { + lineHeight: 0, }, - green: { - color: tokens.colors.green400, + variants: { + color: { + grey: { + color: tokens.colors.grey400, + }, + purple: { + color: tokens.colors.purple400, + }, + green: { + color: tokens.colors.green400, + }, + }, }, }); export const chipCloseButtonStyle = style({ border: 'none', background: 'inherit', + display: 'inline-block', + width: 'auto', + height: 'auto', + lineHeight: 0, }); diff --git a/packages/ui/src/components/Chip/Chip.tsx b/packages/ui/src/components/Chip/Chip.tsx index 5a4a6dd8..cdb07635 100644 --- a/packages/ui/src/components/Chip/Chip.tsx +++ b/packages/ui/src/components/Chip/Chip.tsx @@ -1,6 +1,7 @@ import { ComponentPropsWithoutRef, forwardRef, ReactElement } from 'react'; -import { addonRootStyle, chipCloseButtonStyle, chipRecipe } from './Chip.css'; +import { addonRootRecipe, chipCloseButtonStyle, chipRecipe } from './Chip.css'; import { Icon } from '../Icon/Icon'; +import { Text } from '../Text/Text'; export type ButtonVariant = 'grey' | 'purple' | 'green'; @@ -24,11 +25,17 @@ export const Chip = forwardRef( return ( {leftAddon && ( - {leftAddon} + + {leftAddon} + )} - {children} + + {children} + {rightAddon && ( - {rightAddon} + + {rightAddon} + )} {closable && ( )}