fix bug 16 and 17

2026-08-04 00:52:58 -04:00
parent 626da23c2e
commit 149806a773
72 changed files with 834 additions and 174 deletions
@@ -31,7 +31,7 @@ export default async function RootLayout({ children }: { children: React.ReactNo
  const language = await getCarplaceLanguage()
  const cookieStore = await cookies()
  const rawTheme = cookieStore.get('rentaldrivego-theme')?.value
-  const theme = rawTheme === 'dark' ? 'dark' : 'light'
+  const theme = rawTheme === 'light' ? 'light' : 'dark'

  return (
    <html lang={language} dir={language === 'ar' ? 'rtl' : 'ltr'} suppressHydrationWarning>
@@ -40,7 +40,7 @@ export default async function RootLayout({ children }: { children: React.ReactNo
        <script
          dangerouslySetInnerHTML={{
            __html:
-              "(function(){try{var m=document.cookie.match(/(?:^|; )rentaldrivego-theme=([^;]+)/);var theme=m?decodeURIComponent(m[1]):localStorage.getItem('rentaldrivego-theme');if(theme!=='light'&&theme!=='dark'){theme=window.matchMedia('(prefers-color-scheme: dark)').matches?'dark':'light'}document.documentElement.classList.toggle('dark',theme==='dark');document.documentElement.style.colorScheme=theme;document.body&&document.body.setAttribute('data-theme',theme)}catch(e){}})();",
+              "(function(){try{var m=document.cookie.match(/(?:^|; )rentaldrivego-theme=([^;]+)/);var theme=m?decodeURIComponent(m[1]):localStorage.getItem('rentaldrivego-theme');if(theme!=='light'&&theme!=='dark'){theme='dark'}document.documentElement.classList.toggle('dark',theme==='dark');document.documentElement.style.colorScheme=theme;document.body&&document.body.setAttribute('data-theme',theme)}catch(e){}})();",
          }}
        />
      </head>
@@ -146,7 +146,7 @@ export function useCarplacePreferences() {
 export default function CarplaceShell({
  children,
  initialLanguage = 'en',
-  initialTheme = 'light',
+  initialTheme = 'dark',
 }: {
  children: React.ReactNode
  initialLanguage?: CarplaceLanguage
@@ -198,10 +198,11 @@ export default function CarplaceShell({
  }, [hydrated, language, pathname, router])

  useEffect(() => {
+    if (!hydrated) return
    document.documentElement.classList.toggle('dark', theme === 'dark')
    document.documentElement.style.colorScheme = theme
    document.body.dataset.theme = theme
-    if (hydrated) writeScopedPreference(SHARED_THEME_KEY, theme)
+    writeScopedPreference(SHARED_THEME_KEY, theme)
  }, [hydrated, theme])

  const value = useMemo(