Skip to content

fix: light theme flash on refreshing #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anurag2787 merged 2 commits into from
Apr 12, 2026
Merged

fix: light theme flash on refreshing #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3feede3
fix: light theme flash on refreshing
Ayush-2511 Apr 11, 2026
e2f5389
fix: changed from using theme to activeTheme
Ayush-2511 Apr 12, 2026
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
6 changes: 4 additions & 2 deletions app/layout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Header from '@/components/header'
import AuthProvider from '@/context/session-provider'
import { Analytics } from '@vercel/analytics/next'
import Script from 'next/script'
import { ThemeProvider } from '@/components/theme-provider'

const inter = Inter({ subsets: ['latin'] })

Expand All @@ -15,19 +16,20 @@ export const metadata = {

export default function RootLayout({ children }) {
return (
<html lang="en">
<html lang="en" suppressHydrationWarning>
<body
className={
inter.className + ' flex flex-col min-h-screen justify-between'
}
>
<ThemeProvider attribute="class" defaultTheme="system" enableSystem disableTransitionOnChange>
<AuthProvider>
<Header />
{children}
<Footer />
<Analytics />
</AuthProvider>

</ThemeProvider>
{/* Google Analytics */}
<Script
src="https://www.googletagmanager.com/gtag/js?id=G-FRS93SLW90"
Expand Down
28 changes: 11 additions & 17 deletions components/theme-toggler.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
'use client'
import { useTheme } from 'next-themes'
import { useEffect, useState } from 'react'
import { FaSun, FaMoon } from 'react-icons/fa'

Expand All @@ -7,32 +8,25 @@ interface ThemeToggleProps {
}

export default function ThemeToggle({ text }: ThemeToggleProps) {
const [theme, setTheme] = useState<'light' | 'dark'>('light')
const { theme, resolvedTheme, setTheme } = useTheme()
const [mounted, setMounted] = useState(false)
const activeTheme = resolvedTheme ?? theme

useEffect(() => {
const storedTheme = localStorage.getItem('theme')
if (storedTheme === 'dark') {
setTheme('dark')
document.documentElement.classList.add('dark')
}
setMounted(true)
}, [])

useEffect(() => {
if (theme === 'dark') {
document.documentElement.classList.add('dark')
localStorage.setItem('theme', 'dark')
} else {
document.documentElement.classList.remove('dark')
localStorage.setItem('theme', 'light')
}
}, [theme])
if (!mounted) {
return <button className="p-2 bg-primary flex items-center justify-center gap-3 text-white rounded cursor-pointer opacity-0">{text}</button>
}


return (
<button
className="p-2 bg-primary flex items-center justify-center gap-3 text-white rounded cursor-pointer"
onClick={() => setTheme(theme === 'dark' ? 'light' : 'dark')}
onClick={() => setTheme(activeTheme === 'dark' ? 'light' : 'dark')}
>
{theme === 'dark' ? <FaSun /> : <FaMoon />} {text}
{activeTheme === 'dark' ? <FaSun /> : <FaMoon />} {text}
</button>
)
}
Loading