peter
e832b401ac
/code-review caught that role="status" on the toast container implies aria-atomic="true", so every new toast made a screen reader re-read the entire stack instead of just the new one — the opposite of the U-F fix's intent. Use a bare aria-live="polite" (defaults atomic=false, announcing only the added toast); error toasts keep role="alert". Also simplified the conditional role to a plain ternary.
80 lines
3.5 KiB
TypeScript
80 lines
3.5 KiB
TypeScript
import { useSyncExternalStore } from "react";
|
||
import { useTranslation } from "react-i18next";
|
||
import { AlertCircle, AlertTriangle, CheckCircle2, Info, X, XCircle } from "lucide-react";
|
||
import { dismiss, getActiveToasts, subscribe, type NotifLevel } from "../lib/notifications";
|
||
|
||
export const LEVEL_STYLE: Record<NotifLevel, { icon: typeof Info; color: string; bar: string }> = {
|
||
info: { icon: Info, color: "text-accent", bar: "bg-accent" },
|
||
success: { icon: CheckCircle2, color: "text-emerald-400", bar: "bg-emerald-400" },
|
||
warning: { icon: AlertTriangle, color: "text-amber-400", bar: "bg-amber-400" },
|
||
error: { icon: AlertCircle, color: "text-red-400", bar: "bg-red-400" },
|
||
fatal: { icon: XCircle, color: "text-red-500", bar: "bg-red-500" },
|
||
};
|
||
|
||
export default function Toaster() {
|
||
const { t } = useTranslation();
|
||
const toasts = useSyncExternalStore(subscribe, getActiveToasts, getActiveToasts);
|
||
|
||
return (
|
||
// Stable, always-mounted polite live region — a polite region must PRE-EXIST in the DOM for a
|
||
// screen reader to announce content later inserted into it (a region created together with its
|
||
// first message is unreliably announced). `aria-live` (not role="status") on purpose:
|
||
// role="status" implies aria-atomic="true", which would re-read the WHOLE stack on every toast;
|
||
// aria-live defaults atomic=false, so only the newly-added toast is spoken. Error/fatal toasts
|
||
// additionally carry role="alert", which announces assertively on insertion regardless.
|
||
<div
|
||
aria-live="polite"
|
||
className="absolute bottom-4 left-4 z-overlay flex flex-col gap-2 w-80 max-w-[calc(100vw-2rem)]"
|
||
>
|
||
{toasts.map((toast) => {
|
||
const { icon: Icon, color, bar } = LEVEL_STYLE[toast.level];
|
||
const urgent = toast.level === "error" || toast.level === "fatal";
|
||
return (
|
||
<div
|
||
key={toast.id}
|
||
role={urgent ? "alert" : undefined}
|
||
className="toast-card glass relative overflow-hidden rounded-xl px-3 py-3 flex items-start gap-3 animate-[popIn_0.16s_ease]"
|
||
>
|
||
<Icon className={`w-5 h-5 shrink-0 mt-0.5 ${color}`} />
|
||
<div className="min-w-0 flex-1">
|
||
{toast.title && <div className="text-sm font-semibold">{toast.title}</div>}
|
||
<div className="text-sm break-words">
|
||
{toast.message}
|
||
{toast.repeat > 1 && (
|
||
<span className="ml-1.5 align-middle text-[11px] font-semibold text-muted tabular-nums">
|
||
×{toast.repeat}
|
||
</span>
|
||
)}
|
||
</div>
|
||
{toast.action && (
|
||
<button
|
||
onClick={() => {
|
||
toast.action!.onClick();
|
||
dismiss(toast.id);
|
||
}}
|
||
className="mt-1 text-accent text-sm font-semibold hover:underline"
|
||
>
|
||
{toast.action.label}
|
||
</button>
|
||
)}
|
||
</div>
|
||
<button
|
||
onClick={() => dismiss(toast.id)}
|
||
className="shrink-0 text-muted hover:text-fg"
|
||
title={t("notifications.dismiss")}
|
||
>
|
||
<X className="w-4 h-4" />
|
||
</button>
|
||
{toast.duration && (
|
||
<div
|
||
className={`absolute left-0 bottom-0 h-0.5 w-full origin-left ${bar}`}
|
||
style={{ animation: `toastbar ${toast.duration}ms linear forwards` }}
|
||
/>
|
||
)}
|
||
</div>
|
||
);
|
||
})}
|
||
</div>
|
||
);
|
||
}
|