Skip to content

Fix UX Refactor Sidebar component for improved layout and controls #66

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
rajofearth wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix UX Refactor Sidebar component for improved layout and controls #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed1f8e7
Refactor Sidebar component for improved layout and controls
rajofearth Apr 26, 2026
133988a
Merge branch 'main' into fix-electron-sidebar-controls
rajofearth Apr 27, 2026
fedaf2b
Merge branch 'main' into fix-electron-sidebar-controls
rajofearth Apr 30, 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
72 changes: 34 additions & 38 deletions apps/web/src/components/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5095,18 +5095,8 @@ export default function Sidebar() {
</Tooltip>
);

const titlebarControls = (
<div className="hidden shrink-0 items-center gap-0.5 md:flex">
<AppNavigationButtons className="ms-0" />
<SidebarTrigger
className="size-7 shrink-0 text-muted-foreground/75 hover:text-foreground"
aria-label="Toggle thread sidebar"
/>
</div>
);

const headerControls = (
<div className="ml-auto hidden shrink-0 items-center gap-0.5 md:flex">
const desktopSidebarControls = (
<div className="hidden shrink-0 items-center gap-0.5 md:flex [-webkit-app-region:no-drag]">
<AppNavigationButtons className="ms-0" />
<SidebarTrigger
className="size-7 shrink-0 text-muted-foreground/75 hover:text-foreground"
Expand All @@ -5119,26 +5109,34 @@ export default function Sidebar() {
<div className="flex w-full items-center gap-1.5">
<SidebarTrigger className="shrink-0 md:hidden" />
{brandWordmark}
{headerControls}
<div className="ml-auto">{desktopSidebarControls}</div>
</div>
);

const sidebarBrand = (
<div className="drag-region flex min-w-0 items-center gap-1.5 px-4 pt-3 pb-2">
{brandWordmark}
<div className="ml-auto">{desktopSidebarControls}</div>
</div>
);

const sidebarBrand = <div className="flex min-w-0 px-4 pt-3 pb-2">{brandWordmark}</div>;
const settingsBackToAppButton = (
<SidebarMenuButton
size="default"
className={cn(
"h-8 gap-2.5 rounded-lg px-2 text-[length:var(--app-font-size-ui,12px)] font-normal text-muted-foreground/72 hover:bg-[var(--sidebar-accent)] hover:text-foreground",
isElectron && "[-webkit-app-region:no-drag]",
)}
onClick={() => handleSidebarViewChange("threads")}
>
<ArrowLeftIcon className="size-[15px]" />
<span>Back to app</span>
</SidebarMenuButton>
);

return (
<>
{isElectron ? (
<>
<SidebarHeader
className={cn(
"drag-region h-[48px] flex-row items-center gap-2 px-4 py-0 font-system-ui",
appSettings.sidebarSide === "left" && "pl-[90px]",
)}
>
{titlebarControls}
</SidebarHeader>
</>
) : (
{isElectron ? null : (
<SidebarHeader className="gap-3 px-3 py-2.5 font-system-ui sm:gap-2.5 sm:px-4 sm:py-3">
{wordmark}
</SidebarHeader>
Expand Down Expand Up @@ -5172,18 +5170,16 @@ export default function Sidebar() {
) : null}
{isOnSettings ? (
<SidebarGroup className="px-1.5 py-1.5">
<SidebarMenu className="gap-0.5">
<SidebarMenuItem>
<SidebarMenuButton
size="default"
className="h-8 gap-2.5 rounded-lg px-2 text-[length:var(--app-font-size-ui,12px)] font-normal text-muted-foreground/72 hover:bg-[var(--sidebar-accent)] hover:text-foreground"
onClick={() => handleSidebarViewChange("threads")}
>
<ArrowLeftIcon className="size-[15px]" />
<span>Back to app</span>
</SidebarMenuButton>
</SidebarMenuItem>
</SidebarMenu>
{isElectron ? (
<div className="drag-region flex items-center gap-2 px-0.5 pt-3 pb-1.5">
<div className="min-w-0 flex-1">{settingsBackToAppButton}</div>
{desktopSidebarControls}
</div>
) : (
<SidebarMenu className="gap-0.5">
<SidebarMenuItem>{settingsBackToAppButton}</SidebarMenuItem>
</SidebarMenu>
)}

<div className="-mx-1.5 my-1.5 h-px bg-border/70" />
<div className="space-y-4 pt-2">
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/SidebarHeaderNavigationControls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export function SidebarHeaderNavigationControls() {
}

return (
<div className="flex shrink-0 items-center gap-0.5">
<div className="flex shrink-0 items-center gap-0.5 [-webkit-app-region:no-drag]">
<AppNavigationButtons className="ms-0" />
<SidebarHeaderTrigger className="size-7 shrink-0" />
</div>
Expand Down
Loading