@breadstone/mosaik-elements-angular 0.0.43 → 0.0.44

package/fesm2022/mosaik-elements-angular.mjs

@@ -53498,7 +53498,6 @@ const MOSAIK_THEME = new InjectionToken('MOSAIK_THEME');
 const MOSAIK_THEME_MODE = new InjectionToken('MOSAIK_THEME_MODE');
 
 // #region Imports
-// #endregion
 /**
  * @public
  */
@@ -53531,27 +53530,56 @@ function provideTheme(config) {
 function merge(theme, overrides) {
     return {
         name: theme.name,
-        scheme: {
-            ...theme.scheme,
-            ...overrides?.scheme
-        },
-        palette: {
-            ...theme.palette,
-            ...overrides?.palette
-        },
+        scheme: Object.keys(theme.scheme).reduce((acc, key) => {
+            acc[key] = {
+                ...theme.scheme[key],
+                ...overrides?.scheme?.[key] ? overrides.scheme[key] : {}
+            };
+            return acc;
+        }, {}),
+        palette: Object.keys(theme.palette).reduce((acc, key) => {
+            acc[key] = {
+                ...theme.palette[key],
+                ...overrides?.palette?.[key] ? overrides.palette[key] : {}
+            };
+            return acc;
+        }, {}),
         fontFamily: overrides?.fontFamily ?? theme.fontFamily,
-        typography: {
+        typography: Object.keys({
             ...theme.typography,
             ...overrides?.typography
-        },
+        }).reduce((acc, key) => {
+            const value = overrides?.typography?.[key] !== undefined
+                ? {
+                    ...theme.typography[key],
+                    ...overrides.typography[key]
+                }
+                : theme.typography[key];
+            acc[key] = value;
+            return acc;
+        }, {}),
         layout: {
             ...theme.layout,
             ...overrides?.layout
         },
-        elevation: {
+        elevation: Object.keys({
             ...theme.elevation,
             ...overrides?.elevation
-        }
+        }).reduce((acc, key) => {
+            const base = theme.elevation[key];
+            const override = overrides?.elevation?.[key];
+            if (override) {
+                // Only assign properties that are not undefined
+                acc[key] = Object.fromEntries(Object.entries({
+                    ...base,
+                    ...override
+                }).filter(([_, v]) => v !== undefined));
+            }
+            else {
+                acc[key] = base;
+            }
+            return acc;
+        }, {})
     };
 }