Skip to content

Commit

Permalink
react@16 did away with PropTypes; require prop-types instead
Browse files Browse the repository at this point in the history
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 #14641

Differential Revision: D5287167

Pulled By: javache

fbshipit-source-id: a917e29aa0e5470260568995dfe97f5528ec265e
  • Loading branch information
mojodna authored and grabbou committed Jul 4, 2017
1 parent 415fe90 commit dee6aab
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Libraries/Components/Picker/PickerAndroid.android.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion Libraries/ReactNative/AppContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -41,7 +42,7 @@ class AppContainer extends React.Component {
_subscription: ?EmitterSubscription = null;

static childContextTypes = {
rootTag: React.PropTypes.number,
rootTag: PropTypes.number,
};

getChildContext(): Context {
Expand Down
4 changes: 2 additions & 2 deletions docs/NativeComponentsAndroid.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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,
...
};

Expand Down
17 changes: 9 additions & 8 deletions docs/NativeComponentsIOS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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);
Expand Down Expand Up @@ -177,27 +178,27 @@ 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.
*
* 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,
}),
};

Expand Down Expand Up @@ -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,
...
};
Expand Down

0 comments on commit dee6aab

Please sign in to comment.