hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 18:14:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'generify-component-loaders_contribute-7.6' into generify-component-loaders_contribute-main

Browse Source
This commit is contained in:
Alexandre Vryghem
2023-12-19 01:22:57 +01:00
parent d8be26dcc8 7942c900f4
commit e071b7ffa7
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/shared/abstract-component-loader/abstract-component-loader.component.ts
View File

@@ -2,7 +2,7 @@ import { Component, ComponentRef, Input, OnChanges, OnDestroy, OnInit, SimpleCha
import { Context } from '../../core/shared/context.model'; import { Context } from '../../core/shared/context.model';
import { ThemeService } from '../theme-support/theme.service'; import { ThemeService } from '../theme-support/theme.service';
import { GenericConstructor } from '../../core/shared/generic-constructor'; import { GenericConstructor } from '../../core/shared/generic-constructor';
import { hasNoValue, hasValue, isNotEmpty } from '../empty.util'; import { hasValue, isNotEmpty } from '../empty.util';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
import { DynamicComponentLoaderDirective } from './dynamic-component-loader.directive'; import { DynamicComponentLoaderDirective } from './dynamic-component-loader.directive';
@@ -57,21 +57,15 @@ export abstract class AbstractComponentLoaderComponent<T> implements OnInit, OnC
* Set up the dynamic child component * Set up the dynamic child component
*/ */
ngOnInit(): void { ngOnInit(): void {
if (hasNoValue(this.compRef)) { this.instantiateComponent();
this.instantiateComponent();
}
} }
/** /**
* Whenever the inputs change, update the inputs of the dynamic component * Whenever the inputs change, update the inputs of the dynamic component
*/ */
ngOnChanges(changes: SimpleChanges): void { ngOnChanges(changes: SimpleChanges): void {
if (hasNoValue(this.compRef)) { if (hasValue(this.compRef)) {
// sometimes the component has not been initialized yet, so it first needs to be initialized if (this.inputNamesDependentForComponent.some((name: keyof this & string) => hasValue(changes[name]) && changes[name].previousValue !== changes[name].currentValue)) {
// before being called again
this.instantiateComponent();
} else {
if (this.inputNamesDependentForComponent.some((name: any) => hasValue(changes[name]) && changes[name].previousValue !== changes[name].currentValue)) {
// Recreate the component when the @Input()s used by getComponent() aren't up-to-date anymore // Recreate the component when the @Input()s used by getComponent() aren't up-to-date anymore
this.destroyComponentInstance(); this.destroyComponentInstance();
this.instantiateComponent(); this.instantiateComponent();
@@ -123,7 +117,7 @@ export abstract class AbstractComponentLoaderComponent<T> implements OnInit, OnC
/** /**
* Connect the inputs and outputs of this component to the dynamic component, * Connect the inputs and outputs of this component to the dynamic component,
* to ensure they're in sync * to ensure they're in sync, the ngOnChanges method will automatically be called by setInput
*/ */
public connectInputsAndOutputs(): void { public connectInputsAndOutputs(): void {
if (isNotEmpty(this.inputNames) && hasValue(this.compRef) && hasValue(this.compRef.instance)) { if (isNotEmpty(this.inputNames) && hasValue(this.compRef) && hasValue(this.compRef.instance)) {