iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ivy): error when calling remove() or detach() on an empty view container (#29986) 

Fixes Ivy throwing an error if `remove()` or `detach()` are called on an empty `ViewContainerRef`.

This PR resolves FW-1270.

PR Close #29986
This commit is contained in:
Kristiyan Kostadinov 2019-04-19 19:46:52 +02:00 committed by Ben Lesh
parent 2271f200d7
commit 6ae0084255
3 changed files with 47 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/core/src/render3/node_manipulation.ts
View File

@ -371,23 +371,25 @@ export function insertView(lView: LView, lContainer: LContainer, index: number)
* @param removeIndex The index of the view to detach
* @returns Detached LView instance.
*/
export function detachView(lContainer: LContainer, removeIndex: number): LView {
export function detachView(lContainer: LContainer, removeIndex: number): LView|undefined {
const views = lContainer[VIEWS];
const viewToDetach = views[removeIndex];
if (removeIndex > 0) {
views[removeIndex - 1][NEXT] = viewToDetach[NEXT] as LView;
}
views.splice(removeIndex, 1);
addRemoveViewFromContainer(viewToDetach, false);
if (viewToDetach) {
if (removeIndex > 0) {
views[removeIndex - 1][NEXT] = viewToDetach[NEXT] as LView;
}
views.splice(removeIndex, 1);
addRemoveViewFromContainer(viewToDetach, false);
if ((viewToDetach[FLAGS] & LViewFlags.Attached) &&
!(viewToDetach[FLAGS] & LViewFlags.Destroyed) && viewToDetach[QUERIES]) {
viewToDetach[QUERIES] !.removeView();
if ((viewToDetach[FLAGS] & LViewFlags.Attached) &&
!(viewToDetach[FLAGS] & LViewFlags.Destroyed) && viewToDetach[QUERIES]) {
viewToDetach[QUERIES] !.removeView();
}
viewToDetach[PARENT] = null;
viewToDetach[NEXT] = null;
// Unsets the attached flag
viewToDetach[FLAGS] &= ~LViewFlags.Attached;
}
viewToDetach[PARENT] = null;
viewToDetach[NEXT] = null;
// Unsets the attached flag
viewToDetach[FLAGS] &= ~LViewFlags.Attached;
return viewToDetach;
}
@ -399,8 +401,10 @@ export function detachView(lContainer: LContainer, removeIndex: number): LView {
*/
export function removeView(lContainer: LContainer, removeIndex: number) {
const view = lContainer[VIEWS][removeIndex];
detachView(lContainer, removeIndex);
destroyLView(view);
if (view) {
detachView(lContainer, removeIndex);
destroyLView(view);
}
}
/**

4
packages/core/src/render3/view_engine_compatibility.ts
View File

@ -281,8 +281,8 @@ export function createContainerRef(
detach(index?: number): viewEngine_ViewRef|null {
const adjustedIdx = this._adjustIndex(index, -1);
const view = detachView(this._lContainer, adjustedIdx);
const wasDetached = this._viewRefs.splice(adjustedIdx, 1)[0] != null;
return wasDetached ? new ViewRef(view, view[CONTEXT], -1) : null;
const wasDetached = view && this._viewRefs.splice(adjustedIdx, 1)[0] != null;
return wasDetached ? new ViewRef(view !, view ![CONTEXT], -1) : null;
}
private _adjustIndex(index?: number, shift: number = 0) {

32
packages/core/test/acceptance/view_container_ref_spec.ts
View File

@ -113,6 +113,26 @@ describe('ViewContainerRef', () => {
});
});
it('should not throw when calling remove() on an empty container', () => {
const fixture = TestBed.createComponent(ViewContainerRefApp);
fixture.detectChanges();
const viewContainerRef = fixture.componentInstance.vcrComp.vcr;
expect(viewContainerRef.length).toBe(0);
expect(() => viewContainerRef.remove()).not.toThrow();
});
it('should not throw when calling detach() on an empty container', () => {
const fixture = TestBed.createComponent(ViewContainerRefApp);
fixture.detectChanges();
const viewContainerRef = fixture.componentInstance.vcrComp.vcr;
expect(viewContainerRef.length).toBe(0);
expect(() => viewContainerRef.detach()).not.toThrow();
});
describe('destroy should clean the DOM in all cases:', () => {
function executeTest(template: string) {
TestBed.overrideTemplate(DestroyCasesComp, template).configureTestingModule({
@ -154,7 +174,7 @@ describe('ViewContainerRef', () => {
<ng-template #foo>
<span>Foo</span>
</ng-template>
<ng-template structDir>
<before></before>
<ng-container [ngTemplateOutlet]="foo">
@ -169,7 +189,7 @@ describe('ViewContainerRef', () => {
<ng-template #foo>
<span>Foo</span>
</ng-template>
<ng-template structDir>
<before></before>
<div [ngTemplateOutlet]="foo">
@ -184,7 +204,7 @@ describe('ViewContainerRef', () => {
<ng-template #foo>
<span>Foo</span>
</ng-template>
<ng-template structDir>
<before></before>
<ng-template [ngTemplateOutlet]="foo"></ng-template>
@ -197,7 +217,7 @@ describe('ViewContainerRef', () => {
<ng-template #foo>
<span>Foo</span>
</ng-template>
<ng-template structDir>
<before></before>
<ng-container>
@ -217,7 +237,7 @@ describe('ViewContainerRef', () => {
<ng-template #foo>
<span i18n>Bar</span>
</ng-template>
<ng-template structDir>
<before></before>
<ng-container i18n>
@ -238,7 +258,7 @@ describe('ViewContainerRef', () => {
<ng-template #foo>
<span>Foo</span>
</ng-template>
<ng-template structDir i18n>
<before></before>
<div [ngTemplateOutlet]="foo">