Commit 3e209cc

committed

fix(init): Bootstrap Angular on page "navigatingTo" event.

Avoid a brief flash of a blank page on slower devices.

1 parent 6e35152 commit 3e209ccCopy full SHA for 3e209cc

File tree

2 files changed

+15

-4

lines changed

nativescript-angular
- platform-common.ts
- renderer.ts

2 files changed

+15

-4

lines changed

`‎nativescript-angular/platform-common.ts‎`

Lines changed: 13 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,20 @@ export const COMMON_PROVIDERS = [`
`61`	`61`
`62`	`62`	`export class NativeScriptPlatformRef extends PlatformRef {`
`63`	`63`	`private _bootstrapper: BootstrapperAction;`
	`64`	`+ private static _rootPageRef: WeakRef<Page>;`
`64`	`65`
`65`	`66`	`constructor(private platform: PlatformRef, private appOptions?: AppOptions) {`
`66`	`67`	`super();`
`67`	`68`	`}`
`68`	`69`
	`70`	`+ static set rootPage(page: Page) {`
	`71`	`+ NativeScriptPlatformRef._rootPageRef = new WeakRef(page);`
	`72`	`+ }`
	`73`	`+`
	`74`	`+ static get rootPage(): Page {`
	`75`	`+ return NativeScriptPlatformRef._rootPageRef.get();`
	`76`	`+ }`
	`77`	`+`
`69`	`78`	`bootstrapModuleFactory<M>(moduleFactory: NgModuleFactory<M>): Promise<NgModuleRef<M>> {`
`70`	`79`	`this._bootstrapper = () => this.platform.bootstrapModuleFactory(moduleFactory);`
`71`	`80`
`@@ -149,12 +158,13 @@ export class NativeScriptPlatformRef extends PlatformRef {`
`149`	`158`	`const navEntry: NavigationEntry = {`
`150`	`159`	`create: (): Page => {`
`151`	`160`	`let page = pageFactory({ isBootstrap: true, isLivesync });`
	`161`	`+ NativeScriptPlatformRef.rootPage = page;`
`152`	`162`	`if (this.appOptions) {`
`153`	`163`	`page.actionBarHidden = this.appOptions.startPageActionBarHidden;`
`154`	`164`	`}`
`155`	`165`
`156`		`- let onLoadedHandler = function () {`
`157`		`- page.off("loaded",onLoadedHandler);`
	`166`	`+ let initHandler = function () {`
	`167`	`+ page.off(Page.navigatingToEvent,initHandler);`
`158`	`168`	`// profiling.stop("application-start");`
`159`	`169`	`rendererLog("Page loaded");`
`160`	`170`
`@@ -184,7 +194,7 @@ export class NativeScriptPlatformRef extends PlatformRef {`
`184`	`194`	`});`
`185`	`195`	`};`
`186`	`196`
`187`		`- page.on("loaded",onLoadedHandler);`
	`197`	`+ page.on(Page.navigatingToEvent,initHandler);`
`188`	`198`
`189`	`199`	`return page;`
`190`	`200`	`}`

`‎nativescript-angular/renderer.ts‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import { NgView } from "./element-registry";`
`14`	`14`	`import { rendererLog as traceLog } from "./trace";`
`15`	`15`	`import { escapeRegexSymbols } from "tns-core-modules/utils/utils";`
`16`	`16`	`import { Device } from "tns-core-modules/platform";`
	`17`	`+import { NativeScriptPlatformRef } from "./platform-common";`
`17`	`18`
`18`	`19`	`import { NativeScriptAnimationDriver } from "./animation-driver";`
`19`	`20`
`@@ -46,7 +47,7 @@ export class NativeScriptRootRenderer implements RootRenderer {`
`46`	`47`
`47`	`48`	`public get rootView(): View {`
`48`	`49`	`if (!this._rootView) {`
`49`		`- this._rootView = topmost().currentPage;`
	`50`	`+ this._rootView = NativeScriptPlatformRef.rootPage\|\|topmost().currentPage;`
`50`	`51`	`}`
`51`	`52`	`return this._rootView;`
`52`	`53`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 3e209cc

File tree

2 files changed

2 files changed

`‎nativescript-angular/platform-common.ts‎`

`‎nativescript-angular/renderer.ts‎`

0 commit comments