fix(navigation): fix frame.navigate call inside page.navigatedTo handler (#5649)

manoldonev · web-flow · commit cf950e1ebbf4 · 2018-04-11T11:25:54.000+03:00
diff --git a/tests/app/navigation/navigation-tests.ts b/tests/app/navigation/navigation-tests.ts
@@ -1,5 +1,5 @@
 ﻿import * as TKUnit from "../TKUnit";
-import { Page, NavigatedData } from "tns-core-modules/ui/page";
+import { EventData, Page, NavigatedData } from "tns-core-modules/ui/page";
 import { topmost as topmostFrame, NavigationTransition } from "tns-core-modules/ui/frame";
 import { Color } from "tns-core-modules/color";
 import * as helper from "../ui/helper";
@@ -377,4 +377,41 @@ export function test_NavigationEvents_WithClearHistory() {
 
 export function test_NavigationEvents_WithClearHistory_WithTransition() {
     _test_NavigationEvents_WithClearHistory({ name: "fade", duration: 10 });
+}
+
+export function test_Navigate_From_Page_Loaded_Handler() {
+    _test_Navigate_From_Page_Event_Handler(Page.loadedEvent);
+}
+
+export function test_Navigate_From_Page_NavigatedTo_Handler() {
+    _test_Navigate_From_Page_Event_Handler(Page.navigatedToEvent);
+}
+
+function _test_Navigate_From_Page_Event_Handler(eventName: string) {
+    let secondPageNavigatedTo = false;
+
+    const firstPageFactory = function (): Page {
+        const firstPage = new Page();
+        firstPage.id = "first-page";
+        firstPage.on(eventName, (args: EventData) => { 
+            const page = <Page>args.object;
+            const frame = page.frame;
+
+            const secondPageFactory = function (): Page {
+                const secondPage = new Page();
+                secondPage.id = "second-page";
+                secondPage.on(Page.navigatedToEvent, () => { secondPageNavigatedTo = true });
+
+                return secondPage;
+            };
+
+            frame.navigate(secondPageFactory);
+        });
+
+        return firstPage;
+    };
+
+    helper.navigateWithEntry({ create: firstPageFactory });
+
+    TKUnit.waitUntilReady(() => secondPageNavigatedTo);
 }
diff --git a/tns-core-modules/ui/frame/frame-common.ts b/tns-core-modules/ui/frame/frame-common.ts
@@ -216,8 +216,13 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition {
         }
 
         this._currentEntry = entry;
-        this._executingEntry = null;
+
         newPage.onNavigatedTo(isBack);
+
+        // Reset executing entry after NavigatedTo is raised;
+        // we do not want to execute two navigations in parallel in case 
+        // additional navigation is triggered from the NavigatedTo handler.
+        this._executingEntry = null;
     }
 
     public _updateBackstack(entry: BackstackEntry, isBack: boolean): void {

Original file line number	Diff line number	Diff line change
`@@ -216,8 +216,13 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition {`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`this._currentEntry = entry;`
`219`		`- this._executingEntry = null;`
	`219`	`+`
`220`	`220`	`newPage.onNavigatedTo(isBack);`
	`221`	`+`
	`222`	`+ // Reset executing entry after NavigatedTo is raised;`
	`223`	`+ // we do not want to execute two navigations in parallel in case`
	`224`	`+ // additional navigation is triggered from the NavigatedTo handler.`
	`225`	`+ this._executingEntry = null;`
`221`	`226`	`}`
`222`	`227`
`223`	`228`	`public _updateBackstack(entry: BackstackEntry, isBack: boolean): void {`