Handle undefined theme in the site template widget (#4454)

* Handle undefined theme * Fix comment
compiler-explorer · Jan 24, 2023 · ffc1a30 · ffc1a30
1 parent 6a3c1e4
commit ffc1a30
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/static/settings.ts b/static/settings.ts
@@ -64,7 +64,7 @@ export interface SiteSettings {
     showMinimap: boolean;
     showQuickSuggestions: boolean;
     tabWidth: number;
-    theme: Themes;
+    theme: Themes | undefined;
     useCustomContextMenu: boolean;
     useSpaces: boolean;
     useVim: boolean;

diff --git a/static/themes.ts b/static/themes.ts
@@ -155,7 +155,7 @@ export class Themer {
     }
 
     private onSettingsChange(newSettings: SiteSettings) {
-        const newTheme = newSettings.theme in themes ? themes[newSettings.theme] : themes.default;
+        const newTheme = newSettings.theme && newSettings.theme in themes ? themes[newSettings.theme] : themes.default;
         if (!newTheme.monaco) newTheme.monaco = 'vs';
         this.setTheme(newTheme);
     }

diff --git a/static/widgets/site-templates-widget.ts b/static/widgets/site-templates-widget.ts
@@ -47,7 +47,10 @@ class SiteTemplatesWidget {
     }
     getCurrentTheme() {
         const theme = Settings.getStoredSettings()['theme'];
-        if (theme === 'system') {
+        if (!theme) {
+            // apparently this can happen
+            return 'default';
+        } else if (theme === 'system') {
             if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
                 return 'dark';
             } else {