From dce4e4e7519056b84661c45cf81618d3e6567fde Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Thu, 14 Sep 2023 19:22:11 -0700 Subject: [PATCH] fix: typescript issue --- src/lib/ui/colors.ts | 8 +++++--- src/routes/+layout.svelte | 19 +++++++++++++++++-- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/lib/ui/colors.ts b/src/lib/ui/colors.ts index 13442d71..f58a3258 100644 --- a/src/lib/ui/colors.ts +++ b/src/lib/ui/colors.ts @@ -17,8 +17,9 @@ import { get, writable } from 'svelte/store' import { env } from '$env/dynamic/public' const configuredTheme = env.PUBLIC_THEME ?? 'system' -export const theme = writable<'system' | 'light' | 'dark'>(configuredTheme) - +export const theme = writable<'system' | 'light' | 'dark'>( + configuredTheme as 'system' | 'light' | 'dark' +) export const toggleTheme = () => { theme.update((theme) => { @@ -43,7 +44,8 @@ export const inDarkTheme = (): boolean => { if (typeof localStorage != 'undefined') { const localTheme: 'system' | 'light' | 'dark' = - (localStorage.getItem('theme') as 'system' | 'light' | 'dark') || configuredTheme + (localStorage.getItem('theme') as 'system' | 'light' | 'dark') || + configuredTheme theme.update((theme) => localTheme) diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 98b93ff3..1b1409c4 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -8,9 +8,11 @@ import Sidebar from '$lib/components/ui/sidebar/Sidebar.svelte' // @ts-ignore import { pwaInfo } from 'virtual:pwa-info' - import { inDarkTheme } from '$lib/ui/colors.js' + import { inDarkTheme, theme } from '$lib/ui/colors.js' import { userSettings } from '$lib/settings.js' import { ToastContainer } from 'mono-svelte' + import { onMount } from 'svelte' + import { browser } from '$app/environment' nProgress.configure({ minimum: 0.4, @@ -34,10 +36,23 @@ } $: webManifest = pwaInfo ? pwaInfo.webManifest.linkTag : '' + $: darkTheme = $theme && inDarkTheme() + + $: console.log(darkTheme) + + onMount(() => { + if (browser) { + window + .matchMedia('(prefers-color-scheme: dark)') + .addEventListener('change', (event) => { + darkTheme = inDarkTheme() + }) + } + }) - + {@html webManifest}