Skip to content

Commit ccc3c22

Browse files
committed
refactor(useColorModes): update the handling of color modes
1 parent 0b02b4f commit ccc3c22

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

packages/coreui-vue/src/composables/useColorModes.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { onBeforeMount, ref, watch } from 'vue'
22

33
const getStoredTheme = (localStorageItemName: string) =>
44
typeof window !== 'undefined' && localStorage.getItem(localStorageItemName)
5+
56
const setStoredTheme = (localStorageItemName: string, colorMode: string) =>
67
localStorage.setItem(localStorageItemName, colorMode)
78

@@ -53,7 +54,7 @@ export const useColorModes = (localStorageItemName = 'coreui-vue-color-scheme')
5354
})
5455

5556
return {
56-
getColorMode: () => colorMode.value,
57+
colorMode,
5758
isColorModeSet: () => Boolean(getStoredTheme(localStorageItemName)),
5859
setColorMode: (mode: string) => {
5960
colorMode.value = mode

packages/docs/.vuepress/theme-coreui/src/client/components/Header.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
</li>
2121
<CDropdown variant="nav-item" placement="bottom-end">
2222
<CDropdownToggle :caret="false">
23-
<CIcon v-if="getColorMode() === 'dark'" icon="cil-moon" size="xl" />
24-
<CIcon v-else-if="getColorMode() === 'light'" icon="cil-sun" size="xl" />
23+
<CIcon v-if="colorMode === 'dark'" icon="cil-moon" size="xl" />
24+
<CIcon v-else-if="colorMode === 'light'" icon="cil-sun" size="xl" />
2525
<CIcon v-else icon="cil-contrast" size="xl" />
2626
</CDropdownToggle>
2727
<CDropdownMenu>
2828
<CDropdownItem
29-
:active="getColorMode() === 'light'"
29+
:active="colorMode === 'light'"
3030
class="d-flex align-items-center"
3131
component="button"
3232
type="button"
@@ -35,7 +35,7 @@
3535
<CIcon class="me-2" icon="cil-sun" size="lg" /> Light
3636
</CDropdownItem>
3737
<CDropdownItem
38-
:active="getColorMode() === 'dark'"
38+
:active="colorMode === 'dark'"
3939
class="d-flex align-items-center"
4040
component="button"
4141
type="button"
@@ -44,7 +44,7 @@
4444
<CIcon class="me-2" icon="cil-moon" size="lg" /> Dark
4545
</CDropdownItem>
4646
<CDropdownItem
47-
:active="getColorMode() === 'auto'"
47+
:active="colorMode === 'auto'"
4848
class="d-flex align-items-center"
4949
component="button"
5050
type="button"
@@ -97,11 +97,11 @@ export default defineComponent({
9797
},
9898
emits: ['toggle-sidebar'],
9999
setup() {
100-
const { getColorMode, setColorMode } = useColorModes('coreui-vue-docs-theme')
100+
const { colorMode, setColorMode } = useColorModes('coreui-vue-docs-theme')
101101
102102
return {
103+
colorMode,
103104
setColorMode,
104-
getColorMode,
105105
}
106106
},
107107
})

0 commit comments

Comments
 (0)