Skip to content

Refactor useColorModes #424

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
merged 2 commits into from
Jan 3, 2025
Merged

Refactor useColorModes #424

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
cdb4712
chore: clean-up
mrholek Jan 3, 2025
3f03770
refactor(useColorModes): replace `window` with `globalThis`
mrholek Jan 3, 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
1 change: 0 additions & 1 deletion packages/coreui-react/src/components/modal/CModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ export const CModal = forwardRef<HTMLDivElement, CModalProps>(
}, [_visible])

const handleDismiss = () => {
console.log('handleDismiss')
if (backdrop === 'static') {
return setStaticBackdrop(true)
}
Expand Down
10 changes: 5 additions & 5 deletions packages/coreui-react/src/hooks/useColorModes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ interface UseColorModesOutput {
}

const getStoredTheme = (localStorageItemName: string) =>
typeof window !== 'undefined' && localStorage.getItem(localStorageItemName)
typeof globalThis !== 'undefined' && localStorage.getItem(localStorageItemName)

const setStoredTheme = (localStorageItemName: string, colorMode: string) =>
localStorage.setItem(localStorageItemName, colorMode)

const getPreferredColorScheme = (localStorageItemName: string) => {
if (typeof window === 'undefined') {
if (typeof globalThis === 'undefined') {
return 'light'
}

Expand All @@ -23,12 +23,12 @@ const getPreferredColorScheme = (localStorageItemName: string) => {
return storedTheme
}

return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
return globalThis.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
}

const setTheme = (colorMode: string) => {
document.documentElement.dataset.coreuiTheme =
colorMode === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches
colorMode === 'auto' && globalThis.matchMedia('(prefers-color-scheme: dark)').matches
? 'dark'
: colorMode

Expand All @@ -51,7 +51,7 @@ export const useColorModes = (
}, [colorMode])

useEffect(() => {
window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
globalThis.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
const storedTheme = getStoredTheme(localStorageItemName)
if (storedTheme !== 'light' && storedTheme !== 'dark' && colorMode) {
setTheme(colorMode)
Expand Down