Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 1 deletion packages/views/layout/app-sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ import {
SidebarMenuButton,
SidebarMenuItem,
SidebarRail,
SidebarTrigger,
} from "@multica/ui/components/ui/sidebar";
import {
DropdownMenu,
Expand Down Expand Up @@ -691,7 +692,8 @@ export function AppSidebar({ topSlot, searchSlot, headerClassName, headerStyle }
</SidebarContent>

<SidebarFooter className="p-2">
<div className="flex justify-end">
<div className="flex items-center justify-between">
<SidebarTrigger />
<HelpLauncher />
</div>
</SidebarFooter>
Expand Down
9 changes: 5 additions & 4 deletions packages/views/layout/page-header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
import { cn } from "@multica/ui/lib/utils";
import { SidebarTrigger, useSidebar } from "@multica/ui/components/ui/sidebar";

function MobileSidebarTrigger() {
function SidebarToggle() {
try {
useSidebar();
const { state } = useSidebar();
// On mobile: always show (hamburger). On desktop: only when sidebar is collapsed.
return <SidebarTrigger className={cn("mr-2", state === "expanded" && "md:hidden")} />;
} catch {
return null;
}
return <SidebarTrigger className="mr-2 md:hidden" />;
}

interface PageHeaderProps {
Expand All @@ -20,7 +21,7 @@ interface PageHeaderProps {
export function PageHeader({ children, className }: PageHeaderProps) {
return (
<div className={cn("flex h-12 shrink-0 items-center border-b px-4", className)}>
<MobileSidebarTrigger />
<SidebarToggle />
{children}
</div>
);
Expand Down
Loading