fix(ReactPropTypes): Remove deep linking to ReactPropTypes

rozele · rozele · commit bcc0dc8c05e1 · 2017-05-23T11:35:37.000-04:00
In future versions of react, this kind of deep linking will not be supported. We're eliminating it to ensure there are no issues.
diff --git a/Libraries/Components/ActivityIndicator/ActivityIndicator.windows.js b/Libraries/Components/ActivityIndicator/ActivityIndicator.windows.js
@@ -14,13 +14,14 @@
 const ColorPropType = require('ColorPropType');
 const NativeMethodsMixin = require('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';
 
 /**
diff --git a/Libraries/Components/FlipViewWindows/FlipViewWindows.windows.js b/Libraries/Components/FlipViewWindows/FlipViewWindows.windows.js
@@ -9,12 +9,13 @@
 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 requireNativeComponent = require('requireNativeComponent');
 
+var ReactPropTypes = React.PropTypes;
+
 var FLIPVIEW_REF = 'flipView';
 
 type Event = Object;
diff --git a/Libraries/Components/PasswordBoxWindows/PasswordBoxWindows.windows.js b/Libraries/Components/PasswordBoxWindows/PasswordBoxWindows.windows.js
@@ -14,7 +14,6 @@
 var DocumentSelectionState = require('DocumentSelectionState');
 var EventEmitter = require('EventEmitter');
 var NativeMethodsMixin = require('NativeMethodsMixin');
-var PropTypes = require('react/lib/ReactPropTypes');
 var React = require('React');
 var ReactNative = require('ReactNative');
 var StyleSheet = require('StyleSheet');
@@ -26,6 +25,8 @@ var View = require('View');
 
 var requireNativeComponent = require('requireNativeComponent');
 
+var PropTypes = React.PropTypes;
+
 var NativePasswordBox = requireNativeComponent('PasswordBoxWindows', null);
 
 type Event = Object;
diff --git a/Libraries/Components/Picker/PickerWindows.js b/Libraries/Components/Picker/PickerWindows.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,6 +23,8 @@ var ViewStylePropTypes = require('ViewStylePropTypes');
 var processColor = require('processColor');
 var requireNativeComponent = require('requireNativeComponent');
 
+var ReactPropTypes = React.PropTypes;
+
 var REF_PICKER = 'picker';
 
 var pickerStyleType = StyleSheetPropType({
diff --git a/Libraries/Components/ProgressBarWindows/ProgressBarWindows.windows.js b/Libraries/Components/ProgressBarWindows/ProgressBarWindows.windows.js
@@ -7,13 +7,14 @@
 'use strict';
 
 var React = require('React');
-var ReactPropTypes = require('react/lib/ReactPropTypes');
 var ReactNativeViewAttributes = require('ReactNativeViewAttributes');
 var View = require('View');
 var ColorPropType = require('ColorPropType');
 
 var requireNativeComponent = require('requireNativeComponent');
 
+var ReactPropTypes = React.PropTypes;
+
 /**
  * React component that wraps the Windows-only `ProgressBar`. This component is used to indicate
  * that the app is loading or there is some activity in the app.
diff --git a/Libraries/Components/ProgressRingWindows/ProgressRingWindows.windows.js b/Libraries/Components/ProgressRingWindows/ProgressRingWindows.windows.js
@@ -7,12 +7,13 @@
 'use strict';
 
 var React = require('React');
-var ReactPropTypes = require('react/lib/ReactPropTypes');
 var ReactNativeViewAttributes = require('ReactNativeViewAttributes');
 var View = require('View');
 var requireNativeComponent = require('requireNativeComponent');
 var ColorPropType = require('ColorPropType');
 
+var ReactPropTypes = React.PropTypes;
+
 var ProgressRingWindows = React.createClass({  
   propTypes: {
     ...View.propTypes,
diff --git a/Libraries/Components/SplitViewWindows/SplitViewWindows.windows.js b/Libraries/Components/SplitViewWindows/SplitViewWindows.windows.js
@@ -13,7 +13,6 @@
 var NativeMethodsMixin = require('NativeMethodsMixin');
 var React = require('React');
 var ReactNative = require('ReactNative');
-var ReactPropTypes = require('react/lib/ReactPropTypes');
 var StyleSheet = require('StyleSheet');
 var UIManager = require('UIManager');
 var View = require('View');
@@ -23,6 +22,8 @@ var SplitViewConsts = UIManager.WindowsSplitView.Constants;
 var dismissKeyboard = require('dismissKeyboard');
 var requireNativeComponent = require('requireNativeComponent');
 
+var ReactPropTypes = React.PropTypes;
+
 var RK_PANE_REF = 'paneView';
 var CONTENT_REF = 'contentView';
 
diff --git a/Libraries/Components/TextInput/TextInput.windows.js b/Libraries/Components/TextInput/TextInput.windows.js
@@ -15,10 +15,8 @@ var DocumentSelectionState = require('DocumentSelectionState');
 var EventEmitter = require('EventEmitter');
 var NativeMethodsMixin = require('NativeMethodsMixin');
 var Platform = require('Platform');
-var PropTypes = require('react/lib/ReactPropTypes');
 var React = require('React');
 var ReactNative = require('ReactNative');
-var ReactChildren = require('react/lib/ReactChildren');
 var StyleSheet = require('StyleSheet');
 var Text = require('Text');
 var TextInputState = require('TextInputState');
@@ -32,6 +30,8 @@ var emptyFunction = require('fbjs/lib/emptyFunction');
 var invariant = require('fbjs/lib/invariant');
 var requireNativeComponent = require('requireNativeComponent');
 
+var PropTypes = React.PropTypes;
+
 var onlyMultiline = {
   onTextInput: true, // not supported in Open Source yet
   children: true,
@@ -483,7 +483,7 @@ var TextInput = React.createClass({
 
       var children = props.children;
       var childCount = 0;
-      ReactChildren.forEach(children, () => ++childCount);
+      React.Children.forEach(children, () => ++childCount);
       invariant(
         !(props.value && childCount),
         'Cannot specify both value and children.'
@@ -538,7 +538,7 @@ var TextInput = React.createClass({
       UIManager.AndroidTextInput.Constants.AutoCapitalizationType[this.props.autoCapitalize];
     var children = this.props.children;
     var childCount = 0;
-    ReactChildren.forEach(children, () => ++childCount);
+    React.Children.forEach(children, () => ++childCount);
     invariant(
       !(this.props.value && childCount),
       'Cannot specify both value and children.'
@@ -626,7 +626,7 @@ var TextInput = React.createClass({
 
     var children = this.props.children;
     var childCount = 0;
-    ReactChildren.forEach(children, () => ++childCount);
+    React.Children.forEach(children, () => ++childCount);
     invariant(
         !childCount,
         'TextInput children are not supported on Windows.'
