chore: fixes

NathanWalker · NathanWalker · commit 9a26ca165a91 · 2020-06-16T19:38:55.000-07:00
diff --git a/e2e/tests-app-ng/app/app.routes.ts b/e2e/tests-app-ng/app/app.routes.ts
@@ -96,7 +96,7 @@ export const routableComponents = [
 
 // Set `isNavigatable: true` if the page is a main page to other sub pages
 export const routes = [
-    { path: "", pathMatch: "full", redirectTo: "binding" },
+    { path: "", pathMatch: "full", redirectTo: "main" },
     { path: "main", component: MainComponent, data: { title: "" } },
     // { path: "", component: ModalContentComponent, data: { title: "" } },
     { path: "template", component: AppComponent, data: { title: "Template", isNavigatable: true } },
diff --git a/e2e/tests-app-ng/app/button/button-main-page.component.ts b/e2e/tests-app-ng/app/button/button-main-page.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 
 @Component({
-    selector: "main",
+    selector: "main-button",
     template: `
     <StackLayout>
         <Button text="text-alignment" [nsRouterLink]="['button-text-alignment']"></Button>
diff --git a/e2e/tests-app-ng/app/list-picker/list-picker-main-page.component.ts b/e2e/tests-app-ng/app/list-picker/list-picker-main-page.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 
 @Component({
-    selector: "main",
+    selector: "main-list-picker",
     template: `
     <StackLayout>
         <Button text="ListPicker" [nsRouterLink]="['/listPicker','list-picker']"></Button>
diff --git a/e2e/tests-app-ng/app/list-view/list-view-main-page.component.ts b/e2e/tests-app-ng/app/list-view/list-view-main-page.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 
 @Component({
-    selector: "main",
+    selector: "main-listview",
     template: `
     <StackLayout>
         <Button text="ListView" [nsRouterLink]="'commonTemplate'"></Button>
diff --git a/e2e/tests-app-ng/app/list-view/list-view-nested-template.component.ts b/e2e/tests-app-ng/app/list-view/list-view-nested-template.component.ts
@@ -1,7 +1,7 @@
 import { Component, ChangeDetectionStrategy } from "@angular/core";
 
 @Component({
-    selector: "list-test",
+    selector: "list-test-nested",
     template: `
         <GridLayout rows="* auto" automationText="mainView" iosOverflowSafeArea="false" >
             <ListView [items]="myItems">
diff --git a/e2e/tests-app-ng/app/main.ts b/e2e/tests-app-ng/app/main.ts
@@ -1,5 +1,8 @@
 import { platformNativeScriptDynamic } from "@nativescript/angular/platform";
 
 import { AppModule } from "./app.module";
+import { enable } from "@nativescript/core/trace";
+
+enable();
 
 platformNativeScriptDynamic().bootstrapModule(AppModule);
diff --git a/e2e/tests-app-ng/app/main/main-page-router-outlet.ts b/e2e/tests-app-ng/app/main/main-page-router-outlet.ts
@@ -2,7 +2,7 @@ import { Component } from "@angular/core";
 import * as platform from "@nativescript/core/platform";
 
 @Component({
-    selector: "main",
+    selector: "main-page",
     styles: [
         ".main-btn{" +
         "margin-right:5; margin-bottom:5;" +
diff --git a/e2e/tests-app-ng/app/modal/modal-view-main-page.component.ts b/e2e/tests-app-ng/app/modal/modal-view-main-page.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 
 @Component({
-    selector: "main",
+    selector: "main-modal",
     template: `
     <StackLayout>
         <Button text="modal" [nsRouterLink]="['/modal','modal-dialogs']"></Button>
diff --git a/nativescript-angular/platform-common.ts b/nativescript-angular/platform-common.ts
@@ -218,8 +218,9 @@ export class NativeScriptPlatformRef extends PlatformRef {
                   // Custom launch view color (useful when doing async app intializers where you don't want a flash of undesirable color)
                   launchView.backgroundColor = new Color(this.appOptions && this.appOptions.backgroundColor ? this.appOptions.backgroundColor : '#fff');
                 }
-                args.root = launchView;
+                
                 setRootPage(<any>launchView);
+                args.root = launchView;
 
                 // Launch Angular app on next tick
                 setTimeout(() => {
@@ -255,7 +256,13 @@ export class NativeScriptPlatformRef extends PlatformRef {
                         rootContent = this.createErrorUI(errorMessage);
                     }
                 );
-                // (<any>global).Zone.drainMicroTaskQueue();
+                if (isLogEnabled()) {
+                  bootstrapLog("bootstrapAction called, draining micro tasks queue. Root: " + rootContent);
+                }
+                (<any>global).Zone.drainMicroTaskQueue();
+                if (isLogEnabled()) {
+                    bootstrapLog("bootstrapAction called, draining micro tasks queue finished! Root: " + rootContent);
+                } 
               });
             }
         );
