fix(platform-providers): Remove a circular import.

Author: hdeshev

nativescript-angular/platform-common.ts

@@ -26,7 +26,7 @@ if (global.___TS_UNUSED) {
 }
 
 import { rendererLog, rendererError } from "./trace";
-import { PAGE_FACTORY, PageFactory, defaultPageFactoryProvider } from "./platform-providers";
+import { PAGE_FACTORY, PageFactory, defaultPageFactoryProvider, setRootPage } from "./platform-providers";
 
 import { start, setCssFileName } from "application";
 import { topmost, NavigationEntry } from "ui/frame";
@@ -61,20 +61,11 @@ export const COMMON_PROVIDERS = [
 
 export class NativeScriptPlatformRef extends PlatformRef {
     private _bootstrapper: BootstrapperAction;
-    private static _rootPageRef: WeakRef<Page>;
 
     constructor(private platform: PlatformRef, private appOptions?: AppOptions) {
         super();
     }
 
-    static set rootPage(page: Page) {
-        NativeScriptPlatformRef._rootPageRef = new WeakRef(page);
-    }
-
-    static get rootPage(): Page {
-        return NativeScriptPlatformRef._rootPageRef.get();
-    }
-
     bootstrapModuleFactory<M>(moduleFactory: NgModuleFactory<M>): Promise<NgModuleRef<M>> {
         this._bootstrapper = () => this.platform.bootstrapModuleFactory(moduleFactory);
 
@@ -158,7 +149,7 @@ export class NativeScriptPlatformRef extends PlatformRef {
         const navEntry: NavigationEntry = {
             create: (): Page => {
                 let page = pageFactory({ isBootstrap: true, isLivesync });
-                NativeScriptPlatformRef.rootPage = page;
+                setRootPage(page);
                 if (this.appOptions) {
                     page.actionBarHidden = this.appOptions.startPageActionBarHidden;
                 }

nativescript-angular/platform-providers.ts

@@ -15,14 +15,20 @@ if (global.___TS_UNUSED) {
     })();
 }
 
+let _rootPageRef: WeakRef<Page>;
+
+export function setRootPage(page: Page): void {
+    _rootPageRef = new WeakRef(page);
+}
+
+export function getRootPage(): Page {
+    return _rootPageRef && _rootPageRef.get();
+}
+
 // Use an exported function to make the AoT compiler happy.
 export function getDefaultPage(): Page {
     const frame = topmost();
-    if (frame) {
-        return frame.currentPage;
-    } else {
-        return null;
-    }
+    return getRootPage() || (frame && frame.currentPage);
 }
 
 export const defaultPageProvider = { provide: Page, useFactory: getDefaultPage };

nativescript-angular/renderer.ts

@@ -12,10 +12,9 @@ import { escapeRegexSymbols } from "utils/utils";
 import { Device } from "platform";
 
 import { ViewUtil } from "./view-util";
-import { APP_ROOT_VIEW, DEVICE } from "./platform-providers";
+import { APP_ROOT_VIEW, DEVICE, getRootPage } from "./platform-providers";
 import { NgView } from "./element-registry";
 import { rendererLog as traceLog } from "./trace";
-import { NativeScriptPlatformRef } from "./platform-common";
 
 // CONTENT_ATTR not exported from NativeScript_renderer - we need it for styles application.
 const COMPONENT_REGEX = /%COMP%/g;
@@ -44,8 +43,9 @@ export class NativeScriptRendererFactory implements RendererFactory2 {
 
     private setRootNgView(rootView: any) {
         if (!rootView) {
-            rootView = NativeScriptPlatformRef.rootPage || <NgView><any>topmost().currentPage;
+            rootView = getRootPage() || topmost().currentPage;
         }
+
         rootView.nodeName = "NONE";
         this.rootNgView = rootView;
     }