fix: auto theme not following Obsidian theme (#284)

Closes #136 and #274
esm7 · Oct 20, 2024 · 3085a3e · 3085a3e
1 parent b7811fb
commit 3085a3e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/baseMapView.ts b/src/baseMapView.ts
@@ -163,9 +163,14 @@ export abstract class BaseMapView extends ItemView {
     isDarkMode(settings: PluginSettings): boolean {
         if (settings.chosenMapMode === 'dark') return true;
         if (settings.chosenMapMode === 'light') return false;
+
         // Auto mode - check if the theme is dark
-        if ((this.app.vault as any).getConfig('theme') === 'obsidian')
-            return true;
+        const theme = (this.app.vault as any).getConfig('theme');
+        if (theme === 'obsidian') return true;
+        else if (theme === 'moonstone') return false;
+        else if (theme === 'system')
+            return !document.body.classList.contains('theme-light');
+
         return false;
     }
 

diff --git a/src/mapContainer.ts b/src/mapContainer.ts
@@ -220,9 +220,14 @@ export class MapContainer {
     isDarkMode(settings: PluginSettings): boolean {
         if (settings.chosenMapMode === 'dark') return true;
         if (settings.chosenMapMode === 'light') return false;
+
         // Auto mode - check if the theme is dark
-        if ((this.app.vault as any).getConfig('theme') === 'obsidian')
-            return true;
+        const theme = (this.app.vault as any).getConfig('theme');
+        if (theme === 'obsidian') return true;
+        else if (theme === 'moonstone') return false;
+        else if (theme === 'system')
+            return !document.body.classList.contains('theme-light');
+
         return false;
     }