fix(SettingsFactory): settings of components are now deep merged

valentingavran · May 24, 2022 · 25608e3 · 25608e3
1 parent 7f02ab7
commit 25608e3
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 13 deletions.
diff --git a/libs/anglify/src/factories/settings.factory.ts b/libs/anglify/src/factories/settings.factory.ts
@@ -1,4 +1,5 @@
 import { inject, InjectFlags, InjectionToken, Provider } from '@angular/core';
+import { deepmerge } from 'deepmerge-ts';
 
 /**
  *
@@ -12,7 +13,7 @@ export function createSettingsProvider<T>(name: string, defaultValues: T, settin
     provide: name,
     useFactory: () => {
       const overwrittenSettings = inject<InjectionToken<any>>(settingsToken, InjectFlags.Optional);
-      return { ...defaultValues, ...overwrittenSettings };
+      return deepmerge(defaultValues, overwrittenSettings ?? {});
     },
   };
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,10 +27,10 @@
     "@ngneat/until-destroy": "^9.2.0",
     "@nrwl/angular": "^14.1.4",
     "common-tags": "^1.8.2",
+    "deepmerge-ts": "^4.0.3",
     "ngx-highlightjs": "^6.1.2",
     "ngx-markdown": "^13.1.0",
     "rxjs": "^7.5.5",
-    "ts-deepmerge": "^2.0.1",
     "tslib": "^2.4.0",
     "zone.js": "^0.11.5"
   },