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

fix(ios): stop using artificial state handler via animated setter on uiviewcontroller (#8797)

Browse Source
This commit is contained in:
Nathan Walker
2020-08-27 19:59:30 -07:00
parent 33a703e129
commit 967d652c61
5 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/core/ui/core/view/index.ios.ts
View File

@@ -29,6 +29,10 @@ export class View extends ViewCommon implements ViewDefinition {
private _popoverPresentationDelegate: IOSHelper.UIPopoverPresentationControllerDelegateImp;
private _adaptivePresentationDelegate: IOSHelper.UIAdaptivePresentationControllerDelegateImp;
/**
* Track modal open animated options to use same option upon close
*/
private _modalAnimatedOptions: Array<boolean>;
private _isLaidOut = false;
private _hasTransfrom = false;
private _privateFlags: number = PFLAG_LAYOUT_REQUIRED | PFLAG_FORCE_LAYOUT;
@@ -472,7 +476,7 @@ export class View extends ViewCommon implements ViewDefinition {
this._setupAdaptiveControllerDelegate(controller);
} else {
// Prevent users from dismissing the modal.
(<any>controller).modalInPresentation = true;
controller.modalInPresentation = true;
}
}
@@ -481,7 +485,12 @@ export class View extends ViewCommon implements ViewDefinition {
this._raiseShowingModallyEvent();
const animated = options.animated === undefined ? true : !!options.animated;
(<any>controller).animated = animated;
if (!this._modalAnimatedOptions) {
// track the user's animated options to use upon close as well
this._modalAnimatedOptions = [];
}
this._modalAnimatedOptions.push(animated);
parentController.presentViewControllerAnimatedCompletion(controller, animated, null);
const transitionCoordinator = parentController.transitionCoordinator;
if (transitionCoordinator) {
@@ -509,7 +518,7 @@ export class View extends ViewCommon implements ViewDefinition {
}
const parentController = parent.viewController;
const animated = (<any>this.viewController).animated;
const animated = this._modalAnimatedOptions ? !!this._modalAnimatedOptions.pop() : true;
parentController.dismissViewControllerAnimatedCompletion(animated, whenClosedCallback);
}