From b4faf8dda1ebbc6096dbd4e41a04aa90822c5900 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Mon, 25 Oct 2021 13:39:38 -0700
Subject: [PATCH] Fix checkboxes to use event handler value

---
 src/components/player/NowPlayingMiniView.tsx  |  9 +++------
 src/components/player/NowPlayingView.tsx      |  9 +++------
 src/components/playlist/PlaylistView.tsx      |  2 +-
 .../settings/ConfigPanels/CacheConfig.tsx     | 12 +++++------
 .../settings/ConfigPanels/DebugConfig.tsx     |  8 ++++----
 .../ConfigPanels/LookAndFeelConfig.tsx        | 20 +++++++++----------
 .../settings/ConfigPanels/PlayerConfig.tsx    | 14 ++++++-------
 .../settings/ConfigPanels/WindowConfig.tsx    | 12 +++++------
 8 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/src/components/player/NowPlayingMiniView.tsx b/src/components/player/NowPlayingMiniView.tsx
index 1d9cec6..aa901a6 100644
--- a/src/components/player/NowPlayingMiniView.tsx
+++ b/src/components/player/NowPlayingMiniView.tsx
@@ -231,15 +231,12 @@ const NowPlayingMiniView = () => {
                     <StyledCheckbox
                       defaultChecked={playQueue.scrollWithCurrentSong}
                       checked={playQueue.scrollWithCurrentSong}
-                      onChange={() => {
-                        settings.setSync(
-                          'scrollWithCurrentSong',
-                          !settings.getSync('scrollWithCurrentSong')
-                        );
+                      onChange={(_v: any, e: boolean) => {
+                        settings.setSync('scrollWithCurrentSong', e);
                         dispatch(
                           setPlaybackSetting({
                             setting: 'scrollWithCurrentSong',
-                            value: !playQueue.scrollWithCurrentSong,
+                            value: e,
                           })
                         );
                       }}
diff --git a/src/components/player/NowPlayingView.tsx b/src/components/player/NowPlayingView.tsx
index 5858030..fdef2b0 100644
--- a/src/components/player/NowPlayingView.tsx
+++ b/src/components/player/NowPlayingView.tsx
@@ -385,15 +385,12 @@ const NowPlayingView = () => {
             <StyledCheckbox
               defaultChecked={playQueue.scrollWithCurrentSong}
               checked={playQueue.scrollWithCurrentSong}
-              onChange={() => {
-                settings.setSync(
-                  'scrollWithCurrentSong',
-                  !settings.getSync('scrollWithCurrentSong')
-                );
+              onChange={(_v: any, e: boolean) => {
+                settings.setSync('scrollWithCurrentSong', e);
                 dispatch(
                   setPlaybackSetting({
                     setting: 'scrollWithCurrentSong',
-                    value: !playQueue.scrollWithCurrentSong,
+                    value: e,
                   })
                 );
               }}
diff --git a/src/components/playlist/PlaylistView.tsx b/src/components/playlist/PlaylistView.tsx
index 00a31d8..0058321 100644
--- a/src/components/playlist/PlaylistView.tsx
+++ b/src/components/playlist/PlaylistView.tsx
@@ -433,7 +433,7 @@ const PlaylistView = ({ ...rest }) => {
                           <StyledCheckbox
                             defaultChecked={editPublic}
                             value={editPublic}
-                            onChange={() => setEditPublic(!editPublic)}
+                            onChange={(_v: any, e: boolean) => setEditPublic(e)}
                           >
                             Public
                           </StyledCheckbox>
diff --git a/src/components/settings/ConfigPanels/CacheConfig.tsx b/src/components/settings/ConfigPanels/CacheConfig.tsx
index 65e6ae9..eb67ad2 100644
--- a/src/components/settings/ConfigPanels/CacheConfig.tsx
+++ b/src/components/settings/ConfigPanels/CacheConfig.tsx
@@ -171,9 +171,9 @@ const CacheConfig = () => {
       <div style={{ width: '300px', marginTop: '20px' }}>
         <StyledCheckbox
           defaultChecked={cacheSongs}
-          onChange={() => {
-            settings.setSync('cacheSongs', !settings.getSync('cacheSongs'));
-            setCacheSongs(!cacheSongs);
+          onChange={(_v: any, e: boolean) => {
+            settings.setSync('cacheSongs', e);
+            setCacheSongs(e);
           }}
         >
           Songs{' '}
@@ -183,9 +183,9 @@ const CacheConfig = () => {
         </StyledCheckbox>
         <StyledCheckbox
           defaultChecked={cacheImages}
-          onChange={() => {
-            settings.setSync('cacheImages', !settings.getSync('cacheImages'));
-            setCacheImages(!cacheImages);
+          onChange={(_v: any, e: boolean) => {
+            settings.setSync('cacheImages', e);
+            setCacheImages(e);
           }}
         >
           Images{' '}
diff --git a/src/components/settings/ConfigPanels/DebugConfig.tsx b/src/components/settings/ConfigPanels/DebugConfig.tsx
index f569400..65c0765 100644
--- a/src/components/settings/ConfigPanels/DebugConfig.tsx
+++ b/src/components/settings/ConfigPanels/DebugConfig.tsx
@@ -14,15 +14,15 @@ const DebugConfig = () => {
     <ConfigPanel header="Advanced" bordered>
       <StyledCheckbox
         defaultChecked={showDebugWindow}
-        onChange={() => {
-          settings.setSync('showDebugWindow', !settings.getSync('showDebugWindow'));
+        onChange={(_v: any, e: boolean) => {
+          settings.setSync('showDebugWindow', e);
           dispatch(
             setPlaybackSetting({
               setting: 'showDebugWindow',
-              value: settings.getSync('showDebugWindow'),
+              value: e,
             })
           );
-          setShowDebugWindow(!showDebugWindow);
+          setShowDebugWindow(e);
         }}
       >
         Show debug window
diff --git a/src/components/settings/ConfigPanels/LookAndFeelConfig.tsx b/src/components/settings/ConfigPanels/LookAndFeelConfig.tsx
index 926b252..6013d43 100644
--- a/src/components/settings/ConfigPanels/LookAndFeelConfig.tsx
+++ b/src/components/settings/ConfigPanels/LookAndFeelConfig.tsx
@@ -76,10 +76,10 @@ const LookAndFeelConfig = () => {
         <StyledCheckbox
           defaultChecked={dynamicBackgroundChk}
           checked={dynamicBackgroundChk}
-          onChange={() => {
-            settings.setSync('dynamicBackground', !dynamicBackgroundChk);
-            dispatch(setDynamicBackground(!dynamicBackgroundChk));
-            setDynamicBackgroundChk(!dynamicBackgroundChk);
+          onChange={(_v: any, e: boolean) => {
+            settings.setSync('dynamicBackground', e);
+            dispatch(setDynamicBackground(e));
+            setDynamicBackgroundChk(e);
           }}
         >
           Enable dynamic background
@@ -128,15 +128,15 @@ const LookAndFeelConfig = () => {
         <StyledCheckbox
           defaultChecked={highlightOnRowHoverChk}
           checked={highlightOnRowHoverChk}
-          onChange={() => {
-            settings.setSync('highlightOnRowHover', !highlightOnRowHoverChk);
+          onChange={(_v: any, e: boolean) => {
+            settings.setSync('highlightOnRowHover', e);
             dispatch(
               setMiscSetting({
                 setting: 'highlightOnRowHover',
-                value: !highlightOnRowHoverChk,
+                value: e,
               })
             );
-            setHighlightOnRowHoverChk(!highlightOnRowHoverChk);
+            setHighlightOnRowHoverChk(e);
           }}
         >
           Show highlight on row hover
@@ -145,8 +145,8 @@ const LookAndFeelConfig = () => {
         <p>Select the columns you want displayed on pages with a list-view.</p>
         <StyledCheckbox
           defaultChecked={resizableColumn}
-          onChange={() => {
-            setResizableColumn(!resizableColumn);
+          onChange={(_v: any, e: boolean) => {
+            setResizableColumn(e);
           }}
         >
           Use resizable columns (check/uncheck this before selecting columns)
diff --git a/src/components/settings/ConfigPanels/PlayerConfig.tsx b/src/components/settings/ConfigPanels/PlayerConfig.tsx
index 0566c59..95849e8 100644
--- a/src/components/settings/ConfigPanels/PlayerConfig.tsx
+++ b/src/components/settings/ConfigPanels/PlayerConfig.tsx
@@ -45,19 +45,19 @@ const PlayerConfig = () => {
       <br />
       <StyledCheckbox
         defaultChecked={globalMediaHotkeys}
-        onChange={() => {
-          settings.setSync('globalMediaHotkeys', !settings.getSync('globalMediaHotkeys'));
-          setGlobalMediaHotkeys(!globalMediaHotkeys);
+        onChange={(_v: any, e: boolean) => {
+          settings.setSync('globalMediaHotkeys', e);
+          setGlobalMediaHotkeys(e);
         }}
       >
         Enable global media hotkeys (requires app restart)
       </StyledCheckbox>
       <StyledCheckbox
         defaultChecked={scrobble}
-        onChange={() => {
-          settings.setSync('scrobble', !scrobble);
-          dispatch(setPlaybackSetting({ setting: 'scrobble', value: !scrobble }));
-          setScrobble(!scrobble);
+        onChange={(_v: any, e: boolean) => {
+          settings.setSync('scrobble', e);
+          dispatch(setPlaybackSetting({ setting: 'scrobble', value: e }));
+          setScrobble(e);
         }}
       >
         Enable scrobbling
diff --git a/src/components/settings/ConfigPanels/WindowConfig.tsx b/src/components/settings/ConfigPanels/WindowConfig.tsx
index d8d53bc..6f26a17 100644
--- a/src/components/settings/ConfigPanels/WindowConfig.tsx
+++ b/src/components/settings/ConfigPanels/WindowConfig.tsx
@@ -12,9 +12,9 @@ const WindowConfig = () => {
       <StyledCheckbox
         defaultChecked={minimizeToTray}
         checked={minimizeToTray}
-        onChange={() => {
-          settings.setSync('minimizeToTray', !settings.getSync('minimizeToTray'));
-          setMinimizeToTray(!minimizeToTray);
+        onChange={(_v: any, e: boolean) => {
+          settings.setSync('minimizeToTray', e);
+          setMinimizeToTray(e);
         }}
       >
         Minimize to tray
@@ -23,9 +23,9 @@ const WindowConfig = () => {
       <StyledCheckbox
         defaultChecked={exitToTray}
         checked={exitToTray}
-        onChange={() => {
-          settings.setSync('exitToTray', !settings.getSync('exitToTray'));
-          setExitToTray(!exitToTray);
+        onChange={(_v: any, e: boolean) => {
+          settings.setSync('exitToTray', e);
+          setExitToTray(e);
         }}
       >
         Exit to tray