From 7ba7acdee73cc0e8a490c38e4d8afe63de590368 Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Sat, 12 May 2018 10:25:05 -0700
Subject: [PATCH] Surfacing Flow issues around invalid props

Reviewed By: yungsters

Differential Revision: D7977386

fbshipit-source-id: a6df2d75e0caa55a84f9c9c6860f622942955dfc
---
 Libraries/Components/ScrollView/ScrollView.js | 3 +++
 Libraries/Lists/MetroListView.js              | 2 +-
 Libraries/StyleSheet/EdgeInsetsPropType.js    | 6 ++----
 Libraries/StyleSheet/PointPropType.js         | 4 +---
 RNTester/js/ScrollViewExample.js              | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js
index 4b9aa3cff..0154932f2 100644
--- a/Libraries/Components/ScrollView/ScrollView.js
+++ b/Libraries/Components/ScrollView/ScrollView.js
@@ -237,6 +237,7 @@ const ScrollView = createReactClass({
      *   - `false`, deprecated, use 'never' instead
      *   - `true`, deprecated, use 'always' instead
      */
+    // $FlowFixMe
     keyboardShouldPersistTaps: PropTypes.oneOf([
       'always',
       'never',
@@ -521,9 +522,11 @@ const ScrollView = createReactClass({
 
   UNSAFE_componentWillMount: function() {
     this._scrollAnimatedValue = new AnimatedImplementation.Value(
+      // $FlowFixMe
       this.props.contentOffset ? this.props.contentOffset.y : 0,
     );
     this._scrollAnimatedValue.setOffset(
+      // $FlowFixMe
       this.props.contentInset ? this.props.contentInset.top : 0,
     );
     this._stickyHeaderRefs = new Map();
diff --git a/Libraries/Lists/MetroListView.js b/Libraries/Lists/MetroListView.js
index f2447760f..fbf6b5554 100644
--- a/Libraries/Lists/MetroListView.js
+++ b/Libraries/Lists/MetroListView.js
@@ -146,7 +146,7 @@ class MetroListView extends React.Component<Props, $FlowFixMeState> {
       />
     );
   }
-  _listRef: ListView;
+  _listRef: ?ListView;
   _captureRef = ref => {
     this._listRef = ref;
   };
diff --git a/Libraries/StyleSheet/EdgeInsetsPropType.js b/Libraries/StyleSheet/EdgeInsetsPropType.js
index 01e8919e6..8f6a594c3 100644
--- a/Libraries/StyleSheet/EdgeInsetsPropType.js
+++ b/Libraries/StyleSheet/EdgeInsetsPropType.js
@@ -12,14 +12,12 @@
 
 const PropTypes = require('prop-types');
 
-const createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');
-
-const EdgeInsetsPropType = (createStrictShapeTypeChecker({
+const EdgeInsetsPropType = PropTypes.shape({
   top: PropTypes.number,
   left: PropTypes.number,
   bottom: PropTypes.number,
   right: PropTypes.number,
-}): ReactPropsCheckType & ReactPropsChainableTypeChecker);
+});
 
 export type EdgeInsetsProp = {|
   +top: number,
diff --git a/Libraries/StyleSheet/PointPropType.js b/Libraries/StyleSheet/PointPropType.js
index 362f9185c..3be09b110 100644
--- a/Libraries/StyleSheet/PointPropType.js
+++ b/Libraries/StyleSheet/PointPropType.js
@@ -12,9 +12,7 @@
 
 const PropTypes = require('prop-types');
 
-const createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');
-
-const PointPropType = createStrictShapeTypeChecker({
+const PointPropType = PropTypes.shape({
   x: PropTypes.number,
   y: PropTypes.number,
 });
diff --git a/RNTester/js/ScrollViewExample.js b/RNTester/js/ScrollViewExample.js
index c1d634b8e..201eb93f4 100644
--- a/RNTester/js/ScrollViewExample.js
+++ b/RNTester/js/ScrollViewExample.js
@@ -80,7 +80,7 @@ exports.examples = [
         title: string,
         additionalStyles: typeof StyleSheet,
       ) {
-        let _scrollView: ScrollView;
+        let _scrollView: ?ScrollView;
         return (
           <View style={additionalStyles}>
             <Text style={styles.text}>{title}</Text>