Skip to content

Commit ac20a5e

Browse files
committed
Make sure the side menu can scroll
1 parent 91d852a commit ac20a5e

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

apps/webapp/app/components/navigation/SideMenu.tsx

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -160,17 +160,18 @@ export function SideMenu({
160160
return (
161161
<div
162162
className={cn(
163-
"relative grid h-full grid-cols-[100%] grid-rows-[2.5rem_1fr_auto] border-r border-grid-bright bg-background-bright transition-all duration-200",
163+
"relative h-full border-r border-grid-bright bg-background-bright transition-all duration-200",
164164
isCollapsed ? "w-[2.75rem]" : "w-56"
165165
)}
166166
>
167167
<CollapseToggle isCollapsed={isCollapsed} onToggle={() => setIsCollapsed(!isCollapsed)} />
168-
<div
169-
className={cn(
170-
"flex min-w-0 items-center overflow-hidden border-b px-1 py-1 transition duration-300",
171-
showHeaderDivider || isCollapsed ? "border-grid-bright" : "border-transparent"
172-
)}
173-
>
168+
<div className="absolute inset-0 grid grid-cols-[100%] grid-rows-[2.5rem_1fr_auto] overflow-hidden">
169+
<div
170+
className={cn(
171+
"flex min-w-0 items-center overflow-hidden border-b px-1 py-1 transition duration-300",
172+
showHeaderDivider || isCollapsed ? "border-grid-bright" : "border-transparent"
173+
)}
174+
>
174175
<div className={cn("min-w-0", !isCollapsed && "flex-1")}>
175176
<ProjectSelector
176177
organizations={organizations}
@@ -200,7 +201,12 @@ export function SideMenu({
200201
) : null}
201202
</div>
202203
<div
203-
className="overflow-hidden overflow-y-auto pt-2 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600"
204+
className={cn(
205+
"min-h-0 overflow-y-auto pt-2",
206+
isCollapsed
207+
? "scrollbar-none"
208+
: "scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600"
209+
)}
204210
ref={borderRef}
205211
>
206212
<div className="mb-6 flex w-full flex-col gap-4 overflow-hidden px-1">
@@ -428,6 +434,7 @@ export function SideMenu({
428434
)}
429435
</motion.div>
430436
</div>
437+
</div>
431438
</div>
432439
);
433440
}

0 commit comments

Comments
 (0)