Merge branch 'alpha' into bump/upgrade

channel-io · Feb 26, 2024 · b834eb3 · b834eb3
2 parents 9ff1e8c + 59135e0
commit b834eb3
Show file tree

Hide file tree

Showing 32 changed files with 237 additions and 331 deletions.
diff --git a/.changeset/chilled-oranges-drum.md b/.changeset/chilled-oranges-drum.md
@@ -0,0 +1,5 @@
+---
+"@channel.io/bezier-react": patch
+---
+
+Fixes an issue with color inheritance across components.
diff --git a/.changeset/early-deers-attend.md b/.changeset/early-deers-attend.md
@@ -0,0 +1,5 @@
+---
+"bezier-figma-plugin": minor
+---
+
+Upgrade to use @channel.io/[email protected]
diff --git a/.changeset/eight-hounds-smoke.md b/.changeset/eight-hounds-smoke.md
@@ -0,0 +1,5 @@
+---
+"@channel.io/bezier-react": patch
+---
+
+Add missing default margin styles of `LegacyStackItem`
diff --git a/.changeset/empty-jars-shop.md b/.changeset/empty-jars-shop.md
@@ -0,0 +1,5 @@
+---
+"@channel.io/bezier-react": patch
+---
+
+Fixes issue with `ModalBody`, `ModalFooter` not applying styling correctly when wrapped in other elements.
diff --git a/.changeset/five-plants-rescue.md b/.changeset/five-plants-rescue.md
@@ -0,0 +1,5 @@
+---
+"@channel.io/bezier-react": patch
+---
+
+Add `overflow: hidden` to `ListItem` component
diff --git a/.changeset/many-shrimps-float.md b/.changeset/many-shrimps-float.md
@@ -0,0 +1,5 @@
+---
+"@channel.io/bezier-react": patch
+---
+
+Update background color of `TextField`'s secondary variant.
diff --git a/.changeset/modern-days-cross.md b/.changeset/modern-days-cross.md
@@ -0,0 +1,5 @@
+---
+"@channel.io/bezier-react": patch
+---
+
+Mute the error of `smoothCornerScript` when called twice.
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -15,18 +15,23 @@
     "bright-zoos-attend",
     "calm-wasps-tease",
     "chilled-dots-divide",
+    "chilled-oranges-drum",
     "cuddly-chairs-warn",
     "cuddly-crews-matter",
     "curly-poets-decide",
     "curvy-dragons-rest",
     "cyan-pumpkins-run",
     "dry-schools-draw",
+    "early-deers-attend",
     "early-garlics-smoke",
     "early-tables-taste",
+    "eight-hounds-smoke",
     "eighty-crabs-argue",
     "eighty-steaks-play",
+    "empty-jars-shop",
     "famous-melons-juggle",
     "famous-trees-wash",
+    "five-plants-rescue",
     "fluffy-dolphins-relax",
     "friendly-avocados-love",
     "funny-peaches-report",
@@ -47,10 +52,12 @@
     "long-birds-attend",
     "long-turtles-enjoy",
     "loud-feet-melt",
+    "many-shrimps-float",
     "metal-planets-peel",
     "mighty-balloons-drum",
     "mighty-hornets-promise",
     "modern-cups-nail",
+    "modern-days-cross",
     "modern-houses-give",
     "moody-snakes-rhyme",
     "neat-badgers-arrive",
@@ -72,6 +79,7 @@
     "sixty-cows-fetch",
     "slimy-lobsters-sparkle",
     "small-readers-compare",
+    "smart-geese-provide",
     "soft-months-film",
     "sour-dogs-sin",
     "stale-nails-study",
@@ -85,6 +93,7 @@
     "tame-news-yawn",
     "ten-plants-remain",
     "tender-years-camp",
+    "thin-games-add",
     "thirty-dodos-push",
     "three-mirrors-hunt",
     "tough-lions-change",

diff --git a/.changeset/smart-geese-provide.md b/.changeset/smart-geese-provide.md
@@ -0,0 +1,5 @@
+---
+"@channel.io/bezier-react": patch
+---
+
+Fix invalid style migrations of `Tabs` component.
diff --git a/.changeset/thin-games-add.md b/.changeset/thin-games-add.md
@@ -0,0 +1,5 @@
+---
+"@channel.io/bezier-react": patch
+---
+
+Fix `ListItem`'s left icon color specificity issue.
diff --git a/packages/bezier-figma-plugin/CHANGELOG.md b/packages/bezier-figma-plugin/CHANGELOG.md
@@ -1,5 +1,11 @@
 # bezier-figma-plugin
 
