From dee6aab88ad452f8579549c7b86bdb21ec6aa3e8 Mon Sep 17 00:00:00 2001 From: Seth Fitzsimmons Date: Thu, 22 Jun 2017 13:31:50 -0700 Subject: [PATCH] react@16 did away with PropTypes; require prop-types instead Summary: react@16 (a peerDependency) did away with the PropTypes export in favor of the prop-types module. This updates all of the remaining references to `React.PropTypes`. Closes https://github.com/facebook/react-native/pull/14641 Differential Revision: D5287167 Pulled By: javache fbshipit-source-id: a917e29aa0e5470260568995dfe97f5528ec265e --- .../Components/Picker/PickerAndroid.android.js | 2 +- Libraries/ReactNative/AppContainer.js | 3 ++- docs/NativeComponentsAndroid.md | 4 ++-- docs/NativeComponentsIOS.md | 17 +++++++++-------- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Libraries/Components/Picker/PickerAndroid.android.js b/Libraries/Components/Picker/PickerAndroid.android.js index 03f729709a34c4..a21463683dee47 100644 --- a/Libraries/Components/Picker/PickerAndroid.android.js +++ b/Libraries/Components/Picker/PickerAndroid.android.js @@ -52,7 +52,7 @@ class PickerAndroid extends React.Component { static propTypes = { ...ViewPropTypes, style: pickerStyleType, - selectedValue: React.PropTypes.any, + selectedValue: ReactPropTypes.any, enabled: ReactPropTypes.bool, mode: ReactPropTypes.oneOf(['dialog', 'dropdown']), onValueChange: ReactPropTypes.func, diff --git a/Libraries/ReactNative/AppContainer.js b/Libraries/ReactNative/AppContainer.js index 34def83c5e04cc..8b739ee9f56a31 100644 --- a/Libraries/ReactNative/AppContainer.js +++ b/Libraries/ReactNative/AppContainer.js @@ -13,6 +13,7 @@ 'use strict'; const EmitterSubscription = require('EmitterSubscription'); +const PropTypes = require('prop-types'); const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); const React = require('React'); const ReactNative = require('ReactNative'); @@ -41,7 +42,7 @@ class AppContainer extends React.Component { _subscription: ?EmitterSubscription = null; static childContextTypes = { - rootTag: React.PropTypes.number, + rootTag: PropTypes.number, }; getChildContext(): Context { diff --git a/docs/NativeComponentsAndroid.md b/docs/NativeComponentsAndroid.md index c32622d44ffe19..39eca1cc4c60fe 100644 --- a/docs/NativeComponentsAndroid.md +++ b/docs/NativeComponentsAndroid.md @@ -107,7 +107,7 @@ The very final step is to create the JavaScript module that defines the interfac ```js // ImageView.js -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; import { requireNativeComponent, View } from 'react-native'; var iface = { @@ -168,7 +168,7 @@ MyCustomView.propTypes = { /** * Callback that is called continuously when the user is dragging the map. */ - onChangeMessage: React.PropTypes.func, + onChangeMessage: PropTypes.func, ... }; diff --git a/docs/NativeComponentsIOS.md b/docs/NativeComponentsIOS.md index b66fb324ce6ea7..fd9f77a1ca1701 100644 --- a/docs/NativeComponentsIOS.md +++ b/docs/NativeComponentsIOS.md @@ -84,6 +84,7 @@ This isn't very well documented though - in order to know what properties are av ```javascript // MapView.js +import PropTypes from 'prop-types'; import React from 'react'; import { requireNativeComponent } from 'react-native'; @@ -101,7 +102,7 @@ MapView.propTypes = { * angle is ignored and the map is always displayed as if the user * is looking straight down onto it. */ - pitchEnabled: React.PropTypes.bool, + pitchEnabled: PropTypes.bool, }; var RNTMap = requireNativeComponent('RNTMap', MapView); @@ -177,7 +178,7 @@ MapView.propTypes = { * angle is ignored and the map is always displayed as if the user * is looking straight down onto it. */ - pitchEnabled: React.PropTypes.bool, + pitchEnabled: PropTypes.bool, /** * The region to be displayed by the map. @@ -185,19 +186,19 @@ MapView.propTypes = { * The region is defined by the center coordinates and the span of * coordinates to display. */ - region: React.PropTypes.shape({ + region: PropTypes.shape({ /** * Coordinates for the center of the map. */ - latitude: React.PropTypes.number.isRequired, - longitude: React.PropTypes.number.isRequired, + latitude: PropTypes.number.isRequired, + longitude: PropTypes.number.isRequired, /** * Distance between the minimum and the maximum latitude/longitude * to be displayed. */ - latitudeDelta: React.PropTypes.number.isRequired, - longitudeDelta: React.PropTypes.number.isRequired, + latitudeDelta: PropTypes.number.isRequired, + longitudeDelta: PropTypes.number.isRequired, }), }; @@ -323,7 +324,7 @@ MapView.propTypes = { /** * Callback that is called continuously when the user is dragging the map. */ - onChange: React.PropTypes.func, + onChange: PropTypes.func, ... };