Skip to content

ui: improve sidebar layout and fixed-height app container #7

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
ilovesusu wants to merge 4 commits into
base: main
Choose a base branch
from
+26 −19
Open

ui: improve sidebar layout and fixed-height app container #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c648ce8
ui: improve sidebar layout and fixed-height app container
ilovesusu Apr 2, 2026
1dd8995
Merge branch 'ExplosiveCoderflome:main' into main
ilovesusu Apr 3, 2026
7915a6b
Merge branch 'ExplosiveCoderflome:main' into main
ilovesusu Apr 3, 2026
f89ce3c
Merge branch 'ExplosiveCoderflome:main' into main
ilovesusu Apr 3, 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
4 changes: 2 additions & 2 deletions client/src/components/layout/AppLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ export default function AppLayout() {
}, [isSidebarCollapsed]);

return (
<div className="min-h-screen bg-background">
<div className="h-screen overflow-hidden bg-background">
<Navbar />
<div className="flex min-h-[calc(100vh-4rem)]">
<div className="flex h-[calc(100vh-4rem)] overflow-hidden">
<Sidebar
collapsed={isSidebarCollapsed}
onToggle={() => setIsSidebarCollapsed((current) => !current)}
Expand Down
41 changes: 24 additions & 17 deletions client/src/components/layout/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,25 +143,26 @@ export default function Sidebar({ collapsed, onToggle }: SidebarProps) {
return (
<aside
className={cn(
"border-r bg-muted/20 p-3 transition-[width] duration-200",
"relative flex h-[calc(100vh-4rem)] flex-col border-r bg-muted/20 p-3 transition-[width] duration-200",
collapsed ? "w-[72px]" : "w-64",
)}
>
<div className={cn("mb-4 flex items-center", collapsed ? "justify-center" : "justify-end")}>
<Button
type="button"
variant="ghost"
size="icon"
className="h-8 w-8 text-muted-foreground"
onClick={onToggle}
aria-label={collapsed ? "展开导航栏" : "收起导航栏"}
title={collapsed ? "展开导航栏" : "收起导航栏"}
>
{collapsed ? <ChevronRight className="h-4 w-4" /> : <ChevronLeft className="h-4 w-4" />}
</Button>
</div>

<nav className="space-y-4">
<Button
type="button"
variant="ghost"
size="icon"
className={cn(
"absolute left-full top-1/2 z-10 h-6 w-6 -translate-x-1/2 -translate-y-1/2 rounded-full border bg-background shadow-md transition-colors",
"text-muted-foreground hover:bg-accent hover:text-accent-foreground",
)}
onClick={onToggle}
aria-label={collapsed ? "展开导航栏" : "收起导航栏"}
title={collapsed ? "展开导航栏" : "收起导航栏"}
>
{collapsed ? <ChevronRight className="h-4 w-4" /> : <ChevronLeft className="h-4 w-4" />}
</Button>

<nav className="min-h-0 flex-1 space-y-4 overflow-y-auto pr-1">
{navGroups.map((group) => (
<div key={group.title} className="space-y-1">
{!collapsed ? (
Expand All @@ -175,9 +176,15 @@ export default function Sidebar({ collapsed, onToggle }: SidebarProps) {
{group.items.map((item) => {
const Icon = item.icon;
const isNovelEntry = item.to === "/novels";
const requiresExactMatch = item.to === "/settings";

return (
<NavLink key={item.to} to={item.to} title={collapsed ? item.label : undefined}>
<NavLink
key={item.to}
to={item.to}
end={requiresExactMatch}
title={collapsed ? item.label : undefined}
>
{({ isActive }) => (
<div
className={cn(
Expand Down