Move localStorage getTheme into useEffect

0xsequence · Apr 19, 2024 · e996360 · e996360
1 parent 11c08d1
commit e996360
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/components/ThemeProvider/ThemeProvider.tsx b/src/components/ThemeProvider/ThemeProvider.tsx
@@ -65,7 +65,7 @@ const ThemeContext = createContext<ThemeContextValue | null>(null)
 
 export const ThemeProvider = (props: PropsWithChildren<ThemeProviderProps>) => {
   const [theme, setTheme] = useState<Theme | ThemeOverrides>(
-    props.theme || getTheme(props.scope)
+    props.theme || DEFAULT_THEME
   )
 
   useEffect(() => {
@@ -74,6 +74,13 @@ export const ThemeProvider = (props: PropsWithChildren<ThemeProviderProps>) => {
       window.document.documentElement.classList.add('is-apple')
   }, [])
 
+  // Load theme from local storage
+  useEffect(() => {
+    if (!props.theme) {
+      setTheme(getTheme(props.scope))
+    }
+  }, [])
+
   // Allow prop theme override
   useEffect(() => {
     if (props.theme) {