cargdev/angular
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(upgrade): remove redundant call to appRef.detach()

Browse Source 
Once  a `ViewRef` is attached to the `ApplicationRef`, destroying the corresponding `ComponentRef` will automatically detach the `ViewRef`.
This commit is contained in:
George Kalpakas
2017-09-25 13:22:35 +03:00
committed by Alex Rickabaugh
parent 4e6aa9c2db
commit 29dbc3b67c
3 changed files with 52 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/upgrade/src/common/downgrade_component.ts
View File

@ -115,7 +115,7 @@ export function downgradeComponent(info: {
facade.createComponent(projectableNodes);
facade.setupInputs(needsNgZone, info.propagateDigest);
facade.setupOutputs();
facade.registerCleanup(needsNgZone);
facade.registerCleanup();
injectorPromise.resolve(facade.getInjector());

10
packages/upgrade/src/common/downgrade_component_adapter.ts
View File

@ -25,7 +25,6 @@ export class DowngradeComponentAdapter {
private componentRef: ComponentRef<any>;
private component: any;
private changeDetector: ChangeDetectorRef;
private appRef: ApplicationRef;
constructor(
private element: angular.IAugmentedJQuery, private attrs: angular.IAttributes,
@ -35,7 +34,6 @@ export class DowngradeComponentAdapter {
private componentFactory: ComponentFactory<any>,
private wrapCallback: <T>(cb: () => T) => () => T) {
this.componentScope = scope.$new();
this.appRef = parentInjector.get(ApplicationRef);
}
compileContents(): Node[][] {
@ -154,7 +152,8 @@ export class DowngradeComponentAdapter {
// Attach the view so that it will be dirty-checked.
if (needsNgZone) {
this.appRef.attachView(this.componentRef.hostView);
const appRef = this.parentInjector.get<ApplicationRef>(ApplicationRef);
appRef.attachView(this.componentRef.hostView);
}
}
@ -202,7 +201,7 @@ export class DowngradeComponentAdapter {
}
}
registerCleanup(needsNgZone: boolean) {
registerCleanup() {
const destroyComponentRef = this.wrapCallback(() => this.componentRef.destroy());
this.element.on !('$destroy', () => {
@ -210,9 +209,6 @@ export class DowngradeComponentAdapter {
this.componentRef.injector.get(TestabilityRegistry)
.unregisterApplication(this.componentRef.location.nativeElement);
destroyComponentRef();
if (needsNgZone) {
this.appRef.detachView(this.componentRef.hostView);
}
});
}