fix(theme): sync toast theme with shared theme state
This commit is contained in:
@@ -4,6 +4,7 @@ import { useTranslation } from "../hooks/useTranslation"
|
|||||||
import { Button } from "./ui/button"
|
import { Button } from "./ui/button"
|
||||||
import { SettingsMenu } from "./SettingsMenu"
|
import { SettingsMenu } from "./SettingsMenu"
|
||||||
import { LogOut, User, Moon, Sun, Globe, Command, Menu } from "lucide-react"
|
import { LogOut, User, Moon, Sun, Globe, Command, Menu } from "lucide-react"
|
||||||
|
import { useTheme } from "./ThemeProvider"
|
||||||
import { logoutUser, getUserProfile } from "../api/users"
|
import { logoutUser, getUserProfile } from "../api/users"
|
||||||
import { WorkspaceSelector } from "./WorkspaceSelector"
|
import { WorkspaceSelector } from "./WorkspaceSelector"
|
||||||
import { toast } from "sonner"
|
import { toast } from "sonner"
|
||||||
@@ -16,18 +17,16 @@ type NavbarProps = {
|
|||||||
|
|
||||||
export function Navbar({ onOpenSidebar }: NavbarProps) {
|
export function Navbar({ onOpenSidebar }: NavbarProps) {
|
||||||
const { t, lang, setLanguage } = useTranslation()
|
const { t, lang, setLanguage } = useTranslation()
|
||||||
|
const { theme, setTheme } = useTheme()
|
||||||
const navigate = useNavigate()
|
const navigate = useNavigate()
|
||||||
const [showLogoutModal, setShowLogoutModal] = useState(false)
|
const [showLogoutModal, setShowLogoutModal] = useState(false)
|
||||||
const [isDropdownOpen, setIsDropdownOpen] = useState(false)
|
const [isDropdownOpen, setIsDropdownOpen] = useState(false)
|
||||||
const [user, setUser] = useState<any>(null)
|
const [user, setUser] = useState<any>(null)
|
||||||
const dropdownRef = useRef<HTMLDivElement>(null)
|
const dropdownRef = useRef<HTMLDivElement>(null)
|
||||||
const isFa = lang === "fa"
|
const isFa = lang === "fa"
|
||||||
|
const isDarkMode =
|
||||||
const [isDarkMode, setIsDarkMode] = useState(() => {
|
theme === "dark" ||
|
||||||
const savedTheme = localStorage.getItem("theme")
|
(theme === "system" && document.documentElement.classList.contains("dark"))
|
||||||
if (savedTheme) return savedTheme === "dark"
|
|
||||||
return document.documentElement.classList.contains("dark")
|
|
||||||
})
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const handleProfileUpdated = ((e: CustomEvent) => {
|
const handleProfileUpdated = ((e: CustomEvent) => {
|
||||||
@@ -40,14 +39,6 @@ export function Navbar({ onOpenSidebar }: NavbarProps) {
|
|||||||
return () => window.removeEventListener("profile_updated", handleProfileUpdated)
|
return () => window.removeEventListener("profile_updated", handleProfileUpdated)
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (isDarkMode) {
|
|
||||||
document.documentElement.classList.add("dark")
|
|
||||||
} else {
|
|
||||||
document.documentElement.classList.remove("dark")
|
|
||||||
}
|
|
||||||
}, [isDarkMode])
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const fetchUser = async () => {
|
const fetchUser = async () => {
|
||||||
const token = getAccessToken()
|
const token = getAccessToken()
|
||||||
@@ -92,9 +83,7 @@ export function Navbar({ onOpenSidebar }: NavbarProps) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const toggleTheme = () => {
|
const toggleTheme = () => {
|
||||||
const newThemeState = !isDarkMode
|
setTheme(isDarkMode ? "light" : "dark")
|
||||||
setIsDarkMode(newThemeState)
|
|
||||||
localStorage.setItem("theme", newThemeState ? "dark" : "light")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const toggleLanguage = () => {
|
const toggleLanguage = () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user