Skip to content

Commit 92252bd

Browse files
authored
[Chore] next peerDeps 수정 및 컴포넌트 버그 수정 (#218)
* feat: next devDeps 수정 및 컴포넌트 버그 수정 * chore: changeset 작성 및 코드리뷰 반영
1 parent c936a3f commit 92252bd

File tree

17 files changed

+150
-93
lines changed

17 files changed

+150
-93
lines changed

.changeset/itchy-scissors-visit.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"wowds-ui": patch
3+
---
4+
5+
next peerdeps 14.2.25 이상으로 수정 및 className 관련 버그 수정

apps/wow-docs/next-env.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
/// <reference types="next/image-types/global" />
33

44
// NOTE: This file should not be edited
5-
// see https://nextjs.org/docs/basic-features/typescript for more information.
5+
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

apps/wow-docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"dependencies": {
1414
"clsx": "^2.1.1",
15-
"next": "^14.1.1",
15+
"next": "^14.2.25",
1616
"react": "^18.2.0",
1717
"react-dom": "^18.2.0",
1818
"wowds-icons": "workspace:^",

packages/wow-ui/README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ yarn add wowds-ui
1919

2020
## 🛠️ Usage
2121

22-
2322
```ts
2423
import Button from "wowds-ui/Button";
2524

@@ -34,7 +33,7 @@ export default App;
3433

3534
```
3635
1. 레포 클론
37-
git clone https://github.com/GDSC-Hongik/wow-design-system.git
36+
git clone https://github.com/gdg-hongik-univ/wow-design-system.git
3837
3938
2. 디렉토리 이동
4039
cd packages/wow-ui
@@ -44,11 +43,13 @@ pnpm install
4443
```
4544

4645
## 🌐 Links
46+
4747
- [npm](https://www.npmjs.com/package/wowds-ui)
4848
- [storybook](https://wow-design-system-wow-ui.vercel.app/?path=/docs/ui-avatar--docs)
49-
- [wow-docs](https://wow-design-system-wow-docs.vercel.app/overview)
49+
- [wow-docs](https://wow-ds.wawoo.dev/overview)
5050

5151
## 🚀 Tech Stack
52+
5253
<div align="left">
5354
<div>
5455
<img src="https://img.shields.io/badge/TypeScript-3178C6?style=flat-square&logo=typescript&logoColor=white">

packages/wow-ui/package.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,12 @@
216216
"import": "./dist/Avatar.js"
217217
}
218218
},
219-
"keywords": [],
219+
"keywords": [
220+
"디자인시스템",
221+
"wow-design-system",
222+
"wowds-ui",
223+
"component"
224+
],
220225
"license": "ISC",
221226
"scripts": {
222227
"build": "pnpm generate:build-config && rm -rf dist && rollup -c --bundleConfigAsCjs && tsc-alias && panda cssgen --outfile dist/styles.css",
@@ -266,11 +271,11 @@
266271
"wowds-icons": "workspace:^"
267272
},
268273
"peerDependencies": {
269-
"next": "^14.1.1",
274+
"next": ">=14.2.25",
270275
"react": "^18.2.0"
271276
},
272277
"bugs": {
273-
"url": "https://github.com/GDSC-Hongik/wow-design-system/issues"
278+
"url": "https://github.com/gdg-hongik-univ/wow-design-system/issues"
274279
},
275-
"homepage": "https://github.com/GDSC-Hongik/wow-design-system#readme"
280+
"homepage": "https://github.com/gdg-hongik-univ/wow-design-system#readme"
276281
}

packages/wow-ui/src/components/Box/index.tsx

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import { cva } from "@styled-system/css";
33
import { Flex, styled } from "@styled-system/jsx";
44
import type { ColorToken } from "@styled-system/tokens";
5+
import { clsx } from "clsx";
56
import { RightArrow, Warn } from "wowds-icons";
67

78
import Checkbox from "@/components/Checkbox";
@@ -54,6 +55,7 @@ const Box = <T extends BoxVariantType = "text">({
5455
onClick,
5556
onChange,
5657
checked: checkedProp,
58+
className,
5759
...rest
5860
}: BoxProps<T>) => {
5961
const { handleClick, checked } = useCheckedState({
@@ -86,10 +88,13 @@ const Box = <T extends BoxVariantType = "text">({
8688
gap={variant !== "text" ? "lg" : undefined}
8789
id={`box-${text}`}
8890
justifyContent="space-between"
89-
className={containerStyle({
90-
status: disabled ? "disabled" : status,
91-
variant: disabled ? "disabled" : variant,
92-
})}
91+
className={clsx(
92+
className,
93+
containerStyle({
94+
status: disabled ? "disabled" : status,
95+
variant: disabled ? "disabled" : variant,
96+
})
97+
)}
9398
onClick={handleArrowClick}
9499
{...rest}
95100
>

packages/wow-ui/src/components/Button/index.tsx

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import { cva } from "@styled-system/css/cva";
44
import { styled } from "@styled-system/jsx";
5+
import { clsx } from "clsx";
56
import type { CSSProperties, ElementType, ReactNode } from "react";
67
import { forwardRef } from "react";
78

@@ -56,6 +57,7 @@ const Button: ButtonComponent & { displayName?: string } = forwardRef(
5657
size = "lg",
5758
variant = "solid",
5859
icon,
60+
className,
5961
...rest
6062
}: ButtonProps<C>,
6163
ref?: PolymorphicRef<C>
@@ -67,10 +69,13 @@ const Button: ButtonComponent & { displayName?: string } = forwardRef(
6769
aria-disabled={disabled}
6870
disabled={disabled}
6971
ref={ref}
70-
className={ButtonStyle({
71-
size: variant === "sub" ? "sm" : size,
72-
variant,
73-
})}
72+
className={clsx(
73+
className,
74+
ButtonStyle({
75+
size: variant === "sub" ? "sm" : size,
76+
variant,
77+
})
78+
)}
7479
{...rest}
7580
>
7681
<styled.span className={ContentStyle({ size })}>

packages/wow-ui/src/components/Checkbox/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ const Checkbox = forwardRef<HTMLInputElement, CheckboxProps>(
8787
return (
8888
<styled.label
8989
alignItems="center"
90-
cursor={disabled ? "none" : "pointer"}
90+
cursor={disabled ? "not-allowed" : "pointer"}
9191
display="flex"
9292
flexDirection={position === "vertical" ? "column-reverse" : "row"}
9393
gap={label ? "xs" : "0px"}

packages/wow-ui/src/components/Chip/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use client";
22
import { cva } from "@styled-system/css";
33
import { styled } from "@styled-system/jsx";
4-
import clsx from "clsx";
4+
import { clsx } from "clsx";
55
import type { ReactNode } from "react";
66
import { forwardRef, useEffect, useState } from "react";
77

packages/wow-ui/src/components/Divider/index.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { cva } from "@styled-system/css";
22
import { styled } from "@styled-system/jsx";
3+
import { clsx } from "clsx";
34
import type { CSSProperties } from "react";
45

56
/**
@@ -16,12 +17,15 @@ export interface DividerProps {
1617
className?: string;
1718
}
1819

19-
const Divider = ({ type = "light", ...rest }: DividerProps) => {
20+
const Divider = ({ type = "light", className, ...rest }: DividerProps) => {
2021
return (
2122
<styled.div
22-
className={dividerStyle({
23-
type,
24-
})}
23+
className={clsx(
24+
className,
25+
dividerStyle({
26+
type,
27+
})
28+
)}
2529
{...rest}
2630
/>
2731
);

0 commit comments

Comments
 (0)