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

fix(ivy): extended next pointer lookup while traversing tNode tree (#28533)

Browse Source 
Prior to this change we only checked whether current lView has a next pointer while traversing tNode tree. However in some cases this pointer can be undefined and we need to look up parents chain to find suitable next pointer. This commit adds the logic of searching for the next pointer taking parents chain into account.

PR Close #28533
This commit is contained in:
Andrew Kushnir
2019-02-01 17:04:02 -08:00
committed by Miško Hevery
parent 264ef72800
commit 7660d0d74a
3 changed files with 161 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,7 +150,7 @@ function walkTNodeTree(
*/
while (!nextTNode) {
// If parent is null, we're crossing the view boundary, so we should get the host TNode.
tNode = tNode.parent || currentView[TVIEW].node;
tNode = tNode.parent || currentView[T_HOST];
if (tNode === null || tNode === rootTNode) return null;
@ -160,9 +160,26 @@ function walkTNodeTree(
beforeNode = currentView[tNode.index][NATIVE];
}
if (tNode.type === TNodeType.View && currentView[NEXT]) {
currentView = currentView[NEXT] as LView;
nextTNode = currentView[TVIEW].node;
if (tNode.type === TNodeType.View) {
/**
* If current lView doesn't have next pointer, we try to find it by going up parents
* chain until:
* - we find an lView with a next pointer
* - or find a tNode with a parent that has a next pointer
* - or reach root TNode (in which case we exit, since we traversed all nodes)
*/
while (!currentView[NEXT] && currentView[PARENT] &&
!(tNode.parent && tNode.parent.next)) {
if (tNode === rootTNode) return null;
currentView = currentView[PARENT] as LView;
tNode = currentView[T_HOST] !;
}
if (currentView[NEXT]) {
currentView = currentView[NEXT] as LView;
nextTNode = currentView[T_HOST];
} else {
nextTNode = tNode.next;
}
} else {
nextTNode = tNode.next;
}