+## 0.5.0-alpha.3
+
+### Minor Changes
+
+- Upgrade to use @channel.io/[email protected] ([#2001](https://github.com/channel-io/bezier-react/pull/2001)) by @sungik-choi
+
 ## 0.4.16
 
 ### Patch Changes

diff --git a/packages/bezier-figma-plugin/package.json b/packages/bezier-figma-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bezier-figma-plugin",
-  "version": "0.4.11-alpha.2",
+  "version": "0.5.0-alpha.3",
   "private": true,
   "description": "Figma plugin that helps build Bezier design system and increase productivity.",
   "repository": {
@@ -39,11 +39,10 @@
   },
   "dependencies": {
     "@channel.io/bezier-icons": "^0.18.0",
-    "@channel.io/bezier-react": "^1.19.0",
+    "@channel.io/bezier-react": "^2.0.0-alpha.15",
     "octokit": "^3.1.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.22.0",
-    "styled-components": "^5.3.11"
+    "react-router-dom": "^6.22.0"
   }
 }
diff --git a/packages/bezier-figma-plugin/src/ui/components/ExtractSuccess.tsx b/packages/bezier-figma-plugin/src/ui/components/ExtractSuccess.tsx
@@ -9,9 +9,7 @@ import {
   Button,
   ButtonColorVariant,
   ButtonStyleVariant,
-  StackItem,
   Text,
-  Typography,
   VStack,
 } from '@channel.io/bezier-react'
 
@@ -26,21 +24,15 @@ function ExtractSuccess() {
 
   return (
     <VStack align="center" justify="center" spacing={2}>
-      <StackItem>
-        <Text typo={Typography.Size18}>아이콘 추출 성공!</Text>
-      </StackItem>
-      <StackItem>
-        { /* @ts-ignore */ }
-        <Text color="bgtxt-blue-normal" as="a" href={url} target="_blank">PR 링크</Text>
-      </StackItem>
-      <StackItem marginBefore={40}>
-        <Button
-          styleVariant={ButtonStyleVariant.Secondary}
-          colorVariant={ButtonColorVariant.MonochromeDark}
-          text="선택 단계로"
-          onClick={handleClickGoHome}
-        />
-      </StackItem>
+      <Text typo="18">아이콘 추출 성공!</Text>
+      { /* @ts-ignore */ }
+      <Text color="bgtxt-blue-normal" as="a" href={url} target="_blank">PR 링크</Text>
+      <Button
+        styleVariant={ButtonStyleVariant.Secondary}
+        colorVariant={ButtonColorVariant.MonochromeDark}
+        text="선택 단계로"
+        onClick={handleClickGoHome}
+      />
     </VStack>
   )
 }

diff --git a/packages/bezier-figma-plugin/src/ui/components/Home.tsx b/packages/bezier-figma-plugin/src/ui/components/Home.tsx
@@ -6,7 +6,6 @@ import { HexahedronIcon } from '@channel.io/bezier-icons'
 import {
   ListItem,
   ListItemSize,
-  StackItem,
   VStack,
 } from '@channel.io/bezier-react'
 
@@ -19,14 +18,12 @@ function Home() {
 
   return (
     <VStack align="stretch">
-      <StackItem>
-        <ListItem
-          size={ListItemSize.XL}
-          leftIcon={HexahedronIcon}
-          content="아이콘 추출"
-          onClick={handleClickExtract}
-        />
-      </StackItem>
+      <ListItem
+        size={ListItemSize.L}
+        leftContent={HexahedronIcon}
+        content="아이콘 추출"
+        onClick={handleClickExtract}
+      />
     </VStack>
   )
 }

diff --git a/packages/bezier-figma-plugin/src/ui/components/IconExtract.tsx b/packages/bezier-figma-plugin/src/ui/components/IconExtract.tsx
@@ -16,8 +16,6 @@ import {
   FormLabel,
   HStack,
   ProgressBar,
-  Spacer,
-  StackItem,
   Text,
   TextField,
   TextFieldType,
@@ -112,16 +110,12 @@ function Progress({
   }, [])
 
   return (
-    <VStack align="stretch" spacing={6}>
-      <StackItem>
-        <ProgressBar
-          width="100%"
-          value={progressValue}
-        />
-      </StackItem>
-      <StackItem>
-        <Text>{ progressTitle }</Text>
-      </StackItem>
+    <VStack spacing={6}>
+      <ProgressBar
+        width="100%"
+        value={progressValue}
+      />
+      <Text>{ progressTitle }</Text>
     </VStack>
   )
 }
@@ -177,83 +171,65 @@ function IconExtract() {
 
   return (
     <form onSubmit={handleSubmit}>
-      <VStack align="stretch">
-        <StackItem>
-          <VStack align="stretch" spacing={12}>
-            <StackItem>
-              <FormControl required readOnly={step !== Step.Pending}>
-                <FormLabel help="좌측 상단 Figma 로고 > Help and account > Account settings 에서 발급 받을 수 있습니다.">
-                  Figma personal access token
-                </FormLabel>
-                <TextField
-                  type={TextFieldType.Password}
-                  name="figmaToken"
-                  placeholder="figd_..."
-                  value={figmaToken}
-                  onChange={handleChangeFigmaToken}
-                />
-              </FormControl>
-            </StackItem>
-            <StackItem>
-              <FormControl required readOnly={step !== Step.Pending}>
-                <FormLabel help="Github Repository 쓰기 권한이 있는 토큰을 사용해주세요.">
-                  Github personal access token
-                </FormLabel>
-                <TextField
-                  type={TextFieldType.Password}
-                  name="githubToken"
-                  placeholder="ghp_..."
-                  value={githubToken}
-                  onChange={handleChangeGithubToken}
-                />
-              </FormControl>
-            </StackItem>
-            <StackItem>
-              <FormControl readOnly>
-                <FormLabel>추출할 경로 (루트 기준)</FormLabel>
-                <TextField value={config.repository.iconExtractPath} />
-              </FormControl>
-            </StackItem>
-            <StackItem marginBefore={4}>
-              { errorMessage
-                ? <FormErrorMessage>{ errorMessage }</FormErrorMessage>
-                : <FormHelperText>토큰은 추출 성공 시 로컬 스토리지에 저장됩니다.</FormHelperText> }
-            </StackItem>
-          </VStack>
-        </StackItem>
-
-        <Spacer />
-
-        <StackItem>
-          { step === Step.Pending && (
-            <HStack justify="end" spacing={6}>
-              <StackItem>
-                <Button
-                  type="submit"
-                  styleVariant={ButtonStyleVariant.Primary}
-                  colorVariant={ButtonColorVariant.Blue}
-                  text="아이콘 추출"
-                />
-              </StackItem>
-              <StackItem>
-                <Button
-                  styleVariant={ButtonStyleVariant.Secondary}
-                  colorVariant={ButtonColorVariant.MonochromeDark}
-                  text="선택 단계로"
-                  onClick={handleClickCancel}
-                />
-              </StackItem>
-            </HStack>
-          ) }
-
-          { step === Step.Processing && (
-            <Progress
-              figmaToken={figmaToken}
-              githubToken={githubToken}
-              onError={handleExtractError}
+      <VStack justify="between">
+        <VStack spacing={12}>
+          <FormControl required readOnly={step !== Step.Pending}>
+            <FormLabel help="좌측 상단 Figma 로고 > Help and account > Account settings 에서 발급 받을 수 있습니다.">
+              Figma personal access token
+            </FormLabel>
+            <TextField
+              type={TextFieldType.Password}
+              name="figmaToken"
+              placeholder="figd_..."
+              value={figmaToken}
+              onChange={handleChangeFigmaToken}
             />
-          ) }
-        </StackItem>
+          </FormControl>
+          <FormControl required readOnly={step !== Step.Pending}>
+            <FormLabel help="Github Repository 쓰기 권한이 있는 토큰을 사용해주세요.">
+              Github personal access token
+            </FormLabel>
+            <TextField
+              type={TextFieldType.Password}
+              name="githubToken"
+              placeholder="ghp_..."
+              value={githubToken}
+              onChange={handleChangeGithubToken}
+            />
+          </FormControl>
+          <FormControl readOnly>
+            <FormLabel>추출할 경로 (루트 기준)</FormLabel>
+            <TextField value={config.repository.iconExtractPath} />
+          </FormControl>
+          { errorMessage
+            ? <FormErrorMessage>{ errorMessage }</FormErrorMessage>
+            : <FormHelperText>토큰은 추출 성공 시 로컬 스토리지에 저장됩니다.</FormHelperText> }
+        </VStack>
+
+        { step === Step.Pending && (
+          <HStack justify="end" spacing={6}>
+            <Button
+              type="submit"
+              styleVariant={ButtonStyleVariant.Primary}
+              colorVariant={ButtonColorVariant.Blue}
+              text="아이콘 추출"
+            />
+            <Button
+              styleVariant={ButtonStyleVariant.Secondary}
+              colorVariant={ButtonColorVariant.MonochromeDark}
+              text="선택 단계로"
+              onClick={handleClickCancel}
+            />
+          </HStack>
+        ) }
+
+        { step === Step.Processing && (
+          <Progress
+            figmaToken={figmaToken}
+            githubToken={githubToken}
+            onError={handleExtractError}
+          />
+        ) }
       </VStack>
     </form>
   )