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

NathanWalker · NathanWalker · commit 967d652c61fb · 2020-08-28T00:05:47.000-07:00
diff --git a/package.json b/package.json
@@ -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",
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -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",
diff --git a/packages/core/ui/core/view/index.ios.ts b/packages/core/ui/core/view/index.ios.ts
@@ -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);
 	}
diff --git a/packages/ui-mobile-base/package.json b/packages/ui-mobile-base/package.json
@@ -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": {
diff --git a/packages/webpack/package.json b/packages/webpack/package.json
@@ -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",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nativescript",`
`3`		`- "version": "7.0.0-rc.54",`
	`3`	`+ "version": "7.0.0-rc.55",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"setup": "npx rimraf -- hooks node_modules package-lock.json && npm i && ts-patch install && nx run core:setup",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "@nativescript/ui-base",`
	`2`	`+ "name": "@nativescript/ui-mobile-base",`
`3`	`3`	`"version": "7.0.0-rc.0",`
`4`	`4`	`"description": "Native UI base components used with NativeScript.",`
`5`	`5`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@nativescript/webpack",`
`3`		`- "version": "3.0.0-rc.0",`
	`3`	`+ "version": "3.0.0-rc.1",`
`4`	`4`	`"main": "index",`
`5`	`5`	`"description": "Webpack plugin for NativeScript",`
`6`	`6`	`"homepage": "https://nativescript.org",`