diff --git a/Libraries/CameraRoll/CameraRoll.js b/Libraries/CameraRoll/CameraRoll.js index ac8e251d1..7342c452e 100644 --- a/Libraries/CameraRoll/CameraRoll.js +++ b/Libraries/CameraRoll/CameraRoll.js @@ -11,7 +11,7 @@ */ 'use strict'; -var ReactPropTypes = require('react/lib/ReactPropTypes'); +var ReactPropTypes = require('React').PropTypes var RCTCameraRollManager = require('NativeModules').CameraRollManager; var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker'); diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.js b/Libraries/Components/ActivityIndicator/ActivityIndicator.js index 7c9e7567a..54aacef57 100644 --- a/Libraries/Components/ActivityIndicator/ActivityIndicator.js +++ b/Libraries/Components/ActivityIndicator/ActivityIndicator.js @@ -14,13 +14,14 @@ const ColorPropType = require('ColorPropType'); const NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); const Platform = require('Platform'); -const PropTypes = require('react/lib/ReactPropTypes'); const React = require('React'); const StyleSheet = require('StyleSheet'); const View = require('View'); const requireNativeComponent = require('requireNativeComponent'); +const PropTypes = React.PropTypes; + const GRAY = '#999999'; type IndicatorSize = number | 'small' | 'large'; diff --git a/Libraries/Components/DatePicker/DatePickerIOS.ios.js b/Libraries/Components/DatePicker/DatePickerIOS.ios.js index c1feda578..db9886f32 100644 --- a/Libraries/Components/DatePicker/DatePickerIOS.ios.js +++ b/Libraries/Components/DatePicker/DatePickerIOS.ios.js @@ -14,13 +14,14 @@ 'use strict'; const NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); -const PropTypes = require('react/lib/ReactPropTypes'); const React = require('React'); const StyleSheet = require('StyleSheet'); const View = require('View'); const requireNativeComponent = require('requireNativeComponent'); +const PropTypes = React.PropTypes; + type DefaultProps = { mode: 'date' | 'time' | 'datetime', }; diff --git a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js index 0ab288396..9517bf95d 100644 --- a/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js +++ b/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.android.js @@ -15,7 +15,6 @@ var NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); var Platform = require('Platform'); var React = require('React'); var ReactNative = require('ReactNative'); -var ReactPropTypes = require('react/lib/ReactPropTypes'); var StatusBar = require('StatusBar'); var StyleSheet = require('StyleSheet'); var UIManager = require('UIManager'); @@ -26,6 +25,8 @@ var DrawerConsts = UIManager.AndroidDrawerLayout.Constants; var dismissKeyboard = require('dismissKeyboard'); var requireNativeComponent = require('requireNativeComponent'); +var ReactPropTypes = React.PropTypes; + var RK_DRAWER_REF = 'drawerlayout'; var INNERVIEW_REF = 'innerView'; diff --git a/Libraries/Components/Keyboard/KeyboardAvoidingView.js b/Libraries/Components/Keyboard/KeyboardAvoidingView.js index 437c09c02..164a66c52 100644 --- a/Libraries/Components/Keyboard/KeyboardAvoidingView.js +++ b/Libraries/Components/Keyboard/KeyboardAvoidingView.js @@ -14,11 +14,12 @@ const Keyboard = require('Keyboard'); const LayoutAnimation = require('LayoutAnimation'); const Platform = require('Platform'); -const PropTypes = require('react/lib/ReactPropTypes'); const React = require('React'); const TimerMixin = require('react-timer-mixin'); const View = require('View'); +const PropTypes = React.PropTypes; + import type EmitterSubscription from 'EmitterSubscription'; type Rect = { diff --git a/Libraries/Components/Picker/PickerAndroid.android.js b/Libraries/Components/Picker/PickerAndroid.android.js index 8dc5114d5..2c18175af 100644 --- a/Libraries/Components/Picker/PickerAndroid.android.js +++ b/Libraries/Components/Picker/PickerAndroid.android.js @@ -15,7 +15,6 @@ var ColorPropType = require('ColorPropType'); var React = require('React'); var ReactChildren = require('react/lib/ReactChildren'); -var ReactPropTypes = require('react/lib/ReactPropTypes'); var StyleSheet = require('StyleSheet'); var StyleSheetPropType = require('StyleSheetPropType'); var View = require('View'); @@ -24,8 +23,9 @@ var ViewStylePropTypes = require('ViewStylePropTypes'); var processColor = require('processColor'); var requireNativeComponent = require('requireNativeComponent'); +var ReactPropTypes = React.PropTypes; + var REF_PICKER = 'picker'; -var MODE_DIALOG = 'dialog'; var MODE_DROPDOWN = 'dropdown'; var pickerStyleType = StyleSheetPropType({ diff --git a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js index 61526441e..a5ad1978a 100644 --- a/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js +++ b/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.android.js @@ -12,12 +12,13 @@ var NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); var React = require('React'); -var ReactPropTypes = require('react/lib/ReactPropTypes'); var View = require('View'); var ColorPropType = require('ColorPropType'); var requireNativeComponent = require('requireNativeComponent'); +var ReactPropTypes = React.PropTypes; + var STYLE_ATTRIBUTES = [ 'Horizontal', 'Normal', @@ -25,7 +26,7 @@ var STYLE_ATTRIBUTES = [ 'Large', 'Inverse', 'SmallInverse', - 'LargeInverse' + 'LargeInverse', ]; var indeterminateType = function(props, propName, componentName) { diff --git a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js index 975718e9e..2892ce589 100644 --- a/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js +++ b/Libraries/Components/ProgressViewIOS/ProgressViewIOS.ios.js @@ -13,13 +13,14 @@ var Image = require('Image'); var NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); -var PropTypes = require('react/lib/ReactPropTypes'); var React = require('React'); var StyleSheet = require('StyleSheet'); var View = require('View'); var requireNativeComponent = require('requireNativeComponent'); +var PropTypes = React.PropTypes; + /** * Use `ProgressViewIOS` to render a UIProgressView on iOS. */ diff --git a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js index df269b926..22ce7de2f 100644 --- a/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js +++ b/Libraries/Components/SegmentedControlIOS/SegmentedControlIOS.ios.js @@ -12,13 +12,14 @@ 'use strict'; var NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); -var PropTypes = require('react/lib/ReactPropTypes'); var React = require('React'); var StyleSheet = require('StyleSheet'); var View = require('View'); var requireNativeComponent = require('requireNativeComponent'); +var PropTypes = React.PropTypes; + type DefaultProps = { values: Array, enabled: boolean, diff --git a/Libraries/Components/Slider/Slider.js b/Libraries/Components/Slider/Slider.js index 2db7392b8..6d1daf024 100644 --- a/Libraries/Components/Slider/Slider.js +++ b/Libraries/Components/Slider/Slider.js @@ -15,13 +15,14 @@ var Image = require('Image'); var NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); var ReactNativeViewAttributes = require('ReactNativeViewAttributes'); var Platform = require('Platform'); -var PropTypes = require('react/lib/ReactPropTypes'); var React = require('React'); var StyleSheet = require('StyleSheet'); var View = require('View'); var requireNativeComponent = require('requireNativeComponent'); +var PropTypes = React.PropTypes; + type Event = Object; /** diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js index f8cb07768..40ec23190 100644 --- a/Libraries/Components/TextInput/TextInput.js +++ b/Libraries/Components/TextInput/TextInput.js @@ -16,7 +16,6 @@ const DocumentSelectionState = require('DocumentSelectionState'); const EventEmitter = require('EventEmitter'); const NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); const Platform = require('Platform'); -const PropTypes = require('react/lib/ReactPropTypes'); const React = require('React'); const ReactNative = require('ReactNative'); const ReactChildren = require('react/lib/ReactChildren'); @@ -33,6 +32,8 @@ const emptyFunction = require('fbjs/lib/emptyFunction'); const invariant = require('fbjs/lib/invariant'); const requireNativeComponent = require('requireNativeComponent'); +const PropTypes = React.PropTypes; + const onlyMultiline = { onTextInput: true, children: true, diff --git a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js index d790456fe..4f8a4eaeb 100644 --- a/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js +++ b/Libraries/Components/ToolbarAndroid/ToolbarAndroid.android.js @@ -15,7 +15,6 @@ var Image = require('Image'); var NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); var React = require('React'); var ReactNativeViewAttributes = require('ReactNativeViewAttributes'); -var ReactPropTypes = require('react/lib/ReactPropTypes'); var UIManager = require('UIManager'); var View = require('View'); var ColorPropType = require('ColorPropType'); @@ -23,11 +22,13 @@ var ColorPropType = require('ColorPropType'); var requireNativeComponent = require('requireNativeComponent'); var resolveAssetSource = require('resolveAssetSource'); +var ReactPropTypes = React.PropTypes; + var optionalImageSource = ReactPropTypes.oneOfType([ Image.propTypes.source, // Image.propTypes.source is required but we want it to be optional, so we OR // it with a nullable propType. - ReactPropTypes.oneOf([]) + ReactPropTypes.oneOf([]), ]); /** diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js index 635aebfa5..a9d24eda6 100644 --- a/Libraries/Components/Touchable/TouchableNativeFeedback.android.js +++ b/Libraries/Components/Touchable/TouchableNativeFeedback.android.js @@ -11,7 +11,6 @@ 'use strict'; var Platform = require('Platform'); -var PropTypes = require('react/lib/ReactPropTypes'); var React = require('React'); var ReactNative = require('ReactNative'); var Touchable = require('Touchable'); @@ -22,6 +21,8 @@ var ensurePositiveDelayProps = require('ensurePositiveDelayProps'); var processColor = require('processColor'); var requireNativeComponent = require('requireNativeComponent'); +var PropTypes = React.PropTypes; + var rippleBackgroundPropType = PropTypes.shape({ type: React.PropTypes.oneOf(['RippleAndroid']), color: PropTypes.number, @@ -42,7 +43,7 @@ var TouchableView = requireNativeComponent('RCTView', null, { nativeOnly: { nativeBackgroundAndroid: backgroundPropType, nativeForegroundAndroid: backgroundPropType, - } + }, }); type Event = Object; diff --git a/Libraries/Components/View/ShadowPropTypesIOS.js b/Libraries/Components/View/ShadowPropTypesIOS.js index ee9fc34a1..2a026ced7 100644 --- a/Libraries/Components/View/ShadowPropTypesIOS.js +++ b/Libraries/Components/View/ShadowPropTypesIOS.js @@ -12,7 +12,7 @@ 'use strict'; var ColorPropType = require('ColorPropType'); -var ReactPropTypes = require('react/lib/ReactPropTypes'); +var ReactPropTypes = require('React').PropTypes; var ShadowPropTypesIOS = { /** diff --git a/Libraries/Components/View/View.js b/Libraries/Components/View/View.js index 44debcdc6..ccad6cefa 100644 --- a/Libraries/Components/View/View.js +++ b/Libraries/Components/View/View.js @@ -13,7 +13,6 @@ const EdgeInsetsPropType = require('EdgeInsetsPropType'); const NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); -const PropTypes = require('react/lib/ReactPropTypes'); const React = require('React'); const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes'); const ReactNativeViewAttributes = require('ReactNativeViewAttributes'); @@ -23,6 +22,8 @@ const ViewStylePropTypes = require('ViewStylePropTypes'); const requireNativeComponent = require('requireNativeComponent'); +const PropTypes = React.PropTypes; + const stylePropType = StyleSheetPropType(ViewStylePropTypes); const AccessibilityTraits = [ diff --git a/Libraries/Components/View/ViewStylePropTypes.js b/Libraries/Components/View/ViewStylePropTypes.js index 9990b9971..dcd6c1c54 100644 --- a/Libraries/Components/View/ViewStylePropTypes.js +++ b/Libraries/Components/View/ViewStylePropTypes.js @@ -12,7 +12,7 @@ 'use strict'; var LayoutPropTypes = require('LayoutPropTypes'); -var ReactPropTypes = require('react/lib/ReactPropTypes'); +var ReactPropTypes = require('React').PropTypes; var ColorPropType = require('ColorPropType'); var ShadowPropTypesIOS = require('ShadowPropTypesIOS'); var TransformPropTypes = require('TransformPropTypes'); diff --git a/Libraries/Components/ViewPager/ViewPagerAndroid.android.js b/Libraries/Components/ViewPager/ViewPagerAndroid.android.js index 1459a1b81..8afcb3926 100644 --- a/Libraries/Components/ViewPager/ViewPagerAndroid.android.js +++ b/Libraries/Components/ViewPager/ViewPagerAndroid.android.js @@ -14,13 +14,14 @@ var React = require('React'); var ReactNative = require('ReactNative'); var ReactElement = require('react/lib/ReactElement'); -var ReactPropTypes = require('react/lib/ReactPropTypes'); var UIManager = require('UIManager'); var View = require('View'); var dismissKeyboard = require('dismissKeyboard'); var requireNativeComponent = require('requireNativeComponent'); +var ReactPropTypes = React.PropTypes; + var VIEWPAGER_REF = 'viewPager'; type Event = Object; diff --git a/Libraries/Image/Image.android.js b/Libraries/Image/Image.android.js index 8e0f5e84f..af3fdc6da 100644 --- a/Libraries/Image/Image.android.js +++ b/Libraries/Image/Image.android.js @@ -16,7 +16,6 @@ var NativeModules = require('NativeModules'); var ImageResizeMode = require('ImageResizeMode'); var ImageStylePropTypes = require('ImageStylePropTypes'); var ViewStylePropTypes = require('ViewStylePropTypes'); -var PropTypes = require('react/lib/ReactPropTypes'); var React = require('React'); var ReactNativeViewAttributes = require('ReactNativeViewAttributes'); var StyleSheet = require('StyleSheet'); @@ -30,6 +29,7 @@ var resolveAssetSource = require('resolveAssetSource'); var Set = require('Set'); var filterObject = require('fbjs/lib/filterObject'); +var PropTypes = React.PropTypes; var { ImageLoader, } = NativeModules; diff --git a/Libraries/Image/Image.ios.js b/Libraries/Image/Image.ios.js index 9ecb36dd6..63d1a6ba5 100644 --- a/Libraries/Image/Image.ios.js +++ b/Libraries/Image/Image.ios.js @@ -17,7 +17,6 @@ const ImageSourcePropType = require('ImageSourcePropType'); const ImageStylePropTypes = require('ImageStylePropTypes'); const NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); const NativeModules = require('NativeModules'); -const PropTypes = require('react/lib/ReactPropTypes'); const React = require('React'); const ReactNativeViewAttributes = require('ReactNativeViewAttributes'); const StyleSheet = require('StyleSheet'); @@ -27,6 +26,8 @@ const flattenStyle = require('flattenStyle'); const requireNativeComponent = require('requireNativeComponent'); const resolveAssetSource = require('resolveAssetSource'); +const PropTypes = React.PropTypes; + const ImageViewManager = NativeModules.ImageViewManager; /** diff --git a/Libraries/Image/ImageSourcePropType.js b/Libraries/Image/ImageSourcePropType.js index f63c2efee..2b32c169c 100644 --- a/Libraries/Image/ImageSourcePropType.js +++ b/Libraries/Image/ImageSourcePropType.js @@ -11,7 +11,7 @@ */ 'use strict'; -const PropTypes = require('react/lib/ReactPropTypes'); +const {PropTypes} = require('React'); const ImageURISourcePropType = PropTypes.shape({ /** diff --git a/Libraries/Image/ImageStylePropTypes.js b/Libraries/Image/ImageStylePropTypes.js index bac91d034..9bb684024 100644 --- a/Libraries/Image/ImageStylePropTypes.js +++ b/Libraries/Image/ImageStylePropTypes.js @@ -13,11 +13,12 @@ var ImageResizeMode = require('ImageResizeMode'); var LayoutPropTypes = require('LayoutPropTypes'); -var ReactPropTypes = require('react/lib/ReactPropTypes'); var ColorPropType = require('ColorPropType'); var ShadowPropTypesIOS = require('ShadowPropTypesIOS'); var TransformPropTypes = require('TransformPropTypes'); +var ReactPropTypes = require('React').PropTypes; + var ImageStylePropTypes = { ...LayoutPropTypes, ...ShadowPropTypesIOS, diff --git a/Libraries/Inspector/ElementProperties.js b/Libraries/Inspector/ElementProperties.js index 63dadf9bf..4c90d8abd 100644 --- a/Libraries/Inspector/ElementProperties.js +++ b/Libraries/Inspector/ElementProperties.js @@ -12,7 +12,6 @@ 'use strict'; var BoxInspector = require('BoxInspector'); -var PropTypes = require('react/lib/ReactPropTypes'); var React = require('React'); var StyleInspector = require('StyleInspector'); var StyleSheet = require('StyleSheet'); @@ -20,12 +19,13 @@ var Text = require('Text'); var TouchableHighlight = require('TouchableHighlight'); var TouchableWithoutFeedback = require('TouchableWithoutFeedback'); var View = require('View'); -var {fetch} = require('fetch'); var flattenStyle = require('flattenStyle'); var mapWithSeparator = require('mapWithSeparator'); var openFileInEditor = require('openFileInEditor'); +var PropTypes = React.PropTypes; + class ElementProperties extends React.Component { props: { hierarchy: Array<$FlowFixMe>, diff --git a/Libraries/LayoutAnimation/LayoutAnimation.js b/Libraries/LayoutAnimation/LayoutAnimation.js index cec1ba8fe..8c18a5b5a 100644 --- a/Libraries/LayoutAnimation/LayoutAnimation.js +++ b/Libraries/LayoutAnimation/LayoutAnimation.js @@ -11,7 +11,7 @@ */ 'use strict'; -var PropTypes = require('react/lib/ReactPropTypes'); +var {PropTypes} = require('React'); var UIManager = require('UIManager'); var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker'); diff --git a/Libraries/Modal/Modal.js b/Libraries/Modal/Modal.js index 74b91d89f..c0b20f2ca 100644 --- a/Libraries/Modal/Modal.js +++ b/Libraries/Modal/Modal.js @@ -14,7 +14,6 @@ const AppContainer = require('AppContainer'); const I18nManager = require('I18nManager'); const Platform = require('Platform'); -const PropTypes = require('react/lib/ReactPropTypes'); const React = require('React'); const StyleSheet = require('StyleSheet'); const View = require('View'); @@ -23,6 +22,8 @@ const deprecatedPropType = require('deprecatedPropType'); const requireNativeComponent = require('requireNativeComponent'); const RCTModalHostView = requireNativeComponent('RCTModalHostView', null); +const PropTypes = React.PropTypes; + /** * The Modal component is a simple way to present content above an enclosing view. * diff --git a/Libraries/StyleSheet/EdgeInsetsPropType.js b/Libraries/StyleSheet/EdgeInsetsPropType.js index 7bb8c7fbd..b911febd7 100644 --- a/Libraries/StyleSheet/EdgeInsetsPropType.js +++ b/Libraries/StyleSheet/EdgeInsetsPropType.js @@ -11,7 +11,7 @@ */ 'use strict'; -var PropTypes = require('react/lib/ReactPropTypes'); +var {PropTypes} = require('React'); var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker'); diff --git a/Libraries/StyleSheet/LayoutPropTypes.js b/Libraries/StyleSheet/LayoutPropTypes.js index 47c52c55f..15fa8ee17 100644 --- a/Libraries/StyleSheet/LayoutPropTypes.js +++ b/Libraries/StyleSheet/LayoutPropTypes.js @@ -11,7 +11,7 @@ */ 'use strict'; -var ReactPropTypes = require('react/lib/ReactPropTypes'); +var ReactPropTypes = require('React').PropTypes; /** * React Native's layout system is based on Flexbox and is powered both diff --git a/Libraries/StyleSheet/PointPropType.js b/Libraries/StyleSheet/PointPropType.js index e9e85ce35..5393bf10e 100644 --- a/Libraries/StyleSheet/PointPropType.js +++ b/Libraries/StyleSheet/PointPropType.js @@ -11,7 +11,7 @@ */ 'use strict'; -var PropTypes = require('react/lib/ReactPropTypes'); +var PropTypes = require('React').PropTypes; var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker'); diff --git a/Libraries/StyleSheet/TransformPropTypes.js b/Libraries/StyleSheet/TransformPropTypes.js index 568775d25..884dfaa30 100644 --- a/Libraries/StyleSheet/TransformPropTypes.js +++ b/Libraries/StyleSheet/TransformPropTypes.js @@ -11,10 +11,9 @@ */ 'use strict'; -var ReactPropTypes = require('react/lib/ReactPropTypes'); var deprecatedPropType = require('deprecatedPropType'); -var ArrayOfNumberPropType = ReactPropTypes.arrayOf(ReactPropTypes.number); +var ReactPropTypes = require('React').PropTypes; var TransformMatrixPropType = function( props : Object, diff --git a/Libraries/Text/TextStylePropTypes.js b/Libraries/Text/TextStylePropTypes.js index 4edb225b7..5058d01c7 100644 --- a/Libraries/Text/TextStylePropTypes.js +++ b/Libraries/Text/TextStylePropTypes.js @@ -11,7 +11,7 @@ */ 'use strict'; -var ReactPropTypes = require('react/lib/ReactPropTypes'); +var ReactPropTypes = require('React').PropTypes; var ColorPropType = require('ColorPropType'); var ViewStylePropTypes = require('ViewStylePropTypes');