javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1793 from NativeScript/hhristov/navigation-events

Browse Source 
Fix navigation events https://github.com/NativeScript/NativeScript/issues/1570
This commit is contained in:
Hristo Hristov
2016-03-18 17:24:16 +02:00
parent a2f20a54b2 2cabf02215
commit b1ca9c41ac
19 changed files with 408 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/tests/ui/page/modal-page.ts
View File

@@ -1,20 +1,20 @@
import {ShownModallyData} from "ui/page";
import {topmost} from "ui/frame";
import TKUnit = require("../../TKUnit");
import frame = require("ui/frame");
import page = require("ui/page");
var modalPage: page.Page;
import {Page, ShownModallyData} from "ui/page";
export var modalPage: Page;
export function onShowingModally(args) {
modalPage = <page.Page>args.object;
modalPage = <Page>args.object;
args.object.showingModally = true;
}
export function onShownModally(args: ShownModallyData) {
TKUnit.assertNotNull(modalPage);
TKUnit.wait(0.100);
let page = <Page>args.object;
TKUnit.assertNotNull(page);
if (args.context) {
args.context.shownModally = true;
}
TKUnit.assert(frame.topmost().currentPage.modal = modalPage, "frame.topmost().currentPage.modal should be equal to the page instance on page.shownModally event handler.");
TKUnit.assertEqual(topmost().currentPage.modal, page, "frame.topmost().currentPage.modal should be equal to the page instance on page.shownModally event handler.");
args.closeCallback("return value");
}

4
apps/tests/ui/page/page-tests-common.ts
View File

