Skip to content

Improve Toast appearance of "neutral" variant #1449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 26, 2025
Merged

Improve Toast appearance of "neutral" variant #1449

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c7bb73
fix "neutral" toast appearance;
jossmac Aug 26, 2025
eb09db5
easier to read return statements
jossmac Aug 26, 2025
de7fad6
add changeset
jossmac Aug 26, 2025
57c9b52
Merge branch 'main' into neutral-toast-dark-scheme
emmatown Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 29 additions & 11 deletions design-system/pkg/src/toast/Toast.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,19 @@ import { checkCircle2Icon } from '@keystar/ui/icon/icons/checkCircle2Icon';
import { infoIcon } from '@keystar/ui/icon/icons/infoIcon';
import { alertTriangleIcon } from '@keystar/ui/icon/icons/alertTriangleIcon';
import { SlotProvider } from '@keystar/ui/slots';
import { classNames, css, tokenSchema, useStyleProps } from '@keystar/ui/style';
import {
classNames,
css,
tokenSchema,
useMediaQuery,
useStyleProps,
} from '@keystar/ui/style';
import { Text } from '@keystar/ui/typography';
import { isReactText } from '@keystar/ui/utils';

import intlMessages from './l10n';
import { ToastProps } from './types';
import { useProvider } from '../core';

const ICONS = {
info: infoIcon,
Expand Down Expand Up @@ -45,6 +52,10 @@ function Toast(props: ToastProps, ref: ForwardedRef<HTMLDivElement>) {
tone && tone !== 'neutral' ? stringFormatter.format(tone) : null;
let icon = tone && tone !== 'neutral' ? ICONS[tone] : null;

const colorScheme = useColorScheme();
const staticColor =
tone === 'neutral' && colorScheme === 'dark' ? 'dark' : 'light';

const handleAction = () => {
if (onAction) {
onAction();
Expand Down Expand Up @@ -83,7 +94,8 @@ function Toast(props: ToastProps, ref: ForwardedRef<HTMLDivElement>) {
// tones
color: tokenSchema.color.foreground.onEmphasis,
'&[data-tone=neutral]': {
background: tokenSchema.color.scale['slate9'],
backgroundColor: tokenSchema.color.background.inverse,
color: tokenSchema.color.foreground.inverse,
},
'&[data-tone=info]': {
background: tokenSchema.color.background.accentEmphasis,
Expand Down Expand Up @@ -135,30 +147,36 @@ function Toast(props: ToastProps, ref: ForwardedRef<HTMLDivElement>) {
{isReactText(children) ? <Text>{children}</Text> : children}
</div>
{actionLabel && (
<Button
onPress={handleAction}
// prominence="low"
static="light"
// tone="secondary"
// staticColor="white"
>
<Button onPress={handleAction} static={staticColor}>
{actionLabel}
</Button>
)}
</div>
</div>
<div
className={css({
borderInlineStart: `${tokenSchema.size.border.regular} solid #fff3`,
borderInlineStart: `${tokenSchema.size.border.regular} solid var(--divider)`,
paddingInlineStart: tokenSchema.size.space.regular,
'--divider': 'color-mix(in srgb, transparent, currentColor 20%)',
})}
>
<ClearButton static="light" {...closeButtonProps} />
<ClearButton static={staticColor} {...closeButtonProps} />
</div>
</SlotProvider>
</div>
);
}

function useColorScheme() {
const prefersDark = useMediaQuery('(prefers-color-scheme: dark)');
const preferred = useProvider();

if (preferred.colorScheme === 'auto') {
return prefersDark ? 'dark' : 'light';
}

return preferred.colorScheme;
}

let _Toast = forwardRef(Toast);
export { _Toast as Toast };
Loading