stash changes for another animation

software-mansion · Nov 5, 2024 · 23300c6 · 23300c6
1 parent 81fe5ed
commit 23300c6
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/ios/RNSScreenStackAnimator.mm b/ios/RNSScreenStackAnimator.mm
@@ -370,11 +370,21 @@ - (void)animateSlideFromBottomWithTransitionContext:(id<UIViewControllerContextT
                        completion:completionBlock];
     } else {
       // we don't want the EaseInOut option when swiping to dismiss the view, it is the same in default animation option
-      [UIView animateWithDuration:[self transitionDuration:transitionContext]
-                            delay:0.0
-                          options:UIViewAnimationOptionCurveLinear
-                       animations:animationBlock
-                       completion:completionBlock];
+      UIViewPropertyAnimator *animator =
+          [[UIViewPropertyAnimator alloc] initWithDuration:[self transitionDuration:transitionContext]
+                                                     curve:UIViewAnimationCurveLinear
+                                                animations:animationBlock];
+      [animator addCompletion:^(UIViewAnimatingPosition finalPosition) {
+        completionBlock(finalPosition == UIViewAnimatingPositionEnd);
+      }];
+      [animator setUserInteractionEnabled:YES];
+      _inFlightAnimator = animator;
+      //
+      //      [UIView animateWithDuration:[self transitionDuration:transitionContext]
+      //                            delay:0.0
+      //                          options:UIViewAnimationOptionCurveLinear
+      //                       animations:animationBlock
+      //                       completion:completionBlock];
     }
   }
 }