Merge branch 'fix-ngonchanges-not-working-for-themed-components_contribute-7.2' into fix-ngonchanges-not-working-for-themed-components_contribute-7.4

alexandrevryghem · alexandrevryghem · commit 887eacbfa8b5 · 2023-07-24T23:43:10.000+02:00
diff --git a/src/app/shared/theme-support/themed.component.ts b/src/app/shared/theme-support/themed.component.ts
@@ -60,7 +60,6 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
   }
 
   ngOnInit(): void {
-    this.destroyComponentInstance();
     this.initComponentInstance();
   }
 
@@ -81,8 +80,6 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
     }
 
     if (hasNoValue(this.lazyLoadObs)) {
-      this.destroyComponentInstance();
-
       this.lazyLoadObs = combineLatest([
         observableOf(changes),
         this.resolveThemedComponent(this.themeService.getThemeName()).pipe(
@@ -104,6 +101,7 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
     }
 
     this.lazyLoadSub = this.lazyLoadObs.subscribe(([simpleChanges, constructor]: [SimpleChanges, GenericConstructor<T>]) => {
+      this.destroyComponentInstance();
       const factory = this.resolver.resolveComponentFactory(constructor);
       this.compRef = this.vcr.createComponent(factory);
       if (hasValue(simpleChanges)) {

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`ngOnInit(): void {`
`63`		`- this.destroyComponentInstance();`
`64`	`63`	`this.initComponentInstance();`
`65`	`64`	`}`
`66`	`65`
`@@ -81,8 +80,6 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges`
`81`	`80`	`}`
`82`	`81`
`83`	`82`	`if (hasNoValue(this.lazyLoadObs)) {`
`84`		`- this.destroyComponentInstance();`
`85`		`-`
`86`	`83`	`this.lazyLoadObs = combineLatest([`
`87`	`84`	`observableOf(changes),`
`88`	`85`	`this.resolveThemedComponent(this.themeService.getThemeName()).pipe(`
`@@ -104,6 +101,7 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges`
`104`	`101`	`}`
`105`	`102`
`106`	`103`	`this.lazyLoadSub = this.lazyLoadObs.subscribe(([simpleChanges, constructor]: [SimpleChanges, GenericConstructor<T>]) => {`
	`104`	`+ this.destroyComponentInstance();`
`107`	`105`	`const factory = this.resolver.resolveComponentFactory(constructor);`
`108`	`106`	`this.compRef = this.vcr.createComponent(factory);`
`109`	`107`	`if (hasValue(simpleChanges)) {`