Skip to content

AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.

fix(frontend): allow scrolling anywhere in the sidebar (#15343)

Toran Bruce Richards4429f1c0d6bb
diff --git a/autogpt_platform/frontend/src/components/layout/AppSidebar/AppSidebar.tsx b/autogpt_platform/frontend/src/components/layout/AppSidebar/AppSidebar.tsx
index 9329960483..adac74f3cd 100644
--- a/autogpt_platform/frontend/src/components/layout/AppSidebar/AppSidebar.tsx
+++ b/autogpt_platform/frontend/src/components/layout/AppSidebar/AppSidebar.tsx
@@ -180,23 +180,13 @@ function NavMenu({
function CollapsibleNavGroup({
label,
children,
- scrollable = false,
}: {
label: string;
children: ReactNode;
- scrollable?: boolean;
}) {
return (
- <Collapsible
- defaultOpen
- className={cn(
- "group/collapsible",
- scrollable && "flex min-h-0 flex-1 flex-col",
- )}
- >
- <SidebarGroup
- className={cn("py-1", scrollable && "flex min-h-0 flex-1 flex-col")}
- >
+ <Collapsible defaultOpen className="group/collapsible">
+ <SidebarGroup className="py-1">
<SidebarGroupLabel
asChild
className="text-[13px] font-medium text-zinc-500 group-data-[collapsible=icon]:hidden"
@@ -209,21 +199,8 @@ function CollapsibleNavGroup({
/>
</CollapsibleTrigger>
</SidebarGroupLabel>
- <CollapsibleContent
- className={cn(
- "overflow-hidden data-[state=closed]:animate-collapsible-up data-[state=open]:animate-collapsible-down motion-reduce:animate-none",
- scrollable && "flex min-h-0 flex-1 flex-col",
- )}
- >
- <SidebarGroupContent
- className={
- scrollable
- ? "min-h-0 flex-1 overflow-y-auto [-ms-overflow-style:none] [scrollbar-width:none] [&::-webkit-scrollbar]:hidden"
- : undefined
- }
- >
- {children}
- </SidebarGroupContent>
+ <CollapsibleContent className="overflow-hidden data-[state=closed]:animate-collapsible-up data-[state=open]:animate-collapsible-down motion-reduce:animate-none">
+ <SidebarGroupContent>{children}</SidebarGroupContent>
</CollapsibleContent>
</SidebarGroup>
</Collapsible>
@@ -264,19 +241,15 @@ export function AppSidebar(props: Props) {
}, [router]);
return (
- <Sidebar
- collapsible="icon"
- {...props}
- className="[&_[data-sidebar=sidebar]]:bg-[#fafafa]"
- >
- <AppSidebarHeader />
+ <Sidebar collapsible="icon" {...props}>
+ <SidebarContent className="scroll-py-16 gap-0 overflow-y-auto overflow-x-hidden overscroll-contain [-ms-overflow-style:none] [scrollbar-width:none] group-data-[collapsible=icon]:scroll-pt-24 group-data-[collapsible=icon]:overflow-y-auto [&::-webkit-scrollbar]:hidden">
+ <AppSidebarHeader />
- <SidebarContent className="gap-2 overflow-hidden">
<motion.div
variants={sidebarContainerVariants}
initial="hidden"
animate="show"
- className="flex min-h-0 flex-1 flex-col gap-2"
+ className="flex shrink-0 flex-col gap-2"
>
<motion.div variants={itemVariants}>
<SidebarGroup className="mt-0 py-1">
@@ -297,9 +270,9 @@ export function AppSidebar(props: Props) {
{isLoggedIn && (
<motion.div
variants={itemVariants}
- className="flex min-h-0 flex-1 flex-col group-data-[collapsible=icon]:hidden"
+ className="group-data-[collapsible=icon]:hidden"
>
- <CollapsibleNavGroup label="Recent chats" scrollable>
+ <CollapsibleNavGroup label="Recent chats">
{/* Suspense boundary: RecentChats reads useSearchParams(), which
Next.js requires to be wrapped to avoid forcing the route to
client-side rendering. */}
@@ -310,11 +283,11 @@ export function AppSidebar(props: Props) {
</motion.div>
)}
</motion.div>
- </SidebarContent>
- <SidebarUserActions />
+ <SidebarUserActions />
+ </SidebarContent>
- <SidebarRail />
+ <SidebarRail className="w-2 translate-x-0 after:left-0 group-data-[side=left]:-right-2 group-data-[side=right]:-left-2 group-data-[side=right]:after:left-auto group-data-[side=right]:after:right-0 sm:hidden md:flex" />
</Sidebar>
);
}
diff --git a/autogpt_platform/frontend/src/components/layout/AppSidebar/components/AppSidebarHeader/AppSidebarHeader.tsx b/autogpt_platform/frontend/src/components/layout/AppSidebar/components/AppSidebarHeader/AppSidebarHeader.tsx
index d3e0236da2..f0c6a9e042 100644
--- a/autogpt_platform/frontend/src/components/layout/AppSidebar/components/AppSidebarHeader/AppSidebarHeader.tsx
+++ b/autogpt_platform/frontend/src/components/layout/AppSidebar/components/AppSidebarHeader/AppSidebarHeader.tsx
@@ -44,7 +44,7 @@ export function AppSidebarHeader() {
);
return (
- <SidebarHeader className="mb-1 flex animate-fade-in flex-row items-center justify-between gap-2 p-2 group-data-[collapsible=icon]:flex-col">
+ <SidebarHeader className="sticky top-0 z-10 mb-1 flex shrink-0 animate-fade-in flex-row items-center justify-between gap-2 bg-sidebar p-2 group-data-[collapsible=icon]:flex-col">
<div
className={cn(
"relative flex items-center",
diff --git a/autogpt_platform/frontend/src/components/layout/AppSidebar/components/SidebarUserActions/SidebarUserActions.tsx b/autogpt_platform/frontend/src/components/layout/AppSidebar/components/SidebarUserActions/SidebarUserActions.tsx
index ef82c2a065..74f8538543 100644
--- a/autogpt_platform/frontend/src/components/layout/AppSidebar/components/SidebarUserActions/SidebarUserActions.tsx
+++ b/autogpt_platform/frontend/src/components/layout/AppSidebar/components/SidebarUserActions/SidebarUserActions.tsx
@@ -50,7 +50,7 @@ export function SidebarUserActions() {
);
return (
- <SidebarFooter className="border-t border-zinc-100 px-4">
+ <SidebarFooter className="sticky bottom-0 z-10 mt-auto shrink-0 border-t border-zinc-100 bg-sidebar px-4">
<div className="flex w-full items-center justify-between group-data-[collapsible=icon]:flex-col group-data-[collapsible=icon]:gap-1">
{isCollapsed ? (
<SidebarTooltip>