Return final animation values to JS when animation completes (#37886)

Summary: Pull Request resolved: #37886 When using the native driver for animations that involve layout changes (ie. translateY and other transforms, but not styles such as opacity), because it bypasses Fabric, the new coordinates are not updated so the Pressability responder region/tap target is incorrect **This diff:** - Returning the final values from the native side, at the same place it sets the "finished" flag. This gets sent to JS in `animated/animations/Animation.js`. Changelog: [iOS][Changed] - return animated values to JS for natively driven animations Reviewed By: rshest Differential Revision: D46709214 fbshipit-source-id: f16f36a05cd052d1120ba6e04ec6dd72eb4a98e5
facebook · Jun 14, 2023 · b0485be · b0485be
1 parent 875f6a7
commit b0485be
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/packages/react-native/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m b/packages/react-native/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m
@@ -70,10 +70,10 @@ - (void)startAnimation
 
 - (void)stopAnimation
 {
-  _valueNode = nil;
   if (_callback) {
-    _callback(@[ @{@"finished" : @(_animationHasFinished)} ]);
+    _callback(@[ @{@"finished" : @(_animationHasFinished), @"value" : @(_valueNode.value)} ]);
   }
+  _valueNode = nil;
 }
 
 - (void)stepAnimationWithTime:(NSTimeInterval)currentTime

diff --git a/packages/react-native/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m b/packages/react-native/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
@@ -76,10 +76,10 @@ - (void)startAnimation
 
 - (void)stopAnimation
 {
-  _valueNode = nil;
   if (_callback) {
-    _callback(@[ @{@"finished" : @(_animationHasFinished)} ]);
+    _callback(@[ @{@"finished" : @(_animationHasFinished), @"value" : @(_valueNode.value)} ]);
   }
+  _valueNode = nil;
 }
 
 - (void)stepAnimationWithTime:(NSTimeInterval)currentTime

diff --git a/packages/react-native/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m b/packages/react-native/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m
@@ -96,10 +96,10 @@ - (void)startAnimation
 
 - (void)stopAnimation
 {
-  _valueNode = nil;
   if (_callback) {
-    _callback(@[ @{@"finished" : @(_animationHasFinished)} ]);
+    _callback(@[ @{@"finished" : @(_animationHasFinished), @"value" : @(_valueNode.value)} ]);
   }
+  _valueNode = nil;
 }
 
 - (void)stepAnimationWithTime:(NSTimeInterval)currentTime

diff --git a/packages/rn-tester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m b/packages/rn-tester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m
@@ -486,7 +486,8 @@ - (void)testAnimationCallbackFinish
 
   RCTResponseSenderBlock endCallback = ^(NSArray *response) {
     endCallbackCalls++;
-    XCTAssertEqualObjects(response, @[ @{@"finished" : @YES} ]);
+    NSArray *expected = @[ @{@"finished" : @YES, @"value" : @1} ];
+    XCTAssertEqualObjects(response, expected);
   };
 
   [_nodesManager startAnimatingNode:@1
@@ -714,7 +715,8 @@ - (void)testHandleStoppingAnimation
 
   RCTResponseSenderBlock endCallback = ^(NSArray *response) {
     endCallbackCalled = YES;
-    XCTAssertEqualObjects(response, @[ @{@"finished" : @NO} ]);
+    XCTAssertEqual(response.count, 1);
+    XCTAssertEqualObjects(response[0][@"finished"], @NO);
   };
 
   [_nodesManager startAnimatingNode:@404