Skip to content

[AI] What to change: The left side menu. #31

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
burkongla wants to merge 2 commits into
base: main
Choose a base branch
from
+42 −13
Open

[AI] What to change: The left side menu. #31

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
505e0e6
feat: What to change: The left side menu.
Apr 25, 2026
130989a
feat: follow-up — Fix sidebar bug so sub-categories stay expanded whe…
Apr 26, 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
55 changes: 42 additions & 13 deletions src/components/layout/sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,15 @@ const ProjectLogo = ({

export function Sidebar({ className }: SidebarProps) {
const pathname = usePathname()
const [expandedItems, setExpandedItems] = useState<string[]>(["Settings"])
// The Sidebar is mounted per-page (not in a shared layout), so its state
// is wiped on every navigation. Derive the initially-expanded parent from
// the current path so the active sub-item's parent stays expanded across
// sub-item clicks and on hard refresh.
const [expandedItems, setExpandedItems] = useState<string[]>(() => {
if (pathname?.startsWith("/reports/")) return ["Reports"]
if (pathname?.startsWith("/settings/")) return ["Settings"]
return []
})
const [isCollapsed, setIsCollapsed] = useState(false)
const { user } = useUser()
const isAuthenticated = !!user?.id
Expand Down Expand Up @@ -120,7 +128,7 @@ export function Sidebar({ className }: SidebarProps) {

const toggleExpanded = (itemName: string) => {
setExpandedItems((prev) =>
prev.includes(itemName) ? prev.filter((item) => item !== itemName) : [...prev, itemName],
prev.includes(itemName) ? prev.filter((item) => item !== itemName) : [itemName],
)
}

Expand Down Expand Up @@ -306,24 +314,45 @@ export function Sidebar({ className }: SidebarProps) {
<div key={item.name}>
{item.subItems ? (
<div>
<button
type="button"
onClick={() => toggleExpanded(item.name)}
className={`w-full flex items-center gap-3 px-3 py-2 rounded-lg text-sm font-medium transition-colors cursor-pointer ${
<div
className={`w-full flex items-center gap-3 px-3 py-2 rounded-lg text-sm font-medium transition-colors ${
isActive ? activeClasses : inactiveClasses
}`}
title={isCollapsed ? item.name : undefined}
>
<FlaticonIcon iconClass={item.icon} className="w-5 h-5 flex-shrink-0" />
<div
role="button"
tabIndex={0}
onClick={() => {
if (!isExpanded) setExpandedItems([item.name])
}}
onKeyDown={(e) => {
if ((e.key === "Enter" || e.key === " ") && !isExpanded) {
e.preventDefault()
setExpandedItems([item.name])
}
}}
className="flex items-center gap-3 flex-1 min-w-0 cursor-pointer"
>
<FlaticonIcon iconClass={item.icon} className="w-5 h-5 flex-shrink-0" />
{!isCollapsed && <span>{item.name}</span>}
</div>
{!isCollapsed && (
<>
{item.name}
<button
type="button"
onClick={(e) => {
e.stopPropagation()
toggleExpanded(item.name)
}}
aria-label={`${isExpanded ? "Collapse" : "Expand"} ${item.name}`}
className="flex-shrink-0 cursor-pointer"
>
<ChevronRight
className={`w-4 h-4 ml-auto transition-transform ${isExpanded ? "rotate-90" : ""}`}
className={`w-4 h-4 transition-transform ${isExpanded ? "rotate-90" : ""}`}
/>
</>
</button>
)}
</button>
</div>
{!isCollapsed && isExpanded && (
<div className="ml-6 mt-1 space-y-1">
{item.subItems.map((subItem) => {
Expand All @@ -345,7 +374,7 @@ export function Sidebar({ className }: SidebarProps) {
)}
</div>
) : (
<Link href={item.href}>
<Link href={item.href} onClick={() => setExpandedItems([])}>
<div
className={`flex items-center gap-3 px-3 py-2 rounded-lg text-sm font-medium transition-colors ${
isActive ? activeClasses : inactiveClasses
Expand Down