Merge branch 'w2p-98855_themeable-file-download-link_contribute-7.4' into w2p-98855_themeable-file-download-link_contribute-main

# Conflicts:
#	src/app/shared/theme-support/themed.component.ts
This commit is contained in:
Alexandre Vryghem
2023-02-08 15:40:27 +01:00

View File

@@ -104,7 +104,7 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
}),
).subscribe((constructor: GenericConstructor<T>) => {
const factory = this.resolver.resolveComponentFactory(constructor);
this.compRef = this.vcr.createComponent(factory, undefined, undefined, [this.themedElementContent.nativeElement.children]);
this.compRef = this.vcr.createComponent(factory, undefined, undefined, [this.themedElementContent.nativeElement.childNodes]);
this.connectInputsAndOutputs();
this.compRef$.next(this.compRef);
this.cdr.markForCheck();
@@ -124,7 +124,7 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
protected connectInputsAndOutputs(): void {
if (isNotEmpty(this.inAndOutputNames) && hasValue(this.compRef) && hasValue(this.compRef.instance)) {
this.inAndOutputNames.forEach((name: any) => {
this.inAndOutputNames.filter((name: any) => this[name] !== undefined).forEach((name: any) => {
this.compRef.instance[name] = this[name];
});
}