From c4c50f2c306d86ba65d32b60b910d2a2e506262e Mon Sep 17 00:00:00 2001
From: SethBurkart123 <seth.burkart@hills.adventist.edu.au>
Date: Fri, 28 Mar 2025 11:50:52 +1100
Subject: [PATCH] fix: themes somtimes override default custom accent colour

---
 .../components/themes/ThemeSelector.svelte    |  5 --
 src/plugins/built-in/themes/ThemeCreator.ts   |  6 +-
 src/plugins/built-in/themes/theme-manager.ts  | 59 +++++++++++--------
 3 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/src/interface/components/themes/ThemeSelector.svelte b/src/interface/components/themes/ThemeSelector.svelte
index d6b6ce56..dd1254ad 100644
--- a/src/interface/components/themes/ThemeSelector.svelte
+++ b/src/interface/components/themes/ThemeSelector.svelte
@@ -96,11 +96,6 @@
   onDestroy(() => {
     themeUpdates.removeListener(fetchThemes);
   })
-
-  $effect(() => {
-    if (!themes) return;
-    console.log(themes.selectedTheme);
-  })
 </script>
 
 <div
diff --git a/src/plugins/built-in/themes/ThemeCreator.ts b/src/plugins/built-in/themes/ThemeCreator.ts
index 2d33033c..b41b90df 100644
--- a/src/plugins/built-in/themes/ThemeCreator.ts
+++ b/src/plugins/built-in/themes/ThemeCreator.ts
@@ -15,9 +15,11 @@ const themeManager = ThemeManager.getInstance();
 export function OpenThemeCreator(themeID: string = "") {
   CloseThemeCreator()
 
-  // Store that theme creator is open and save original color
+  // Only store original color if we're not editing an existing theme
   localStorage.setItem('themeCreatorOpen', 'true');
-  localStorage.setItem('originalPreviewColor', settingsState.selectedColor);
+  if (!themeID) {
+    localStorage.setItem('originalPreviewColor', settingsState.selectedColor);
+  }
 
   const width = "310px"
 
diff --git a/src/plugins/built-in/themes/theme-manager.ts b/src/plugins/built-in/themes/theme-manager.ts
index 321376ce..94f10e32 100644
--- a/src/plugins/built-in/themes/theme-manager.ts
+++ b/src/plugins/built-in/themes/theme-manager.ts
@@ -454,13 +454,15 @@ export class ThemeManager {
     try {
       const { CustomCSS, CustomImages, defaultColour, forceDark } = theme;
 
-      // Store original settings if not already stored
-      if (this.originalPreviewColor === null) {
-        this.originalPreviewColor = settingsState.selectedColor;
-        localStorage.setItem('originalPreviewColor', settingsState.selectedColor);
-      }
-      if (this.originalPreviewTheme === null) {
-        this.originalPreviewTheme = settingsState.DarkMode;
+      // Store original settings only if this is a new theme
+      if (!theme.webURL) {
+        if (this.originalPreviewColor === null) {
+          this.originalPreviewColor = settingsState.selectedColor;
+          localStorage.setItem('originalPreviewColor', settingsState.selectedColor);
+        }
+        if (this.originalPreviewTheme === null) {
+          this.originalPreviewTheme = settingsState.DarkMode;
+        }
       }
 
       // Apply custom CSS
@@ -487,12 +489,14 @@ export class ThemeManager {
       // Update previousImageVariableNames
       this.previousImageVariableNames = newImageVariableNames;
 
-      // Apply theme settings
-      if (forceDark !== undefined) {
-        settingsState.DarkMode = forceDark;
-      }
-      if (defaultColour) {
-        settingsState.selectedColor = defaultColour;
+      // Apply theme settings only if this is a new theme
+      if (!theme.webURL) {
+        if (forceDark !== undefined) {
+          settingsState.DarkMode = forceDark;
+        }
+        if (defaultColour) {
+          settingsState.selectedColor = defaultColour;
+        }
       }
     } catch (error) {
       console.error('[ThemeManager] Error previewing theme:', error);
@@ -505,12 +509,15 @@ export class ThemeManager {
   public async updatePreview(theme: Partial<LoadedCustomTheme>): Promise<void> {
     console.debug('[ThemeManager] Updating theme preview');
     try {
-      // Store original settings if not already stored
-      if (this.originalPreviewColor === null) {
-        this.originalPreviewColor = settingsState.selectedColor;
-      }
-      if (this.originalPreviewTheme === null) {
-        this.originalPreviewTheme = settingsState.DarkMode;
+      // Only store original settings if this is a new theme (not editing)
+      // We can tell it's a new theme if it has no webURL (which is set when a theme is saved/loaded)
+      if (!theme.webURL) {
+        if (this.originalPreviewColor === null) {
+          this.originalPreviewColor = settingsState.selectedColor;
+        }
+        if (this.originalPreviewTheme === null) {
+          this.originalPreviewTheme = settingsState.DarkMode;
+        }
       }
 
       // Apply CSS if changed
@@ -548,12 +555,14 @@ export class ThemeManager {
         this.previousImageVariableNames = newImageVariableNames;
       }
 
-      // Update theme settings
-      if (theme.forceDark !== undefined) {
-        settingsState.DarkMode = theme.forceDark;
-      }
-      if (theme.defaultColour) {
-        settingsState.selectedColor = theme.defaultColour;
+      // Update theme settings only if this is a new theme
+      if (!theme.webURL) {
+        if (theme.forceDark !== undefined) {
+          settingsState.DarkMode = theme.forceDark;
+        }
+        if (theme.defaultColour) {
+          settingsState.selectedColor = theme.defaultColour;
+        }
       }
     } catch (error) {
       console.error('[ThemeManager] Error updating theme preview:', error);