From cdb4712240fc097cd5961dc74aa0112fdba52198 Mon Sep 17 00:00:00 2001 From: mrholek Date: Fri, 3 Jan 2025 11:28:52 +0100 Subject: [PATCH 1/2] chore: clean-up --- packages/coreui-react/src/components/modal/CModal.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/coreui-react/src/components/modal/CModal.tsx b/packages/coreui-react/src/components/modal/CModal.tsx index 31637877..1eb4544c 100644 --- a/packages/coreui-react/src/components/modal/CModal.tsx +++ b/packages/coreui-react/src/components/modal/CModal.tsx @@ -158,7 +158,6 @@ export const CModal = forwardRef( }, [_visible]) const handleDismiss = () => { - console.log('handleDismiss') if (backdrop === 'static') { return setStaticBackdrop(true) } From 3f03770ab7a8d36c7aa84a64f17901f28af16a4c Mon Sep 17 00:00:00 2001 From: mrholek Date: Fri, 3 Jan 2025 11:30:46 +0100 Subject: [PATCH 2/2] refactor(useColorModes): replace `window` with `globalThis` --- packages/coreui-react/src/hooks/useColorModes.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/coreui-react/src/hooks/useColorModes.ts b/packages/coreui-react/src/hooks/useColorModes.ts index b6c63a80..4995f18b 100644 --- a/packages/coreui-react/src/hooks/useColorModes.ts +++ b/packages/coreui-react/src/hooks/useColorModes.ts @@ -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' } @@ -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 @@ -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)