From 4a835fd1581c7f949a0e05a2ff23b22112b6b7e3 Mon Sep 17 00:00:00 2001
From: Vijay Vikram Singh <vsingh@axway.com>
Date: Thu, 10 Sep 2020 05:18:40 -0700
Subject: [PATCH] fix(ios): do not update properties if transition animation
 (#12028)

---
 .../TitaniumKit/Sources/API/TiAnimation.m     |  2 +-
 tests/Resources/ti.ui.view.test.js            | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/TiAnimation.m b/iphone/TitaniumKit/TitaniumKit/Sources/API/TiAnimation.m
index 1cd3f648e1e..65a30cb5d5b 100644
--- a/iphone/TitaniumKit/TitaniumKit/Sources/API/TiAnimation.m
+++ b/iphone/TitaniumKit/TitaniumKit/Sources/API/TiAnimation.m
@@ -282,7 +282,7 @@ - (void)animationCompleted:(NSString *)animationID finished:(NSNumber *)finished
 
   // Update the modified properties on the view!
   if (animatedViewProxy != nil) {
-    if (!isReverse && ![autoreverse boolValue] && properties != nil) {
+    if (!isReverse && ![self isTransitionAnimation] && ![autoreverse boolValue] && properties != nil) {
       [animatedViewProxy applyProperties:properties];
     }
     // TODO: What about center?
diff --git a/tests/Resources/ti.ui.view.test.js b/tests/Resources/ti.ui.view.test.js
index f6779fab5fc..1ace5fa43f7 100644
--- a/tests/Resources/ti.ui.view.test.js
+++ b/tests/Resources/ti.ui.view.test.js
@@ -654,6 +654,38 @@ describe('Titanium.UI.View', function () {
 		win.open();
 	});
 
+	it.ios('animate (transition) - FLIP (app should not crash)', function (finish) {
+		win = Ti.UI.createWindow();
+		const controlView = Ti.UI.createView({
+			backgroundColor: 'red',
+			width: 100, height: 100,
+			left: 100,  top: 100
+		});
+
+		win.addEventListener('open', function () {
+			const view = Ti.UI.createView({
+				top: 150,
+				left: 150,
+				width: 150,
+				height: 150,
+				backgroundColor: 'green'
+			});
+			controlView.add(view);
+			try {
+				controlView.animate({
+					view: view,
+					backgroundColor: 'green',
+					transition: Ti.UI.iOS.AnimationStyle.FLIP_FROM_LEFT
+				});
+			} catch (err) {
+				return finish(err);
+			}
+			finish();
+		});
+		win.add(controlView);
+		win.open();
+	});
+
 	// FIXME: I think there's a parity issue here!
 	// Android returns x/y values as pixels *always*. while the input '100' uses the default unit (dip)
 	// which may vary based on screen density (Ti.Platform.DisplayCaps.ydpi) - so may be 100 or 200 pixels!