From 740bbc5d84b143a1d7310d7b413b6a5af89e500c Mon Sep 17 00:00:00 2001
From: mlanter <matt@opendoor.com>
Date: Mon, 13 Mar 2017 16:00:03 -0700
Subject: [PATCH 1/3] Support animating nested values

---
 .../Animated/src/AnimatedImplementation.js    | 42 +++++++++++++------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/Libraries/Animated/src/AnimatedImplementation.js b/Libraries/Animated/src/AnimatedImplementation.js
index e0860eced71cac..ab45496d97cd45 100644
--- a/Libraries/Animated/src/AnimatedImplementation.js
+++ b/Libraries/Animated/src/AnimatedImplementation.js
@@ -1485,32 +1485,48 @@ class AnimatedStyle extends AnimatedWithChildren {
     this._style = style;
   }
 
-  __getValue(): Object {
-    var style = {};
-    for (var key in this._style) {
-      var value = this._style[key];
+  // Recursively get values for nested styles (like iOS's shadowOffset)
+  __walkStyleAndGetValues(style) {
+    let updatedStyle = {};
+    for (let key in style) {
+      let value = style[key];
       if (value instanceof Animated) {
         if (!value.__isNative) {
           // We cannot use value of natively driven nodes this way as the value we have access from
           // JS may not be up to date.
-          style[key] = value.__getValue();
+          updatedStyle[key] = value.__getValue();
         }
+      } else if (value && !Array.isArray(value) && typeof value === 'object') {
+        // Support animating nested values (for example: shadowOffset.height)
+        updatedStyle[key] = this.__walkStyleAndGetValues(value);
       } else {
-        style[key] = value;
+        updatedStyle[key] = value;
       }
     }
-    return style;
+    return updatedStyle;
   }
 
-  __getAnimatedValue(): Object {
-    var style = {};
-    for (var key in this._style) {
-      var value = this._style[key];
+  __getValue(): Object {
+    return this.__walkStyleAndGetValues(this._style);
+  }
+
+  // Recursively get animated values for nested styles (like iOS's shadowOffset)
+  __walkStyleAndGetAnimatedValues(style) {
+    let updatedStyle = {};
+    for (let key in style) {
+      let value = style[key];
       if (value instanceof Animated) {
-        style[key] = value.__getAnimatedValue();
+        updatedStyle[key] = value.__getAnimatedValue();
+      } else if (value && !Array.isArray(value) && typeof value === 'object') {
+        // Support animating nested values (for example: shadowOffset.height)
+        updatedStyle[key] = this.__walkStyleAndGetAnimatedValues(value);
       }
     }
-    return style;
+    return updatedStyle;
+  }
+
+  __getAnimatedValue(): Object {
+    return this.__walkStyleAndGetAnimatedValues(this._style);
   }
 
   __attach(): void {

From 97666e855a0c738f50944a69134472de5735ccf4 Mon Sep 17 00:00:00 2001
From: mlanter <matt@opendoor.com>
Date: Mon, 13 Mar 2017 16:01:47 -0700
Subject: [PATCH 2/3] Add test for nested animated value

---
 Libraries/Animated/src/__tests__/Animated-test.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Libraries/Animated/src/__tests__/Animated-test.js b/Libraries/Animated/src/__tests__/Animated-test.js
index fc313a8af0582b..2ff2f3c8d84914 100644
--- a/Libraries/Animated/src/__tests__/Animated-test.js
+++ b/Libraries/Animated/src/__tests__/Animated-test.js
@@ -33,7 +33,11 @@ describe('Animated tests', () => {
               outputRange: [100, 200],
             })},
             {scale: anim},
-          ]
+          ],
+          shadowOffset: {
+            width: anim,
+            height: anim,
+          },
         }
       }, callback);
 
@@ -47,6 +51,10 @@ describe('Animated tests', () => {
             {translateX: 100},
             {scale: 0},
           ],
+          shadowOffset: {
+            width: 0,
+            height: 0,
+          },
         },
       });
 
@@ -62,6 +70,10 @@ describe('Animated tests', () => {
             {translateX: 150},
             {scale: 0.5},
           ],
+          shadowOffset: {
+            width: 0,
+            height: 0,
+          },
         },
       });
 

From 877cdce0785175ebf26ed31da583b8fe116f7078 Mon Sep 17 00:00:00 2001
From: mlanter <matt@opendoor.com>
Date: Wed, 15 Mar 2017 13:05:28 -0700
Subject: [PATCH 3/3] Fix unit test

---
 Libraries/Animated/src/__tests__/Animated-test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Libraries/Animated/src/__tests__/Animated-test.js b/Libraries/Animated/src/__tests__/Animated-test.js
index 2ff2f3c8d84914..909fc0f44b5ae5 100644
--- a/Libraries/Animated/src/__tests__/Animated-test.js
+++ b/Libraries/Animated/src/__tests__/Animated-test.js
@@ -71,8 +71,8 @@ describe('Animated tests', () => {
             {scale: 0.5},
           ],
           shadowOffset: {
-            width: 0,
-            height: 0,
+            width: 0.5,
+            height: 0.5,
           },
         },
       });