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 #2479 from NativeScript/fix-isBackNavigation

Browse Source 
FIX: isBackNavigation wrong parameter
This commit is contained in:
Alexander Vakrilov
2016-07-20 18:20:45 +03:00
committed by GitHub
parent fa48f4e425 4d1010155b
commit ff71e6ebee
3 changed files with 180 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

193
tests/app/navigation/navigation-tests.ts
View File

@@ -5,9 +5,9 @@ import {Color} from "color";
import helper = require("../ui/helper");
// Creates a random colorful page full of meaningless stuff.
var id = 0;
var pageFactory = function (): Page {
var page = new Page();
let id = 0;
let pageFactory = function (): Page {
const page = new Page();
page.actionBarHidden = true;
page.id = `NavTestPage${id++}`;
page.style.backgroundColor = new Color(255, Math.round(Math.random() * 255), Math.round(Math.random() * 255), Math.round(Math.random() * 255));
@@ -22,17 +22,28 @@ function androidGC() {
}
}
function attachEventListeners(page: Page, events: Array<string>) {
let argsToString = (args: NavigatedData) => {
return `${(<Page>args.object).id} ${args.eventName} ${(args.isBackNavigation ? "back" : "forward")}`;
};
page.on(Page.navigatingFromEvent, (args: NavigatedData) => { events.push(argsToString(args)); });
page.on(Page.navigatedFromEvent, (args: NavigatedData) => { events.push(argsToString(args)); });
page.on(Page.navigatingToEvent, (args: NavigatedData) => { events.push(argsToString(args)); });
page.on(Page.navigatedToEvent, (args: NavigatedData) => { events.push(argsToString(args)); });
}
function _test_backstackVisible(transition?: NavigationTransition) {
let topmost = topmostFrame();
let mainTestPage = topmost.currentPage;
helper.navigateWithEntry({ create: pageFactory, transition: transition, animated: true });
// page1 should not be added to the backstack
let page0 = topmost.currentPage;
helper.navigateWithEntry({ create: pageFactory, backstackVisible: false, transition: transition, animated: true });
helper.navigateWithEntry({ create: pageFactory, transition: transition, animated: true });
helper.goBack();
// From page2 we have to go directly to page0, skipping page1.
@@ -42,12 +53,12 @@ function _test_backstackVisible(transition?: NavigationTransition) {
TKUnit.assertEqual(topmost.currentPage, mainTestPage, "We should be on the main test page at the end of the test.");
}
export var test_backstackVisible = function () {
export function test_backstackVisible() {
androidGC();
_test_backstackVisible();
}
export var test_backstackVisible_WithTransition = function () {
export function test_backstackVisible_WithTransition() {
androidGC();
_test_backstackVisible({ name: "fade" });
}
@@ -55,26 +66,29 @@ export var test_backstackVisible_WithTransition = function () {
function _test_backToEntry(transition?: NavigationTransition) {
let topmost = topmostFrame();
let page = (tag) => () => {
var p = new Page();
const p = new Page();
p.actionBarHidden = true;
p.id = `NavTestPage${id++}`;
p["tag"] = tag;
return p;
}
};
let mainTestPage = topmost.currentPage;
let waitFunc = tag => TKUnit.waitUntilReady(() => topmost.currentPage["tag"] === tag, 1);
let navigate = tag => {
topmost.navigate({ create: page(tag), transition: transition, animated: true });
waitFunc(tag);
}
};
let back = pages => {
topmost.goBack(topmost.backStack[topmost.backStack.length - pages]);
}
};
let currentPageMustBe = tag => {
waitFunc(tag); // TODO: Add a timeout...
TKUnit.assert(topmost.currentPage["tag"] === tag, "Expected current page to be " + tag + " it was " + topmost.currentPage["tag"] + " instead.");
}
};
navigate("page1");
navigate("page2");
@@ -99,14 +113,14 @@ function _test_backToEntry(transition?: NavigationTransition) {
TKUnit.assertEqual(topmost.currentPage, mainTestPage, "We should be on the main test page at the end of the test.");
}
export var test_backToEntry = function () {
export function test_backToEntry() {
androidGC();
_test_backToEntry();
}
export var test_backToEntry_WithTransition = function () {
export function test_backToEntry_WithTransition() {
androidGC();
_test_backToEntry({name: "flip"});
_test_backToEntry({ name: "flip" });
}
function _test_ClearHistory(transition?: NavigationTransition) {
@@ -141,17 +155,17 @@ function _test_ClearHistory(transition?: NavigationTransition) {
}
// Clearing the history messes up the tests app.
export var test_ClearHistory = function () {
export function test_ClearHistory() {
androidGC();
_test_ClearHistory();
}
export var test_ClearHistory_WithTransition = function () {
export function test_ClearHistory_WithTransition() {
androidGC();
_test_ClearHistory({ name: "fade" });
}
export var test_ClearHistory_WithTransition_WithCachePagesOnNavigate = function () {
export function test_ClearHistory_WithTransition_WithCachePagesOnNavigate() {
androidGC();
let topmost = topmostFrame();
if (!topmost.android) {
@@ -165,7 +179,7 @@ export var test_ClearHistory_WithTransition_WithCachePagesOnNavigate = function
}
// Test case for https://github.com/NativeScript/NativeScript/issues/1948
export var test_ClearHistoryWithTransitionDoesNotBreakNavigation = function () {
export function test_ClearHistoryWithTransitionDoesNotBreakNavigation() {
androidGC();
let topmost = topmostFrame();
let mainTestPage = topmost.currentPage;
@@ -175,18 +189,18 @@ export var test_ClearHistoryWithTransitionDoesNotBreakNavigation = function () {
// Go to details-page
helper.navigateWithEntry({ create: pageFactory, clearHistory: false, animated: true });
// Go back to main-page with clearHistory
topmost.transition = { name: "fade" };
helper.navigateWithEntry({ create: mainPageFactory, clearHistory: true, animated: true });
// Go to details-page AGAIN
helper.navigateWithEntry({ create: pageFactory, clearHistory: false, animated: true });
// Go back to main-page with clearHistory
topmost.transition = { name: "fade" };
helper.navigateWithEntry({ create: mainPageFactory, clearHistory: true, animated: true });
// Clean up
topmost.transition = undefined;
@@ -194,9 +208,10 @@ export var test_ClearHistoryWithTransitionDoesNotBreakNavigation = function () {
TKUnit.assertEqual(topmost.backStack.length, 0, "Back stack should be empty at the end of the test.");
}
export var test_ClearHistoryWithTransitionDoesNotBreakNavigation_WithLocalTransition = function () {
export function test_ClearHistoryWithTransitionDoesNotBreakNavigation_WithLocalTransition() {
androidGC();
let topmost = topmostFrame();
const topmost = topmostFrame();
let originalCachePagesOnNavigate: boolean;
if (topmost.android) {
originalCachePagesOnNavigate = topmost.android.cachePagesOnNavigate;
@@ -210,16 +225,16 @@ export var test_ClearHistoryWithTransitionDoesNotBreakNavigation_WithLocalTransi
// Go to 1st page
helper.navigateWithEntry({ create: pageFactory, clearHistory: false, transition: { name: "fade" }, animated: true });
// Go to 2nd page
helper.navigateWithEntry({ create: pageFactory, clearHistory: false, transition: { name: "fade" }, animated: true });
// Go to 3rd page with clearHistory
helper.navigateWithEntry({ create: pageFactory, clearHistory: true, transition: { name: "fade" }, animated: true });
// Go back to main
helper.navigateWithEntry({ create: mainPageFactory, clearHistory: true, transition: { name: "fade" }, animated: true });
if (topmost.android) {
topmostFrame().android.cachePagesOnNavigate = originalCachePagesOnNavigate;
}
@@ -229,39 +244,30 @@ export var test_ClearHistoryWithTransitionDoesNotBreakNavigation_WithLocalTransi
}
function _test_NavigationEvents(transition?: NavigationTransition) {
let topmost = topmostFrame();
let argsToString = (args: NavigatedData) => {
return `${(<Page>args.object).id} ${args.eventName} ${(args.isBackNavigation ? "back" : "forward") }`
};
const topmost = topmostFrame();
const mainTestPage = topmost.currentPage;
const originalMainPageId = mainTestPage.id;
let mainTestPage = topmost.currentPage;
let originalMainPageId = mainTestPage.id;
mainTestPage.id = "main-page";
let actualMainPageEvents = new Array<string>();
mainTestPage.on(Page.navigatingFromEvent, (args: NavigatedData) => { actualMainPageEvents.push(argsToString(args)); });
mainTestPage.on(Page.navigatedFromEvent, (args: NavigatedData) => { actualMainPageEvents.push(argsToString(args)); });
mainTestPage.on(Page.navigatingToEvent, (args: NavigatedData) => { actualMainPageEvents.push(argsToString(args)); });
mainTestPage.on(Page.navigatedToEvent, (args: NavigatedData) => { actualMainPageEvents.push(argsToString(args)); });
attachEventListeners(mainTestPage, actualMainPageEvents);
let actualSecondPageEvents = new Array<string>();
let secondPageFactory = function (): Page {
var secondPage = new Page();
secondPage.actionBarHidden = true;
secondPage.id = "second-page"
secondPage.on(Page.navigatingFromEvent, (args: NavigatedData) => { actualSecondPageEvents.push(argsToString(args)); });
secondPage.on(Page.navigatedFromEvent, (args: NavigatedData) => { actualSecondPageEvents.push(argsToString(args)); });
secondPage.on(Page.navigatingToEvent, (args: NavigatedData) => { actualSecondPageEvents.push(argsToString(args)); });
secondPage.on(Page.navigatedToEvent, (args: NavigatedData) => { actualSecondPageEvents.push(argsToString(args)); });
const secondPage = new Page();
secondPage.actionBarHidden = true;
secondPage.id = "second-page";
attachEventListeners(secondPage, actualSecondPageEvents);
secondPage.style.backgroundColor = new Color(255, Math.round(Math.random() * 255), Math.round(Math.random() * 255), Math.round(Math.random() * 255));
return secondPage;
};
// Go to other page
helper.navigateWithEntry({ create: secondPageFactory, transition: transition, animated: true });
// Go back to main
helper.goBack();
mainTestPage.id = originalMainPageId;
let expectedMainPageEvents = [
@@ -283,12 +289,97 @@ function _test_NavigationEvents(transition?: NavigationTransition) {
TKUnit.assertEqual(topmost.currentPage, mainTestPage, "We should be on the main test page at the end of the test.");
}
export var test_NavigationEvents = function () {
export function test_NavigationEvents() {
androidGC();
_test_NavigationEvents();
}
export var test_NavigationEvents_WithTransition = function () {
export function test_NavigationEvents_WithTransition() {
androidGC();
_test_NavigationEvents({ name: "fade" });
}
function _test_NavigationEvents_WithBackstackVisibile_False_Forward_Back(transition?: NavigationTransition) {
const topmost = topmostFrame();
const mainTestPage = topmost.currentPage;
let actualSecondPageEvents = new Array<string>();
let secondPageFactory = function (): Page {
const secondPage = new Page();
secondPage.actionBarHidden = true;
secondPage.id = "second-page";
attachEventListeners(secondPage, actualSecondPageEvents);
secondPage.style.backgroundColor = new Color(255, Math.round(Math.random() * 255), Math.round(Math.random() * 255), Math.round(Math.random() * 255));
return secondPage;
};
// Go to other page
helper.navigateWithEntry({ create: secondPageFactory, transition: transition, animated: true, backstackVisible: false });
// Go back to main
helper.goBack();
let expectedSecondPageEvents = [
"second-page navigatingTo forward",
"second-page navigatedTo forward",
"second-page navigatingFrom back",
"second-page navigatedFrom back"
];
TKUnit.arrayAssert(actualSecondPageEvents, expectedSecondPageEvents, "Actual second-page events are different from expected.");
TKUnit.assertEqual(topmost.currentPage, mainTestPage, "We should be on the main test page at the end of the test.");
}
export function test_NavigationEvents_WithBackstackVisibile_False_Forward_Back() {
androidGC();
_test_NavigationEvents_WithBackstackVisibile_False_Forward_Back();
}
export function test_NavigationEvents_WithBackstackVisibile_False_Forward_Back_WithTransition() {
androidGC();
_test_NavigationEvents_WithBackstackVisibile_False_Forward_Back({ name: "fade" });
}
function _test_NavigationEvents_WithBackstackVisibile_False_Forward_Forward(transition?: NavigationTransition) {
const topmost = topmostFrame();
const mainTestPage = topmost.currentPage;
let actualSecondPageEvents = new Array<string>();
let secondPageFactory = function (): Page {
const secondPage = new Page();
secondPage.actionBarHidden = true;
secondPage.id = "second-page";
attachEventListeners(secondPage, actualSecondPageEvents);
secondPage.style.backgroundColor = new Color(255, Math.round(Math.random() * 255), Math.round(Math.random() * 255), Math.round(Math.random() * 255));
return secondPage;
};
// Go to other page
helper.navigateWithEntry({ create: secondPageFactory, transition: transition, animated: true, backstackVisible: false });
// Go forward to third page
helper.navigateWithEntry({ create: pageFactory, transition: transition, animated: true });
// Go back to main
helper.goBack();
let expectedSecondPageEvents = [
"second-page navigatingTo forward",
"second-page navigatedTo forward",
"second-page navigatingFrom forward",
"second-page navigatedFrom forward"
];
TKUnit.arrayAssert(actualSecondPageEvents, expectedSecondPageEvents, "Actual second-page events are different from expected.");
TKUnit.assertEqual(topmost.currentPage, mainTestPage, "We should be on the main test page at the end of the test.");
}
export function test_NavigationEvents_WithBackstackVisibile_False_Forward_Forward() {
androidGC();
_test_NavigationEvents_WithBackstackVisibile_False_Forward_Forward();
}
export function test_NavigationEvents_WithBackstackVisibile_False_Forward_Forward_WithTransition() {
androidGC();
_test_NavigationEvents_WithBackstackVisibile_False_Forward_Forward({ name: "fade" });
}

58
tns-core-modules/ui/frame/frame.ios.ts
View File

@@ -10,15 +10,15 @@ import * as types from "utils/types";
import application = require("application");
import * as _transitionModule from "ui/transition";
var transitionModule: typeof _transitionModule;
let transitionModule: typeof _transitionModule;
global.moduleMerge(frameCommon, exports);
var ENTRY = "_entry";
var NAV_DEPTH = "_navDepth";
var TRANSITION = "_transition";
var DELEGATE = "_delegate";
var navDepth = -1;
const ENTRY = "_entry";
const NAV_DEPTH = "_navDepth";
const TRANSITION = "_transition";
const DELEGATE = "_delegate";
let navDepth = -1;
export class Frame extends frameCommon.Frame {
private _ios: iOSFrame;
@@ -123,7 +123,7 @@ export class Frame extends frameCommon.Frame {
// We should clear the entire history.
if (clearHistory) {
viewController.navigationItem.hidesBackButton = true;
var newControllers = NSMutableArray.alloc().initWithCapacity(1);
let newControllers = NSMutableArray.alloc().initWithCapacity(1);
newControllers.addObject(viewController);
this._ios.controller.setViewControllersAnimated(newControllers, animated);
if (trace.enabled) {
@@ -135,7 +135,7 @@ export class Frame extends frameCommon.Frame {
// We should hide the current entry from the back stack.
if (!Frame._isEntryBackstackVisible(this._currentEntry)) {
var newControllers = NSMutableArray.alloc().initWithArray(this._ios.controller.viewControllers);
let newControllers = NSMutableArray.alloc().initWithArray(this._ios.controller.viewControllers);
if (newControllers.count === 0) {
throw new Error("Wrong controllers count.");
}
@@ -145,6 +145,8 @@ export class Frame extends frameCommon.Frame {
viewController.navigationItem.hidesBackButton = this.backStack.length === 0;
// swap the top entry with the new one
const skippedNavController = newControllers.lastObject;
skippedNavController.isBackstackSkipped = true;
newControllers.removeLastObject();
newControllers.addObject(viewController);
@@ -169,8 +171,8 @@ export class Frame extends frameCommon.Frame {
navDepth = backstackEntry[NAV_DEPTH];
if (!this._shouldSkipNativePop) {
var controller = backstackEntry.resolvedPage.ios;
var animated = this._currentEntry ? this._getIsAnimatedNavigation(this._currentEntry.entry) : false;
let controller = backstackEntry.resolvedPage.ios;
let animated = this._currentEntry ? this._getIsAnimatedNavigation(this._currentEntry.entry) : false;
this._updateActionBar(backstackEntry.resolvedPage);
if (trace.enabled) {
@@ -183,8 +185,8 @@ export class Frame extends frameCommon.Frame {
public _updateActionBar(page?: Page): void {
super._updateActionBar(page);
var page = page || this.currentPage;
var newValue = this._getNavBarVisible(page);
page = page || this.currentPage;
let newValue = this._getNavBarVisible(page);
this._ios.showNavigationBar = newValue;
if (this._ios.controller.navigationBar) {
@@ -240,7 +242,7 @@ export class Frame extends frameCommon.Frame {
public requestLayout(): void {
super.requestLayout();
// Invalidate our Window so that layout is triggered again.
var window = this._nativeView.window;
let window = this._nativeView.window;
if (window) {
window.setNeedsLayout();
}
@@ -306,7 +308,7 @@ export class Frame extends frameCommon.Frame {
}
public get navigationBarHeight(): number {
var navigationBar = this._ios.controller.navigationBar;
let navigationBar = this._ios.controller.navigationBar;
return (navigationBar && !this._ios.controller.navigationBarHidden) ? navigationBar.frame.size.height : 0;
}
@@ -346,7 +348,7 @@ export class Frame extends frameCommon.Frame {
if (trace.enabled) {
trace.write(`Forcing navigationBar.frame.origin.y to ${statusBarHeight} due to a higher in-call status-bar`, trace.categories.Layout);
}
this._ios.controller.navigationBar.autoresizingMask = UIViewAutoresizing.UIViewAutoresizingNone;
this._ios.controller.navigationBar.removeConstraints((<any>this)._ios.controller.navigationBar.constraints);
this._ios.controller.navigationBar.frame = CGRectMake(
@@ -388,7 +390,7 @@ class TransitionDelegate extends NSObject {
}
}
var index = transitionDelegates.indexOf(this);
let index = transitionDelegates.indexOf(this);
if (index > -1) {
transitionDelegates.splice(index, 1);
}
@@ -400,7 +402,7 @@ class TransitionDelegate extends NSObject {
};
}
var _defaultTransitionDuration = 0.35;
const _defaultTransitionDuration = 0.35;
class UINavigationControllerAnimatedDelegate extends NSObject implements UINavigationControllerDelegate {
public static ObjCProtocols = [UINavigationControllerDelegate];
@@ -433,7 +435,7 @@ class UINavigationControllerAnimatedDelegate extends NSObject implements UINavig
if (trace.enabled) {
trace.write(`UINavigationControllerImpl.navigationControllerAnimationControllerForOperationFromViewControllerToViewController(${operation}, ${fromVC}, ${toVC}), transition: ${JSON.stringify(navigationTransition)}`, trace.categories.NativeLifecycle);
}
if (!transitionModule) {
transitionModule = require("ui/transition");
}
@@ -448,7 +450,7 @@ class UINavigationControllerImpl extends UINavigationController {
private _owner: WeakRef<Frame>;
public static initWithOwner(owner: WeakRef<Frame>): UINavigationControllerImpl {
var controller = <UINavigationControllerImpl>UINavigationControllerImpl.new();
let controller = <UINavigationControllerImpl>UINavigationControllerImpl.new();
controller._owner = owner;
return controller;
}
@@ -471,7 +473,7 @@ class UINavigationControllerImpl extends UINavigationController {
if (trace.enabled) {
trace.write(this._owner + " viewDidLayoutSubviews, isLoaded = " + owner.isLoaded, trace.categories.ViewHierarchy);
}
owner._updateLayout();
}
}
@@ -522,8 +524,8 @@ class UINavigationControllerImpl extends UINavigationController {
}
public setViewControllersAnimated(viewControllers: NSArray, animated: boolean): void {
var viewController = viewControllers.lastObject;
var navigationTransition = <definition.NavigationTransition>viewController[TRANSITION];
let viewController = viewControllers.lastObject;
let navigationTransition = <definition.NavigationTransition>viewController[TRANSITION];
if (trace.enabled) {
trace.write(`UINavigationControllerImpl.setViewControllersAnimated(${viewControllers}, ${animated}); transition: ${JSON.stringify(navigationTransition)}`, trace.categories.NativeLifecycle);
}
@@ -540,8 +542,8 @@ class UINavigationControllerImpl extends UINavigationController {
}
public popViewControllerAnimated(animated: boolean): UIViewController {
var lastViewController = this.viewControllers.lastObject;
var navigationTransition = <definition.NavigationTransition>lastViewController[TRANSITION];
let lastViewController = this.viewControllers.lastObject;
let navigationTransition = <definition.NavigationTransition>lastViewController[TRANSITION];
if (trace.enabled) {
trace.write(`UINavigationControllerImpl.popViewControllerAnimated(${animated}); transition: ${JSON.stringify(navigationTransition)}`, trace.categories.NativeLifecycle);
}
@@ -551,7 +553,7 @@ class UINavigationControllerImpl extends UINavigationController {
return super.popViewControllerAnimated(false);
}
var nativeTransition = _getNativeTransition(navigationTransition, false);
let nativeTransition = _getNativeTransition(navigationTransition, false);
if (!animated || !navigationTransition || !nativeTransition) {
return super.popViewControllerAnimated(animated);
}
@@ -589,7 +591,7 @@ class UINavigationControllerImpl extends UINavigationController {
}
function _getTransitionId(nativeTransition: UIViewAnimationTransition, transitionType: string): string {
var name;
let name;
switch (nativeTransition) {
case UIViewAnimationTransition.UIViewAnimationTransitionCurlDown: name = "CurlDown"; break;
case UIViewAnimationTransition.UIViewAnimationTransitionCurlUp: name = "CurlUp"; break;
@@ -661,7 +663,7 @@ class iOSFrame implements definition.iOSFrame {
private _showNavigationBar: boolean;
private _navBarVisibility: string;
private _frame: Frame;
// TabView uses this flag to disable animation while showing/hiding the navigation bar because of the "< More" bar.
// See the TabView._handleTwoNavigationBars method for more details.
public _disableNavBarAnimation: boolean;
@@ -682,7 +684,7 @@ class iOSFrame implements definition.iOSFrame {
return this._showNavigationBar;
}
public set showNavigationBar(value: boolean) {
var change = this._showNavigationBar !== value;
let change = this._showNavigationBar !== value;
this._showNavigationBar = value;
let animated = !this._frame._isInitialNavigation && !this._disableNavBarAnimation;

14
tns-core-modules/ui/page/page.ios.ts
View File

@@ -35,6 +35,8 @@ class UIViewControllerImpl extends UIViewController {
private _owner: WeakRef<Page>;
public isBackstackSkipped: boolean;
public static initWithOwner(owner: WeakRef<Page>): UIViewControllerImpl {
let controller = <UIViewControllerImpl>UIViewControllerImpl.new();
controller._owner = owner;
@@ -51,7 +53,7 @@ class UIViewControllerImpl extends UIViewController {
if (trace.enabled) {
trace.write(owner + " viewDidLayoutSubviews, isLoaded = " + owner.isLoaded, trace.categories.ViewHierarchy);
}
if (!owner.isLoaded) {
return;
}
@@ -225,7 +227,7 @@ class UIViewControllerImpl extends UIViewController {
var frame = page.frame;
// Skip navigation events if we are hiding because we are about to show modal page.
if (!page._presentedViewController && frame && frame.currentPage === page) {
let isBack = page.frame && (!this.navigationController || !this.navigationController.viewControllers.containsObject(this));
let isBack = page.frame && (!this.navigationController || !this.navigationController.viewControllers.containsObject(this)) && !this.isBackstackSkipped;
page.onNavigatingFrom(isBack);
}
@@ -239,7 +241,7 @@ class UIViewControllerImpl extends UIViewController {
trace.write(page + " viewDidDisappear", trace.categories.Navigation);
}
// Exit if no page or page is hiding because it shows another page modally.
if (!page || page.modal || page._presentedViewController ) {
if (!page || page.modal || page._presentedViewController) {
return;
}
@@ -265,7 +267,7 @@ class UIViewControllerImpl extends UIViewController {
// Remove from parent if page was in frame and we navigated back.
// Showing page modally will not pass isBack check so currentPage won't be removed from Frame.
let isBack = frame && (!this.navigationController || !this.navigationController.viewControllers.containsObject(this));
let isBack = frame && (!this.navigationController || !this.navigationController.viewControllers.containsObject(this)) && !this.isBackstackSkipped;
if (isBack) {
// Remove parent when navigating back.
frame._removeView(page);
@@ -372,12 +374,12 @@ export class Page extends pageCommon.Page {
this._ios.modalPresentationStyle = UIModalPresentationStyle.UIModalPresentationFormSheet;
this._UIModalPresentationFormSheet = true;
}
super._raiseShowingModallyEvent();
parent.ios.presentViewControllerAnimatedCompletion(this._ios, utils.ios.MajorVersion >= 7, null);
let transitionCoordinator = parent.ios.transitionCoordinator();
if (transitionCoordinator){
if (transitionCoordinator) {
UIViewControllerTransitionCoordinator.prototype.animateAlongsideTransitionCompletion.call(transitionCoordinator, null, () => this._raiseShownModallyEvent());
}
else {