FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix(modal): parent page invalid hierarchy handling by NathanWalker · Pull Request #5841 · NativeScript/NativeScript · GitHub

/ NativeScript Public

fix(modal): parent page invalid hierarchy handling #5841

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
Conversation 4 Commits 1 Checks 0 Files changed
Closed

fix(modal): parent page invalid hierarchy handling #5841

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

Filter by extension

Filter by extension .ts  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
117 changes: 68 additions & 49 deletions tns-core-modules/ui/core/view/view.ios.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -311,56 +311,67 @@ export class View extends ViewCommon {
protected _showNativeModalView(parent: View, context: any, closeCallback: Function, fullscreen?: boolean, animated?: boolean, stretched?: boolean) {
let parentWithController = ios.getParentWithViewController(parent);

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);
if (parentWithController) {
const parentController = parentWithController.viewController;
if (parentController && parentController.view) {
if (!parentController.view.window) {
if (traceEnabled()) {
traceWrite("Parent page is not part of the window hierarchy. Close the current modal page before showing another one!", traceCategories.ViewHierarchy);
}
return;
}

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;
}

this._setupAsRootView({});

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

this.horizontalAlignment = "stretch";
this.verticalAlignment = "stretch";

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());
} 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();
}
}

this.viewController = controller;
}

this._setupAsRootView({});

const parentController = parentWithController.viewController;
if (!parentController.view.window) {
throw new Error("Parent page is not part of the window hierarchy. Close the current modal page before showing another one!");
}

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

this.horizontalAlignment = "stretch";
this.verticalAlignment = "stretch";

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());
} 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();
}
}

protected _hideNativeModalView(parent: View) {
const parentController = parent.viewController;
const animated = (<any>this.viewController).animated;

super._hideNativeModalView(parent);
parentController.dismissModalViewControllerAnimated(animated);
if (parent) {
const parentController = parent.viewController;
const animated = (<any>this.viewController).animated;

super._hideNativeModalView(parent);
if (parentController) {
parentController.dismissModalViewControllerAnimated(animated);
}
}
}

[isEnabledProperty.getDefault](): boolean {
Expand Down Expand Up @@ -584,10 +595,18 @@ export class CustomLayoutView extends View {
export namespace ios {
export function getParentWithViewController(parent: View): View {
let view = parent;
let controller = view.viewController;
while (!controller) {
view = view.parent as View;
controller = view.viewController;
if (view) {
let controller = view.viewController;
while (!controller) {
// view is reassigned here
// ensure view is protected against undefined access at each turn
if (view) {
view = view.parent as View;
if (view) {
controller = view.viewController;
}
}
}
}

return view;
Expand Down
Back | FazBrowse Home | New Git URL