Skip to content

Commit eddce2a

Browse files
authored
refactor: Set colors for toast icons explicitly (#1170)
1 parent 3aa5960 commit eddce2a

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

web_ui/packages/ui/src/toast/toast.component.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ type CustomToastProps = {
3838
};
3939

4040
const ICON: Record<ToastType, ReactNode> = {
41-
success: <AcceptCircle />,
42-
error: <CrossCircle />,
43-
warning: <Alert />,
44-
info: <Info />,
41+
success: <AcceptCircle className={classes.icon} />,
42+
error: <CrossCircle className={classes.icon} />,
43+
warning: <Alert className={classes.icon} />,
44+
info: <Info className={classes.icon} />,
4545
neutral: null,
4646
};
4747

@@ -53,7 +53,7 @@ const ToastCloseButton = ({ id }: { id: string }) => {
5353
aria-label={'Close toast'}
5454
UNSAFE_className={classes.closeButton}
5555
>
56-
<CloseSmall className={classes.closeIcon} />
56+
<CloseSmall className={classes.icon} />
5757
</ActionButton>
5858
);
5959
};
@@ -95,7 +95,7 @@ const CustomToast = ({ message, id, actionButtons, type, hasCloseButton = true,
9595
>
9696
<Flex flex={1} alignItems={'center'} justifyContent={'space-between'}>
9797
<Flex gap={'size-100'} alignItems={'center'}>
98-
<View>{icon}</View>
98+
<Flex>{icon}</Flex>
9999
<Text>{message}</Text>
100100
</Flex>
101101
<ToastActionButtons actionButtons={actionButtons} />

web_ui/packages/ui/src/toast/toast.module.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,36 +32,36 @@
3232
}
3333
}
3434

35-
.closeIcon {
36-
color: var(--closeIconColor);
35+
.icon {
36+
fill: var(--iconColor);
3737
}
3838

3939
.info {
4040
--backgroundColor: var(--energy-blue-shade);
4141
--textColor: var(--spectrum-global-color-gray-900);
42-
--closeIconColor: var(--spectrum-global-color-gray-900);
42+
--iconColor: var(--spectrum-global-color-gray-900);
4343
}
4444

4545
.warning {
4646
--backgroundColor: var(--brand-daisy);
4747
--textColor: var(--spectrum-global-color-gray-50);
48-
--closeIconColor: var(--spectrum-global-color-gray-50);
48+
--iconColor: var(--spectrum-global-color-gray-50);
4949
}
5050

5151
.error {
5252
--backgroundColor: var(--brand-coral-coral-shade1);
5353
--textColor: var(--spectrum-global-color-gray-900);
54-
--closeIconColor: var(--spectrum-global-color-gray-900);
54+
--iconColor: var(--spectrum-global-color-gray-900);
5555
}
5656

5757
.success {
5858
--backgroundColor: var(--brand-moss);
5959
--textColor: var(--spectrum-global-color-gray-900);
60-
--closeIconColor: var(--spectrum-global-color-gray-900);
60+
--iconColor: var(--spectrum-global-color-gray-900);
6161
}
6262

6363
.neutral {
6464
--backgroundColor: var(--spectrum-global-color-gray-400);
6565
--textColor: var(--spectrum-global-color-gray-900);
66-
--closeIconColor: var(--spectrum-global-color-gray-900);
66+
--iconColor: var(--spectrum-global-color-gray-900);
6767
}

0 commit comments

Comments
 (0)