Skip to content
Merged
Changes from all commits
Commits
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
101 changes: 63 additions & 38 deletions packages/ui/src/features/sidebar/components/items/TaskIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export function getOriginProductMeta(
// clickable NestedButton that opens the originating thread externally.
// SidebarItem renders the row as a `<button>`, so a real `<a>` or a nested
// `<button>` here would be invalid HTML.
function renderIconSpan({
function IconSpan({
icon,
link,
ariaLabel,
Expand All @@ -72,7 +72,18 @@ function renderIconSpan({
ariaLabel?: string;
}) {
if (!link) {
return <span className="flex items-center justify-center">{icon}</span>;
if (!ariaLabel) {
return <span className="flex items-center justify-center">{icon}</span>;
}
return (
<span
aria-label={ariaLabel}
className="flex items-center justify-center"
role="img"
>
{icon}
</span>
);
}
return (
<NestedButton
Expand Down Expand Up @@ -112,11 +123,11 @@ function CloudStatusIcon({
}
side="right"
>
{renderIconSpan({
icon: <Icon size={size} className="ph-pulse" />,
link,
ariaLabel,
})}
<IconSpan
icon={<Icon size={size} className="ph-pulse" />}
link={link}
ariaLabel={ariaLabel}
/>
</Tooltip>
);
}
Expand All @@ -128,11 +139,11 @@ function CloudStatusIcon({
}
side="right"
>
{renderIconSpan({
icon: <Icon size={size} weight="fill" color="var(--accent-11)" />,
link,
ariaLabel,
})}
<IconSpan
icon={<Icon size={size} weight="fill" color="var(--accent-11)" />}
link={link}
ariaLabel={ariaLabel}
/>
</Tooltip>
);
}
Expand All @@ -144,29 +155,47 @@ function CloudStatusIcon({
}
side="right"
>
{renderIconSpan({
icon: <Icon size={size} weight="fill" color="var(--green-11)" />,
link,
ariaLabel,
})}
<IconSpan
icon={<Icon size={size} weight="fill" color="var(--green-11)" />}
link={link}
ariaLabel={ariaLabel}
/>
</Tooltip>
);
}
if (taskRunStatus === "cancelled") {
return (
<Tooltip
content={
link ? `Open ${sourceLabel} thread` : `${sourceLabel} (stopped)`
}
side="right"
>
<IconSpan
icon={<Icon size={size} weight="fill" color="var(--green-11)" />}
link={link}
ariaLabel={
link
? `Open ${sourceLabel} thread (stopped)`
: `${sourceLabel} (stopped)`
}
/>
</Tooltip>
);
}
if (taskRunStatus === "failed" || taskRunStatus === "cancelled") {
const statusLabel =
taskRunStatus === "cancelled"
? `${sourceLabel} (cancelled)`
: `${sourceLabel} (failed)`;
if (taskRunStatus === "failed") {
return (
<Tooltip
content={link ? `Open ${sourceLabel} thread` : statusLabel}
content={
link ? `Open ${sourceLabel} thread` : `${sourceLabel} (failed)`
}
side="right"
>
{renderIconSpan({
icon: <Icon size={size} weight="fill" color="var(--red-11)" />,
link,
ariaLabel,
})}
<IconSpan
icon={<Icon size={size} weight="fill" color="var(--red-11)" />}
link={link}
ariaLabel={ariaLabel}
/>
</Tooltip>
);
}
Expand All @@ -175,11 +204,7 @@ function CloudStatusIcon({
content={link ? `Open ${sourceLabel} thread` : sourceLabel}
side="right"
>
{renderIconSpan({
icon: <Icon size={size} />,
link,
ariaLabel,
})}
<IconSpan icon={<Icon size={size} />} link={link} ariaLabel={ariaLabel} />
</Tooltip>
);
}
Expand Down Expand Up @@ -351,11 +376,11 @@ export function TaskIcon({
content={link ? `Open ${label} thread` : `From ${label}`}
side="right"
>
{renderIconSpan({
icon: <Icon size={size} color="var(--gray-10)" />,
link,
ariaLabel: `Open ${label} thread`,
})}
<IconSpan
icon={<Icon size={size} color="var(--gray-10)" />}
link={link}
ariaLabel={`Open ${label} thread`}
/>
</Tooltip>
);
}
Expand Down
Loading