Skip to content

fix: make Sidebar scrollable #1029

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
reillylm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: make Sidebar scrollable #1029

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
4 changes: 2 additions & 2 deletions packages/web/src/components/DeviceInfoPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ export const DeviceInfoPanel = ({
"flex flex-col gap-2 mt-1",
"transition-all duration-300 ease-in-out",
isCollapsed
? "opacity-0 max-w-0 h-0 invisible pointer-events-none"
? "opacity-0 max-w-0 hidden pointer-events-none"
: "opacity-100 max-w-xs h-auto visible",
)}
>
Expand Down Expand Up @@ -244,7 +244,7 @@ export const DeviceInfoPanel = ({
"flex flex-col gap-1 mt-1",
"transition-all duration-300 ease-in-out",
isCollapsed
? "opacity-0 max-w-0 h-0 invisible pointer-events-none"
? "opacity-0 max-w-0 hidden pointer-events-none"
: "opacity-100 max-w-xs visible",
)}
>
Expand Down
109 changes: 56 additions & 53 deletions packages/web/src/components/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { useFirstSavedConnection } from "@app/core/stores/deviceStore/selectors.ts";
import { ScrollArea } from "@components/UI/ScrollArea.tsx";
import { SidebarButton } from "@components/UI/Sidebar/SidebarButton.tsx";
import { SidebarSection } from "@components/UI/Sidebar/SidebarSection.tsx";
import { Spinner } from "@components/UI/Spinner.tsx";
Expand Down Expand Up @@ -130,7 +131,7 @@ export const Sidebar = ({ children }: SidebarProps) => {
return (
<div
className={cn(
"relative border-slate-300 dark:border-slate-700",
"relative h-svh flex flex-col border-slate-300 dark:border-slate-700",
"transition-all duration-300 ease-in-out flex-shrink-0",
isCollapsed ? "w-24" : "w-52 lg:w-64",
)}
Expand All @@ -156,60 +157,62 @@ export const Sidebar = ({ children }: SidebarProps) => {
</h2>
</div>

<SidebarSection label={t("navigation.title")} className="mt-4 px-0">
{pages.map((link) => {
return (
<SidebarButton
key={link.name}
count={link.count}
label={link.name}
Icon={link.icon}
onClick={() => {
if (myNode !== undefined) {
navigate({ to: `/${link.page}` });
}
<ScrollArea>
<SidebarSection label={t("navigation.title")} className="mt-4 px-0">
{pages.map((link) => {
return (
<SidebarButton
key={link.name}
count={link.count}
label={link.name}
Icon={link.icon}
onClick={() => {
if (myNode !== undefined) {
navigate({ to: `/${link.page}` });
}
}}
active={link.page === pathname}
disabled={myNode === undefined}
/>
);
})}
</SidebarSection>

<div>{children}</div>

<div className=" pt-4 border-t-[0.5px] bg-background-primary border-slate-300 dark:border-slate-700 h-full flex-1">
{myNode === undefined ? (
<div className="flex flex-col items-center justify-center py-6">
<Spinner />
<Subtle
className={cn(
"mt-4 transition-opacity duration-300",
isCollapsed ? "opacity-0 invisible" : "opacity-100 visible",
)}
>
{t("loading")}
</Subtle>
</div>
) : (
<DeviceInfoPanel
isCollapsed={isCollapsed}
setCommandPaletteOpen={() => setCommandPaletteOpen(true)}
setDialogOpen={() => setDialogOpen("deviceName", true)}
user={myNode.user}
firmwareVersion={myMetadata?.firmwareVersion ?? t("unknown.notAvailable")}
deviceMetrics={{
batteryLevel: myNode.deviceMetrics?.batteryLevel,
voltage:
typeof myNode.deviceMetrics?.voltage === "number"
? Math.abs(myNode.deviceMetrics?.voltage)
: undefined,
}}
active={link.page === pathname}
disabled={myNode === undefined}
connectionStatus={activeConnection?.status}
connectionName={activeConnection?.name}
/>
);
})}
</SidebarSection>

<div className={cn("flex-1 min-h-0", isCollapsed && "overflow-hidden")}>{children}</div>

<div className=" pt-4 border-t-[0.5px] bg-background-primary border-slate-300 dark:border-slate-700 h-full flex-1">
{myNode === undefined ? (
<div className="flex flex-col items-center justify-center py-6">
<Spinner />
<Subtle
className={cn(
"mt-4 transition-opacity duration-300",
isCollapsed ? "opacity-0 invisible" : "opacity-100 visible",
)}
>
{t("loading")}
</Subtle>
</div>
) : (
<DeviceInfoPanel
isCollapsed={isCollapsed}
setCommandPaletteOpen={() => setCommandPaletteOpen(true)}
setDialogOpen={() => setDialogOpen("deviceName", true)}
user={myNode.user}
firmwareVersion={myMetadata?.firmwareVersion ?? t("unknown.notAvailable")}
deviceMetrics={{
batteryLevel: myNode.deviceMetrics?.batteryLevel,
voltage:
typeof myNode.deviceMetrics?.voltage === "number"
? Math.abs(myNode.deviceMetrics?.voltage)
: undefined,
}}
connectionStatus={activeConnection?.status}
connectionName={activeConnection?.name}
/>
)}
</div>
)}
</div>
</ScrollArea>
</div>
);
};