Update src/contexts/themeContext/ThemeContext.tsx

nhannah · virdesai · web-flow · commit 7cf7ece7e073 · 2021-02-23T16:58:27.000-07:00
Co-authored-by: Vir Desai &lt;virdesai@users.noreply.github.com&gt;
diff --git a/src/contexts/themeContext/ThemeContext.tsx b/src/contexts/themeContext/ThemeContext.tsx
@@ -41,7 +41,7 @@ export const ThemeProvider: React.FC<ThemeProviderInputValue> = (props) => {
     }
 
     return mergeThemes({ style, theme });
-  }, [theme, style, mergedStyle]);
+  }, [mergedStyle, style, theme]);
 
   return (
     <ThemeContext.Provider value={modifiedTheme}>

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ export const ThemeProvider: React.FC<ThemeProviderInputValue> = (props) => {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`return mergeThemes({ style, theme });`
`44`		`- }, [theme, style, mergedStyle]);`
	`44`	`+ }, [mergedStyle, style, theme]);`
`45`	`45`
`46`	`46`	`return (`
`47`	`47`	`<ThemeContext.Provider value={modifiedTheme}>`