@flesler/cursor-canvas-web 1.5.1 → 1.5.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@flesler/cursor-canvas-web",
   "private": false,
-  "version": "1.5.1",
+  "version": "1.5.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/flesler/cursor-canvas-web.git"

package/src/shim/__tests__/useCanvasState.test.tsx

@@ -32,4 +32,36 @@ describe('useCanvasState', () => {
 
     expect(result.current[0]).toBe(true)
   })
+
+  it('falls back to __canvasJsonState when localStorage throws', () => {
+    const storage = Object.getOwnPropertyDescriptor(globalThis, 'localStorage')
+    Object.defineProperty(globalThis, 'localStorage', {
+      configurable: true,
+      get() {
+        throw new DOMException('sandboxed', 'SecurityError')
+      },
+    })
+    ;(globalThis as { __canvasJsonState?: Record<string, unknown> }).__canvasJsonState = {
+      label: 'from-sidecar',
+    }
+
+    const { result } = renderHook(() => useCanvasState('label', 'default'))
+
+    expect(result.current[0]).toBe('from-sidecar')
+    delete (globalThis as { __canvasJsonState?: Record<string, unknown> }).__canvasJsonState
+    if (storage) {
+      Object.defineProperty(globalThis, 'localStorage', storage)
+    }
+  })
+
+  it('reads global __canvasJsonState when localStorage has no value', () => {
+    ;(globalThis as { __canvasJsonState?: Record<string, unknown> }).__canvasJsonState = {
+      label: 'from-sidecar',
+    }
+
+    const { result } = renderHook(() => useCanvasState('label', 'default'))
+
+    expect(result.current[0]).toBe('from-sidecar')
+    delete (globalThis as { __canvasJsonState?: Record<string, unknown> }).__canvasJsonState
+  })
 })

package/src/shim/canvas-hooks.tsx

@@ -8,13 +8,15 @@ export function useCanvasState<T>(
   const storageKey = `canvas:${key}`
 
   const [state, setState] = useState<T>(() => {
-    if (typeof localStorage === 'undefined') return defaultValue
     try {
       const raw = localStorage.getItem(storageKey)
-      return raw === null ? defaultValue : (JSON.parse(raw) as T)
+      if (raw !== null) return JSON.parse(raw) as T
     } catch {
-      return defaultValue
+      // Sandboxed, SSR, or unavailable; fall through to inlined export state.
     }
+    const inline = inlineCanvasState<T>(key)
+    if (inline !== undefined) return inline
+    return defaultValue
   })
 
   const set = useCallback<SetCanvasState<T>>(
@@ -25,7 +27,7 @@ export function useCanvasState<T>(
             ? (action as (prev: T) => T)(prev)
             : action
         try {
-          localStorage?.setItem(storageKey, JSON.stringify(next))
+          localStorage.setItem(storageKey, JSON.stringify(next))
         } catch {
           // Ignore quota / unavailable storage; state still updates in memory.
         }
@@ -55,3 +57,13 @@ export function mergeStyle(
 ): CSSProperties {
   return { ...base, ...override }
 }
+
+function inlineCanvasState<T>(key: string): T | undefined {
+  try {
+    const bag = (globalThis as { __canvasJsonState?: Record<string, unknown> }).__canvasJsonState
+    if (!bag || !Object.hasOwn(bag, key)) return undefined
+    return bag[key] as T
+  } catch {
+    return undefined
+  }
+}