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

fix(ivy): remove query results from destroyed embedded views (#28445)

Browse Source 
PR Close #28445
This commit is contained in:
Pawel Kozlowski
2019-01-30 12:18:27 +01:00
committed by Matias Niemelä
parent eed59b713a
commit 5ebc0da640
3 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,14 +242,17 @@ export function destroyViewTree(rootView: LView): void {
while (viewOrContainer) {
let next: LView|LContainer|null = null;
if (viewOrContainer.length >= HEADER_OFFSET) {
if (isLContainer(viewOrContainer)) {
// If container, traverse down to its first LView.
const container = viewOrContainer as LContainer;
const viewsInContainer = container[VIEWS];
if (viewsInContainer.length) {
next = viewsInContainer[0];
}
} else {
// If LView, traverse down to child.
const view = viewOrContainer as LView;
if (view[TVIEW].childIndex > -1) next = getLViewChild(view);
} else {
// If container, traverse down to its first LView.
const container = viewOrContainer as LContainer;
if (container[VIEWS].length) next = container[VIEWS][0];
}
if (next == null) {
@ -258,6 +261,15 @@ export function destroyViewTree(rootView: LView): void {
while (viewOrContainer && !viewOrContainer ![NEXT] && viewOrContainer !== rootView) {
cleanUpView(viewOrContainer);
viewOrContainer = getParentState(viewOrContainer, rootView);
if (isLContainer(viewOrContainer)) {
// this view will be destroyed so we need to notify queries that a view is detached
const viewsInContainer = (viewOrContainer as LContainer)[VIEWS];
for (let viewToDetach of viewsInContainer) {
if (viewToDetach[QUERIES]) {
viewToDetach[QUERIES] !.removeView();
}
}
}
}
cleanUpView(viewOrContainer || rootView);
next = viewOrContainer && viewOrContainer ![NEXT];