Skip to content

Fix sidebar click #40

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
ScriptSmith merged 2 commits into from
May 31, 2026
+37 −15
Merged

Fix sidebar click #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2ecc62
Fix sidebar click
ScriptSmith May 31, 2026
027cb30
Review fixes
ScriptSmith May 31, 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
20 changes: 14 additions & 6 deletions ui/src/components/ConversationList/ConversationList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,17 +143,25 @@ const ConversationItem = memo(
<li>
<div
className={cn(
"group flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors",
"group relative flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors",
"hover:bg-accent hover:text-accent-foreground",
isSelected && "bg-accent text-accent-foreground"
)}
>
{/* Full-row click target so the whole bubble (not just the text) selects */}
<button
type="button"
className="flex min-w-0 flex-1 items-center gap-2 text-left"
onClick={() => onSelect(conv.id)}
aria-label={
`${conv.title}, ${conv.messages.length} messages` +
(conv.models.length > 0
? `, ${conv.models.length} model${conv.models.length !== 1 ? "s" : ""}`
: "")
}
aria-current={isSelected ? "page" : undefined}
>
className="absolute inset-0 cursor-pointer rounded-md"
onClick={() => onSelect(conv.id)}
/>
<div className="flex min-w-0 flex-1 items-center gap-2" aria-hidden="true">
<MessageSquare
className={cn(
"h-4 w-4 shrink-0",
Expand All @@ -178,14 +186,14 @@ const ConversationItem = memo(
)}
</div>
</div>
</button>
</div>
Comment thread
greptile-apps[bot] marked this conversation as resolved.
<Dropdown>
<DropdownTrigger asChild showChevron={false}>
<button
type="button"
aria-label="Conversation actions"
className={cn(
"inline-flex items-center justify-center h-6 w-6 shrink-0 p-0 opacity-0 transition-opacity",
"relative z-10 inline-flex items-center justify-center h-6 w-6 shrink-0 p-0 opacity-0 transition-opacity",
"group-hover:opacity-100",
isSelected && "opacity-100"
)}
Expand Down
32 changes: 23 additions & 9 deletions ui/src/components/Sidebar/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ function SortablePinnedItem({
<ConversationPreview conv={conv}>
<div
className={cn(
"group flex w-full items-center gap-1 rounded-lg px-1 py-1.5 text-sm",
"group relative flex w-full items-center gap-1 rounded-lg px-1 py-1.5 text-sm",
"hover:bg-accent/50",
isActive ? "bg-accent text-accent-foreground font-medium" : "text-foreground/80"
)}
Expand All @@ -276,7 +276,7 @@ function SortablePinnedItem({
{/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions -- DnD kit provides keyboard handlers via {...attributes} and {...listeners} */}
<div
className={cn(
"flex h-6 w-5 shrink-0 cursor-grab items-center justify-center rounded text-muted-foreground",
"relative z-10 flex h-6 w-5 shrink-0 cursor-grab items-center justify-center rounded text-muted-foreground",
"opacity-0 group-hover:opacity-100 hover:bg-muted active:cursor-grabbing",
isDragging && "opacity-100"
)}
Expand All @@ -288,10 +288,18 @@ function SortablePinnedItem({
<GripVertical className="h-3.5 w-3.5" />
</div>

{/* Full-row click target so the whole bubble (not just the text) selects */}
<button
type="button"
aria-label={conv.title}
className="absolute inset-0 cursor-pointer rounded-lg"
onClick={onSelect}
/>

{/* Title */}
<button type="button" className="min-w-0 flex-1 truncate text-left" onClick={onSelect}>
<span className="min-w-0 flex-1 truncate text-left" aria-hidden="true">
{conv.title}
</button>
</span>

{/* Actions dropdown */}
<Dropdown>
Expand All @@ -300,7 +308,7 @@ function SortablePinnedItem({
type="button"
aria-label="Conversation actions"
className={cn(
"inline-flex items-center justify-center h-6 w-6 shrink-0 rounded-md p-0 opacity-0 transition-opacity hover:bg-muted",
"relative z-10 inline-flex items-center justify-center h-6 w-6 shrink-0 rounded-md p-0 opacity-0 transition-opacity hover:bg-muted",
"group-hover:opacity-100",
isActive && "opacity-100"
)}
Expand Down Expand Up @@ -909,28 +917,34 @@ export function Sidebar({
<ConversationPreview conv={conv}>
<div
className={cn(
"group flex w-full items-center gap-2 rounded-lg px-2 py-1.5 text-sm",
"group relative flex w-full items-center gap-2 rounded-lg px-2 py-1.5 text-sm",
"hover:bg-accent/50",
isActive(conv) && isChatRoute
? "bg-accent text-accent-foreground font-medium"
: "text-foreground/80"
)}
onContextMenu={(e) => handleContextMenu(e, conv)}
>
{/* Full-row click target so the whole bubble (not just the text) selects */}
<button
type="button"
className="min-w-0 flex-1 truncate text-left"
aria-label={conv.title}
className="absolute inset-0 cursor-pointer rounded-lg"
onClick={() => handleSelectConversation(conv.id)}
/>
<span
className="min-w-0 flex-1 truncate text-left"
aria-hidden="true"
>
{conv.title}
</button>
</span>
<Dropdown>
<DropdownTrigger asChild showChevron={false}>
<button
type="button"
aria-label="Conversation actions"
className={cn(
"inline-flex items-center justify-center h-6 w-6 shrink-0 rounded-md p-0 opacity-0 transition-opacity hover:bg-muted",
"relative z-10 inline-flex items-center justify-center h-6 w-6 shrink-0 rounded-md p-0 opacity-0 transition-opacity hover:bg-muted",
"group-hover:opacity-100",
isActive(conv) && "opacity-100"
)}
Expand Down
Loading