Skip to content

fix: sidebar footer items stay as text when the sidebar is collapsed #550

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
IliaAvdeev wants to merge 1 commit into
base: dev
Choose a base branch
from
+18 −11
Open

fix: sidebar footer items stay as text when the sidebar is collapsed #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions web/components/sidebar/SidebarShell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,12 @@ interface SidebarShellProps {
onSelectSession?: (sessionId: string) => void | Promise<void>;
onRenameSession?: (sessionId: string, title: string) => void | Promise<void>;
onDeleteSession?: (sessionId: string) => void | Promise<void>;
footerSlot?: ReactNode;
/**
* Footer content rendered below the nav. Pass a render function to receive
* the current ``collapsed`` state so footer items (e.g. Admin / Sign out) can
* switch to their icon-only variant when the rail is collapsed.
*/
footerSlot?: ReactNode | ((collapsed: boolean) => ReactNode);
}

export function SidebarShell({
Expand All @@ -117,6 +122,8 @@ export function SidebarShell({
const { t } = useTranslation();
const { sidebarCollapsed: collapsed, setSidebarCollapsed: setCollapsed } =
useAppShell();
const renderedFooter =
typeof footerSlot === "function" ? footerSlot(collapsed) : footerSlot;
const [recentsCollapsed, setRecentsCollapsed] = useState(false);

// Hydrate Recents collapse from localStorage after first render to stay SSR-safe.
Expand Down Expand Up @@ -236,7 +243,7 @@ export function SidebarShell({
</Link>
);
})}
{footerSlot}
{renderedFooter}
<a
href={DOCS_URL}
target="_blank"
Expand Down Expand Up @@ -389,7 +396,7 @@ export function SidebarShell({
</Link>
);
})}
{footerSlot}
{renderedFooter}
<div className="mt-0.5 flex items-center gap-0.5">
<VersionBadge />
<a
Expand Down
8 changes: 4 additions & 4 deletions web/components/sidebar/UtilitySidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ export default function UtilitySidebar() {
onSelectSession={handleSelectSession}
onRenameSession={handleRenameSession}
onDeleteSession={handleDeleteSession}
footerSlot={
footerSlot={(collapsed) => (
<>
<AdminLink />
<LogoutButton />
<AdminLink collapsed={collapsed} />
<LogoutButton collapsed={collapsed} />
</>
}
)}
/>
);
}
8 changes: 4 additions & 4 deletions web/components/sidebar/WorkspaceSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,12 @@ export default function WorkspaceSidebar() {
onSelectSession={handleSelectSession}
onRenameSession={handleRenameSession}
onDeleteSession={handleDeleteSession}
footerSlot={
footerSlot={(collapsed) => (
<>
<AdminLink />
<LogoutButton />
<AdminLink collapsed={collapsed} />
<LogoutButton collapsed={collapsed} />
</>
}
)}
/>
);
}