Skip to content

Commit b895bcb

Browse files
authored
Merge pull request #661 from codeSafari10/formatting
fix: copy before mutating the theme
2 parents 827e63d + e00f347 commit b895bcb

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

src/theme/theme.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,17 @@ export const drawerWidth = 240;
77

88
export const createCustomTheme = (mode: PaletteMode, brandPalette?: Interactiveness) => {
99
const basePalette = mode == 'light' ? lightModePalette : darkModePalette;
10-
const themePalette = brandPalette
11-
? Object.assign({}, basePalette, {
12-
background: {
13-
brand: brandPalette
14-
}
15-
})
16-
: basePalette;
10+
11+
const themePalette = {
12+
...basePalette,
13+
background: {
14+
...(basePalette.background || {}),
15+
brand: {
16+
...((basePalette?.background?.brand || {}) as Interactiveness),
17+
...(brandPalette || {})
18+
}
19+
}
20+
};
1721

1822
return createTheme({
1923
palette: {

0 commit comments

Comments
 (0)