fix: default theme on select

misa198 · Apr 5, 2022 · 682c9ff · 682c9ff
1 parent 2243c26
commit 682c9ff
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/src/scripts/content.ts b/src/scripts/content.ts
@@ -179,27 +179,27 @@ const init = async () => {
 
 // ============ Code color theme ===================
 
-const applyColorTheme = async () => {
-  const changeTheme = (themeName?: string) => {
-    const body = document.querySelector('body') as HTMLElement;
-    const { classList } = body;
-    const currentThemeClass = Array.from(classList).find((className) =>
-      className.startsWith(`${colorThemeDeaultClass}`)
+const changeTheme = (themeName?: string) => {
+  const body = document.querySelector('body') as HTMLElement;
+  const { classList } = body;
+  const currentThemeClass = Array.from(classList).find((className) =>
+    className.startsWith(`${colorThemeDeaultClass}`)
+  );
+  if (currentThemeClass) {
+    body.classList.remove(currentThemeClass);
+  }
+  if (themeName) {
+    const foundTheme = colorThemes.find(
+      (colorTheme) => colorTheme === themeName
     );
-    if (currentThemeClass) {
-      body.classList.remove(currentThemeClass);
-    }
-    if (themeName) {
-      const foundTheme = colorThemes.find(
-        (colorTheme) => colorTheme === themeName
-      );
-      if (foundTheme) {
-        classList.add(`${colorThemeDeaultClass}-${foundTheme}`);
-        set({ [KEYS.MISA198_CODE_COLOR_THEME]: foundTheme });
-      }
-    }
-  };
+    if (foundTheme) {
+      classList.add(`${colorThemeDeaultClass}-${foundTheme}`);
+      set({ [KEYS.MISA198_CODE_COLOR_THEME]: foundTheme });
+    } else set({ [KEYS.MISA198_CODE_COLOR_THEME]: 'default' });
+  }
+};
 
+const applyColorTheme = async () => {
   observe('body', {
     add() {
       get([KEYS.MISA198_CODE_COLOR_THEME], (result) => {

diff --git a/src/scripts/popup.ts b/src/scripts/popup.ts
@@ -79,7 +79,7 @@ get([KEYS.MISA198_CODE_COLOR_THEME], (result) => {
     );
     if (foundTheme) {
       select.value = foundTheme;
-    }
+    } else select.value = 'default';
   }
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,7 +79,7 @@ get([KEYS.MISA198_CODE_COLOR_THEME], (result) => { @@
         );
         if (foundTheme) {
           select.value = foundTheme;
-        }
+        } else select.value = 'default';
       }
     });
@@ Expand Down @@