Skip to content

fix(site/src/pages/WorkspacePage/WorkspaceNotifications): make workspace notification pills keyboard accessible #24536

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
jeremyruppel merged 1 commit into from
Apr 22, 2026
Merged

fix(site/src/pages/WorkspacePage/WorkspaceNotifications): make workspace notification pills keyboard accessible #24536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
71 changes: 34 additions & 37 deletions site/src/pages/WorkspacePage/WorkspaceNotifications/Notifications.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ import type { AlertProps } from "#/components/Alert/Alert";
import { Button, type ButtonProps } from "#/components/Button/Button";
import { Pill } from "#/components/Pill/Pill";
import {
Tooltip,
TooltipContent,
TooltipProvider,
TooltipTrigger,
} from "#/components/Tooltip/Tooltip";
Popover,
PopoverContent,
PopoverTrigger,
} from "#/components/Popover/Popover";
import type { ThemeRole } from "#/theme/roles";

export type NotificationItem = {
Expand All @@ -33,55 +32,53 @@ export const Notifications: FC<NotificationsProps> = ({
const theme = useTheme();

return (
<TooltipProvider>
<Tooltip open={isOpen} onOpenChange={setIsOpen} delayDuration={0}>
<TooltipTrigger asChild>
<div
// Adds some spacing from the Tooltip content
className="py-2"
data-testid={`${severity}-notifications`}
>
<NotificationPill
items={items}
severity={severity}
icon={icon}
isTooltipOpen={isOpen}
/>
</div>
</TooltipTrigger>
<TooltipContent
align="end"
collisionPadding={16}
className="max-w-[400px] p-0 bg-surface-secondary border-surface-quaternary text-sm text-content-primary"
style={{
borderColor: theme.roles[severity].outline,
}}
<Popover open={isOpen} onOpenChange={setIsOpen}>
<PopoverTrigger asChild>
<button
type="button"
className="py-2 bg-transparent border-none cursor-pointer"
data-testid={`${severity}-notifications`}
>
{items.map((n) => (
<NotificationItem notification={n} key={n.title} />
))}
</TooltipContent>
</Tooltip>
</TooltipProvider>
<NotificationPill
items={items}
severity={severity}
icon={icon}
isOpen={isOpen}
/>
</button>
</PopoverTrigger>
<PopoverContent
align="end"
collisionPadding={16}
className="max-w-[400px] p-0 w-auto bg-surface-secondary border-surface-quaternary text-sm text-content-primary"
style={{
borderColor: theme.roles[severity].outline,
}}
>
{items.map((n) => (
<NotificationItem notification={n} key={n.title} />
))}
</PopoverContent>
</Popover>
);
};

type NotificationPillProps = NotificationsProps & {
isTooltipOpen: boolean;
isOpen: boolean;
};

const NotificationPill: FC<NotificationPillProps> = ({
items,
severity,
icon,
isTooltipOpen,
isOpen,
}) => {
return (
<Pill
icon={icon}
css={(theme) => ({
"& svg": { color: theme.roles[severity].outline },
borderColor: isTooltipOpen ? theme.roles[severity].outline : undefined,
borderColor: isOpen ? theme.roles[severity].outline : undefined,
})}
>
{items.length}
Expand Down
4 changes: 3 additions & 1 deletion site/src/pages/WorkspacePage/WorkspaceNotifications/WorkspaceNotifications.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,9 @@ export const WorkspaceNotifications: FC<WorkspaceNotificationsProps> = ({
<Notifications
items={warningNotifications}
severity="warning"
icon={<TriangleAlertIcon className="size-icon-sm" />}
icon={
<TriangleAlertIcon aria-hidden="true" className="size-icon-sm" />
}
/>
)}
</div>
Expand Down
Loading