Skip to content

Commit 49c082c

Browse files
fix: IconButton disabled color and background (#762)
1 parent fd95c82 commit 49c082c

File tree

2 files changed

+44
-14
lines changed

2 files changed

+44
-14
lines changed

packages/fuselage/src/components/Button/IconButton.stories.tsx

+33-3
Original file line numberDiff line numberDiff line change
@@ -35,36 +35,66 @@ export default {
3535
export const _IconButton: ComponentStory<typeof IconButton> = () => (
3636
<IconButton icon='balloon' />
3737
);
38+
export const _IconButtonDisabled: ComponentStory<typeof IconButton> = () => (
39+
<IconButton icon='balloon' disabled />
40+
);
41+
3842
export const _IconButtonMini: ComponentStory<typeof IconButton> = () => (
3943
<IconButton icon='balloon' mini />
4044
);
41-
export const _IconButtonSecondary: ComponentStory<typeof IconButton> = () => (
42-
<IconButton icon='balloon' secondary />
43-
);
45+
4446
export const _IconButtonInfo: ComponentStory<typeof IconButton> = () => (
4547
<IconButton icon='balloon' info />
4648
);
49+
export const _IconButtonInfoDisabled: ComponentStory<
50+
typeof IconButton
51+
> = () => <IconButton icon='balloon' info disabled />;
52+
4753
export const _IconButtonSecondaryInfo: ComponentStory<
4854
typeof IconButton
4955
> = () => <IconButton icon='balloon' secondary info />;
56+
export const _IconButtonSecondaryInfoDisabled: ComponentStory<
57+
typeof IconButton
58+
> = () => <IconButton icon='balloon' secondary info disabled />;
5059

5160
export const _IconButtonSuccess: ComponentStory<typeof IconButton> = () => (
5261
<IconButton icon='balloon' success />
5362
);
63+
export const _IconButtonSuccessDisabled: ComponentStory<
64+
typeof IconButton
65+
> = () => <IconButton icon='balloon' success disabled />;
66+
5467
export const _IconButtonSecondarySuccess: ComponentStory<
5568
typeof IconButton
5669
> = () => <IconButton icon='balloon' secondary success />;
70+
export const _IconButtonSecondarySuccessDisabled: ComponentStory<
71+
typeof IconButton
72+
> = () => <IconButton icon='balloon' secondary success disabled />;
5773

5874
export const _IconButtonWarning: ComponentStory<typeof IconButton> = () => (
5975
<IconButton icon='balloon' warning />
6076
);
77+
export const _IconButtonWarningDisabled: ComponentStory<
78+
typeof IconButton
79+
> = () => <IconButton icon='balloon' warning disabled />;
80+
6181
export const _IconButtonSecondaryWarning: ComponentStory<
6282
typeof IconButton
6383
> = () => <IconButton icon='balloon' secondary warning />;
84+
export const _IconButtonSecondaryWarningDisabled: ComponentStory<
85+
typeof IconButton
86+
> = () => <IconButton icon='balloon' secondary warning disabled />;
6487

6588
export const _IconButtonDanger: ComponentStory<typeof IconButton> = () => (
6689
<IconButton icon='balloon' danger />
6790
);
91+
export const _IconButtonDangerDisabled: ComponentStory<
92+
typeof IconButton
93+
> = () => <IconButton icon='balloon' danger disabled />;
94+
6895
export const _IconButtonSecondaryDanger: ComponentStory<
6996
typeof IconButton
7097
> = () => <IconButton icon='balloon' secondary danger />;
98+
export const _IconButtonSecondaryDangerDisabled: ComponentStory<
99+
typeof IconButton
100+
> = () => <IconButton icon='balloon' secondary danger disabled />;

packages/fuselage/src/styles/variables/buttons.scss

+11-11
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ $icon: (
175175
focus-background-color: -color('icon', 'focus-background-color', colors.neutral(400)),
176176
focus-border-color: -color('icon', 'focus-border-color', colors.neutral(500)),
177177
focus-shadow-color: -color('icon', 'focus-shadow-color', colors.neutral(100)),
178-
disabled-background-color: -color('icon', 'disabled-background-color', colors.neutral(100)),
179-
disabled-border-color: -color('icon', 'disabled-border-color', colors.neutral(100)),
180-
disabled-color: -color('icon', 'disabled-color', colors.neutral(200)),
178+
disabled-background-color: -color('icon', 'disabled-background-color', transparent),
179+
disabled-border-color: -color('icon', 'disabled-border-color', transparent),
180+
disabled-color: -color('icon', 'disabled-color', colors.neutral(600)),
181181
);
182182

183183
$icon-info: (
@@ -191,8 +191,8 @@ $icon-info: (
191191
focus-background-color: -color('icon-info', 'focus-background-color', colors.info(300)),
192192
focus-border-color: -color('icon-info', 'focus-border-color', colors.info(400)),
193193
focus-shadow-color: -color('icon-info', 'focus-shadow-color', colors.info(100)),
194-
disabled-background-color: -color('icon-info', 'disabled-background-color', colors.info(100)),
195-
disabled-border-color: -color('icon-info', 'disabled-border-color', colors.info(100)),
194+
disabled-background-color: -color('icon', 'disabled-background-color', transparent),
195+
disabled-border-color: -color('icon', 'disabled-border-color', transparent),
196196
disabled-color: -color('icon-info', 'disabled-color', colors.info(200)),
197197
);
198198

@@ -207,8 +207,8 @@ $icon-success: (
207207
focus-background-color: -color('icon-success', 'focus-background-color', colors.success(300)),
208208
focus-border-color: -color('icon-success', 'focus-border-color', colors.success(400)),
209209
focus-shadow-color: -color('icon-success', 'focus-shadow-color', colors.success(100)),
210-
disabled-background-color: -color('icon-success', 'disabled-background-color', colors.success(100)),
211-
disabled-border-color: -color('icon-success', 'disabled-border-color', colors.success(100)),
210+
disabled-background-color: -color('icon', 'disabled-background-color', transparent),
211+
disabled-border-color: -color('icon', 'disabled-border-color', transparent),
212212
disabled-color: -color('icon-success', 'disabled-color', colors.success(200)),
213213
);
214214

@@ -223,8 +223,8 @@ $icon-warning: (
223223
focus-background-color: -color('icon-warning', 'focus-background-color', colors.warning(300)),
224224
focus-border-color: -color('icon-warning', 'focus-border-color', colors.warning(400)),
225225
focus-shadow-color: -color('icon-warning', 'focus-shadow-color', colors.warning(100)),
226-
disabled-background-color: -color('icon-warning', 'disabled-background-color', colors.warning(100)),
227-
disabled-border-color: -color('icon-warning', 'disabled-border-color', colors.warning(100)),
226+
disabled-background-color: -color('icon', 'disabled-background-color', transparent),
227+
disabled-border-color: -color('icon', 'disabled-border-color', transparent),
228228
disabled-color: -color('icon-warning', 'disabled-color', colors.warning(200)),
229229
);
230230

@@ -239,7 +239,7 @@ $icon-danger: (
239239
focus-background-color: -color('icon-danger', 'focus-background-color', colors.danger(300)),
240240
focus-border-color: -color('icon-danger', 'focus-border-color', colors.danger(400)),
241241
focus-shadow-color: -color('icon-danger', 'focus-shadow-color', colors.danger(100)),
242-
disabled-background-color: -color('icon-danger', 'disabled-background-color', colors.danger(100)),
243-
disabled-border-color: -color('icon-danger', 'disabled-border-color', colors.danger(100)),
242+
disabled-background-color: -color('icon', 'disabled-background-color', transparent),
243+
disabled-border-color: -color('icon', 'disabled-border-color', transparent),
244244
disabled-color: -color('icon-danger', 'disabled-color', colors.danger(200)),
245245
);

0 commit comments

Comments
 (0)