fix(theme): simplify theme cycle to dark/light and improve initial load

- Remove 'system' from Theme type (now 'dark' | 'light')
- Fix cycle to predictable dark -> light -> dark -> light
- Replace getStoredTheme with getInitialTheme
- Initial load: check localStorage, detect system theme, fallback dark
- Simplify resolveTheme (no longer needs system branch)
- Remove unused getSystemTheme function
- Add spec-v3-theme-switch.md
This commit is contained in:
dong.nguyen committed 2026-10-13 14:56:20 +07:00
1 parent cce04a6e78
commit 58941f6001
2 files changed
+337 -18

No files matched your search

+8 -18
View File
@@ -1,6 +1,6 @@
import { createContext, useContext, useEffect, useState, useCallback } from 'react'
type Theme = 'dark' | 'light' | 'system'
type Theme = 'dark' | 'light'
interface ThemeContextValue {
theme: Theme
@@ -13,28 +13,25 @@ const ThemeContext = createContext<ThemeContextValue | undefined>(undefined)
const STORAGE_KEY = 'portfolio-theme'
function getSystemTheme(): 'dark' | 'light' {
return window.matchMedia('(prefers-color-scheme: light)').matches ? 'dark' : 'light'
}
function getStoredTheme(): Theme {
function getInitialTheme(): 'dark' | 'light' {
try {
const stored = localStorage.getItem(STORAGE_KEY)
if (stored === 'dark' || stored === 'light' || stored === 'system') {
if (stored === 'dark' || stored === 'light') {
return stored
}
} catch {
// localStorage unavailable
}
return 'system'
const prefersLight = window.matchMedia('(prefers-color-scheme: light)').matches
return prefersLight ? 'light' : 'dark'
}
function resolveTheme(theme: Theme): 'dark' | 'light' {
return theme === 'system' ? getSystemTheme() : theme
return theme
}
export function ThemeProvider({ children }: { children: React.ReactNode }) {
const [theme, setThemeState] = useState<Theme>(getStoredTheme)
const [theme, setThemeState] = useState<Theme>(getInitialTheme)
const resolvedTheme = resolveTheme(theme)
@@ -52,14 +49,7 @@ export function ThemeProvider({ children }: { children: React.ReactNode }) {
}, [])
const cycleTheme = useCallback(() => {
setThemeState((prev) => {
if (prev === 'system') {
return getSystemTheme() === 'dark' ? 'light' : 'dark'
}
if (prev === 'dark') return 'light'
if (prev === 'light') return 'system'
return 'dark'
})
setThemeState((prev) => (prev === 'dark' ? 'light' : 'dark'))
}, [])
return (