Prefer using the same scrollResponderZoomTo with a second animated arg

Author: gre

Libraries/Components/ScrollResponder.js

@@ -388,24 +388,13 @@ var ScrollResponderMixin = {
   /**
    * A helper function to zoom to a specific rect in the scrollview.
    * @param {object} rect Should have shape {x, y, width, height}
+   * @param {bool} animated Enable the zoom animation
    */
-  scrollResponderZoomTo: function(rect: { x: number; y: number; width: number; height: number; }) {
+  scrollResponderZoomTo: function(rect: { x: number; y: number; width: number; height: number; }, animated?: boolean = true) {
     if (Platform.OS === 'android') {
       invariant('zoomToRect is not implemented');
     } else {
-      ScrollViewManager.zoomToRect(React.findNodeHandle(this), rect);
-    }
-  },
-
-  /**
-   * A helper function to zoom to a specific rect in the scrollview without animation.
-   * @param {object} rect Should have shape {x, y, width, height}
-   */
-  scrollResponderZoomWithoutAnimationTo: function(rect: { x: number; y: number; width: number; height: number; }) {
-    if (Platform.OS === 'android') {
-      invariant('zoomToRect is not implemented');
-    } else {
-      ScrollViewManager.zoomToRectWithoutAnimation(React.findNodeHandle(this), rect);
+      ScrollViewManager.zoomToRect(React.findNodeHandle(this), rect, animated);
     }
   },
 

React/Views/RCTScrollViewManager.m

@@ -152,30 +152,18 @@ - (UIView *)view
     }];
 }
 
-RCT_EXPORT_METHOD(zoomToRect:(nonnull NSNumber *)reactTag withRect:(CGRect)rect)
+RCT_EXPORT_METHOD(zoomToRect:(nonnull NSNumber *)reactTag withRect:(CGRect)rect withAnimated:(BOOL)animated)
 {
   [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry){
     UIView *view = viewRegistry[reactTag];
     if ([view conformsToProtocol:@protocol(RCTScrollableProtocol)]) {
-      [(id<RCTScrollableProtocol>)view zoomToRect:rect animated:YES];
+      [(id<RCTScrollableProtocol>)view zoomToRect:rect animated:animated];
     } else {
       RCTLogError(@"tried to zoomToRect: on non-RCTScrollableProtocol view %@ with tag #%@", view, reactTag);
     }
   }];
 }
 
-RCT_EXPORT_METHOD(zoomToRectWithoutAnimation:(nonnull NSNumber *)reactTag withRect:(CGRect)rect)
-{
-  [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry){
-    UIView *view = viewRegistry[reactTag];
-    if ([view conformsToProtocol:@protocol(RCTScrollableProtocol)]) {
-      [(id<RCTScrollableProtocol>)view zoomToRect:rect animated:NO];
-    } else {
-      RCTLogError(@"tried to zoomToRectWithoutAnimation: on non-RCTScrollableProtocol view %@ with tag #%@", view, reactTag);
-    }
-  }];
-}
-
 - (NSArray<NSString *> *)customDirectEventTypes
 {
   return @[