Merge branch 'theme-fixes_contribute-7.6' into dspace-8_x

alexandrevryghem · alexandrevryghem · commit 84ad762b32db · 2025-06-05T19:18:13.000+02:00
diff --git a/src/app/shared/theme-support/themed.component.ts b/src/app/shared/theme-support/themed.component.ts
@@ -99,6 +99,9 @@ export abstract class ThemedComponent<T extends object> implements AfterViewInit
   }
 
   initComponentInstance(changes?: SimpleChanges) {
+    if (hasValue(this.themeSub)) {
+      this.themeSub.unsubscribe();
+    }
     this.themeSub = this.themeService?.getThemeName$().subscribe(() => {
       this.renderComponentInstance(changes);
     });

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,9 @@ export abstract class ThemedComponent<T extends object> implements AfterViewInit`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`initComponentInstance(changes?: SimpleChanges) {`
	`102`	`+ if (hasValue(this.themeSub)) {`
	`103`	`+ this.themeSub.unsubscribe();`
	`104`	`+ }`
`102`	`105`	`this.themeSub = this.themeService?.getThemeName$().subscribe(() => {`
`103`	`106`	`this.renderComponentInstance(changes);`
`104`	`107`	`});`