Skip to content

bug:DOMTokenList error #224

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
fahimahammed merged 5 commits into from
Oct 20, 2025
Merged

bug:DOMTokenList error #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dce000e
bug:DOMTokenList error
kunal-10-cloud Oct 18, 2025
2484e4e
Resolve merge conflict: combine Header component with theme features
kunal-10-cloud Oct 18, 2025
c8cb903
removed addition header
kunal-10-cloud Oct 18, 2025
56c08e6
Merge branch 'stage' into DOMTokenList#223
kunal-10-cloud Oct 18, 2025
7bb6d3a
fix:parsing error
kunal-10-cloud Oct 18, 2025
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: 3 additions & 3 deletions src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ export default function RootLayout({
<body
className={`${geistSans.variable} ${geistMono.variable} antialiased`}
>
{/* Wrap everything in ThemeProvider */}
<ThemeProvider attribute="class" defaultTheme="dark" enableSystem>
{/* ✅ Wrap everything in ThemeProvider */}
Copy link
Owner

@fahimahammed fahimahammed Oct 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approved. thank you

<ThemeProvider attribute="class" defaultTheme="dark" enableSystem storageKey="devui-theme">
<SearchProvider>
<ThemeColorPicker />
<Header />
<ThemeColorPicker />
{children}
<Toaster position="top-center" richColors />
<BackToTopButton />
Expand Down
18 changes: 17 additions & 1 deletion src/components/ui/ThemeColorPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,29 @@ const ThemeColorPicker = () => {
// Load saved theme from localStorage on mount
useEffect(() => {
setMounted(true);

// Clean up any invalid theme names from next-themes localStorage
const nextThemesKey = 'devui-theme';
const nextThemesValue = localStorage.getItem(nextThemesKey);
if (nextThemesValue && nextThemesValue.includes(' ')) {
localStorage.removeItem(nextThemesKey);
}

const savedThemeName = localStorage.getItem(STORAGE_KEY);
const savedTheme = themes.find((t) => t.name === savedThemeName);

// Validate theme name - remove any invalid characters
const cleanThemeName = savedThemeName?.replace(/[^a-zA-Z0-9-_]/g, '');
const savedTheme = themes.find((t) => t.name === cleanThemeName);

if (savedTheme) {
// If a theme was saved, apply it
handleThemeChange(savedTheme, false); // Pass false to prevent re-saving
} else {
// Clean up invalid theme names from localStorage
if (savedThemeName && savedThemeName !== cleanThemeName) {
localStorage.removeItem(STORAGE_KEY);
}

// Otherwise, get the default color from CSS
const currentColor = getComputedStyle(document.body)
.getPropertyValue("--primary")
Expand Down