mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-11-05 13:26:48 +08:00
fix(ios): stop using artificial state handler via animated setter on uiviewcontroller (#8797)
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "nativescript",
|
||||
"version": "7.0.0-rc.54",
|
||||
"version": "7.0.0-rc.55",
|
||||
"license": "MIT",
|
||||
"scripts": {
|
||||
"setup": "npx rimraf -- hooks node_modules package-lock.json && npm i && ts-patch install && nx run core:setup",
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"main": "index",
|
||||
"types": "index.d.ts",
|
||||
"description": "NativeScript Core Modules",
|
||||
"version": "7.0.0-rc.54",
|
||||
"version": "7.0.0-rc.55",
|
||||
"homepage": "https://nativescript.org",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "@nativescript/ui-base",
|
||||
"name": "@nativescript/ui-mobile-base",
|
||||
"version": "7.0.0-rc.0",
|
||||
"description": "Native UI base components used with NativeScript.",
|
||||
"scripts": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@nativescript/webpack",
|
||||
"version": "3.0.0-rc.0",
|
||||
"version": "3.0.0-rc.1",
|
||||
"main": "index",
|
||||
"description": "Webpack plugin for NativeScript",
|
||||
"homepage": "https://nativescript.org",
|
||||
|
||||
Reference in New Issue
Block a user