@@ -199,7 +199,11 @@ import { SidebarChromeFooter, SidebarChromeHeader } from "./sidebar/SidebarChrom
199199import { useCopyToClipboard } from "~/hooks/useCopyToClipboard" ;
200200import { useIsMobile } from "~/hooks/useMediaQuery" ;
201201import { CommandDialogTrigger } from "./ui/command" ;
202- import { useClientSettings , useUpdateClientSettings } from "~/hooks/useSettings" ;
202+ import {
203+ useClientSettings ,
204+ useCompactSidebarEnabled ,
205+ useUpdateClientSettings ,
206+ } from "~/hooks/useSettings" ;
203207import { primaryServerKeybindingsAtom } from "../state/server" ;
204208import {
205209 derivePhysicalProjectKey ,
@@ -1194,7 +1198,9 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
11941198 const router = useRouter ( ) ;
11951199 const queuePendingFileDrop = useSidebarPendingFileDropStore ( ( s ) => s . queuePendingFileDrop ) ;
11961200 const clearPendingFileDrop = useSidebarPendingFileDropStore ( ( s ) => s . clearPendingFileDrop ) ;
1197- const { isMobile, setOpenMobile } = useSidebar ( ) ;
1201+ const { isMobile, setOpenMobile, state, setOpen } = useSidebar ( ) ;
1202+ const compactSidebarEnabled = useCompactSidebarEnabled ( ) ;
1203+ const isCompact = compactSidebarEnabled && ! isMobile && state === "collapsed" ;
11981204 const markThreadUnread = useUiStateStore ( ( state ) => state . markThreadUnread ) ;
11991205 const setProjectExpanded = useUiStateStore ( ( state ) => state . setProjectExpanded ) ;
12001206 const toggleThreadSelection = useThreadSelectionStore ( ( state ) => state . toggleThread ) ;
@@ -1445,10 +1451,13 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
14451451 if ( useThreadSelectionStore . getState ( ) . hasSelection ( ) ) {
14461452 clearSelection ( ) ;
14471453 }
1448- setProjectExpanded ( projectPreferenceKeys , ! projectExpanded ) ;
1454+ setProjectExpanded ( projectPreferenceKeys , isCompact || ! projectExpanded ) ;
1455+ if ( isCompact ) setOpen ( true ) ;
14491456 } ,
14501457 [
14511458 clearSelection ,
1459+ isCompact ,
1460+ setOpen ,
14521461 dragInProgressRef ,
14531462 projectExpanded ,
14541463 projectPreferenceKeys ,
@@ -1465,9 +1474,17 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
14651474 if ( dragInProgressRef . current ) {
14661475 return ;
14671476 }
1468- setProjectExpanded ( projectPreferenceKeys , ! projectExpanded ) ;
1477+ setProjectExpanded ( projectPreferenceKeys , isCompact || ! projectExpanded ) ;
1478+ if ( isCompact ) setOpen ( true ) ;
14691479 } ,
1470- [ dragInProgressRef , projectExpanded , projectPreferenceKeys , setProjectExpanded ] ,
1480+ [
1481+ dragInProgressRef ,
1482+ isCompact ,
1483+ projectExpanded ,
1484+ projectPreferenceKeys ,
1485+ setOpen ,
1486+ setProjectExpanded ,
1487+ ] ,
14711488 ) ;
14721489
14731490 const handleProjectButtonPointerDownCapture = useCallback (
@@ -2359,8 +2376,10 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
23592376 < >
23602377 < div className = "group/project-header relative" >
23612378 < SidebarMenuButton
2379+ tooltip = { project . displayName }
2380+ aria-label = { project . displayName }
23622381 ref = { isManualProjectSorting ? dragHandleProps ?. setActivatorNodeRef : undefined }
2363- className = { `pr-8 group-hover/project-header:bg-sidebar-row-hover group-hover/project-header:text-sidebar-foreground max-sm:pr-14 ${
2382+ className = { `pr-8 group-hover/project-header:bg-sidebar-row-hover group-hover/project-header:text-sidebar-foreground max-sm:pr-14 group-data-[collapsible=icon]:justify-center ${
23642383 isManualProjectSorting ? "cursor-grab active:cursor-grabbing" : ""
23652384 } `}
23662385 { ...( isManualProjectSorting && dragHandleProps ? dragHandleProps . attributes : { } ) }
@@ -2370,7 +2389,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
23702389 onKeyDown = { handleProjectButtonKeyDown }
23712390 onContextMenu = { handleProjectButtonContextMenu }
23722391 >
2373- { ! projectExpanded && projectStatus ? (
2392+ { isCompact ? null : ! projectExpanded && projectStatus ? (
23742393 < Tooltip >
23752394 < TooltipTrigger
23762395 render = {
@@ -2401,7 +2420,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
24012420 < span className = "flex shrink-0" >
24022421 < ProjectFavicon project = { project } />
24032422 </ span >
2404- < span className = "flex min-w-0 flex-1 items-center gap-2" >
2423+ < span className = "flex min-w-0 flex-1 items-center gap-2 group-data-[collapsible=icon]:hidden " >
24052424 < span className = "truncate text-sm font-medium text-sidebar-foreground/90" >
24062425 { project . displayName }
24072426 </ span >
@@ -2415,7 +2434,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
24152434 { /* Environment badge – visible by default, crossfades with the
24162435 "new thread" button on hover using the same pointer-events +
24172436 opacity pattern as the thread row archive/timestamp swap. */ }
2418- { project . environmentPresence === "remote-only" && (
2437+ { ! isCompact && project . environmentPresence === "remote-only" && (
24192438 < Tooltip >
24202439 < TooltipTrigger
24212440 render = {
@@ -2441,7 +2460,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
24412460 < Tooltip >
24422461 < TooltipTrigger
24432462 render = {
2444- < div className = "pointer-events-none absolute top-[calc(50%+1px)] right-0.5 -translate-y-1/2 opacity-0 transition-opacity duration-150 max-sm:pointer-events-auto max-sm:opacity-100 group-hover/project-header:pointer-events-auto group-hover/project-header:opacity-100 group-focus-within/project-header:pointer-events-auto group-focus-within/project-header:opacity-100" >
2463+ < div className = "pointer-events-none absolute top-[calc(50%+1px)] right-0.5 -translate-y-1/2 opacity-0 transition-opacity duration-150 max-sm:pointer-events-auto max-sm:opacity-100 group-hover/project-header:pointer-events-auto group-hover/project-header:opacity-100 group-focus-within/project-header:pointer-events-auto group-focus-within/project-header:opacity-100 group-data-[collapsible=icon]:hidden " >
24452464 < button
24462465 type = "button"
24472466 aria-label = { `Create new thread in ${ project . displayName } ` }
@@ -2674,7 +2693,7 @@ function LocalSecondaryStatus() {
26742693 }
26752694
26762695 return (
2677- < SidebarGroup className = "px-2 pt-2 pb-0" >
2696+ < SidebarGroup className = "px-2 pt-2 pb-0 group-data-[collapsible=icon]:hidden " >
26782697 { connecting . length > 0 ? (
26792698 < Alert
26802699 variant = "default"
@@ -2978,14 +2997,16 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
29782997 render = {
29792998 < SidebarMenuButton
29802999 className = "focus-visible:ring-0"
3000+ tooltip = "Search"
3001+ aria-label = "Search"
29813002 data-testid = "command-palette-trigger"
29823003 />
29833004 }
29843005 >
29853006 < SearchIcon />
2986- < span className = "flex-1 truncate" > Search</ span >
3007+ < span className = "flex-1 truncate group-data-[collapsible=icon]:hidden " > Search</ span >
29873008 { commandPaletteShortcutLabel ? (
2988- < Kbd className = "h-4 min-w-0 rounded-sm px-1.5 text-[10px]" >
3009+ < Kbd className = "h-4 min-w-0 rounded-sm px-1.5 text-[10px] group-data-[collapsible=icon]:hidden " >
29893010 { commandPaletteShortcutLabel }
29903011 </ Kbd >
29913012 ) : null }
@@ -2996,7 +3017,7 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
29963017 }
29973018 >
29983019 { showArm64IntelBuildWarning && arm64IntelBuildWarningDescription ? (
2999- < SidebarGroup className = "px-2 pt-2 pb-0" >
3020+ < SidebarGroup className = "px-2 pt-2 pb-0 group-data-[collapsible=icon]:hidden " >
30003021 < Alert variant = "warning" className = "rounded-2xl border-warning/40 bg-warning/8" >
30013022 < TriangleAlertIcon />
30023023 < AlertTitle > Intel build on Apple Silicon</ AlertTitle >
@@ -3020,17 +3041,21 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
30203041 ) : null }
30213042 < LocalSecondaryStatus />
30223043 < SidebarGroup className = "px-2 py-2" >
3023- < div className = "mb-1 flex items-center justify-between pl-2 pr-1.5" >
3024- < span className = "text-xs font-medium text-sidebar-muted-foreground/80" > Projects</ span >
3044+ < div className = "mb-1 flex items-center justify-between pl-2 pr-1.5 group-data-[collapsible=icon]:justify-center group-data-[collapsible=icon]:px-0" >
3045+ < span className = "text-xs font-medium text-sidebar-muted-foreground/80 group-data-[collapsible=icon]:hidden" >
3046+ Projects
3047+ </ span >
30253048 < div className = "flex items-center gap-1" >
3026- < ProjectSortMenu
3027- projectSortOrder = { projectSortOrder }
3028- threadSortOrder = { threadSortOrder }
3029- threadPreviewCount = { threadPreviewCount }
3030- onProjectSortOrderChange = { handleProjectSortOrderChange }
3031- onThreadSortOrderChange = { handleThreadSortOrderChange }
3032- onThreadPreviewCountChange = { handleThreadPreviewCountChange }
3033- />
3049+ < div className = "group-data-[collapsible=icon]:hidden" >
3050+ < ProjectSortMenu
3051+ projectSortOrder = { projectSortOrder }
3052+ threadSortOrder = { threadSortOrder }
3053+ threadPreviewCount = { threadPreviewCount }
3054+ onProjectSortOrderChange = { handleProjectSortOrderChange }
3055+ onThreadSortOrderChange = { handleThreadSortOrderChange }
3056+ onThreadPreviewCountChange = { handleThreadPreviewCountChange }
3057+ />
3058+ </ div >
30343059 < Tooltip >
30353060 < TooltipTrigger
30363061 render = {
@@ -3127,7 +3152,9 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
31273152 ) }
31283153
31293154 { projectsLength === 0 && (
3130- < div className = "px-2 pt-4 text-center text-secondary-label text-xs" > No projects yet</ div >
3155+ < div className = "px-2 pt-4 text-center text-secondary-label text-xs group-data-[collapsible=icon]:hidden" >
3156+ No projects yet
3157+ </ div >
31313158 ) }
31323159 </ SidebarGroup >
31333160 </ SidebarContent >
0 commit comments