Skip to content

fix(iOS): viewhierarchy stability with modals #6370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
NathanWalker wants to merge 1 commit into from
Closed

fix(iOS): viewhierarchy stability with modals #6370

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 54 additions & 44 deletions tns-core-modules/ui/core/view/view.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Definitions.
// Definitions.
import { Point, View as ViewDefinition, dip } from ".";
import { ViewBase } from "../view-base";
import { booleanConverter, Property } from "../view";
Expand All @@ -8,8 +8,9 @@ import {
traceEnabled, traceWrite, traceCategories, traceError, traceMessageType, getAncestor
} from "./view-common";

import { ios as iosBackground, Background } from "../../styling/background";
import { topmost } from "../../frame/frame-stack";
import { ios as iosUtils } from "../../../utils/utils";
import { ios as iosBackground, Background } from "../../styling/background";
import {
Visibility,
visibilityProperty, opacityProperty,
Expand Down Expand Up @@ -362,57 +363,66 @@ export class View extends ViewCommon {
}

protected _showNativeModalView(parent: View, context: any, closeCallback: Function, fullscreen?: boolean, animated?: boolean, stretched?: boolean) {
const that = this;
const superCall = super._showNativeModalView;
const parentWithController = ios.getParentWithViewController(parent);
if (!parentWithController) {
traceWrite(`Could not find parent with viewController for ${parent} while showing modal view.`,
traceCategories.ViewHierarchy, traceMessageType.error)
return;
}

const parentController = parentWithController.viewController;
if (!parentController.view || !parentController.view.window) {
traceWrite("Parent page is not part of the window hierarchy. Close the current modal page before showing another one!",
traceCategories.ViewHierarchy, traceMessageType.error);
return;
}

this._setupAsRootView({});

super._showNativeModalView(parentWithController, context, closeCallback, fullscreen, stretched);
let controller = this.viewController;
if (!controller) {
const nativeView = this.ios || this.nativeViewProtected;
controller = ios.UILayoutViewController.initWithOwner(new WeakRef(this));

if (nativeView instanceof UIView) {
controller.view.addSubview(nativeView);
}

this.viewController = controller;
}

if (fullscreen) {
controller.modalPresentationStyle = UIModalPresentationStyle.FullScreen;
} else {
controller.modalPresentationStyle = UIModalPresentationStyle.FormSheet;
}

this.horizontalAlignment = "stretch";
this.verticalAlignment = "stretch";
const openNow = function() {
that._setupAsRootView({});

superCall(parentWithController, context, closeCallback, fullscreen, stretched);
let controller = that.viewController;
if (!controller) {
const nativeView = that.ios || that.nativeViewProtected;
controller = ios.UILayoutViewController.initWithOwner(new WeakRef(that));

if (nativeView instanceof UIView) {
controller.view.addSubview(nativeView);
}

that.viewController = controller;
}

if (fullscreen) {
controller.modalPresentationStyle = UIModalPresentationStyle.FullScreen;
} else {
controller.modalPresentationStyle = UIModalPresentationStyle.FormSheet;
}

that.horizontalAlignment = "stretch";
that.verticalAlignment = "stretch";

that._raiseShowingModallyEvent();
animated = animated === undefined ? true : !!animated;
(<any>controller).animated = animated;
parentController.presentViewControllerAnimatedCompletion(controller, animated, null);
const transitionCoordinator = iosUtils.getter(parentController, parentController.transitionCoordinator);
if (transitionCoordinator) {
UIViewControllerTransitionCoordinator.prototype.animateAlongsideTransitionCompletion
.call(transitionCoordinator, null, () => that._raiseShownModallyEvent());
} else {
// Apparently iOS 9+ stops all transitions and animations upon application suspend and transitionCoordinator becomes null here in this case.
// Since we are not waiting for any transition to complete, i.e. transitionCoordinator is null, we can directly raise our shownModally event.
// Take a look at https://github.com/NativeScript/NativeScript/issues/2173 for more info and a sample project.
that._raiseShownModallyEvent();
}
};

this._raiseShowingModallyEvent();
animated = animated === undefined ? true : !!animated;
(<any>controller).animated = animated;
parentController.presentViewControllerAnimatedCompletion(controller, animated, null);
const transitionCoordinator = iosUtils.getter(parentController, parentController.transitionCoordinator);
if (transitionCoordinator) {
UIViewControllerTransitionCoordinator.prototype.animateAlongsideTransitionCompletion
.call(transitionCoordinator, null, () => this._raiseShownModallyEvent());
let parentController = parentWithController.viewController;
if (!parentController.view || !parentController.view.window) {
// close first
parentController.dismissModalViewControllerAnimated(false);
// give it a moment to fully close before opening again
setTimeout(function() {
openNow();
}, 300);
} else {
// Apparently iOS 9+ stops all transitions and animations upon application suspend and transitionCoordinator becomes null here in this case.
// Since we are not waiting for any transition to complete, i.e. transitionCoordinator is null, we can directly raise our shownModally event.
// Take a look at https://github.com/NativeScript/NativeScript/issues/2173 for more info and a sample project.
this._raiseShownModallyEvent();
openNow();
}
}

Expand Down