From c48ddf3d60cdc5467f3dd130eeaa3b08ded1d7da Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@keyboard.io>
Date: Thu, 14 Mar 2024 11:23:28 -0700
Subject: [PATCH] Set Dark Mode based on the system theme.

- Added a state to track if in dark mode in App.js
- Updated theme mode based on inDarkMode in App.js
- Modified getDarkMode function in GlobalContext.js to check theme and native dark mode preference.
---
 src/renderer/App.js                      | 22 +++++++++++++---------
 src/renderer/components/GlobalContext.js | 12 +++++++++++-
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/renderer/App.js b/src/renderer/App.js
index 7eca36560..2b814c133 100644
--- a/src/renderer/App.js
+++ b/src/renderer/App.js
@@ -65,7 +65,7 @@ const App = (props) => {
   const darkMode = state.darkMode;
   const [activeDevice, setActiveDevice] = state.activeDevice;
   const [bgColor, setBgColor] = useState(null);
-
+  const [inDarkMode, setInDarkMode] = useState(darkMode());
   const handleDeviceDisconnect = async (sender, vid, pid) => {
     if (!focus.focusDeviceDescriptor) return;
     if (flashing) return;
@@ -93,12 +93,16 @@ const App = (props) => {
 
   const handleNativeThemeUpdate = (event, v) => {
     if (theme != "system") return;
-
-    // This enforces a re-render, without having to use another state.
-    setTheme(null);
-    setTheme("system");
+    if (darkMode() === inDarkMode) return;
+    // This forces a re-render, without having to use another state.
+    setInDarkMode(darkMode());
   };
 
+  // Listening for changes to the native theme
+  window.matchMedia("(prefers-color-scheme: dark)").addEventListener("change", (event) => {
+    handleNativeThemeUpdate(event);
+  });
+
   useEffect(() => {
     async function setupLayout() {
       const layoutSetting = await settings.get("keyboard.layout", "English (US)");
@@ -121,15 +125,15 @@ const App = (props) => {
 
   const uiTheme = createTheme({
     palette: {
-      mode: darkMode() ? "dark" : "light",
+      mode: inDarkMode ? "dark" : "light",
       primary: {
         main: "#EF5022",
       },
       secondary: {
-        main: darkMode() ? "#ed91f3" : "#ab0edd",
+        main: inDarkMode ? "#ed91f3" : "#ab0edd",
       },
       background: {
-        default: darkMode() ? "#353535" : "#f5f5f5",
+        default: inDarkMode ? "#353535" : "#f5f5f5",
       },
     },
     components: {
@@ -151,7 +155,7 @@ const App = (props) => {
   useEffect(() => {
     setTheme(theme);
     setBgColor(uiTheme.palette.body);
-  }, [theme, uiTheme, setTheme]);
+  }, [theme, uiTheme, setTheme, inDarkMode]);
 
   const toggleFlashing = async () => {
     flashing = !flashing;
diff --git a/src/renderer/components/GlobalContext.js b/src/renderer/components/GlobalContext.js
index 7e125861e..164c1a325 100644
--- a/src/renderer/components/GlobalContext.js
+++ b/src/renderer/components/GlobalContext.js
@@ -28,7 +28,17 @@ export const GlobalContextProvider = (props) => {
   const [firmwareUpdateWarning, setFirmwareUpdateWarning] = useState(false);
   const [hideHeaderInPrint, setHideHeaderInPrint] = useState(false);
   const getDarkMode = () => {
-    return theme == "dark";
+    if (theme === "dark") {
+      return true;
+    }
+    if (theme === "system") {
+      if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
+        return true;
+      } else {
+        return false;
+      }
+    }
+    return false; // light
   };
 
   const state = {