Merge branch 'fix-ngonchanges-not-working-for-themed-components_contr…

…ibute-7.2' into fix-ngonchanges-not-working-for-themed-components_contribute-7.4
alexandrevryghem · Dec 30, 2024 · 5c59565 · 5c59565
2 parents a7bef6f + 5ab1bd3
commit 5c59565
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/app/shared/theme-support/themed.component.ts b/src/app/shared/theme-support/themed.component.ts
@@ -69,6 +69,9 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
   }
 
   initComponentInstance(changes?: SimpleChanges) {
+    if (hasValue(this.themeSub)) {
+      this.themeSub.unsubscribe();
+    }
     this.themeSub = this.themeService?.getThemeName$().subscribe(() => {
       this.renderComponentInstance(changes);
     });