Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

feat(web): animate sidebar and keep inset padding

Andrej1b53391ea2ca
diff --git a/apps/web/src/components/common/layout.tsx b/apps/web/src/components/common/layout.tsx
index 77125892b..531609e4e 100644
--- a/apps/web/src/components/common/layout.tsx
+++ b/apps/web/src/components/common/layout.tsx
@@ -66,7 +66,6 @@ function Layout({ children, className }: LayoutProps) {
<SidebarInset
className={cn(
"m-2 flex flex-1 flex-col overflow-auto rounded-xl border border-border/80 bg-background shadow-sm/5",
- "md:peer-data-[variant=inset]:peer-data-[state=collapsed]:border-0",
{
"before:content-[''] before:absolute before:inset-0 before:bg-cover before:bg-center before:bg-(image:--bg) before:pointer-events-none":
background,
diff --git a/apps/web/src/components/settings/settings-shell.tsx b/apps/web/src/components/settings/settings-shell.tsx
index 2a401ede8..06876e41d 100644
--- a/apps/web/src/components/settings/settings-shell.tsx
+++ b/apps/web/src/components/settings/settings-shell.tsx
@@ -35,7 +35,7 @@ export function SettingsShell({ children }: SettingsShellProps) {
}
>
<SettingsSidebar nav={nav} onLeave={leave} />
- <SidebarInset className="m-2 flex flex-1 flex-col overflow-hidden rounded-xl border border-border/80 bg-background shadow-sm/5 md:peer-data-[variant=inset]:peer-data-[state=collapsed]:border-0">
+ <SidebarInset className="m-2 flex flex-1 flex-col overflow-hidden rounded-xl border border-border/80 bg-background shadow-sm/5">
<SettingsHeader breadcrumb={getSettingsBreadcrumb(nav, pathname)} />
<div className="min-h-0 flex-1 overflow-y-auto">{children}</div>
</SidebarInset>
diff --git a/apps/web/src/components/ui/sidebar.tsx b/apps/web/src/components/ui/sidebar.tsx
index 0c1b64e76..0431ddb07 100644
--- a/apps/web/src/components/ui/sidebar.tsx
+++ b/apps/web/src/components/ui/sidebar.tsx
@@ -212,7 +212,7 @@ function Sidebar({
{/* This is what handles the sidebar gap on desktop */}
<div
className={cn(
- "relative w-(--sidebar-width) bg-transparent",
+ "relative w-(--sidebar-width) bg-transparent transition-[width] duration-200 ease-out motion-reduce:transition-none",
"group-data-[collapsible=offcanvas]:w-0",
"group-data-[side=right]:rotate-180",
variant === "floating" || variant === "inset"
@@ -223,10 +223,10 @@ function Sidebar({
/>
<div
className={cn(
- "fixed inset-y-0 z-10 hidden h-svh w-(--sidebar-width) md:flex",
+ "fixed inset-y-0 z-10 hidden h-svh w-(--sidebar-width) transition-[translate,width] duration-200 ease-out motion-reduce:transition-none md:flex",
side === "left"
- ? "left-0 group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)]"
- : "right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]",
+ ? "left-0 group-data-[collapsible=offcanvas]:-translate-x-full"
+ : "right-0 group-data-[collapsible=offcanvas]:translate-x-full",
// Adjust the padding for floating and inset variants.
variant === "floating" || variant === "inset"
? "p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4))+2px)]"
@@ -307,7 +307,7 @@ function SidebarInset({ className, ...props }: React.ComponentProps<"main">) {
<main
className={cn(
"relative flex w-full flex-1 flex-col bg-background",
- "md:peer-data-[variant=inset]:peer-data-[state=collapsed]:ms-2 md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:peer-data-[state=collapsed]:m-0 md:peer-data-[variant=inset]:ms-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:peer-data-[state=collapsed]:rounded-none md:peer-data-[variant=inset]:shadow-sm/5",
+ "transition-[margin] duration-200 ease-out motion-reduce:transition-none md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ms-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow-sm/5 md:peer-data-[variant=inset]:peer-data-[state=collapsed]:ms-2",
className,
)}
data-slot="sidebar-inset"