@@ -18,13 +18,15 @@ import {
1818import { Tooltip , TooltipPopup , TooltipTrigger } from "~/components/ui/tooltip" ;
1919import { useResizeDrag } from "~/hooks/useResizeDrag" ;
2020import { useMediaQuery } from "~/hooks/useMediaQuery" ;
21- import { setLocalStorageItem } from "~/hooks/useLocalStorage" ;
21+ import {
22+ getLocalStorageItem ,
23+ setLocalStorageItem ,
24+ writeLocalStorageValue ,
25+ } from "~/hooks/useLocalStorage" ;
2226import { resolveSidebarState , type ResponsiveSidebarState } from "./sidebarState" ;
2327import * as Schema from "effect/Schema" ;
2428import { announceSidebarVisibility } from "~/lib/accessibilityAnnouncements" ;
2529
26- const SIDEBAR_COOKIE_NAME = "sidebar_state" ;
27- const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7 ;
2830const SIDEBAR_WIDTH = "16rem" ;
2931const SIDEBAR_WIDTH_MOBILE = "calc(100vw - var(--spacing(3)))" ;
3032const 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
177183function 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