Skip to content

Commit cd76e1a

Browse files
committed
[unit-testing] Fixed theme re-render issue
1 parent cb028a7 commit cd76e1a

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

src/packages/react-native-material-elements/src/libraries/themes/V2ThemeContext.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,12 @@ export const ThemeProvider = ({
151151
}
152152

153153
const baseTheme = isDark ? darkTheme ?? defaultDarkTheme : lightTheme ?? defaultLightTheme;
154+
const theme = { ...baseTheme, ...(dimensions ?? themeDimensions) };
154155

155-
return { ...baseTheme, ...(dimensions ?? themeDimensions) };
156-
}, [colorScheme, darkTheme, lightTheme, dimensions, mode]);
156+
return { theme, components };
157+
}, [colorScheme, darkTheme, lightTheme, dimensions, mode, components]);
157158

158-
return <ThemeContext.Provider value={{ theme: themeValues, components }}>{children}</ThemeContext.Provider>;
159+
return <ThemeContext.Provider value={themeValues}>{children}</ThemeContext.Provider>;
159160
};
160161

161162
export const useTheme = (): UseTheme => {

0 commit comments

Comments
 (0)