Skip to content

fix(web): sidebar project filter rows line up and stay still on hover #29639

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
shivamhwp merged 15 commits into from
Nov 5, 2026
+66 −31
Merged

fix(web): sidebar project filter rows line up and stay still on hover #29639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
135b9b1
fix(web): sidebar project filter rows no longer shift on hover
shivamhwp Nov 2, 2026
a1b46c9
fix(web): separate project filter touch targets
maria-rcks Nov 3, 2026
65133bd
fix(web): distinguish highlighted selected projects
maria-rcks Nov 3, 2026
889523d
fix(web): project pickers mark machines on the icon and select with c…
shivamhwp Nov 3, 2026
355e1ce
fix(web): clicking the machine badge toggles the project checkbox
shivamhwp Nov 3, 2026
635b659
fix(web): checked projects hide their machine badge
shivamhwp Nov 3, 2026
7c7c03e
fix(web): show the machine icon after the project name
shivamhwp Nov 3, 2026
f385638
fix(web): keep the machine icon on checked projects
shivamhwp Nov 3, 2026
fe38d9b
fix(web): mark checked projects with a small check on their icon
shivamhwp Nov 4, 2026
f4f50cc
fix(web): put the selected-project check on the icon's bottom-left
shivamhwp Nov 4, 2026
4467d63
fix(web): toggle filter projects from their icon, with a ring on hover
shivamhwp Nov 5, 2026
1b82d6c
fix(web): bigger touch target for toggling filter projects
shivamhwp Nov 5, 2026
7825bd6
fix(web): keep the gear next to the pin on touch
shivamhwp Nov 5, 2026
a714362
fix(web): keep main's badge-only selection in the project filter
shivamhwp Nov 5, 2026
075b4f5
fix(web): drop the hover ring; Shift-click stays the way to pick seve…
shivamhwp Nov 5, 2026
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
18 changes: 18 additions & 0 deletions apps/web/src/components/ProjectComboboxRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import type { ReactNode } from "react";

/** Settings shows only on the highlighted row; the pin keeps the far-right column. */
export function ProjectRowActions(props: {
readonly settings?: ReactNode;
readonly pin?: ReactNode;
}) {
return (
<span className="ml-auto flex shrink-0 items-center pointer-coarse:gap-1">
{props.settings ? (
<span className="flex pointer-fine:invisible pointer-fine:in-data-highlighted:visible">
{props.settings}
</span>
) : null}
{props.pin ?? <span className="size-7 sm:size-6" />}
</span>
);
}
2 changes: 1 addition & 1 deletion apps/web/src/components/ProjectEnvironmentBadge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export function ProjectEnvironmentBadge(props: {
<span
role="img"
aria-label={description}
className="ml-auto inline-flex shrink-0 items-center text-muted-foreground"
className="inline-flex shrink-0 items-center text-muted-foreground"
/>
}
>
Expand Down
77 changes: 47 additions & 30 deletions apps/web/src/components/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ import type { SidebarThreadSummary } from "../types";
import { isScratchProject } from "@t3tools/client-runtime/state/projects";
import { cn } from "~/lib/utils";
import { ProjectEnvironmentBadge } from "./ProjectEnvironmentBadge";
import { ProjectRowActions } from "./ProjectComboboxRow";
import {
buildDraftActionMenuItems,
buildThreadActionMenuItems,
Expand Down Expand Up @@ -3020,13 +3021,18 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
}
>
{scopedProjectGroups.length > 1 ? (
<span className="flex shrink-0 -space-x-1.5">
{scopedProjectGroups.slice(0, 2).map((project) => (
<ProjectFavicon
<span className="flex shrink-0">
{scopedProjectGroups.slice(0, 2).map((project, index) => (
<span
key={project.projectKey}
project={project}
className="size-3.5"
/>
className={
index === 0
? "flex"
: "-ml-1 flex rounded-[25%] bg-sidebar ring-2 ring-sidebar"
}
>
<ProjectFavicon project={project} className="size-3.5" />
</span>
))}
</span>
) : scopedProjectGroups[0] ? (
Expand Down Expand Up @@ -3117,15 +3123,7 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
<FolderIcon className="size-4 shrink-0" />
)}
</ProjectScopeRowIcon>
<span className="min-w-0 flex-1 truncate text-sm">{item.label}</span>
{project && canPinProject(project) ? (
<ProjectPinButton
name={project.displayName}
pinned={project.pinned}
shortcutLabel={shortcutLabelForCommand(keybindings, "thread.pin")}
onToggle={() => toggleProjectGroupPin(project)}
/>
) : null}
<span className="min-w-0 truncate text-sm">{item.label}</span>
{project && showProjectEnvironments ? (
<ProjectEnvironmentBadge
group={project}
Expand All @@ -3134,21 +3132,40 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
/>
) : null}
{project ? (
<Button
size="icon-xs"
variant="ghost-muted"
tabIndex={-1}
aria-hidden="true"
title={`Project settings for ${project.displayName}`}
className={canPinProject(project) ? undefined : "ml-auto"}
onPointerDown={(event) => event.stopPropagation()}
onClick={(event) => {
void handleProjectSettings(event, project);
}}
>
<SettingsIcon className="size-3.5" />
</Button>
) : null}
<ProjectRowActions
pin={
canPinProject(project) ? (
<ProjectPinButton
name={project.displayName}
pinned={project.pinned}
shortcutLabel={shortcutLabelForCommand(
keybindings,
"thread.pin",
)}
onToggle={() => toggleProjectGroupPin(project)}
/>
) : null
}
settings={
<Button
size="icon-xs"
variant="ghost-muted"
tabIndex={-1}
aria-hidden="true"
title={`Project settings for ${project.displayName}`}
onPointerDown={(event) => event.stopPropagation()}
onClick={(event) => {
void handleProjectSettings(event, project);
}}
>
<SettingsIcon className="size-3.5" />
</Button>
}
/>
) : (
// Keeps "All projects" as tall as the project rows.
<span className="ml-auto size-7 shrink-0 sm:size-6" />
)}
</ComboboxItem>
);
}}
Expand Down
Loading