refactor(renderer): fix setting of siblings

sis0k0 · sis0k0 · commit 1520aecf96c9 · 2017-08-12T14:36:37.000+03:00
diff --git a/nativescript-angular/renderer.ts b/nativescript-angular/renderer.ts
@@ -92,7 +92,8 @@ export class NativeScriptRenderer extends Renderer2 {
 
     @profile
     insertBefore(parent: NgView, newChild: NgView, refChild: NgElement): void {
-        traceLog(`NativeScriptRenderer.insertBefore child: ${newChild} parent: ${parent}`);
+        traceLog(`NativeScriptRenderer.insertBefore ` +
+             `child: ${newChild} parent: ${parent} refChild: ${refChild}`);
         this.viewUtil.insertChild(parent, newChild, refChild);
     }
 
@@ -110,7 +111,7 @@ export class NativeScriptRenderer extends Renderer2 {
 
     @profile
     parentNode(node: NgView): any {
-        traceLog("NativeScriptRenderer.parentNode for node: " + node);
+        traceLog(`NativeScriptRenderer.parentNode for node: ${node}`);
         return node.parent || node.templateParent;
     }
 
diff --git a/nativescript-angular/view-util.ts b/nativescript-angular/view-util.ts
@@ -60,14 +60,14 @@ export class ViewUtil {
         }
 
         // add to queue
-        if (!parent) {
-            return;
-        }
-        const previousView = refChild || parent.lastChild;
+        const previousView = refChild || (parent && parent.lastChild);
         if (previousView) {
             previousView.nextSibling = child;
             child.previousSibling = previousView;
-        } else {
+        }
+
+        // TODO: check number of parent's children
+        if (!refChild && parent) {
             parent.lastChild = child;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,8 @@ export class NativeScriptRenderer extends Renderer2 {`
`92`	`92`
`93`	`93`	`@profile`
`94`	`94`	`insertBefore(parent: NgView, newChild: NgView, refChild: NgElement): void {`
`95`		- traceLog(`NativeScriptRenderer.insertBefore child: ${newChild} parent: ${parent}`);
	`95`	+ traceLog(`NativeScriptRenderer.insertBefore ` +
	`96`	+ `child: ${newChild} parent: ${parent} refChild: ${refChild}`);
`96`	`97`	`this.viewUtil.insertChild(parent, newChild, refChild);`
`97`	`98`	`}`
`98`	`99`
`@@ -110,7 +111,7 @@ export class NativeScriptRenderer extends Renderer2 {`
`110`	`111`
`111`	`112`	`@profile`
`112`	`113`	`parentNode(node: NgView): any {`
`113`		`- traceLog("NativeScriptRenderer.parentNode for node: " + node);`
	`114`	+ traceLog(`NativeScriptRenderer.parentNode for node: ${node}`);
`114`	`115`	`return node.parent \|\| node.templateParent;`
`115`	`116`	`}`
`116`	`117`