Skip to content

Commit 4f39249

Browse files
authored
Merge pull request #338 from belltalion/feat-toggle
Feat toggle
2 parents 3e9bb94 + 8e8fa95 commit 4f39249

File tree

10 files changed

+489
-42
lines changed

10 files changed

+489
-42
lines changed

.changeset/true-stars-listen.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@devup-ui/components": patch
3+
---
4+
5+
Feat toggle

packages/components/src/components/Radio/Radio.stories.tsx

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,6 @@ export default {
88
export const Default = {
99
args: {
1010
checked: undefined,
11-
colors: {
12-
primary: 'var(--primary)',
13-
border: 'var(--border)',
14-
text: 'var(--text)',
15-
bg: 'var(--bg)',
16-
hoverBg: 'var(--hoverBg)',
17-
hoverBorder: 'var(--hoverBorder)',
18-
hoverColor: 'var(--hoverColor)',
19-
checkedBg: 'var(--checkedBg)',
20-
checkedBorder: 'var(--checkedBorder)',
21-
checkedColor: 'var(--checkedColor)',
22-
disabledBg: 'var(--disabledBg)',
23-
disabledColor: 'var(--disabledColor)',
24-
},
2511
name: 'radio',
2612
children: '옵션1',
2713
variant: 'default',

packages/components/src/components/Radio/__tests__/__snapshots__/index.browser.test.tsx.snap

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ exports[`Radio > should Radio snapshot 2`] = `
2828
type="radio"
2929
/>
3030
<div
31-
class=" cursor-0-not-allowed-14172363753176421546-1 background-0-var(--bg,light-dark(#FFF,#2E2E2E))--1 border-0-1px solid--1 border-color-0-$border--1 color-0-var(--text,light-dark(#000,#FFF))--1 cursor-0-pointer--1 display-0-flex--1 padding-right-0-32px--1 padding-left-0-32px--1 padding-bottom-0-16px--1 padding-top-0-16px--1 font-weight-0-600-13599873562982711818-1 background-0-var(--checkedBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 80%),color-mix(in srgb,var(--primary) 10%,black 80%)))-13599873562982711818-1 border-color-0-var(--checkedBorder,var(--primary))-13599873562982711818-1 color-0-var(--checkedColor,var(--primary))-13599873562982711818-1 background-0-var(--hoverBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 90%),color-mix(in srgb,var(--primary) 10%,black 90%)))-17878486696247413219-1 border-color-0-var(--hoverBorder,var(--primary))-17878486696247413219-1 background-0-var(--disabledBg,light-dark(#F0F0F3,#47474A))-13062485276290174291-1 color-0-var(--disabledColor,light-dark(#D6D7DE,#373737))-13062485276290174291-1 transition-0-background-color .25s,border-color .25s--1 width-0-fit-content--1 "
31+
class=" cursor-0-not-allowed-14172363753176421546-1 background-0-var(--bg,light-dark(#FFF,#2E2E2E))--1 border-0-1px solid--1 border-color-0-$border--1 color-0-var(--text,light-dark(#000,#FFF))--1 cursor-0-pointer--1 display-0-flex--1 padding-right-0-32px--1 padding-left-0-32px--1 padding-bottom-0-12px--1 padding-top-0-12px--1 font-weight-0-600-13599873562982711818-1 background-0-var(--checkedBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 80%),color-mix(in srgb,var(--primary) 10%,black 80%)))-13599873562982711818-1 border-color-0-var(--checkedBorder,var(--primary))-13599873562982711818-1 color-0-var(--checkedColor,var(--primary))-13599873562982711818-1 background-0-var(--hoverBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 90%),color-mix(in srgb,var(--primary) 10%,black 90%)))-17878486696247413219-1 border-color-0-var(--hoverBorder,var(--primary))-17878486696247413219-1 background-0-var(--disabledBg,light-dark(#F0F0F3,#47474A))-13062485276290174291-1 color-0-var(--disabledColor,light-dark(#D6D7DE,#373737))-13062485276290174291-1 transition-0-background-color .25s,border-color .25s--1 width-0-fit-content--1 "
3232
data-radio-button="true"
3333
/>
3434
</label>
@@ -69,7 +69,7 @@ exports[`Radio > should Radio snapshot 4`] = `
6969
/>
7070
<div
7171
aria-disabled="true"
72-
class=" cursor-0-not-allowed-14172363753176421546-1 background-0-var(--bg,light-dark(#FFF,#2E2E2E))--1 border-0-1px solid--1 border-color-0-$border--1 color-0-var(--text,light-dark(#000,#FFF))--1 cursor-0-pointer--1 display-0-flex--1 padding-right-0-32px--1 padding-left-0-32px--1 padding-bottom-0-16px--1 padding-top-0-16px--1 font-weight-0-600-13599873562982711818-1 background-0-var(--checkedBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 80%),color-mix(in srgb,var(--primary) 10%,black 80%)))-13599873562982711818-1 border-color-0-var(--checkedBorder,var(--primary))-13599873562982711818-1 color-0-var(--checkedColor,var(--primary))-13599873562982711818-1 background-0-var(--hoverBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 90%),color-mix(in srgb,var(--primary) 10%,black 90%)))-17878486696247413219-1 border-color-0-var(--hoverBorder,var(--primary))-17878486696247413219-1 background-0-var(--disabledBg,light-dark(#F0F0F3,#47474A))-13062485276290174291-1 color-0-var(--disabledColor,light-dark(#D6D7DE,#373737))-13062485276290174291-1 transition-0-background-color .25s,border-color .25s--1 width-0-fit-content--1 "
72+
class=" cursor-0-not-allowed-14172363753176421546-1 background-0-var(--bg,light-dark(#FFF,#2E2E2E))--1 border-0-1px solid--1 border-color-0-$border--1 color-0-var(--text,light-dark(#000,#FFF))--1 cursor-0-pointer--1 display-0-flex--1 padding-right-0-32px--1 padding-left-0-32px--1 padding-bottom-0-12px--1 padding-top-0-12px--1 font-weight-0-600-13599873562982711818-1 background-0-var(--checkedBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 80%),color-mix(in srgb,var(--primary) 10%,black 80%)))-13599873562982711818-1 border-color-0-var(--checkedBorder,var(--primary))-13599873562982711818-1 color-0-var(--checkedColor,var(--primary))-13599873562982711818-1 background-0-var(--hoverBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 90%),color-mix(in srgb,var(--primary) 10%,black 90%)))-17878486696247413219-1 border-color-0-var(--hoverBorder,var(--primary))-17878486696247413219-1 background-0-var(--disabledBg,light-dark(#F0F0F3,#47474A))-13062485276290174291-1 color-0-var(--disabledColor,light-dark(#D6D7DE,#373737))-13062485276290174291-1 transition-0-background-color .25s,border-color .25s--1 width-0-fit-content--1 "
7373
data-radio-button="true"
7474
/>
7575
</label>
@@ -111,7 +111,7 @@ exports[`Radio > should Radio snapshot 6`] = `
111111
/>
112112
<div
113113
aria-disabled="true"
114-
class=" cursor-0-not-allowed-14172363753176421546-1 background-0-var(--bg,light-dark(#FFF,#2E2E2E))--1 border-0-1px solid--1 border-color-0-$border--1 color-0-var(--text,light-dark(#000,#FFF))--1 cursor-0-pointer--1 display-0-flex--1 padding-right-0-32px--1 padding-left-0-32px--1 padding-bottom-0-16px--1 padding-top-0-16px--1 font-weight-0-600-13599873562982711818-1 background-0-var(--checkedBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 80%),color-mix(in srgb,var(--primary) 10%,black 80%)))-13599873562982711818-1 border-color-0-var(--checkedBorder,var(--primary))-13599873562982711818-1 color-0-var(--checkedColor,var(--primary))-13599873562982711818-1 background-0-var(--hoverBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 90%),color-mix(in srgb,var(--primary) 10%,black 90%)))-17878486696247413219-1 border-color-0-var(--hoverBorder,var(--primary))-17878486696247413219-1 background-0-var(--disabledBg,light-dark(#F0F0F3,#47474A))-13062485276290174291-1 color-0-var(--disabledColor,light-dark(#D6D7DE,#373737))-13062485276290174291-1 transition-0-background-color .25s,border-color .25s--1 width-0-fit-content--1 "
114+
class=" cursor-0-not-allowed-14172363753176421546-1 background-0-var(--bg,light-dark(#FFF,#2E2E2E))--1 border-0-1px solid--1 border-color-0-$border--1 color-0-var(--text,light-dark(#000,#FFF))--1 cursor-0-pointer--1 display-0-flex--1 padding-right-0-32px--1 padding-left-0-32px--1 padding-bottom-0-12px--1 padding-top-0-12px--1 font-weight-0-600-13599873562982711818-1 background-0-var(--checkedBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 80%),color-mix(in srgb,var(--primary) 10%,black 80%)))-13599873562982711818-1 border-color-0-var(--checkedBorder,var(--primary))-13599873562982711818-1 color-0-var(--checkedColor,var(--primary))-13599873562982711818-1 background-0-var(--hoverBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 90%),color-mix(in srgb,var(--primary) 10%,black 90%)))-17878486696247413219-1 border-color-0-var(--hoverBorder,var(--primary))-17878486696247413219-1 background-0-var(--disabledBg,light-dark(#F0F0F3,#47474A))-13062485276290174291-1 color-0-var(--disabledColor,light-dark(#D6D7DE,#373737))-13062485276290174291-1 transition-0-background-color .25s,border-color .25s--1 width-0-fit-content--1 "
115115
data-radio-button="true"
116116
style="width: 500px;"
117117
/>
@@ -154,7 +154,7 @@ exports[`Radio > should Radio snapshot 8`] = `
154154
/>
155155
<div
156156
aria-disabled="true"
157-
class="className cursor-0-not-allowed-14172363753176421546-1 background-0-var(--bg,light-dark(#FFF,#2E2E2E))--1 border-0-1px solid--1 border-color-0-$border--1 color-0-var(--text,light-dark(#000,#FFF))--1 cursor-0-pointer--1 display-0-flex--1 padding-right-0-32px--1 padding-left-0-32px--1 padding-bottom-0-16px--1 padding-top-0-16px--1 font-weight-0-600-13599873562982711818-1 background-0-var(--checkedBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 80%),color-mix(in srgb,var(--primary) 10%,black 80%)))-13599873562982711818-1 border-color-0-var(--checkedBorder,var(--primary))-13599873562982711818-1 color-0-var(--checkedColor,var(--primary))-13599873562982711818-1 background-0-var(--hoverBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 90%),color-mix(in srgb,var(--primary) 10%,black 90%)))-17878486696247413219-1 border-color-0-var(--hoverBorder,var(--primary))-17878486696247413219-1 background-0-var(--disabledBg,light-dark(#F0F0F3,#47474A))-13062485276290174291-1 color-0-var(--disabledColor,light-dark(#D6D7DE,#373737))-13062485276290174291-1 transition-0-background-color .25s,border-color .25s--1 width-0-fit-content--1 "
157+
class="className cursor-0-not-allowed-14172363753176421546-1 background-0-var(--bg,light-dark(#FFF,#2E2E2E))--1 border-0-1px solid--1 border-color-0-$border--1 color-0-var(--text,light-dark(#000,#FFF))--1 cursor-0-pointer--1 display-0-flex--1 padding-right-0-32px--1 padding-left-0-32px--1 padding-bottom-0-12px--1 padding-top-0-12px--1 font-weight-0-600-13599873562982711818-1 background-0-var(--checkedBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 80%),color-mix(in srgb,var(--primary) 10%,black 80%)))-13599873562982711818-1 border-color-0-var(--checkedBorder,var(--primary))-13599873562982711818-1 color-0-var(--checkedColor,var(--primary))-13599873562982711818-1 background-0-var(--hoverBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 90%),color-mix(in srgb,var(--primary) 10%,black 90%)))-17878486696247413219-1 border-color-0-var(--hoverBorder,var(--primary))-17878486696247413219-1 background-0-var(--disabledBg,light-dark(#F0F0F3,#47474A))-13062485276290174291-1 color-0-var(--disabledColor,light-dark(#D6D7DE,#373737))-13062485276290174291-1 transition-0-background-color .25s,border-color .25s--1 width-0-fit-content--1 "
158158
data-radio-button="true"
159159
/>
160160
</label>
@@ -192,7 +192,7 @@ exports[`Radio > should Radio snapshot 10`] = `
192192
type="radio"
193193
/>
194194
<div
195-
class=" cursor-0-not-allowed-14172363753176421546-1 background-0-var(--bg,light-dark(#FFF,#2E2E2E))--1 border-0-1px solid--1 border-color-0-$border--1 color-0-var(--text,light-dark(#000,#FFF))--1 cursor-0-pointer--1 display-0-flex--1 padding-right-0-32px--1 padding-left-0-32px--1 padding-bottom-0-16px--1 padding-top-0-16px--1 font-weight-0-600-13599873562982711818-1 background-0-var(--checkedBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 80%),color-mix(in srgb,var(--primary) 10%,black 80%)))-13599873562982711818-1 border-color-0-var(--checkedBorder,var(--primary))-13599873562982711818-1 color-0-var(--checkedColor,var(--primary))-13599873562982711818-1 background-0-var(--hoverBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 90%),color-mix(in srgb,var(--primary) 10%,black 90%)))-17878486696247413219-1 border-color-0-var(--hoverBorder,var(--primary))-17878486696247413219-1 background-0-var(--disabledBg,light-dark(#F0F0F3,#47474A))-13062485276290174291-1 color-0-var(--disabledColor,light-dark(#D6D7DE,#373737))-13062485276290174291-1 transition-0-background-color .25s,border-color .25s--1 width-0-fit-content--1 border-radius-0-6px 0 0 6px--1"
195+
class=" cursor-0-not-allowed-14172363753176421546-1 background-0-var(--bg,light-dark(#FFF,#2E2E2E))--1 border-0-1px solid--1 border-color-0-$border--1 color-0-var(--text,light-dark(#000,#FFF))--1 cursor-0-pointer--1 display-0-flex--1 padding-right-0-32px--1 padding-left-0-32px--1 padding-bottom-0-12px--1 padding-top-0-12px--1 font-weight-0-600-13599873562982711818-1 background-0-var(--checkedBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 80%),color-mix(in srgb,var(--primary) 10%,black 80%)))-13599873562982711818-1 border-color-0-var(--checkedBorder,var(--primary))-13599873562982711818-1 color-0-var(--checkedColor,var(--primary))-13599873562982711818-1 background-0-var(--hoverBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 90%),color-mix(in srgb,var(--primary) 10%,black 90%)))-17878486696247413219-1 border-color-0-var(--hoverBorder,var(--primary))-17878486696247413219-1 background-0-var(--disabledBg,light-dark(#F0F0F3,#47474A))-13062485276290174291-1 color-0-var(--disabledColor,light-dark(#D6D7DE,#373737))-13062485276290174291-1 transition-0-background-color .25s,border-color .25s--1 width-0-fit-content--1 border-radius-0-8px 0 0 8px--1"
196196
data-radio-button="true"
197197
/>
198198
</label>
@@ -210,7 +210,7 @@ exports[`Radio > should Radio snapshot 11`] = `
210210
type="radio"
211211
/>
212212
<div
213-
class=" cursor-0-not-allowed-14172363753176421546-1 background-0-var(--bg,light-dark(#FFF,#2E2E2E))--1 border-0-1px solid--1 border-color-0-$border--1 color-0-var(--text,light-dark(#000,#FFF))--1 cursor-0-pointer--1 display-0-flex--1 padding-right-0-32px--1 padding-left-0-32px--1 padding-bottom-0-16px--1 padding-top-0-16px--1 font-weight-0-600-13599873562982711818-1 background-0-var(--checkedBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 80%),color-mix(in srgb,var(--primary) 10%,black 80%)))-13599873562982711818-1 border-color-0-var(--checkedBorder,var(--primary))-13599873562982711818-1 color-0-var(--checkedColor,var(--primary))-13599873562982711818-1 background-0-var(--hoverBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 90%),color-mix(in srgb,var(--primary) 10%,black 90%)))-17878486696247413219-1 border-color-0-var(--hoverBorder,var(--primary))-17878486696247413219-1 background-0-var(--disabledBg,light-dark(#F0F0F3,#47474A))-13062485276290174291-1 color-0-var(--disabledColor,light-dark(#D6D7DE,#373737))-13062485276290174291-1 transition-0-background-color .25s,border-color .25s--1 width-0-fit-content--1 border-radius-0-0 6px 6px 0--1"
213+
class=" cursor-0-not-allowed-14172363753176421546-1 background-0-var(--bg,light-dark(#FFF,#2E2E2E))--1 border-0-1px solid--1 border-color-0-$border--1 color-0-var(--text,light-dark(#000,#FFF))--1 cursor-0-pointer--1 display-0-flex--1 padding-right-0-32px--1 padding-left-0-32px--1 padding-bottom-0-12px--1 padding-top-0-12px--1 font-weight-0-600-13599873562982711818-1 background-0-var(--checkedBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 80%),color-mix(in srgb,var(--primary) 10%,black 80%)))-13599873562982711818-1 border-color-0-var(--checkedBorder,var(--primary))-13599873562982711818-1 color-0-var(--checkedColor,var(--primary))-13599873562982711818-1 background-0-var(--hoverBg,light-dark(color-mix(in srgb,var(--primary) 10%,white 90%),color-mix(in srgb,var(--primary) 10%,black 90%)))-17878486696247413219-1 border-color-0-var(--hoverBorder,var(--primary))-17878486696247413219-1 background-0-var(--disabledBg,light-dark(#F0F0F3,#47474A))-13062485276290174291-1 color-0-var(--disabledColor,light-dark(#D6D7DE,#373737))-13062485276290174291-1 transition-0-background-color .25s,border-color .25s--1 width-0-fit-content--1 border-radius-0-0 8px 8px 0--1"
214214
data-radio-button="true"
215215
/>
216216
</label>

packages/components/src/components/Radio/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@ export function Radio({
144144
border="1px solid"
145145
borderColor="$border"
146146
borderRadius={
147-
firstButton ? '6px 0 0 6px' : lastButton ? '0 6px 6px 0' : undefined
147+
firstButton ? '8px 0 0 8px' : lastButton ? '0 8px 8px 0' : undefined
148148
}
149149
className={className}
150150
color="var(--text, light-dark(#000, #fff))"
151151
cursor="pointer"
152152
data-radio-button
153153
display="flex"
154154
px={8}
155-
py={4}
155+
py={3}
156156
selectors={{
157157
// checked
158158
'[data-radio-input]:checked + &:not([aria-disabled=true])': {

packages/components/src/components/RadioGroup/RadioGroup.stories.tsx

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,6 @@ export const Default = {
99
args: {
1010
disabled: false,
1111
name: 'radio',
12-
colors: {
13-
primary: 'var(--primary)',
14-
border: 'var(--border)',
15-
text: 'var(--text)',
16-
bg: 'var(--bg)',
17-
hoverBg: 'var(--hoverBg)',
18-
hoverBorder: 'var(--hoverBorder)',
19-
hoverColor: 'var(--hoverColor)',
20-
checkedBg: 'var(--checkedBg)',
21-
checkedBorder: 'var(--checkedBorder)',
22-
checkedColor: 'var(--checkedColor)',
23-
disabledBg: 'var(--disabledBg)',
24-
disabledColor: 'var(--disabledColor)',
25-
},
2612
options: [
2713
{
2814
value: '1',

0 commit comments

Comments
 (0)