From 877b6dd979e59fdc79cc8abf62669d433752d603 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 4 Jul 2022 09:29:06 +0200 Subject: [PATCH] fix: chart not rendering when theme auto --- src/lib/charts/echarts.svelte | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/lib/charts/echarts.svelte b/src/lib/charts/echarts.svelte index 7008b528d..faab1721e 100644 --- a/src/lib/charts/echarts.svelte +++ b/src/lib/charts/echarts.svelte @@ -16,6 +16,7 @@ import { app } from '$lib/stores/app'; import light from './echartLight.json'; import dark from './echartDark.json'; + import { browser } from '$app/env'; echarts.use([ TitleComponent, @@ -59,11 +60,25 @@ let timeoutId: unknown; $: option && setOption(); - $: if (myChart && $app.theme) { + $: if (myChart && selectedTheme) { makeChart(); setOption(); } + $: selectedTheme = $app.theme; + $: if ($app.theme === 'auto') { + if (browser) { + const darkThemeMq = window.matchMedia('(prefers-color-scheme: dark)'); + if (darkThemeMq.matches) { + selectedTheme = 'dark'; + } else { + selectedTheme = 'light'; + } + } + } else { + selectedTheme = $app.theme; + } + onMount(() => { makeChart(); }); @@ -85,7 +100,7 @@ const makeChart = () => { destroyChart(); - myChart = echarts.init(document.getElementById(`echart-${title}`), $app.theme); + myChart = echarts.init(document.getElementById(`echart-${title}`), selectedTheme); series.forEach((s: LineSeriesOption, i: number) => { s.areaStyle = colorToGradient(myChart['_theme'].color[i]); });