From d696e2ee00e602516b001166e002c93373e737c5 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@nd.edu>
Date: Wed, 26 Jul 2023 12:27:02 -0400
Subject: [PATCH] fix: allow UI settings to persist (#21)

UI settings were being overwritten on refresh. Changing this check
appears to resolve this issue and allows for the UI settings to persist.
---
 src/lib/settings.ts | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/lib/settings.ts b/src/lib/settings.ts
index bdafd185..c8bf56fb 100644
--- a/src/lib/settings.ts
+++ b/src/lib/settings.ts
@@ -27,21 +27,12 @@ const defaultSettings: Settings = {
 
 export const userSettings = writable(defaultSettings)
 
-function mergeObjects<T>(obj1: any, obj2: any): T {
-  for (let prop in obj2) {
-    if (!(prop in obj1) || obj1[prop] == null || obj2[prop] == '') {
-      obj1[prop] = obj2[prop]
-    }
-  }
-  return obj1
-}
-
 if (typeof window != 'undefined') {
   let oldUserSettings = JSON.parse(
     localStorage.getItem('settings') ?? JSON.stringify(defaultSettings)
   )
 
-  userSettings.set(mergeObjects<Settings>(oldUserSettings, defaultSettings))
+  userSettings.set({...defaultSettings, ...oldUserSettings})
 }
 
 userSettings.subscribe((settings) => {