@geminilight/mindos 0.6.51 → 0.6.53

package/_standalone/lib/hooks/useFocusTrap.ts

@@ -0,0 +1,65 @@
+'use client';
+
+import { useEffect, useRef } from 'react';
+
+/**
+ * Focus trap hook: keeps Tab navigation within a dialog/modal.
+ * Wraps focus from last focusable element back to first, and vice versa.
+ */
+export function useFocusTrap(ref: React.RefObject<HTMLElement | null>, enabled = true) {
+  useEffect(() => {
+    if (!enabled || !ref.current) return;
+
+    const handleKeyDown = (e: KeyboardEvent) => {
+      if (e.key !== 'Tab') return;
+
+      const focusableElements = ref.current?.querySelectorAll(
+        'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])'
+      ) as NodeListOf<HTMLElement>;
+
+      if (!focusableElements || focusableElements.length === 0) return;
+
+      const firstElement = focusableElements[0];
+      const lastElement = focusableElements[focusableElements.length - 1];
+      const activeElement = document.activeElement;
+
+      if (e.shiftKey) {
+        // Shift+Tab on first element -> focus last
+        if (activeElement === firstElement) {
+          e.preventDefault();
+          lastElement.focus();
+        }
+      } else {
+        // Tab on last element -> focus first
+        if (activeElement === lastElement) {
+          e.preventDefault();
+          firstElement.focus();
+        }
+      }
+    };
+
+    const container = ref.current;
+    container.addEventListener('keydown', handleKeyDown);
+    return () => container.removeEventListener('keydown', handleKeyDown);
+  }, [ref, enabled]);
+}
+
+/**
+ * Return focus hook: saves reference to trigger element and restores focus on unmount
+ */
+export function useReturnFocus() {
+  const triggerRef = useRef<HTMLElement | null>(null);
+
+  const saveTrigger = (el: HTMLElement | null) => {
+    triggerRef.current = el;
+  };
+
+  useEffect(() => {
+    return () => {
+      // Return focus on unmount
+      triggerRef.current?.focus();
+    };
+  }, []);
+
+  return saveTrigger;
+}

package/_standalone/lib/stores/walkthrough-store.ts

@@ -21,7 +21,20 @@ export interface WalkthroughStoreState {
 
 /* ── Helpers ── */
 
+const LS_KEY = 'mindos_walkthrough_done';
+
+/**
+ * Persist walkthrough state to server AND localStorage.
+ * localStorage acts as a safety net: even if the server persist fails
+ * (e.g. during update restart, network blip), the completion state
+ * survives page reload and prevents the "stuck overlay" bug.
+ */
 function persistStep(step: number, dismissed: boolean) {
+  // Local safety net — instant, survives server outage
+  if (step >= walkthroughSteps.length || dismissed) {
+    try { localStorage.setItem(LS_KEY, '1'); } catch {}
+  }
+  // Server persist — fire-and-forget (localStorage is the safety net)
   fetch('/api/setup', {
     method: 'PATCH',
     headers: { 'Content-Type': 'application/json' },
@@ -31,6 +44,11 @@ function persistStep(step: number, dismissed: boolean) {
   }).catch((err) => { console.warn('[walkthrough-store] persist failed:', err); });
 }
 
+/** Check if walkthrough was completed/dismissed (fast, sync, local) */
+function isLocallyDone(): boolean {
+  try { return localStorage.getItem(LS_KEY) === '1'; } catch { return false; }
+}
+
 /* ── Store ── */
 
 export const useWalkthroughStore = create<WalkthroughStoreState>((set, get) => {
@@ -84,12 +102,26 @@ export const useWalkthroughStore = create<WalkthroughStoreState>((set, get) => {
       // Only auto-start on desktop
       if (window.innerWidth < 768) return () => {};
 
+      // Fast local check: if walkthrough was completed/dismissed, never reactivate.
+      // This prevents the "stuck overlay" bug where server persist failed during
+      // update restart but localStorage recorded the completion.
+      if (isLocallyDone()) return () => {};
+
       fetch('/api/setup')
         .then(r => r.json())
         .then(data => {
           const gs = data.guideState;
           if (!gs) return;
-          if (gs.walkthroughDismissed) return;
+          if (gs.walkthroughDismissed) {
+            try { localStorage.setItem(LS_KEY, '1'); } catch {} // sync local
+            return;
+          }
+
+          // If server says completed (step >= totalSteps), mark locally done
+          if (typeof gs.walkthroughStep === 'number' && gs.walkthroughStep >= totalSteps) {
+            try { localStorage.setItem(LS_KEY, '1'); } catch {};
+            return;
+          }
 
           if (gs.active && !gs.dismissed && gs.walkthroughStep === undefined) {
             if (isWelcome) {