Merge branch 'main' into feat/ui-fieldbox

sopt-makers · Oct 16, 2024 · f6a4952 · f6a4952
2 parents e74c02d + 782a3cc
commit f6a4952
Show file tree

Hide file tree

Showing 10 changed files with 77 additions and 126 deletions.
diff --git a/.github/workflows/vitest.yml b/.github/workflows/vitest.yml
@@ -25,5 +25,8 @@ jobs:
       - name: Install Dependencies
         run: pnpm install
 
+      - name: Build Packages
+        run: pnpm build
+
       - name: Run Vitest Tests
         run: pnpm test
diff --git a/.husky/pre-commit b/.husky/pre-commit
diff --git a/apps/docs/CHANGELOG.md b/apps/docs/CHANGELOG.md
@@ -1,5 +1,19 @@
 # docs
 
+## 0.0.5
+
+### Patch Changes
+
+- Updated dependencies [9bde25b]
+  - @sopt-makers/ui@2.4.4
+
+## 0.0.4
+
+### Patch Changes
+
+- Updated dependencies [b0a088e]
+  - @sopt-makers/ui@2.4.3
+
 ## 0.0.3
 
 ### Patch Changes

diff --git a/apps/docs/package.json b/apps/docs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "docs",
   "private": true,
-  "version": "0.0.3",
+  "version": "0.0.5",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -13,10 +13,10 @@
     "chromatic": "npx chromatic --project-token=chpt_98c750b6bad066a"
   },
   "dependencies": {
-    "@sopt-makers/colors": "^3.0.1",
-    "@sopt-makers/fonts": "^2.0.1",
-    "@sopt-makers/icons": "^1.0.5",
-    "@sopt-makers/ui": "^2.3.0"
+    "@sopt-makers/colors": "workspace:^",
+    "@sopt-makers/fonts": "workspace:^",
+    "@sopt-makers/icons": "workspace:^",
+    "@sopt-makers/ui": "workspace:^"
   },
   "devDependencies": {
     "@storybook/addon-essentials": "^7.6.3",

diff --git a/packages/ui/Button/constants.ts b/packages/ui/Button/constants.ts
@@ -96,7 +96,7 @@ export const paddings: Record<ButtonSizeTheme, string> = {
 
 export const fontSizes: Record<ButtonSizeTheme, string> = {
   sm: '14px',
-  md: '14px',
+  md: '16px',
   lg: '18px',
 };
 

diff --git a/packages/ui/CHANGELOG.md b/packages/ui/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @sopt-makers/ui
 
+## 2.4.4
+
+### Patch Changes
+
+- 9bde25b: SelectV2 피그마 명세와 상이한 border/padding 수정
+
+## 2.4.3
+
+### Patch Changes
+
+- b0a088e: fix dependancy (static version -> workspace:^)
+
+## 2.4.2
+
+### Patch Changes
+
+- c9a5645: 의존성 업데이트
+
+## 2.4.1
+
+### Patch Changes
+
+- 7d8e506: Button 사이즈 md 일 때 text 사이즈 16px로 변경
+
 ## 2.4.0
 
 ### Minor Changes

diff --git a/packages/ui/Input/Select.tsx b/packages/ui/Input/Select.tsx
@@ -155,7 +155,7 @@ function SelectTriggerContent({ className, placeholder }: SelectTriggerContentPr
   const selectedLabel = selected ? selected.label : placeholder;
 
   return (
-    <div className={`${S.select} ${className ? className : ''}`}>
+    <div className={`${S.select} ${open ? S.focus : ''} ${className ? className : ''}`}>
       <p className={!selected ? S.selectPlaceholder : ''}>{selectedLabel}</p>
       <IconChevronDown
         style={{

diff --git a/packages/ui/Input/style.css.ts b/packages/ui/Input/style.css.ts
@@ -162,23 +162,17 @@ export const selectWrap = style({
 
 export const select = style({
   ...theme.fontsObject.BODY_2_16_M,
-  'color': theme.colors.white,
-  'width': '160px',
-  'height': '48px',
-  'borderRadius': '10px',
-  'background': theme.colors.gray800,
-  'border': '1px solid transparent',
-  'padding': '11px 16px',
-  'display': 'flex',
-  'justifyContent': 'space-between',
-  'alignItems': 'center',
-  'gap': '12px',
-  'cursor': 'pointer',
-  'transition': 'border 0.2s',
-
-  ':focus': {
-    border: `1px solid ${theme.colors.gray200}`,
-  },
+  color: theme.colors.white,
+  width: '160px',
+  height: '48px',
+  borderRadius: '10px',
+  background: theme.colors.gray800,
+  padding: '11px 16px',
+  display: 'flex',
+  justifyContent: 'space-between',
+  alignItems: 'center',
+  gap: '12px',
+  cursor: 'pointer',
 });
 
 export const selectPlaceholder = style({
@@ -200,9 +194,6 @@ export const optionList = style({
   'animation': `${fadeIn} 0.5s forwards`,
   'overflowX': 'hidden',
 
-  '::-webkit-scrollbar': {
-    width: '16px',
-  },
   '::-webkit-scrollbar-thumb': {
     background: theme.colors.gray500,
     backgroundClip: 'padding-box',

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sopt-makers/ui",
-  "version": "2.4.0",
+  "version": "2.4.4",
   "description": "sopt-makers의 frontend repository에 사용되는 ui를 제공해요.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -18,9 +18,9 @@
   "dependencies": {
     "@radix-ui/react-dialog": "^1.0.5",
     "@radix-ui/react-switch": "^1.0.3",
-    "@sopt-makers/colors": "^3.0.1",
-    "@sopt-makers/fonts": "^2.0.1",
-    "@sopt-makers/icons": "^1.0.5",
+    "@sopt-makers/colors": "workspace:^",
+    "@sopt-makers/fonts": "workspace:^",
+    "@sopt-makers/icons": "workspace:^",
     "@vanilla-extract/css": "^1.14.0",
     "@vanilla-extract/sprinkles": "1.6.1",
     "tsup": "^8.0.2"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml