diff --git a/e2e/modal-navigation/app/app.ts b/e2e/modal-navigation/app/app.ts index 88113cfe5..ae7b39686 100644 --- a/e2e/modal-navigation/app/app.ts +++ b/e2e/modal-navigation/app/app.ts @@ -3,3 +3,4 @@ import * as application from "tns-core-modules/application"; application.run({ moduleName: "app-root" }); // application.run({ moduleName: "tab-root" }); +// application.run({ moduleName: "layout-root" }); diff --git a/e2e/modal-navigation/app/home/home-page.ts b/e2e/modal-navigation/app/home/home-page.ts index 684ec48bd..3a0b9a9af 100644 --- a/e2e/modal-navigation/app/home/home-page.ts +++ b/e2e/modal-navigation/app/home/home-page.ts @@ -41,6 +41,14 @@ export function onModalPage(args: EventData) { false); } +export function onModalLayout(args: EventData) { + const view = args.object as View; + view.showModal("modal-layout/modal-layout", + "context", + () => console.log("home-page modal layout closed"), + false); +} + export function onModalTabView(args: EventData) { const fullscreen = false; const animated = false; @@ -61,7 +69,14 @@ export function onNavigate(args: EventData) { page.frame.navigate("second/second-page"); } -export function onRootViewChange() { - let rootView = application.getRootView(); - rootView instanceof Frame ? application._resetRootView({ moduleName: "tab-root" }) : application._resetRootView({ moduleName: "app-root" }); +export function onFrameRootViewReset() { + application._resetRootView({ moduleName: "app-root" }); } + +export function onTabRootViewReset() { + application._resetRootView({ moduleName: "tab-root" }); +} + +export function onLayoutRootViewReset() { + application._resetRootView({ moduleName: "layout-root" }); +} \ No newline at end of file diff --git a/e2e/modal-navigation/app/home/home-page.xml b/e2e/modal-navigation/app/home/home-page.xml index a34618a34..805df0ab5 100644 --- a/e2e/modal-navigation/app/home/home-page.xml +++ b/e2e/modal-navigation/app/home/home-page.xml @@ -12,8 +12,11 @@