Fix useTheme initialization

gilbarbara · Oct 8, 2024 · 321462b · 321462b
1 parent f8d7348
commit 321462b
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/hooks/useTheme.tsx b/src/hooks/useTheme.tsx
@@ -12,14 +12,12 @@ let storedTheme: Theme;
 export function useTheme() {
   const emotionTheme = useThemeEmotion();
   const needsUpdate = !storedTheme || !deepEqual(storedEmotionTheme, emotionTheme);
-  const nextTheme = useRef<Theme>(emotionTheme);
+  const nextTheme = useRef<Theme>(storedTheme ?? emotionTheme);
 
   if (needsUpdate) {
     storedEmotionTheme = emotionTheme;
     nextTheme.current = mergeTheme(emotionTheme);
     storedTheme = nextTheme.current;
-  } else {
-    nextTheme.current = Object.keys(emotionTheme).length ? mergeTheme(emotionTheme) : storedTheme;
   }
 
   const { dataAttributeName } = nextTheme.current;