Skip to content

Commit 4d8332d

Browse files
authored
Merge branch 'main' into issue-watch/30245
2 parents d3da721 + f8c7c75 commit 4d8332d

3 files changed

Lines changed: 81 additions & 15 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ export function AppSidebarLayout({ children }: { children: ReactNode }) {
447447
<SidebarProvider
448448
className="h-dvh! min-h-0!"
449449
data-panel-animations={routePanelAnimationsActive ? "true" : "false"}
450-
defaultOpen
450+
storageKey="chat_thread_sidebar_open"
451451
style={sidebarProviderStyle}
452452
>
453453
<SidebarBrandWidthProbe isElectron={isElectron} onWidthChange={setBrandWidth} />

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

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,61 @@ describe("Sidebar", () => {
7272
expect(onResize).toHaveBeenCalledTimes(1);
7373
});
7474
});
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‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@ import {
1818
import { Tooltip, TooltipPopup, TooltipTrigger } from "~/components/ui/tooltip";
1919
import { useResizeDrag } from "~/hooks/useResizeDrag";
2020
import { useMediaQuery } from "~/hooks/useMediaQuery";
21-
import { setLocalStorageItem } from "~/hooks/useLocalStorage";
21+
import {
22+
getLocalStorageItem,
23+
setLocalStorageItem,
24+
writeLocalStorageValue,
25+
} from "~/hooks/useLocalStorage";
2226
import { resolveSidebarState, type ResponsiveSidebarState } from "./sidebarState";
2327
import * as Schema from "effect/Schema";
2428
import { announceSidebarVisibility } from "~/lib/accessibilityAnnouncements";
2529

26-
const SIDEBAR_COOKIE_NAME = "sidebar_state";
27-
const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
2830
const SIDEBAR_WIDTH = "16rem";
2931
const SIDEBAR_WIDTH_MOBILE = "calc(100vw - var(--spacing(3)))";
3032
const SIDEBAR_WIDTH_ICON = "3rem";
@@ -104,13 +106,14 @@ function isMobileViewport(): boolean {
104106
return typeof window !== "undefined" && window.matchMedia(SIDEBAR_MOBILE_QUERY).matches;
105107
}
106108

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+
}
114117
}
115118

116119
// An offcanvas sidebar turns inert once collapsed, which drops focus to the body.
@@ -132,8 +135,11 @@ interface SidebarOpenState {
132135
}
133136

134137
/** 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+
};
137143
const listeners = new Set<() => void>();
138144
const collapseListeners = new Set<() => void>();
139145
const publish = (next: SidebarOpenState) => {
@@ -149,7 +155,7 @@ function createSidebarOpenStore(defaultOpen: boolean) {
149155
if (!isMobileViewport()) announceSidebarVisibility(open);
150156
publish({ ...state, open });
151157
}
152-
void persistSidebarOpen(open);
158+
if (storageKey) writeLocalStorageValue(storageKey, open, defaultOpen, Schema.Boolean);
153159
};
154160
const setOpenMobile = (openMobile: boolean) => {
155161
if (openMobile !== state.openMobile) publish({ ...state, openMobile });
@@ -176,15 +182,17 @@ function createSidebarOpenStore(defaultOpen: boolean) {
176182

177183
function SidebarProvider({
178184
defaultOpen = true,
185+
storageKey,
179186
className,
180187
style,
181188
children,
182189
...props
183190
}: React.ComponentProps<"div"> & {
184191
defaultOpen?: boolean;
192+
storageKey?: string;
185193
}) {
186194
const isMobile = useMediaQuery(SIDEBAR_MOBILE_QUERY);
187-
const [store] = React.useState(() => createSidebarOpenStore(defaultOpen));
195+
const [store] = React.useState(() => createSidebarOpenStore(defaultOpen, storageKey));
188196
const { open, openMobile } = React.useSyncExternalStore(
189197
store.subscribe,
190198
store.getSnapshot,

0 commit comments

Comments
 (0)