Polish 'Fix dark scheme detect function'

See gh-23 Closes gh-23
spring-io · Jun 10, 2021 · caa0a60 · caa0a60
1 parent d0e44ad
commit caa0a60
Showing 1 changed file with 5 additions and 12 deletions.
diff --git a/src/main/js/setup/switchtheme.js b/src/main/js/setup/switchtheme.js
@@ -21,6 +21,9 @@
 
   const localStorage = window.localStorage;
   const htmlElement = document.documentElement;
+  const prefersDarkColorScheme = window.matchMedia(
+    "(prefers-color-scheme: dark)"
+  );
 
   swithInitialTheme();
   window.addEventListener("load", onWindowLoad);
@@ -43,18 +46,8 @@
   }
 
   function isInitialThemeDark() {
-    const prefersDarkColorScheme = window.matchMedia(
-      "(prefers-color-scheme: dark)"
-    );
-    const savedColorScheme = loadTheme();
-    switch (savedColorScheme) {
-      case "dark":
-        return true;
-      case "light":
-        return false;
-      default:
-        return prefersDarkColorScheme.matches;
-    }
+    const theme = loadTheme();
+    return theme ? theme === "dark" : prefersDarkColorScheme.matches;
   }
 
   function onThemeChange() {