Skip to content

Commit e99efe9

Browse files
committed
fix(Button): optimize styles * 5
1 parent c3f7734 commit e99efe9

File tree

2 files changed

+42
-15
lines changed

2 files changed

+42
-15
lines changed

src/components/actions/Button/Button.stories.tsx

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ const TemplateStates: StoryFn<CubeButtonProps> = ({
110110
disabled: false,
111111
}}
112112
>
113-
{label || 'Secondary'}
113+
{label || 'Default'}
114114
</Button>
115115
<Button
116116
{...props}
@@ -156,6 +156,19 @@ const TemplateStates: StoryFn<CubeButtonProps> = ({
156156
>
157157
{label || 'Focused'}
158158
</Button>
159+
{['outline', 'neutral', 'clear'].includes(props.type) || !props.type ? (
160+
<Button
161+
{...props}
162+
mods={{
163+
pressed: false,
164+
focused: false,
165+
disabled: false,
166+
selected: true,
167+
}}
168+
>
169+
{label || 'Selected'}
170+
</Button>
171+
) : null}
159172
<Button
160173
{...props}
161174
isDisabled
@@ -231,6 +244,19 @@ const DarkTemplateStates: StoryFn<CubeButtonProps> = ({
231244
>
232245
{label || 'Focused'}
233246
</Button>
247+
{['outline', 'neutral'].includes(props.type) || !props.type ? (
248+
<Button
249+
{...props}
250+
mods={{
251+
pressed: false,
252+
focused: false,
253+
disabled: false,
254+
selected: true,
255+
}}
256+
>
257+
{label || 'Selected'}
258+
</Button>
259+
) : null}
234260
<Button
235261
{...props}
236262
isDisabled

src/components/actions/Button/Button.tsx

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export const DEFAULT_OUTLINE_STYLES: Styles = {
138138
color: {
139139
'': '#dark-02',
140140
hovered: '#dark-02',
141-
pressed: '#dark',
141+
'pressed | selected': '#dark',
142142
'[disabled]': '#dark.30',
143143
},
144144
} as const;
@@ -173,7 +173,7 @@ export const DEFAULT_CLEAR_STYLES: Styles = {
173173
fill: {
174174
'': '#purple.0',
175175
hovered: '#purple.16',
176-
pressed: '#purple.10',
176+
'pressed | selected': '#purple.10',
177177
'[disabled]': '#dark.04',
178178
},
179179
color: {
@@ -248,7 +248,7 @@ export const DANGER_OUTLINE_STYLES: Styles = {
248248
fill: {
249249
'': '#danger.0',
250250
hovered: '#danger.1',
251-
pressed: '#danger.05',
251+
'pressed | selected': '#danger.05',
252252
'[disabled]': '#dark.04',
253253
},
254254
color: {
@@ -266,12 +266,12 @@ export const DANGER_NEUTRAL_STYLES: Styles = {
266266
fill: {
267267
'': '#dark.0',
268268
hovered: '#dark.04',
269-
pressed: '#dark.05',
269+
'pressed | selected': '#dark.05',
270270
'[disabled]': '#dark.04',
271271
},
272272
color: {
273273
'': '#dark-02',
274-
pressed: '#dark',
274+
'pressed | selected': '#danger-text',
275275
'[disabled]': '#dark.30',
276276
},
277277
} as const;
@@ -286,7 +286,7 @@ export const DANGER_CLEAR_STYLES: Styles = {
286286
fill: {
287287
'': '#danger.0',
288288
hovered: '#danger.1',
289-
pressed: '#danger.05',
289+
'pressed | selected': '#danger.05',
290290
'[disabled]': '#dark.04',
291291
},
292292
color: {
@@ -361,7 +361,7 @@ export const SUCCESS_OUTLINE_STYLES: Styles = {
361361
fill: {
362362
'': '#success.0',
363363
hovered: '#success.1',
364-
pressed: '#success.05',
364+
'pressed | selected': '#success.05',
365365
'[disabled]': '#dark.04',
366366
},
367367
color: {
@@ -379,13 +379,12 @@ export const SUCCESS_NEUTRAL_STYLES: Styles = {
379379
fill: {
380380
'': '#dark.0',
381381
hovered: '#dark.04',
382-
pressed: '#dark.05',
382+
'pressed | selected': '#dark.05',
383383
'[disabled]': '#dark.04',
384384
},
385385
color: {
386386
'': '#dark-02',
387-
hovered: '#dark-02',
388-
pressed: '#dark',
387+
'pressed | selected': '#success-text',
389388
'[disabled]': '#dark.30',
390389
},
391390
} as const;
@@ -400,7 +399,7 @@ export const SUCCESS_CLEAR_STYLES: Styles = {
400399
fill: {
401400
'': '#success.0',
402401
hovered: '#success.1',
403-
pressed: '#success.05',
402+
'pressed | selected': '#success.05',
404403
'[disabled]': '#dark.04',
405404
},
406405
color: {
@@ -473,7 +472,7 @@ export const SPECIAL_OUTLINE_STYLES: Styles = {
473472
fill: {
474473
'': '#white.0',
475474
hovered: '#white.18',
476-
pressed: '#white.12',
475+
'pressed | selected': '#white.12',
477476
'[disabled]': '#white.12',
478477
},
479478
color: {
@@ -491,7 +490,7 @@ export const SPECIAL_NEUTRAL_STYLES: Styles = {
491490
fill: {
492491
'': '#white.0',
493492
hovered: '#white.18',
494-
'pressed | [disabled]': '#white.12',
493+
'pressed | selected | [disabled]': '#white.12',
495494
},
496495
color: {
497496
'': '#white',
@@ -514,7 +513,9 @@ export const SPECIAL_CLEAR_STYLES: Styles = {
514513
'[disabled]': '#white.12',
515514
},
516515
color: {
517-
'': '#purple',
516+
'': '#purple-text',
517+
hovered: '#purple',
518+
'pressed & hovered': '#purple-text',
518519
'[disabled]': '#white.30',
519520
},
520521
} as const;

0 commit comments

Comments
 (0)