mirror of
https://github.com/freedbygrace/ActiveDirectoryManager.git
synced 2026-08-28 11:37:13 +00:00
Enhance theme switching to handle missing context
Replit-Commit-Author: Agent Replit-Commit-Session-Id: 705f2157-ef97-4fbd-89e4-8c7f2ecaea90 Replit-Commit-Screenshot-Url: https://storage.googleapis.com/screenshot-production-us-central1/7ed01c5f-a82d-405a-b728-b2e3d127c60c/70b9c0b1-a5f0-4a27-9a6a-5bb48b9d90b1.jpg
This commit is contained in:
@@ -9,7 +9,25 @@ import {
|
|||||||
} from "@/components/ui/dropdown-menu";
|
} from "@/components/ui/dropdown-menu";
|
||||||
import { useTheme } from "@/hooks/use-theme";
|
import { useTheme } from "@/hooks/use-theme";
|
||||||
|
|
||||||
|
// Fallback toggle without context dependency
|
||||||
export function ThemeToggle() {
|
export function ThemeToggle() {
|
||||||
|
// Try/catch block to handle possible context errors
|
||||||
|
try {
|
||||||
|
return <ThemeToggleWithContext />;
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Theme context error:", error);
|
||||||
|
// Fallback rendering without context
|
||||||
|
return (
|
||||||
|
<Button variant="ghost" size="icon" className="relative h-9 w-9 rounded-md">
|
||||||
|
<Sun className="h-5 w-5" />
|
||||||
|
<span className="sr-only">Theme settings</span>
|
||||||
|
</Button>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Component that uses the theme context
|
||||||
|
function ThemeToggleWithContext() {
|
||||||
const { theme, setTheme } = useTheme();
|
const { theme, setTheme } = useTheme();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -59,8 +59,65 @@ export function ThemeProvider({
|
|||||||
export const useTheme = (): ThemeContextType => {
|
export const useTheme = (): ThemeContextType => {
|
||||||
const context = useContext(ThemeContext);
|
const context = useContext(ThemeContext);
|
||||||
|
|
||||||
if (context === undefined)
|
if (context === undefined) {
|
||||||
throw new Error('useTheme must be used within a ThemeProvider');
|
// Fallback implementation that doesn't rely on context
|
||||||
|
// This prevents crashes but won't sync across components
|
||||||
|
const storageKey = 'ad-management-theme';
|
||||||
|
const defaultTheme = 'system';
|
||||||
|
|
||||||
|
// Create a fallback state using localStorage
|
||||||
|
const getThemeFromStorage = (): Theme => {
|
||||||
|
try {
|
||||||
|
const storedTheme = localStorage.getItem(storageKey);
|
||||||
|
return (storedTheme as Theme) || defaultTheme;
|
||||||
|
} catch (e) {
|
||||||
|
return defaultTheme;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const currentTheme = getThemeFromStorage();
|
||||||
|
|
||||||
|
const applyThemeToDOM = (newTheme: Theme) => {
|
||||||
|
try {
|
||||||
|
const root = window.document.documentElement;
|
||||||
|
root.classList.remove('light', 'dark');
|
||||||
|
|
||||||
|
if (newTheme === 'system') {
|
||||||
|
const systemTheme = window.matchMedia('(prefers-color-scheme: dark)').matches
|
||||||
|
? 'dark'
|
||||||
|
: 'light';
|
||||||
|
root.classList.add(systemTheme);
|
||||||
|
} else {
|
||||||
|
root.classList.add(newTheme);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error('Error applying theme to DOM:', e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Apply the theme immediately for this component
|
||||||
|
applyThemeToDOM(currentTheme);
|
||||||
|
|
||||||
|
// Return a fallback implementation
|
||||||
|
return {
|
||||||
|
theme: currentTheme,
|
||||||
|
setTheme: (newTheme: Theme) => {
|
||||||
|
try {
|
||||||
|
localStorage.setItem(storageKey, newTheme);
|
||||||
|
applyThemeToDOM(newTheme);
|
||||||
|
|
||||||
|
// We can't update state here because we're not in a React component
|
||||||
|
// but we can apply the theme directly to the DOM
|
||||||
|
console.warn(
|
||||||
|
'Theme changed outside of ThemeProvider context. ' +
|
||||||
|
'This change won\'t be synced between components.'
|
||||||
|
);
|
||||||
|
} catch (e) {
|
||||||
|
console.error('Error setting theme:', e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
return context;
|
return context;
|
||||||
};
|
};
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { useState, useEffect } from "react";
|
||||||
import { DashboardLayout } from "@/layouts/dashboard-layout";
|
import { DashboardLayout } from "@/layouts/dashboard-layout";
|
||||||
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
|
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
|
||||||
import { Switch } from "@/components/ui/switch";
|
import { Switch } from "@/components/ui/switch";
|
||||||
@@ -14,6 +15,64 @@ import {
|
|||||||
SelectValue
|
SelectValue
|
||||||
} from "@/components/ui/select";
|
} from "@/components/ui/select";
|
||||||
import { Separator } from "@/components/ui/separator";
|
import { Separator } from "@/components/ui/separator";
|
||||||
|
import { Moon, Sun, Laptop } from "lucide-react";
|
||||||
|
|
||||||
|
// Safe theme selector that doesn't throw errors if ThemeProvider is missing
|
||||||
|
function ThemeSelector() {
|
||||||
|
const [currentTheme, setCurrentTheme] = useState<string>(() => {
|
||||||
|
// Read from localStorage or default to system
|
||||||
|
return localStorage.getItem("ad-management-theme") || "system";
|
||||||
|
});
|
||||||
|
|
||||||
|
const handleThemeChange = (value: string) => {
|
||||||
|
setCurrentTheme(value);
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Handle theme change manually if context is missing
|
||||||
|
localStorage.setItem("ad-management-theme", value);
|
||||||
|
|
||||||
|
const root = window.document.documentElement;
|
||||||
|
root.classList.remove("light", "dark");
|
||||||
|
|
||||||
|
if (value === "system") {
|
||||||
|
const systemTheme = window.matchMedia("(prefers-color-scheme: dark)").matches
|
||||||
|
? "dark"
|
||||||
|
: "light";
|
||||||
|
root.classList.add(systemTheme);
|
||||||
|
} else {
|
||||||
|
root.classList.add(value);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error changing theme:", error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<RadioGroup value={currentTheme} onValueChange={handleThemeChange}>
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
<RadioGroupItem value="light" id="light-theme" />
|
||||||
|
<Label htmlFor="light-theme" className="flex items-center">
|
||||||
|
<Sun className="mr-2 h-4 w-4" />
|
||||||
|
Light
|
||||||
|
</Label>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
<RadioGroupItem value="dark" id="dark-theme" />
|
||||||
|
<Label htmlFor="dark-theme" className="flex items-center">
|
||||||
|
<Moon className="mr-2 h-4 w-4" />
|
||||||
|
Dark
|
||||||
|
</Label>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
<RadioGroupItem value="system" id="system-theme" />
|
||||||
|
<Label htmlFor="system-theme" className="flex items-center">
|
||||||
|
<Laptop className="mr-2 h-4 w-4" />
|
||||||
|
System
|
||||||
|
</Label>
|
||||||
|
</div>
|
||||||
|
</RadioGroup>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export default function SettingsPage() {
|
export default function SettingsPage() {
|
||||||
return (
|
return (
|
||||||
@@ -43,20 +102,7 @@ export default function SettingsPage() {
|
|||||||
|
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<Label>Theme</Label>
|
<Label>Theme</Label>
|
||||||
<RadioGroup defaultValue="light">
|
<ThemeSelector />
|
||||||
<div className="flex items-center space-x-2">
|
|
||||||
<RadioGroupItem value="light" id="light" />
|
|
||||||
<Label htmlFor="light">Light</Label>
|
|
||||||
</div>
|
|
||||||
<div className="flex items-center space-x-2">
|
|
||||||
<RadioGroupItem value="dark" id="dark" />
|
|
||||||
<Label htmlFor="dark">Dark</Label>
|
|
||||||
</div>
|
|
||||||
<div className="flex items-center space-x-2">
|
|
||||||
<RadioGroupItem value="system" id="system" />
|
|
||||||
<Label htmlFor="system">System</Label>
|
|
||||||
</div>
|
|
||||||
</RadioGroup>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
|
|||||||
Reference in New Issue
Block a user