Skip to content
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

Fix: Prevent persistence of dark mode styles when switching to light … #106

Merged
merged 2 commits into from
Nov 8, 2024
Merged

Fix: Prevent persistence of dark mode styles when switching to light … #106

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f2d517
Fix: Prevent persistence of dark mode styles when switching to light …
epsilonxaos Oct 2, 2024
55e09d6
Merge branch 'main' into fix/disabledDarkMode
hxf31891 Nov 8, 2024
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
7 changes: 4 additions & 3 deletions src/styles/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,16 +182,17 @@ const styles: Styles = {
export const getStyles = (disableDarkMode: boolean, disableLightMode: boolean) => {
if (typeof window === 'undefined' || disableDarkMode) return styles;
if (window.matchMedia("(prefers-color-scheme: dark)").matches || disableLightMode) {
const mergedStyles = { ...styles }
for (const key in darkStyles) {
if (Object.prototype.hasOwnProperty.call(darkStyles, key)) {
(styles as Record<string, any>)[key] = {
...(Object.prototype.hasOwnProperty.call(styles, key) ? (styles as Record<string, any>)[key] : {}),
(mergedStyles as Record<string, any>)[key] = {
...(Object.prototype.hasOwnProperty.call(mergedStyles, key) ? (mergedStyles as Record<string, any>)[key] : {}),
...(darkStyles as Record<string, any>)[key],
};
}
}

return styles;
return mergedStyles;
}
return styles;
};
Expand Down
Loading