@devries-cameron20 / t3code Mirror · read-only / commits / f8c7c7593f
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 22, 02:00 UTC

fix(web): the main sidebar stays collapsed after relaunch (#24202)

Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>

shivam committed Nov 7, 2026 at 13:19 UTC f8c7c7593f32c5fd17c9647cb89761ce8285cc7e
3 files changed +81 -15
apps/web/src/components/AppSidebarLayout.tsx
+1 -1
@@ -447,7 +447,7 @@ export function AppSidebarLayout({ children }: { children: ReactNode }) {
447 <SidebarProvider
448 className="h-dvh! min-h-0!"
449 data-panel-animations={routePanelAnimationsActive ? "true" : "false"}
450 - defaultOpen
450 + storageKey="chat_thread_sidebar_open"
451 style={sidebarProviderStyle}
452 >
453 <SidebarBrandWidthProbe isElectron={isElectron} onWidthChange={setBrandWidth} />
apps/web/src/components/ui/sidebar.browser.test.tsx
+58
@@ -72,3 +72,61 @@ describe("Sidebar", () => {
72 expect(onResize).toHaveBeenCalledTimes(1);
73 });
74 });
75 +
76 +it("restores collapsed and expanded desktop state after remounting", async () => {
77 + await page.viewport(1280, 800);
78 + const storageKey = "sidebar_persistence_test";
79 + localStorage.removeItem(storageKey);
80 + const layout = () => (
81 + <SidebarProvider storageKey={storageKey}>
82 + <SidebarTrigger />
83 + </SidebarProvider>
84 + );
85 + {
86 + await using screen = await render(layout(), { router: false /* no routes involved */ });
87 + const trigger = screen.getByRole("button", { name: "Toggle Sidebar" });
88 + await expect.element(trigger).toHaveAttribute("aria-pressed", "true");
89 + await userEvent.click(trigger);
90 + await expect.element(trigger).toHaveAttribute("aria-pressed", "false");
91 + }
92 + {
93 + await using screen = await render(layout(), { router: false /* no routes involved */ });
94 + const trigger = screen.getByRole("button", { name: "Toggle Sidebar" });
95 + await expect.element(trigger).toHaveAttribute("aria-pressed", "false");
96 + await userEvent.click(trigger);
97 + }
98 + await using screen = await render(layout(), { router: false /* no routes involved */ });
99 + await expect
100 + .element(screen.getByRole("button", { name: "Toggle Sidebar" }))
101 + .toHaveAttribute("aria-pressed", "true");
102 + localStorage.removeItem(storageKey);
103 +});
104 +
105 +it("keeps the mobile sheet closed and leaves the saved desktop state alone", async () => {
106 + await page.viewport(390, 844);
107 + const storageKey = "sidebar_mobile_persistence_test";
108 + localStorage.setItem(storageKey, "false");
109 + {
110 + await using screen = await render(
111 + <SidebarProvider storageKey={storageKey}>
112 + <SidebarTrigger />
113 + </SidebarProvider>,
114 + { router: false /* no routes involved */ },
115 + );
116 + const trigger = screen.getByRole("button", { name: "Toggle Sidebar" });
117 + await expect.element(trigger).toHaveAttribute("aria-pressed", "false");
118 + await userEvent.click(trigger);
119 + await expect.element(trigger).toHaveAttribute("aria-pressed", "true");
120 + expect(localStorage.getItem(storageKey)).toBe("false");
121 + }
122 + await using screen = await render(
123 + <SidebarProvider storageKey={storageKey}>
124 + <SidebarTrigger />
125 + </SidebarProvider>,
126 + { router: false /* no routes involved */ },
127 + );
128 + await expect
129 + .element(screen.getByRole("button", { name: "Toggle Sidebar" }))
130 + .toHaveAttribute("aria-pressed", "false");
131 + localStorage.removeItem(storageKey);
132 +});
apps/web/src/components/ui/sidebar.tsx
+22 -14
@@ -18,13 +18,15 @@ import {
18 import { Tooltip, TooltipPopup, TooltipTrigger } from "~/components/ui/tooltip";
19 import { useResizeDrag } from "~/hooks/useResizeDrag";
20 import { useMediaQuery } from "~/hooks/useMediaQuery";
21 -import { setLocalStorageItem } from "~/hooks/useLocalStorage";
21 +import {
22 + getLocalStorageItem,
23 + setLocalStorageItem,
24 + writeLocalStorageValue,
25 +} from "~/hooks/useLocalStorage";
26 import { resolveSidebarState, type ResponsiveSidebarState } from "./sidebarState";
27 import * as Schema from "effect/Schema";
28 import { announceSidebarVisibility } from "~/lib/accessibilityAnnouncements";
29
26 -const SIDEBAR_COOKIE_NAME = "sidebar_state";
27 -const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
30 const SIDEBAR_WIDTH = "16rem";
31 const SIDEBAR_WIDTH_MOBILE = "calc(100vw - var(--spacing(3)))";
32 const SIDEBAR_WIDTH_ICON = "3rem";
@@ -104,13 +106,14 @@ function isMobileViewport(): boolean {
106 return typeof window !== "undefined" && window.matchMedia(SIDEBAR_MOBILE_QUERY).matches;
107 }
108
107 -async function persistSidebarOpen(open: boolean) {
108 - await cookieStore.set({
109 - expires: Date.now() + SIDEBAR_COOKIE_MAX_AGE * 1000,
110 - name: SIDEBAR_COOKIE_NAME,
111 - path: "/",
112 - value: String(open),
113 - });
109 +function readStoredSidebarOpen(storageKey: string | undefined): boolean | null {
110 + if (!storageKey) return null;
111 + try {
112 + return getLocalStorageItem(storageKey, Schema.Boolean);
113 + } catch (error) {
114 + console.error("Could not restore persisted sidebar state.", error);
115 + return null;
116 + }
117 }
118
119 // An offcanvas sidebar turns inert once collapsed, which drops focus to the body.
@@ -132,8 +135,11 @@ interface SidebarOpenState {
135 }
136
137 /** Per-provider open state, kept outside React so shortcuts can toggle it at event time. */
135 -function createSidebarOpenStore(defaultOpen: boolean) {
136 - let state: SidebarOpenState = { open: defaultOpen, openMobile: false };
138 +function createSidebarOpenStore(defaultOpen: boolean, storageKey: string | undefined) {
139 + let state: SidebarOpenState = {
140 + open: readStoredSidebarOpen(storageKey) ?? defaultOpen,
141 + openMobile: false,
142 + };
143 const listeners = new Set<() => void>();
144 const collapseListeners = new Set<() => void>();
145 const publish = (next: SidebarOpenState) => {
@@ -149,7 +155,7 @@ function createSidebarOpenStore(defaultOpen: boolean) {
155 if (!isMobileViewport()) announceSidebarVisibility(open);
156 publish({ ...state, open });
157 }
152 - void persistSidebarOpen(open);
158 + if (storageKey) writeLocalStorageValue(storageKey, open, defaultOpen, Schema.Boolean);
159 };
160 const setOpenMobile = (openMobile: boolean) => {
161 if (openMobile !== state.openMobile) publish({ ...state, openMobile });
@@ -176,15 +182,17 @@ function createSidebarOpenStore(defaultOpen: boolean) {
182
183 function SidebarProvider({
184 defaultOpen = true,
185 + storageKey,
186 className,
187 style,
188 children,
189 ...props
190 }: React.ComponentProps<"div"> & {
191 defaultOpen?: boolean;
192 + storageKey?: string;
193 }) {
194 const isMobile = useMediaQuery(SIDEBAR_MOBILE_QUERY);
187 - const [store] = React.useState(() => createSidebarOpenStore(defaultOpen));
195 + const [store] = React.useState(() => createSidebarOpenStore(defaultOpen, storageKey));
196 const { open, openMobile } = React.useSyncExternalStore(
197 store.subscribe,
198 store.getSnapshot,