Some props fixes

Author: acoates-ms

Libraries/Animated/src/Animated.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow strict-local
+ * @flow
  * @format
  */
 
@@ -13,23 +13,23 @@
 const AnimatedImplementation = require('AnimatedImplementation');
 
 module.exports = {
-  get FlatList() {
-    return require('AnimatedFlatList');
+get FlatList() {
+  return require('AnimatedFlatList');
   },
-  get Image() {
-    return require('AnimatedImage');
+get Image() {
+  return require('AnimatedImage');
   },
-  get ScrollView() {
-    return require('AnimatedScrollView');
+get ScrollView() {
+  return require('AnimatedScrollView');
   },
-  get SectionList() {
-    return require('AnimatedSectionList');
+get SectionList() {
+  return require('AnimatedSectionList');
   },
-  get Text() {
-    return require('AnimatedText');
+get Text() {
+  return require('AnimatedText');
   },
-  get View() {
-    return require('AnimatedView');
+get View() {
+  return require('AnimatedView');
   },
-  ...AnimatedImplementation,
+...AnimatedImplementation,
 };

Libraries/Components/Button.js

@@ -37,30 +37,30 @@ type ButtonProps = $ReadOnly<{|
       /**
        * Color of the text (iOS), or background color of the button (Android)
        */
-      color ?: ? string,
+      color?: ?string,
 
       /**
        * TV preferred focus (see documentation for the View component).
        */
-      hasTVPreferredFocus ?: ? boolean,
+      hasTVPreferredFocus?: ?boolean,
 
       /**
        * Text to display for blindness accessibility features
        */
-      accessibilityLabel ?: ? string,
+      accessibilityLabel?: ?string,
       /**
        * Hint text to display blindness accessibility features
        */
-      accessibilityHint: PropTypes.string, // TODO(OSS Candidate ISS#2710739)
+      accessibilityHint? : ?string, // TODO(OSS Candidate ISS#2710739)
         /**
          * If true, disable all interactions for this component.
          */
-        disabled ?: ? boolean,
+        disabled?: ?boolean,
 
         /**
          * Used to locate this view in end-to-end tests.
          */
-        testID ?: ? string,
+        testID?: ?string,
 |}>;
 
 /**

Libraries/Components/Picker/PickerIOS.macos.js

@@ -19,29 +19,16 @@ var NativeMethodsMixin = require('NativeMethodsMixin');
 var React = require('React');
 const PropTypes = require('prop-types');
 var StyleSheet = require('StyleSheet');
-var StyleSheetPropType = require('StyleSheetPropType');
-var TextStylePropTypes = require('TextStylePropTypes');
 var View = require('View');
-const ViewPropTypes = require('ViewPropTypes');
 var processColor = require('processColor');
 
 var createReactClass = require('create-react-class');
-var itemStylePropType = StyleSheetPropType(TextStylePropTypes);
 var requireNativeComponent = require('requireNativeComponent');
 
 var PickerIOS = createReactClass({
   displayName: 'PickerIOS',
   mixins: [NativeMethodsMixin],
 
-  propTypes: {
-    ...ViewPropTypes,
-    children: PropTypes.arrayOf(PropTypes.any),
-    itemStyle: itemStylePropType,
-    onChange: PropTypes.func,
-    onValueChange: PropTypes.func,
-    selectedValue: PropTypes.any, // string or integer basically
-  },
-
   getInitialState: function() {
     return this._stateFromProps(this.props);
   },

Libraries/Components/View/ViewPropTypes.js

@@ -573,4 +573,4 @@ export type ViewProps = $ReadOnly<{|
    * Any additional platform-specific view prop types, or prop type overrides.
    */
   ...PlatformViewPropTypes,
-};
+|};

Libraries/Renderer/shims/ReactTypes.js

@@ -19,8 +19,6 @@ export type ReactNode =
 
 export type ReactEmpty = null | void | boolean;
 
-export type ReactEmpty = null | void | boolean;
-
 export type ReactFragment = ReactEmpty | Iterable<React$Node>;
 
 export type ReactNodeList = ReactEmpty | React$Node;

Libraries/react-native/react-native-implementation.macos.js

@@ -348,7 +348,7 @@ const ReactNative = {
 
   // Prop Types
   get ColorPropType() {
-    return require('ColorPropType');
+    return require('DeprecatedColorPropType');
   },
   get EdgeInsetsPropType() {
     return require('EdgeInsetsPropType');

RNTester/js/AnimatedExampleMacOS.js

@@ -63,7 +63,9 @@ exports.examples = [
       }
       class FadeInExample extends React.Component<$FlowFixMeProps, any> {
         state: any;
-
+        /* $FlowFixMe(>=0.85.0 site=react_native_fb) This comment suppresses an
+         * error found when Flow v0.85 was deployed. To see the error, delete
+         * this comment and run Flow. */
         constructor(props) {
           super(props);
           this.state = {

RNTester/js/TextInputExample.macos.js

@@ -125,6 +125,9 @@ class TextInputAccessoryViewExample extends React.Component<{}, *> {
 */
 
 class RewriteExample extends React.Component<$FlowFixMeProps, any> {
+  /* $FlowFixMe(>=0.85.0 site=react_native_fb) This comment suppresses an
+  * error found when Flow v0.85 was deployed. To see the error, delete
+  * this comment and run Flow. */
   constructor(props) {
     super(props);
     this.state = {text: ''};
@@ -157,7 +160,10 @@ class RewriteExampleInvalidCharacters extends React.Component<
   $FlowFixMeProps,
   any,
 > {
-  constructor(props) {
+  /* $FlowFixMe(>=0.85.0 site=react_native_fb) This comment suppresses an
+  * error found when Flow v0.85 was deployed. To see the error, delete
+  * this comment and run Flow. */
+ constructor(props) {
     super(props);
     this.state = {text: ''};
   }
@@ -178,7 +184,10 @@ class RewriteExampleInvalidCharacters extends React.Component<
 }
 
 class RewriteExampleKana extends React.Component<$FlowFixMeProps, any> {
-  constructor(props) {
+  /* $FlowFixMe(>=0.85.0 site=react_native_fb) This comment suppresses an
+  * error found when Flow v0.85 was deployed. To see the error, delete
+  * this comment and run Flow. */
+ constructor(props) {
     super(props);
     this.state = {text: ''};
   }
@@ -199,7 +208,10 @@ class RewriteExampleKana extends React.Component<$FlowFixMeProps, any> {
 }
 
 class SecureEntryExample extends React.Component<$FlowFixMeProps, any> {
-  constructor(props) {
+  /* $FlowFixMe(>=0.85.0 site=react_native_fb) This comment suppresses an
+  * error found when Flow v0.85 was deployed. To see the error, delete
+  * this comment and run Flow. */
+ constructor(props) {
     super(props);
     this.state = {text: ''};
   }
@@ -220,7 +232,10 @@ class SecureEntryExample extends React.Component<$FlowFixMeProps, any> {
 }
 
 class TokenizedTextExample extends React.Component<$FlowFixMeProps, any> {
-  constructor(props) {
+  /* $FlowFixMe(>=0.85.0 site=react_native_fb) This comment suppresses an
+  * error found when Flow v0.85 was deployed. To see the error, delete
+  * this comment and run Flow. */
+ constructor(props) {
     super(props);
     this.state = {text: 'Hello #World'};
   }