@@ -191,7 +191,7 @@ function _test_PageNavigation_EventSequence(withTransition: boolean) {
if (withTransition) {
var navigationTransition: FrameModule.NavigationTransition = {
name: "slide",
duration: 1000,
duration: 100,
};
var navigationEntry: FrameModule.NavigationEntry = {
create: pageFactory,
@@ -207,7 +207,7 @@ function _test_PageNavigation_EventSequence(withTransition: boolean) {
helper.goBack();
var expectedEventSequence = ["navigatingTo", "loaded", "navigatedTo", "navigatingFrom", "navigatedFrom", "unloaded"];
var expectedEventSequence = ["navigatingTo", "loaded", "navigatedTo", "navigatingFrom", "unloaded", "navigatedFrom"];
TKUnit.arrayAssert(eventSequence, expectedEventSequence, "Actual event sequence is not equal to expected. Actual: " + eventSequence + "; Expected: " + expectedEventSequence);
}

115
apps/tests/ui/page/page-tests.ios.ts
View File

@@ -1,18 +1,18 @@
import PageTestCommon = require("./page-tests-common");
import PageModule = require("ui/page");
import {Page, ShownModallyData} from "ui/page";
import TKUnit = require("../../TKUnit");
import LabelModule = require("ui/label");
import {Label} from "ui/label";
import helper = require("../helper");
import view = require("ui/core/view");
import frame = require("ui/frame");
import {View} from "ui/core/view";
import {EventData} from "data/observable";
import uiUtils = require("ui/utils");
global.moduleMerge(PageTestCommon, exports);
export function test_NavigateToNewPage_InnerControl() {
var testPage: PageModule.Page;
var pageFactory = function (): PageModule.Page {
testPage = new PageModule.Page();
var testPage: Page;
var pageFactory = function (): Page {
testPage = new Page();
PageTestCommon.addLabelToPage(testPage);
return testPage;
};
@@ -20,11 +20,11 @@ export function test_NavigateToNewPage_InnerControl() {
helper.navigate(pageFactory);
helper.goBack();
var label = <LabelModule.Label>testPage.content;
var label = <Label>testPage.content;
TKUnit.assert(label._context === undefined, "InnerControl._context should be undefined after navigate back.");
TKUnit.assert(label.android === undefined, "InnerControl.android should be undefined after navigate back.");
TKUnit.assert(label.isLoaded === false, "InnerControl.isLoaded should become false after navigating back");
TKUnit.assertEqual(label._context, undefined, "label._context should be undefined after navigate back.");
TKUnit.assertEqual(label.android, undefined, "label.android should be undefined after navigate back.");
TKUnit.assertFalse(label.isLoaded, "label.isLoaded should become false after navigating back");
}
export function test_WhenPageIsNavigatedToItCanShowAnotherPageAsModal() {
@@ -35,24 +35,48 @@ export function test_WhenPageIsNavigatedToItCanShowAnotherPageAsModal() {
var modalClosed = false;
var modalCloseCallback = function (returnValue: any) {
TKUnit.assert(ctx.shownModally, "Modal-page must be shown!");
TKUnit.assert(returnValue === "return value", "Modal-page must return value!");
TKUnit.assert(!frame.topmost().currentPage.modal, "frame.topmost().currentPage.modal should be undefined when no modal page is shown!");
TKUnit.wait(0.100);
TKUnit.assertTrue(ctx.shownModally, "Modal-page must be shown!");
TKUnit.assertEqual(returnValue, "return value", "Modal-page must return value!");
modalClosed = true;
}
let modalPage: Page;
let shownModally = 0;
var onShownModal = function (args: ShownModallyData) {
shownModally++;
modalPage.off(Page.shownModallyEvent, onShownModal);
}
let modalLoaded = 0;
var onModalLoaded = function (args: EventData) {
modalLoaded++;
modalPage.off(Page.loadedEvent, onModalLoaded);
}
let modalUnloaded = 0;
var onModalUnloaded = function (args: EventData) {
modalUnloaded++;
modalPage.off(Page.unloadedEvent, onModalUnloaded);
TKUnit.assertNull(masterPage.modal, "currentPage.modal should be undefined when no modal page is shown!");
}
var navigatedToEventHandler = function (args) {
TKUnit.assert(!frame.topmost().currentPage.modal, "frame.topmost().currentPage.modal should be undefined when no modal page is shown!");
var basePath = "ui/page/";
args.object.showModal(basePath + "modal-page", ctx, modalCloseCallback, false);
let page = <Page>args.object;
TKUnit.assertNull(page.modal, "currentPage.modal should be undefined when no modal page is shown!");
let basePath = "ui/page/";
modalPage = page.showModal(basePath + "modal-page", ctx, modalCloseCallback, false);
TKUnit.assertTrue((<any>modalPage).showingModally, "showingModally");
modalPage.on(Page.shownModallyEvent, onShownModal);
modalPage.on(Page.loadedEvent, onModalLoaded);
modalPage.on(Page.unloadedEvent, onModalUnloaded);
};
var masterPageFactory = function (): PageModule.Page {
masterPage = new PageModule.Page();
var masterPageFactory = function (): Page {
masterPage = new Page();
masterPage.id = "newPage";
masterPage.on(PageModule.Page.navigatedToEvent, navigatedToEventHandler);
var label = new LabelModule.Label();
masterPage.on(Page.navigatedToEvent, navigatedToEventHandler);
var label = new Label();
label.text = "Text";
masterPage.content = label;
return masterPage;
@@ -60,8 +84,13 @@ export function test_WhenPageIsNavigatedToItCanShowAnotherPageAsModal() {
try {
helper.navigate(masterPageFactory);
TKUnit.waitUntilReady(() => { return modalClosed; });
masterPage.off(view.View.loadedEvent, navigatedToEventHandler);
TKUnit.waitUntilReady(() => { return modalUnloaded > 0; });
TKUnit.assertEqual(shownModally, 1, "shownModally");
TKUnit.assertEqual(modalLoaded, 1,"modalLoaded");
TKUnit.assertEqual(modalUnloaded,1 , "modalUnloaded");
masterPage.off(Page.navigatedToEvent, navigatedToEventHandler);
}
finally {
helper.goBack();
@@ -69,29 +98,33 @@ export function test_WhenPageIsNavigatedToItCanShowAnotherPageAsModal() {
}
export function test_WhenShowingModalPageUnloadedIsNotFiredForTheMasterPage() {
var masterPage;
var masterPageUnloaded = false;
var modalClosed = false;
var modalCloseCallback = function (returnValue: any) {
TKUnit.wait(0.100);
modalClosed = true;
let masterPage: Page;
let masterPageUnloaded = false;
let modalPage: Page;
let modalUnloaded = 0;
let onModalUnloaded = function (args: EventData) {
modalUnloaded++;
modalPage.off(Page.unloadedEvent, onModalUnloaded);
TKUnit.assertNull(masterPage.modal, "currentPage.modal should be undefined when no modal page is shown!");
}
var navigatedToEventHandler = function (args) {
var basePath = "ui/page/";
args.object.showModal(basePath + "modal-page", null, modalCloseCallback, false);
modalPage = masterPage.showModal(basePath + "modal-page", null, null, false);
modalPage.on(Page.unloadedEvent, onModalUnloaded);
};
var unloadedEventHandler = function (args) {
masterPageUnloaded = true;
};
var masterPageFactory = function (): PageModule.Page {
masterPage = new PageModule.Page();
var masterPageFactory = function (): Page {
masterPage = new Page();
masterPage.id = "master-page";
masterPage.on(PageModule.Page.navigatedToEvent, navigatedToEventHandler);
masterPage.on(view.View.unloadedEvent, unloadedEventHandler);
var label = new LabelModule.Label();
masterPage.on(Page.navigatedToEvent, navigatedToEventHandler);
masterPage.on(View.unloadedEvent, unloadedEventHandler);
var label = new Label();
label.text = "Modal Page";
masterPage.content = label;
return masterPage;
@@ -99,10 +132,10 @@ export function test_WhenShowingModalPageUnloadedIsNotFiredForTheMasterPage() {
try {
helper.navigate(masterPageFactory);
TKUnit.waitUntilReady(() => { return modalClosed; });
TKUnit.waitUntilReady(() => { return modalUnloaded > 0; });
TKUnit.assert(!masterPageUnloaded, "Master page should not raise 'unloaded' when showing modal!");
masterPage.off(view.View.loadedEvent, navigatedToEventHandler);
masterPage.off(view.View.unloadedEvent, unloadedEventHandler);
masterPage.off(View.loadedEvent, navigatedToEventHandler);
masterPage.off(View.unloadedEvent, unloadedEventHandler);
}
finally {
helper.goBack();
@@ -110,10 +143,10 @@ export function test_WhenShowingModalPageUnloadedIsNotFiredForTheMasterPage() {
}
export function test_page_no_anctionBar_measure_no_spanUnderBackground_measure_layout_size_isCorrect() {
let page = new PageModule.Page();
let page = new Page();
page.backgroundSpanUnderStatusBar = true;
page.actionBarHidden = true;
let lbl = new LabelModule.Label();
let lbl = new Label();
page.content = lbl;
try {