fix bug on firefox where non-forcedTheme is not updated on navigation

trm217 · Feb 20, 2022 · f810f12 · f810f12
1 parent e73e36f
commit f810f12
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/src/index.tsx b/src/index.tsx
@@ -65,10 +65,6 @@ export const ThemeProvider: React.FC<ThemeProviderProps> = ({
 
   const setTheme = useCallback(
     theme => {
-      // If there is a forced theme, changing the theme is a no-op
-      if (forcedTheme) return
-
-      applyTheme(theme)
       setThemeState(theme)
 
       // Save to storage
@@ -120,11 +116,10 @@ export const ThemeProvider: React.FC<ThemeProviderProps> = ({
     return () => window.removeEventListener('storage', handleStorage)
   }, [setTheme])
 
+  // Whenever theme or forcedTheme changes, apply it
   useEffect(() => {
-    if (forcedTheme) {
-      applyTheme(forcedTheme)
-    }
-  }, [forcedTheme])
+    applyTheme(forcedTheme ?? theme)
+  }, [forcedTheme, theme])
 
   return (
     <ThemeContext.Provider