Skip to content

Commit 10823c0

Browse files
committed
fix(web): persist sidebar open state across refresh
Right panel already restored after reload; sidebar only wrote a cookie and never read it, and the layout forced defaultOpen. Store the preference in localStorage and restore on mount.
1 parent 9510390 commit 10823c0

4 files changed

Lines changed: 56 additions & 15 deletions

File tree

‎apps/web/src/components/AppSidebarLayout.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ export function AppSidebarLayout({ children }: { children: ReactNode }) {
216216
<SidebarProvider
217217
className="h-dvh! min-h-0!"
218218
data-panel-animations={panelAnimationsActive ? "true" : "false"}
219-
defaultOpen
220219
style={sidebarProviderStyle}
221220
>
222221
<ProjectProjectionRetention />

‎apps/web/src/components/ui/sidebar.test.tsx‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import { renderToStaticMarkup } from "react-dom/server";
2-
import { describe, expect, it } from "vite-plus/test";
2+
import { afterEach, describe, expect, it } from "vite-plus/test";
3+
4+
import { removeLocalStorageItem } from "~/hooks/useLocalStorage";
35

46
import {
57
SidebarMenuAction,
@@ -8,7 +10,12 @@ import {
810
SidebarProvider,
911
SidebarTrigger,
1012
} from "./sidebar";
11-
import { resolveSidebarState } from "./sidebarState";
13+
import {
14+
readPersistedSidebarOpen,
15+
resolveSidebarState,
16+
SIDEBAR_OPEN_STORAGE_KEY,
17+
writePersistedSidebarOpen,
18+
} from "./sidebarState";
1219

1320
function renderSidebarButton(className?: string) {
1421
return renderToStaticMarkup(
@@ -19,6 +26,10 @@ function renderSidebarButton(className?: string) {
1926
}
2027

2128
describe("sidebar interactive cursors", () => {
29+
afterEach(() => {
30+
removeLocalStorageItem(SIDEBAR_OPEN_STORAGE_KEY);
31+
});
32+
2233
it("uses mobile sheet visibility for the shared responsive state", () => {
2334
expect(resolveSidebarState({ isMobile: true, open: true, openMobile: false })).toBe(
2435
"collapsed",
@@ -29,6 +40,18 @@ describe("sidebar interactive cursors", () => {
2940
);
3041
});
3142

43+
it("persists and restores desktop open state", () => {
44+
writePersistedSidebarOpen(false);
45+
expect(readPersistedSidebarOpen()).toBe(false);
46+
47+
const html = renderToStaticMarkup(
48+
<SidebarProvider>
49+
<div />
50+
</SidebarProvider>,
51+
);
52+
expect(html).toContain('data-sidebar-state="collapsed"');
53+
});
54+
3255
it("exposes collapsed state for shared titlebar inset styling", () => {
3356
const html = renderToStaticMarkup(
3457
<SidebarProvider defaultOpen={false}>

‎apps/web/src/components/ui/sidebar.tsx‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@ import { Skeleton } from "~/components/ui/skeleton";
1919
import { Tooltip, TooltipPopup, TooltipTrigger } from "~/components/ui/tooltip";
2020
import { useIsMobile } from "~/hooks/useMediaQuery";
2121
import { getLocalStorageItem, setLocalStorageItem } from "~/hooks/useLocalStorage";
22-
import { resolveSidebarState, type ResponsiveSidebarState } from "./sidebarState";
22+
import {
23+
readPersistedSidebarOpen,
24+
resolveSidebarState,
25+
writePersistedSidebarOpen,
26+
type ResponsiveSidebarState,
27+
} from "./sidebarState";
2328
import * as Schema from "effect/Schema";
2429

25-
const SIDEBAR_COOKIE_NAME = "sidebar_state";
26-
const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
2730
const SIDEBAR_WIDTH = "16rem";
2831
const SIDEBAR_WIDTH_MOBILE = "calc(100vw - var(--spacing(3)))";
2932
const SIDEBAR_WIDTH_ICON = "3rem";
@@ -109,24 +112,18 @@ function SidebarProvider({
109112

110113
// This is the internal state of the sidebar.
111114
// We use openProp and setOpenProp for control from outside the component.
112-
const [_open, _setOpen] = React.useState(defaultOpen);
115+
const [_open, _setOpen] = React.useState(() => readPersistedSidebarOpen(defaultOpen));
113116
const open = openProp ?? _open;
114117
const setOpen = React.useCallback(
115-
async (value: boolean | ((value: boolean) => boolean)) => {
118+
(value: boolean | ((value: boolean) => boolean)) => {
116119
const openState = typeof value === "function" ? value(open) : value;
117120
if (setOpenProp) {
118121
setOpenProp(openState);
119122
} else {
120123
_setOpen(openState);
121124
}
122125

123-
// This sets the cookie to keep the sidebar state.
124-
await cookieStore.set({
125-
expires: Date.now() + SIDEBAR_COOKIE_MAX_AGE * 1000,
126-
name: SIDEBAR_COOKIE_NAME,
127-
path: "/",
128-
value: String(openState),
129-
});
126+
writePersistedSidebarOpen(openState);
130127
},
131128
[setOpenProp, open],
132129
);
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,31 @@
1+
import * as Schema from "effect/Schema";
2+
3+
import { getLocalStorageItem, setLocalStorageItem } from "~/hooks/useLocalStorage";
4+
15
export type ResponsiveSidebarState = "expanded" | "collapsed";
26

7+
export const SIDEBAR_OPEN_STORAGE_KEY = "t3code:sidebar-open";
8+
39
export function resolveSidebarState(input: {
410
isMobile: boolean;
511
open: boolean;
612
openMobile: boolean;
713
}): ResponsiveSidebarState {
814
return (input.isMobile ? input.openMobile : input.open) ? "expanded" : "collapsed";
915
}
16+
17+
export function readPersistedSidebarOpen(fallback = true): boolean {
18+
try {
19+
return getLocalStorageItem(SIDEBAR_OPEN_STORAGE_KEY, Schema.Boolean) ?? fallback;
20+
} catch {
21+
return fallback;
22+
}
23+
}
24+
25+
export function writePersistedSidebarOpen(open: boolean): void {
26+
try {
27+
setLocalStorageItem(SIDEBAR_OPEN_STORAGE_KEY, open, Schema.Boolean);
28+
} catch {
29+
// Preference persistence is best-effort.
30+
}
31+
}

0 commit comments

Comments
 (0)