Email for professionals and teams
persist menu width between pages
Hieu Nguyen (Jack)403c649d9610
diff --git a/src/app/(admin)/layout.tsx b/src/app/(admin)/layout.tsxindex d1e37d8..b24b91d 100644--- a/src/app/(admin)/layout.tsx+++ b/src/app/(admin)/layout.tsx@@ -24,7 +24,7 @@ export default function DashboardLayout({<MailboxProvider><ComposeProvider><ShortcutsProvider>- <div className="grid h-dvh grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc] transition-[grid-template-columns] duration-200">+ <div className="grid h-dvh grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc] transition-[grid-template-columns]" style={{ transitionDuration: "var(--sidebar-transition-duration)" }}><aside className="relative min-h-0 min-w-0"><div className="h-full overflow-y-auto overscroll-contain px-3 py-4 scrollbar-gutter-stable"><AdminNav />diff --git a/src/app/(settings)/layout.tsx b/src/app/(settings)/layout.tsxindex 48bd333..670624a 100644--- a/src/app/(settings)/layout.tsx+++ b/src/app/(settings)/layout.tsx@@ -26,7 +26,7 @@ export default function DashboardLayout({<ComposeProvider><MailSearchProvider><ShortcutsProvider>- <div className="grid h-[100dvh] grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc] transition-[grid-template-columns] duration-200">+ <div className="grid h-[100dvh] grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc] transition-[grid-template-columns]" style={{ transitionDuration: "var(--sidebar-transition-duration)" }}><aside className="min-h-0 overflow-y-auto overscroll-contain px-3 py-4 [scrollbar-gutter:stable]"><DashboardNav /></aside>diff --git a/src/app/layout.tsx b/src/app/layout.tsxindex 83e32b8..18c4a74 100644--- a/src/app/layout.tsx+++ b/src/app/layout.tsx@@ -1,6 +1,7 @@import type { Metadata } from "next";import { Geist, Geist_Mono } from "next/font/google";import { Providers } from "@/components/providers";+import { sidebarBootstrapScript } from "@/components/sidebar-state-utils";import "./globals.css";const geistSans = Geist({@@ -37,6 +38,7 @@ export default function RootLayout({ children }: Readonly<{ children: React.Reacreturn (<html lang="en"><head>+ <script dangerouslySetInnerHTML={{ __html: sidebarBootstrapScript }} /><link rel="icon" href="/api/branding/icon"></link></head><body className={`${geistSans.variable} ${geistMono.variable} antialiased light`}>diff --git a/src/components/sidebar-state-utils.ts b/src/components/sidebar-state-utils.tsindex 4e5ed90..5093d88 100644--- a/src/components/sidebar-state-utils.ts+++ b/src/components/sidebar-state-utils.ts@@ -1,5 +1,29 @@const SIDEBAR_MINIMAL_STORAGE_KEY = "mailflare-sidebar-minimal";+export const sidebarBootstrapScript = `(() => {+ try {+ const minimalKey = "mailflare-sidebar-minimal";+ const widthKey = "mailflare-column-width:sidebar";+ let minimal = localStorage.getItem(minimalKey);+ let width = localStorage.getItem(widthKey);+ if (minimal === null) {+ const keys = Object.keys(localStorage).filter((key) => key.startsWith(minimalKey + ":"));+ if (keys.length === 1) minimal = localStorage.getItem(keys[0]);+ }+ if (width === null) {+ const keys = Object.keys(localStorage).filter((key) => key.startsWith(widthKey + ":"));+ if (keys.length === 1) width = localStorage.getItem(keys[0]);+ }+ if (minimal === "true") document.documentElement.style.setProperty("--persisted-sidebar-width", "72px");+ else if (width !== null && Number.isFinite(Number(width))) document.documentElement.style.setProperty("--persisted-sidebar-width", Math.max(200, Math.min(480, Number(width))) + "px");+ } catch {}+})();`;++export function syncInitialSidebarWidth(width: number, minimal: boolean): void {+ if (typeof document === "undefined") return;+ document.documentElement.style.setProperty("--persisted-sidebar-width", `${minimal ? 72 : width}px`);+}+export function readInitialSidebarMinimal(): boolean {if (typeof window === "undefined") return false;try {diff --git a/src/components/sidebar-state.tsx b/src/components/sidebar-state.tsxindex 238a550..51fdd35 100644--- a/src/components/sidebar-state.tsx+++ b/src/components/sidebar-state.tsx@@ -2,7 +2,7 @@import { createContext, useContext, useEffect, useLayoutEffect, useState } from "react";import { readColumnWidth, readInitialColumnWidth, saveColumnWidth } from "./column-width-preferences";-import { readInitialSidebarMinimal, saveInitialSidebarMinimal } from "./sidebar-state-utils";+import { readInitialSidebarMinimal, saveInitialSidebarMinimal, syncInitialSidebarWidth } from "./sidebar-state-utils";import type { SidebarProviderProps, SidebarState } from "./sidebar-state-types";const SidebarContext = createContext<SidebarState>({ minimal: false, width: 260, userId: null, toggle: () => undefined, setWidth: () => undefined, setForcedMinimal: () => undefined });@@ -22,6 +22,10 @@ export function SidebarProvider({ children, expandedWidth = 260 }: SidebarProvidreturn () => cancelAnimationFrame(frame);}, [expandedWidth]);+ useLayoutEffect(() => {+ syncInitialSidebarWidth(width, minimal);+ }, [width, minimal]);+useEffect(() => {// The sidebar preference is cosmetic, so every failure here degrades to the default.// Guard the parse: an error response may carry an empty or non-JSON body, and an@@ -71,7 +75,7 @@ export function SidebarProvider({ children, expandedWidth = 260 }: SidebarProvidreturn (<SidebarContext.Provider value={{ minimal: minimal || forcedMinimal, width, userId, toggle, setWidth, setForcedMinimal }}>- <div className="h-full" style={{ "--sidebar-width": `${minimal || forcedMinimal ? 72 : width}px`, "--sidebar-transition-duration": widthReady ? "200ms" : "0ms" } as React.CSSProperties}>+ <div className="h-full" style={{ "--sidebar-width": widthReady ? `${minimal || forcedMinimal ? 72 : width}px` : `var(--persisted-sidebar-width, ${expandedWidth}px)`, "--sidebar-transition-duration": widthReady ? "200ms" : "0ms" } as React.CSSProperties}>{children}</div></SidebarContext.Provider>