Skip to content

fix(sidebar): restore status tooltip hit area #136

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

Open
brooksc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(sidebar): restore status tooltip hit area #136

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
28 changes: 24 additions & 4 deletions src/components/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import { ImportWorktreesDialog } from './ImportWorktreesDialog';
import { SidebarFooter } from './SidebarFooter';
import { IconButton } from './IconButton';
import { UpdateButton } from './UpdateButton';
import { StatusDot } from './StatusDot';
import { StatusDot, getDotTooltip } from './StatusDot';
import { theme } from '../lib/theme';
import { sf } from '../lib/fontScale';
import { mod } from '../lib/platform';
Expand Down Expand Up @@ -967,6 +967,10 @@ function CoordinatorFolder(props: TaskEntryProps) {
<div
class={`task-item${t().closingStatus === 'removing' ? ' task-item-removing' : ' task-item-appearing'}`}
data-task-index={idx()}
title={getDotTooltip(
getTaskDotStatus(props.taskId),
getTaskAttentionState(props.taskId),
)}
onClick={() => {
setActiveTask(props.taskId);
focusSidebar();
Expand Down Expand Up @@ -1004,7 +1008,11 @@ function CoordinatorFolder(props: TaskEntryProps) {
>
<div style={{ display: 'flex', 'align-items': 'center', gap: '6px' }}>
<CoordinatorIcon />
<StatusDot status={getTaskDotStatus(props.taskId)} size="sm" />
<StatusDot
status={getTaskDotStatus(props.taskId)}
size="sm"
attention={getTaskAttentionState(props.taskId)}
/>
<span style={{ overflow: 'hidden', 'text-overflow': 'ellipsis', flex: '1' }}>
{t().name}
</span>
Expand Down Expand Up @@ -1111,7 +1119,11 @@ function CollapsedTaskEntry(props: { taskId: string; indented?: boolean; coordin
<Show when={isCoordinator()}>
<CoordinatorIcon />
</Show>
<StatusDot status={getTaskDotStatus(props.taskId)} size="sm" />
<StatusDot
status={getTaskDotStatus(props.taskId)}
size="sm"
attention={getTaskAttentionState(props.taskId)}
/>
<Show when={t().gitIsolation === 'direct'}>
<span
style={{
Expand Down Expand Up @@ -1186,6 +1198,10 @@ function TaskRow(props: TaskRowProps) {
<div
class={`task-item${t().closingStatus === 'removing' ? ' task-item-removing' : ' task-item-appearing'}`}
data-task-index={props.indented ? undefined : idx()}
title={getDotTooltip(
getTaskDotStatus(props.taskId),
getTaskAttentionState(props.taskId),
)}
onClick={() => {
setActiveTask(props.taskId);
focusSidebar();
Expand Down Expand Up @@ -1227,7 +1243,11 @@ function TaskRow(props: TaskRowProps) {
}}
>
<div style={{ display: 'flex', 'align-items': 'center', gap: '6px' }}>
<StatusDot status={getTaskDotStatus(props.taskId)} size="sm" />
<StatusDot
status={getTaskDotStatus(props.taskId)}
size="sm"
attention={getTaskAttentionState(props.taskId)}
/>
<Show when={t().gitIsolation === 'direct'}>
<span
style={{
Expand Down
6 changes: 6 additions & 0 deletions src/components/StatusDot.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,10 @@ describe('StatusDot', () => {

expect(html).toContain('title="Ready for review"');
});

it('uses attention state for the rendered tooltip', () => {
const html = renderToString(() => StatusDot({ status: 'ready', attention: 'needs_input' }));

expect(html).toContain('title="Waiting for input"');
});
});
Loading