From 11932defdd503fdce9e6123a4daa3599af537a2c Mon Sep 17 00:00:00 2001 From: Sebastian-Webster <84299475+Sebastian-Webster@users.noreply.github.com> Date: Wed, 5 Jun 2024 02:40:09 +1200 Subject: [PATCH 1/2] fix: fixed theme change from dark mode to light mode not working --- src/modules/Theme.js | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/modules/Theme.js b/src/modules/Theme.js index f79e8fa2c..fc99141aa 100644 --- a/src/modules/Theme.js +++ b/src/modules/Theme.js @@ -178,20 +178,26 @@ export default class Theme { updateThemeOptions(options) { options.chart = options.chart || {} options.tooltip = options.tooltip || {} - const mode = options.theme.mode || 'light' - const palette = options.theme.palette - ? options.theme.palette - : mode === 'dark' + const mode = options.theme.mode + const background = mode === 'dark' + ? '#424242' + : mode === 'light' + ? '#fff' + : options.chart.background || '#fff' + const palette = mode === 'dark' ? 'palette4' - : 'palette1' - const foreColor = options.chart.foreColor - ? options.chart.foreColor - : mode === 'dark' + : mode === 'light' + ? 'palette1' + : options.theme.palette || 'palette1' + const foreColor = mode === 'dark' ? '#f6f7f8' - : '#373d3f' + : mode === 'light' + ? '#373d3f' + : options.chart.foreColor || '#373d3f' options.tooltip.theme = mode options.chart.foreColor = foreColor + options.chart.background = background options.theme.palette = palette return options From d47bc723fb805a0cf3e1824b798b22be21666db8 Mon Sep 17 00:00:00 2001 From: Sebastian-Webster <84299475+Sebastian-Webster@users.noreply.github.com> Date: Wed, 5 Jun 2024 03:54:19 +1200 Subject: [PATCH 2/2] chore: set tooltip theme to light if no mode is provided --- src/modules/Theme.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/Theme.js b/src/modules/Theme.js index fc99141aa..b71ed3b78 100644 --- a/src/modules/Theme.js +++ b/src/modules/Theme.js @@ -195,7 +195,7 @@ export default class Theme { ? '#373d3f' : options.chart.foreColor || '#373d3f' - options.tooltip.theme = mode + options.tooltip.theme = mode || 'light' options.chart.foreColor = foreColor options.chart.background = background options.theme.palette = palette