Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions src/components/ui/mode-toggle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,18 @@ export function ModeToggle() {
<Tooltip>
<TooltipTrigger asChild>
<div>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant='ghost' size='icon' className='h-8 w-8 p-0'>
{theme === 'light' ? (
<Sun className='hover:text-text-primary h-6 w-6 text-white transition-all dark:-rotate-90' />
) : (
<Moon className='hover:text-text-primary h-6 w-6 rotate-90 scale-0 text-white transition-all dark:rotate-0 dark:scale-100' />
)}
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align='end'>
<DropdownMenuItem onClick={() => setTheme('light')}>Light</DropdownMenuItem>
<DropdownMenuItem onClick={() => setTheme('dark')}>Dark</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
<Button
variant='ghost'
size='icon'
className='h-8 w-8 p-0'
onClick={() => setTheme(theme === 'light' ? 'dark' : 'light')}
>
{theme === 'light' ? (
<Sun className='hover:text-text-primary h-6 w-6 text-white transition-all dark:-rotate-90' />
) : (
<Moon className='hover:text-text-primary h-6 w-6 rotate-90 scale-0 text-white transition-all dark:rotate-0 dark:scale-100' />
)}
</Button>
</div>
</TooltipTrigger>
<TooltipContent>Toggle theme</TooltipContent>
Expand Down
20 changes: 19 additions & 1 deletion src/providers/theme.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,26 @@ const initialState: ThemeProviderState = {
const ThemeProviderContext = createContext<ThemeProviderState>(initialState)

export function ThemeProvider({ children, storageKey = 'app-theme', ...props }: ThemeProviderProps) {
const [theme, setTheme] = useState<Theme>(() => (localStorage.getItem(storageKey) as Theme) || 'light')
const [theme, setTheme] = useState<Theme>(() => {
const stored = localStorage.getItem(storageKey) as Theme
if (stored) return stored

// Check system preference
if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
return 'dark'
}
return 'light'
})

// Listen for system theme changes
useEffect(() => {
const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)')
const handleChange = (e: MediaQueryListEvent) => {
setTheme(e.matches ? 'dark' : 'light')
}
mediaQuery.addEventListener('change', handleChange)
return () => mediaQuery.removeEventListener('change', handleChange)
}, [])
useEffect(() => {
const root = window.document.documentElement
root.classList.remove('light', 'dark')
Expand Down