Merge pull request #661 from codeSafari10/formatting

fix: copy before mutating the theme
layer5io · Jun 25, 2024 · b895bcb · b895bcb
2 parents 827e63d + e00f347
commit b895bcb
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/theme/theme.ts b/src/theme/theme.ts
@@ -7,13 +7,17 @@ export const drawerWidth = 240;
 
 export const createCustomTheme = (mode: PaletteMode, brandPalette?: Interactiveness) => {
   const basePalette = mode == 'light' ? lightModePalette : darkModePalette;
-  const themePalette = brandPalette
-    ? Object.assign({}, basePalette, {
-        background: {
-          brand: brandPalette
-        }
-      })
-    : basePalette;
+
+  const themePalette = {
+    ...basePalette,
+    background: {
+      ...(basePalette.background || {}),
+      brand: {
+        ...((basePalette?.background?.brand || {}) as Interactiveness),
+        ...(brandPalette || {})
+      }
+    }
+  };
 
   return createTheme({
     palette: {