Skip to content

Commit 7fe3478

Browse files
authored
Merge branch 'main' into 203-apply-link-component-to-website
2 parents 018be91 + 6fc2022 commit 7fe3478

File tree

8 files changed

+74
-5
lines changed

8 files changed

+74
-5
lines changed

β€Žpanda.config.tsβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { defineConfig } from "@pandacss/dev";
22
import { globalCss } from "./src/styles/globalCss";
33
import { colors, semanticColors } from "./src/tokens/colors";
4+
import { radii } from "./src/tokens/radii";
45
import { spacing, semanticSpacing } from "./src/tokens/spacing";
56
import {
67
textStyles,
@@ -50,6 +51,7 @@ export default defineConfig({
5051
fontSizes,
5152
letterSpacings,
5253
lineHeights,
54+
radii,
5355
spacing,
5456
},
5557
semanticTokens: {

β€Žsrc/components/Button/Button.tsxβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ const styles = cva({
6464
alignItems: "center",
6565
justifyContent: "center",
6666
width: ["auto", "100%"],
67-
borderRadius: "10px",
67+
borderRadius: "md",
6868
cursor: "pointer",
6969
transition: "0.2s",
7070
lineHeight: "1",

β€Žsrc/components/Checkbox/Checkbox.tsxβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ const styles = cva({
8686
backgroundColor: "transparent",
8787
border: "3px solid",
8888
borderColor: "border",
89-
borderRadius: "4px",
89+
borderRadius: "sm",
9090
width: "1.5rem",
9191
height: "1.5rem",
9292
display: "flex",

β€Žsrc/components/RadioGroup/RadioGroup.stories.tsxβ€Ž

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ Required.decorators = [
125125
},
126126
];
127127

128-
129128
export const Tones: Story = {
130129
render: () => {
131130
return (

β€Žsrc/components/RadioGroup/RadioGroup.tsxβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ const radioCircleStyles = cva({
237237
backgroundColor: "bg",
238238
width: "5",
239239
height: "5",
240-
borderRadius: "50%",
240+
borderRadius: "full",
241241
border: "2px solid",
242242
borderColor: "border",
243243
position: "absolute",
@@ -319,7 +319,7 @@ const radioDotStyles = cva({
319319
display: "block",
320320
width: "2.5",
321321
height: "2.5",
322-
borderRadius: "50%",
322+
borderRadius: "full",
323323
backgroundColor: "text",
324324
},
325325
},
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import { test } from "vitest";
2+
3+
test.todo("μž…λ ₯μœ ν˜• email μ μš©λœλ‹€.");
4+
test.todo("μž…λ ₯μœ ν˜• number μ μš©λœλ‹€.");
5+
test.todo("μž…λ ₯μœ ν˜• password μ μš©λœλ‹€.");
6+
test.todo("μž…λ ₯μœ ν˜• tel μ μš©λœλ‹€.");
7+
test.todo("μž…λ ₯μœ ν˜• text μ μš©λœλ‹€.");
8+
test.todo("μž…λ ₯μœ ν˜• url μ μš©λœλ‹€.");
9+
10+
test.todo("색쑰 neutral μ μš©λœλ‹€.");
11+
test.todo("색쑰 accent μ μš©λœλ‹€.");
12+
test.todo("색쑰 danger μ μš©λœλ‹€.");
13+
test.todo("색쑰 warning μ μš©λœλ‹€.");
14+
15+
test.todo("크기 small μ μš©λœλ‹€.");
16+
test.todo("크기 medium μ μš©λœλ‹€.");
17+
test.todo("크기 large μ μš©λœλ‹€.");
18+
19+
test.todo("μž…λ ₯값이 변경될 λ•Œ 값이 λ³€κ²½λœλ‹€.");
20+
test.todo("λ³€κ²½μ΄λ²€νŠΈ ν•Έλ“€λŸ¬κ°€ λ™μž‘ν•œλ‹€.");
21+
22+
test.todo("ν…μŠ€νŠΈ 인풋이 λΉ„ν™œμ„±ν™” λœλ‹€.");
23+
test.todo("μ•ˆλ‚΄λ¬Έκ΅¬κ°€ μ μš©λœλ‹€.");
24+
test.todo("읽기λͺ¨λ“œκ°€ ν™œμ„±ν™”λœλ‹€.");
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
import type { InputHTMLAttributes } from "react";
2+
import type { Tone } from "../../tokens/colors";
3+
4+
type TextInputSize = "sm" | "md" | "lg";
5+
6+
export interface TextInput
7+
extends Omit<InputHTMLAttributes<HTMLInputElement>, "size"> {
8+
/** μž…λ ₯μœ ν˜• */
9+
type?: "email" | "number" | "password" | "tel" | "text" | "url";
10+
/** 색쑰 */
11+
tone?: Tone;
12+
/** 크기 */
13+
size?: TextInputSize;
14+
/** 처음 λ Œλ”λ§λ  λ•Œ μž…λ ₯λ˜λŠ” κ°’*/
15+
defaultValue?: string;
16+
/** κ°’ */
17+
value?: string;
18+
/** λ³€κ²½ 이벀트 ν•Έλ“€λŸ¬ */
19+
onChange?: (e: React.ChangeEvent<HTMLInputElement>) => void;
20+
/** ν…μŠ€νŠΈμΈν’‹ ν™œμ„±ν™” μ—¬λΆ€ */
21+
disabled?: boolean;
22+
/** μ•ˆλ‚΄λ¬Έκ΅¬ */
23+
placeholder?: string;
24+
/** 읽기λͺ¨λ“œ ν™œμ„±ν™” μ—¬λΆ€ */
25+
readOnly?: boolean;
26+
}
27+
28+
/**
29+
* ν…μŠ€νŠΈλ₯Ό μž…λ ₯ν•  수 μžˆλŠ” 인풋 μ»΄ν¬λ„ŒνŠΈμž…λ‹ˆλ‹€.
30+
*
31+
* - `type` μ†μ„±μœΌλ‘œ 이메일, λΉ„λ°€λ²ˆν˜Έ, 숫자, μ „ν™”λ²ˆν˜Έ λ“± λ‹€μ–‘ν•œ μž…λ ₯ μœ ν˜•μ„ μ§€μ •ν•  수 μžˆμŠ΅λ‹ˆλ‹€.
32+
* - `tone` `size` λ””μžμΈ μ‹œμŠ€ν…œ 기반의 μŠ€νƒ€μΌ μ œμ–΄κ°€ κ°€λŠ₯ν•©λ‹ˆλ‹€.
33+
* - `value` `onChange` 속성을 톡해 μ™ΈλΆ€μ—μ„œ μž…λ ₯값을 μ œμ–΄ν•  수 μžˆμŠ΅λ‹ˆλ‹€.
34+
* - `disabled` `placeholder` `readOnly` λ“± μžμ£Όμ‚¬μš©ν•˜λŠ” 속성듀을 μ§€μ›ν•©λ‹ˆλ‹€.
35+
*/

β€Žsrc/tokens/radii.tsβ€Ž

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import type { Tokens } from "@pandacss/types";
2+
3+
export const radii: Tokens["radii"] = {
4+
xs: { value: "0.125rem" }, // 2px
5+
sm: { value: "0.25rem" }, // 4px
6+
md: { value: "0.5rem" }, // 8px
7+
lg: { value: "1rem" }, // 16px
8+
full: { value: "calc(infinity * 1px)" }, // 9999px
9+
};

0 commit comments

Comments
Β (0)