Fix incorrect theme regexp

tomodasheesh · Apr 19, 2024 · d01f366 · d01f366
1 parent 53f9b67
commit d01f366
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 30 deletions.
diff --git a/packages/angular/src/app/services/theme.service.ts b/packages/angular/src/app/services/theme.service.ts
@@ -36,23 +36,15 @@ export class ThemeService {
     this.currentTheme = theme;
     this.isDark.next(this.currentTheme === 'dark');
 
-    currentVizTheme(this.getNewVizTheme(theme));
+    const regexTheme = new RegExp(`${themes.join('|')}`, 'g');
+    currentVizTheme(currentVizTheme().replace(regexTheme, theme));
     refreshTheme();
   }
 
   getCurrentTheme() {
     return this.currentTheme;
   }
 
-  private getNewVizTheme(theme: Theme) {
-    const themeArr = currentVizTheme().split('.');
-    return themeArr.reduce((prev, curr) => {
-      if (!prev) return themeArr[0];
-      if (themes.includes(curr as Theme)) return `${prev}.${theme}`;
-      return `${prev}.${curr}`;
-    }, '');
-  }
-
   isFluent(): boolean {
     return current().includes('fluent');
   }

diff --git a/packages/react/src/theme/theme.tsx b/packages/react/src/theme/theme.tsx
@@ -27,15 +27,6 @@ function getCurrentTheme(): Theme {
   return window.localStorage[storageKey] || getNextTheme();
 }
 
-function getNewVizTheme(theme: Theme) {
-  const themeArr = currentVizTheme().split('.');
-  return themeArr.reduce((prev, curr) => {
-    if (!prev) return themeArr[0];
-    if (themes.includes(curr as Theme)) return `${prev}.${theme}`;
-    return `${prev}.${curr}`;
-  }, '');
-}
-
 function isThemeStyleSheet(styleSheet, theme: Theme) {
   const themeMarker = `${themePrefix}${theme}`;
   // eslint-disable-next-line no-undef
@@ -61,7 +52,8 @@ async function setAppTheme(newTheme?: Theme) {
 
   switchThemeStyleSheets(themeName);
 
-  currentVizTheme(getNewVizTheme(themeName));
+  const regexTheme = new RegExp(`${themes.join('|')}`, 'g');
+  currentVizTheme(currentVizTheme().replace(regexTheme, themeName));
   refreshTheme();
 }
 

diff --git a/packages/vue/src/theme/theme-service.ts b/packages/vue/src/theme/theme-service.ts
@@ -23,15 +23,6 @@ class ThemeService {
     return current().includes('fluent');
   }
 
-  private getNewVizTheme(theme: Theme) {
-    const themeArr = currentVizTheme().split('.');
-    return themeArr.reduce((prev, curr) => {
-      if (!prev) return themeArr[0];
-      if (themes.includes(curr as Theme)) return `${prev}.${theme}`;
-      return `${prev}.${curr}`;
-    }, '');
-  }
-
   getCurrentTheme(): Theme {
     return window.localStorage[this.storageKey] || getNextTheme();
   }
@@ -48,7 +39,8 @@ class ThemeService {
     });
 
     this.currentTheme.value = theme;
-    currentVizTheme(this.getNewVizTheme(theme));
+    const regexTheme = new RegExp(`${themes.join('|')}`, 'g');
+    currentVizTheme(currentVizTheme().replace(regexTheme, theme));
     refreshTheme();
   }