From d3288776c1d93aa032f63aef3174990cb72579f7 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Fri, 11 Oct 2019 11:43:51 -0700
Subject: [PATCH] Fix ref type for Native Scroll View

Summary: These types were wrong, this is a HostComponent, not a ReactNative.NativeComponent

Reviewed By: lunaleaps

Differential Revision: D17862305

fbshipit-source-id: e1e7acc7a5892f124b07cdc39d73d6ce7d414063
---
 Libraries/Components/ScrollView/ScrollView.js | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js
index 0476fd9cde0634..3c209e86513386 100644
--- a/Libraries/Components/ScrollView/ScrollView.js
+++ b/Libraries/Components/ScrollView/ScrollView.js
@@ -37,6 +37,7 @@ import type {
   ScrollEvent,
   LayoutEvent,
 } from '../../Types/CoreEventTypes';
+import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {State as ScrollResponderState} from '../ScrollResponder';
 import type {ViewProps} from '../View/ViewPropTypes';
 import type {Props as ScrollViewStickyHeaderProps} from './ScrollViewStickyHeader';
@@ -769,15 +770,11 @@ class ScrollView extends React.Component<Props, State> {
     return ReactNative.findNodeHandle(this._innerViewRef);
   }
 
-  getInnerViewRef(): ?React.ElementRef<
-    Class<ReactNative.NativeComponent<mixed>>,
-  > {
+  getInnerViewRef(): ?React.ElementRef<HostComponent<mixed>> {
     return this._innerViewRef;
   }
 
-  getNativeScrollRef(): ?React.ElementRef<
-    Class<ReactNative.NativeComponent<mixed>>,
-  > {
+  getNativeScrollRef(): ?React.ElementRef<HostComponent<mixed>> {
     return this._scrollViewRef;
   }
 
@@ -950,21 +947,13 @@ class ScrollView extends React.Component<Props, State> {
       this.props.onContentSizeChange(width, height);
   };
 
-  _scrollViewRef: ?React.ElementRef<
-    Class<ReactNative.NativeComponent<mixed>>,
-  > = null;
-  _setScrollViewRef = (
-    ref: ?React.ElementRef<Class<ReactNative.NativeComponent<mixed>>>,
-  ) => {
+  _scrollViewRef: ?React.ElementRef<HostComponent<mixed>> = null;
+  _setScrollViewRef = (ref: ?React.ElementRef<HostComponent<mixed>>) => {
     this._scrollViewRef = ref;
   };
 
-  _innerViewRef: ?React.ElementRef<
-    Class<ReactNative.NativeComponent<mixed>>,
-  > = null;
-  _setInnerViewRef = (
-    ref: ?React.ElementRef<Class<ReactNative.NativeComponent<mixed>>>,
-  ) => {
+  _innerViewRef: ?React.ElementRef<HostComponent<mixed>> = null;
+  _setInnerViewRef = (ref: ?React.ElementRef<HostComponent<mixed>>) => {
     this._innerViewRef = ref;
   };
 
@@ -1068,7 +1057,6 @@ class ScrollView extends React.Component<Props, State> {
     const contentContainer = (
       <ScrollContentContainerViewClass
         {...contentSizeChangeProps}
-        // $FlowFixMe Invalid prop usage
         ref={this._setInnerViewRef}
         style={contentContainerStyle}
         removeClippedSubviews={
@@ -1178,7 +1166,6 @@ class ScrollView extends React.Component<Props, State> {
         // On iOS the RefreshControl is a child of the ScrollView.
         // tvOS lacks native support for RefreshControl, so don't include it in that case
         return (
-          // $FlowFixMe
           <ScrollViewClass {...props} ref={this._setScrollViewRef}>
             {Platform.isTV ? null : refreshControl}
             {contentContainer}
@@ -1197,7 +1184,6 @@ class ScrollView extends React.Component<Props, State> {
           <ScrollViewClass
             {...props}
             style={[baseStyle, inner]}
-            // $FlowFixMe
             ref={this._setScrollViewRef}>
             {contentContainer}
           </ScrollViewClass>,
@@ -1205,7 +1191,6 @@ class ScrollView extends React.Component<Props, State> {
       }
     }
     return (
-      // $FlowFixMe
       <ScrollViewClass {...props} ref={this._setScrollViewRef}>
         {contentContainer}
       </ScrollViewClass>