Files
BrowserOS/packages/browseros-agent/apps/agent/entrypoints/app/layout/SidebarLayout.tsx
Nikhil 7bdeeb85d5 fix: revert: convert settings to popup dialog (#477) (#498)
* Revert "feat: convert settings to popup dialog (#477)"

This reverts commit 42aa0ff1ef.

* fix: address review feedback for PR #498

- Remove erroneous SETTINGS_PAGE_VIEWED_EVENT tracking from SidebarLayout
  (was firing on every non-settings page navigation)
- Fix mobile settings sidebar not closing on route change by merging
  setMobileOpen(false) into the pathname-dependent analytics useEffect

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-19 11:13:14 -07:00

119 lines
3.7 KiB
TypeScript

import { Menu } from 'lucide-react'
import type { FC } from 'react'
import { useCallback, useEffect, useRef, useState } from 'react'
import { Outlet, useLocation } from 'react-router'
import { AppSidebar } from '@/components/sidebar/AppSidebar'
import { Button } from '@/components/ui/button'
import { Sheet, SheetContent } from '@/components/ui/sheet'
import { ShortcutsDialog } from '@/entrypoints/newtab/index/ShortcutsDialog'
import { useIsMobile } from '@/hooks/use-mobile'
import { RpcClientProvider } from '@/lib/rpc/RpcClientProvider'
const COLLAPSE_DELAY = 150
export const SidebarLayout: FC = () => {
const location = useLocation()
const isMobile = useIsMobile()
const [sidebarOpen, setSidebarOpen] = useState(false)
const [mobileOpen, setMobileOpen] = useState(false)
const [shortcutsDialogOpen, setShortcutsDialogOpen] = useState(false)
const collapseTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null)
const openShortcuts = useCallback(() => {
setShortcutsDialogOpen(true)
}, [])
useEffect(() => {
setMobileOpen(false)
}, [])
useEffect(() => {
return () => {
if (collapseTimeoutRef.current) {
clearTimeout(collapseTimeoutRef.current)
}
}
}, [])
const handleMouseEnter = useCallback(() => {
if (collapseTimeoutRef.current) {
clearTimeout(collapseTimeoutRef.current)
collapseTimeoutRef.current = null
}
setSidebarOpen(true)
}, [])
const handleMouseLeave = useCallback(() => {
collapseTimeoutRef.current = setTimeout(() => {
setSidebarOpen(false)
}, COLLAPSE_DELAY)
}, [])
if (isMobile) {
return (
<RpcClientProvider>
<div className="flex min-h-screen flex-col bg-background">
<header className="flex h-14 shrink-0 items-center gap-2 border-b px-4">
<Button
variant="ghost"
size="icon"
className="-ml-1 size-7"
onClick={() => setMobileOpen(true)}
>
<Menu className="size-4" />
</Button>
<span className="font-semibold">BrowserOS</span>
</header>
<main className="flex-1 overflow-y-auto">
<div className="mx-auto max-w-4xl px-4 py-8 sm:px-6 lg:px-8">
<Outlet />
</div>
</main>
<Sheet open={mobileOpen} onOpenChange={setMobileOpen}>
<SheetContent side="left" className="w-72 p-0">
<AppSidebar expanded onOpenShortcuts={openShortcuts} />
</SheetContent>
</Sheet>
<ShortcutsDialog
open={shortcutsDialogOpen}
onOpenChange={setShortcutsDialogOpen}
/>
</div>
</RpcClientProvider>
)
}
return (
<RpcClientProvider>
<div className="relative min-h-screen bg-background">
{/* Sidebar - fixed overlay */}
{/* biome-ignore lint/a11y/noStaticElementInteractions: hover interactions needed */}
<div
className="fixed inset-y-0 left-0 z-40"
onMouseEnter={handleMouseEnter}
onMouseLeave={handleMouseLeave}
>
<AppSidebar expanded={sidebarOpen} onOpenShortcuts={openShortcuts} />
</div>
{/* Main content - full width, centered */}
{location.pathname === '/home/chat' ? (
<main className="relative h-dvh overflow-hidden">
<Outlet />
</main>
) : (
<main className="min-h-screen overflow-y-auto">
<div className="mx-auto max-w-4xl px-4 py-8 sm:px-6 lg:px-8">
<Outlet />
</div>
</main>
)}
</div>
<ShortcutsDialog
open={shortcutsDialogOpen}
onOpenChange={setShortcutsDialogOpen}
/>
</RpcClientProvider>
)
}