RN: Stop Deep Linking ReactPropTypes

Reviewed By: sebmarkbage

Differential Revision: D4025448

fbshipit-source-id: 4e9b6ee002a86f638fc57a4bbeb45bf35fabf74c
This commit is contained in:
Tim Yung 2016-10-14 18:50:17 -07:00 committed by Facebook Github Bot
parent c4fc13b997
commit 7263c349c7
29 changed files with 50 additions and 35 deletions

View File

@ -11,7 +11,7 @@
*/ */
'use strict'; 'use strict';
var ReactPropTypes = require('react/lib/ReactPropTypes'); var ReactPropTypes = require('React').PropTypes
var RCTCameraRollManager = require('NativeModules').CameraRollManager; var RCTCameraRollManager = require('NativeModules').CameraRollManager;
var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker'); var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');

View File

@ -14,13 +14,14 @@
const ColorPropType = require('ColorPropType'); const ColorPropType = require('ColorPropType');
const NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); const NativeMethodsMixin = require('react/lib/NativeMethodsMixin');
const Platform = require('Platform'); const Platform = require('Platform');
const PropTypes = require('react/lib/ReactPropTypes');
const React = require('React'); const React = require('React');
const StyleSheet = require('StyleSheet'); const StyleSheet = require('StyleSheet');
const View = require('View'); const View = require('View');
const requireNativeComponent = require('requireNativeComponent'); const requireNativeComponent = require('requireNativeComponent');
const PropTypes = React.PropTypes;
const GRAY = '#999999'; const GRAY = '#999999';
type IndicatorSize = number | 'small' | 'large'; type IndicatorSize = number | 'small' | 'large';

View File

@ -14,13 +14,14 @@
'use strict'; 'use strict';
const NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); const NativeMethodsMixin = require('react/lib/NativeMethodsMixin');
const PropTypes = require('react/lib/ReactPropTypes');
const React = require('React'); const React = require('React');
const StyleSheet = require('StyleSheet'); const StyleSheet = require('StyleSheet');
const View = require('View'); const View = require('View');
const requireNativeComponent = require('requireNativeComponent'); const requireNativeComponent = require('requireNativeComponent');
const PropTypes = React.PropTypes;
type DefaultProps = { type DefaultProps = {
mode: 'date' | 'time' | 'datetime', mode: 'date' | 'time' | 'datetime',
}; };

View File

@ -15,7 +15,6 @@ var NativeMethodsMixin = require('react/lib/NativeMethodsMixin');
var Platform = require('Platform'); var Platform = require('Platform');
var React = require('React'); var React = require('React');
var ReactNative = require('ReactNative'); var ReactNative = require('ReactNative');
var ReactPropTypes = require('react/lib/ReactPropTypes');
var StatusBar = require('StatusBar'); var StatusBar = require('StatusBar');
var StyleSheet = require('StyleSheet'); var StyleSheet = require('StyleSheet');
var UIManager = require('UIManager'); var UIManager = require('UIManager');
@ -26,6 +25,8 @@ var DrawerConsts = UIManager.AndroidDrawerLayout.Constants;
var dismissKeyboard = require('dismissKeyboard'); var dismissKeyboard = require('dismissKeyboard');
var requireNativeComponent = require('requireNativeComponent'); var requireNativeComponent = require('requireNativeComponent');
var ReactPropTypes = React.PropTypes;
var RK_DRAWER_REF = 'drawerlayout'; var RK_DRAWER_REF = 'drawerlayout';
var INNERVIEW_REF = 'innerView'; var INNERVIEW_REF = 'innerView';

View File

@ -14,11 +14,12 @@
const Keyboard = require('Keyboard'); const Keyboard = require('Keyboard');
const LayoutAnimation = require('LayoutAnimation'); const LayoutAnimation = require('LayoutAnimation');
const Platform = require('Platform'); const Platform = require('Platform');
const PropTypes = require('react/lib/ReactPropTypes');
const React = require('React'); const React = require('React');
const TimerMixin = require('react-timer-mixin'); const TimerMixin = require('react-timer-mixin');
const View = require('View'); const View = require('View');
const PropTypes = React.PropTypes;
import type EmitterSubscription from 'EmitterSubscription'; import type EmitterSubscription from 'EmitterSubscription';
type Rect = { type Rect = {

View File

@ -15,7 +15,6 @@
var ColorPropType = require('ColorPropType'); var ColorPropType = require('ColorPropType');
var React = require('React'); var React = require('React');
var ReactChildren = require('react/lib/ReactChildren'); var ReactChildren = require('react/lib/ReactChildren');
var ReactPropTypes = require('react/lib/ReactPropTypes');
var StyleSheet = require('StyleSheet'); var StyleSheet = require('StyleSheet');
var StyleSheetPropType = require('StyleSheetPropType'); var StyleSheetPropType = require('StyleSheetPropType');
var View = require('View'); var View = require('View');
@ -24,8 +23,9 @@ var ViewStylePropTypes = require('ViewStylePropTypes');
var processColor = require('processColor'); var processColor = require('processColor');
var requireNativeComponent = require('requireNativeComponent'); var requireNativeComponent = require('requireNativeComponent');
var ReactPropTypes = React.PropTypes;
var REF_PICKER = 'picker'; var REF_PICKER = 'picker';
var MODE_DIALOG = 'dialog';
var MODE_DROPDOWN = 'dropdown'; var MODE_DROPDOWN = 'dropdown';
var pickerStyleType = StyleSheetPropType({ var pickerStyleType = StyleSheetPropType({

View File

@ -12,12 +12,13 @@
var NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); var NativeMethodsMixin = require('react/lib/NativeMethodsMixin');
var React = require('React'); var React = require('React');
var ReactPropTypes = require('react/lib/ReactPropTypes');
var View = require('View'); var View = require('View');
var ColorPropType = require('ColorPropType'); var ColorPropType = require('ColorPropType');
var requireNativeComponent = require('requireNativeComponent'); var requireNativeComponent = require('requireNativeComponent');
var ReactPropTypes = React.PropTypes;
var STYLE_ATTRIBUTES = [ var STYLE_ATTRIBUTES = [
'Horizontal', 'Horizontal',
'Normal', 'Normal',
@ -25,7 +26,7 @@ var STYLE_ATTRIBUTES = [
'Large', 'Large',
'Inverse', 'Inverse',
'SmallInverse', 'SmallInverse',
'LargeInverse' 'LargeInverse',
]; ];
var indeterminateType = function(props, propName, componentName) { var indeterminateType = function(props, propName, componentName) {

View File

@ -13,13 +13,14 @@
var Image = require('Image'); var Image = require('Image');
var NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); var NativeMethodsMixin = require('react/lib/NativeMethodsMixin');
var PropTypes = require('react/lib/ReactPropTypes');
var React = require('React'); var React = require('React');
var StyleSheet = require('StyleSheet'); var StyleSheet = require('StyleSheet');
var View = require('View'); var View = require('View');
var requireNativeComponent = require('requireNativeComponent'); var requireNativeComponent = require('requireNativeComponent');
var PropTypes = React.PropTypes;
/** /**
* Use `ProgressViewIOS` to render a UIProgressView on iOS. * Use `ProgressViewIOS` to render a UIProgressView on iOS.
*/ */

View File

@ -12,13 +12,14 @@
'use strict'; 'use strict';
var NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); var NativeMethodsMixin = require('react/lib/NativeMethodsMixin');
var PropTypes = require('react/lib/ReactPropTypes');
var React = require('React'); var React = require('React');
var StyleSheet = require('StyleSheet'); var StyleSheet = require('StyleSheet');
var View = require('View'); var View = require('View');
var requireNativeComponent = require('requireNativeComponent'); var requireNativeComponent = require('requireNativeComponent');
var PropTypes = React.PropTypes;
type DefaultProps = { type DefaultProps = {
values: Array<string>, values: Array<string>,
enabled: boolean, enabled: boolean,

View File

@ -15,13 +15,14 @@ var Image = require('Image');
var NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); var NativeMethodsMixin = require('react/lib/NativeMethodsMixin');
var ReactNativeViewAttributes = require('ReactNativeViewAttributes'); var ReactNativeViewAttributes = require('ReactNativeViewAttributes');
var Platform = require('Platform'); var Platform = require('Platform');
var PropTypes = require('react/lib/ReactPropTypes');
var React = require('React'); var React = require('React');
var StyleSheet = require('StyleSheet'); var StyleSheet = require('StyleSheet');
var View = require('View'); var View = require('View');
var requireNativeComponent = require('requireNativeComponent'); var requireNativeComponent = require('requireNativeComponent');
var PropTypes = React.PropTypes;
type Event = Object; type Event = Object;
/** /**

View File

@ -16,7 +16,6 @@ const DocumentSelectionState = require('DocumentSelectionState');
const EventEmitter = require('EventEmitter'); const EventEmitter = require('EventEmitter');
const NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); const NativeMethodsMixin = require('react/lib/NativeMethodsMixin');
const Platform = require('Platform'); const Platform = require('Platform');
const PropTypes = require('react/lib/ReactPropTypes');
const React = require('React'); const React = require('React');
const ReactNative = require('ReactNative'); const ReactNative = require('ReactNative');
const ReactChildren = require('react/lib/ReactChildren'); const ReactChildren = require('react/lib/ReactChildren');
@ -33,6 +32,8 @@ const emptyFunction = require('fbjs/lib/emptyFunction');
const invariant = require('fbjs/lib/invariant'); const invariant = require('fbjs/lib/invariant');
const requireNativeComponent = require('requireNativeComponent'); const requireNativeComponent = require('requireNativeComponent');
const PropTypes = React.PropTypes;
const onlyMultiline = { const onlyMultiline = {
onTextInput: true, onTextInput: true,
children: true, children: true,

View File

@ -15,7 +15,6 @@ var Image = require('Image');
var NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); var NativeMethodsMixin = require('react/lib/NativeMethodsMixin');
var React = require('React'); var React = require('React');
var ReactNativeViewAttributes = require('ReactNativeViewAttributes'); var ReactNativeViewAttributes = require('ReactNativeViewAttributes');
var ReactPropTypes = require('react/lib/ReactPropTypes');
var UIManager = require('UIManager'); var UIManager = require('UIManager');
var View = require('View'); var View = require('View');
var ColorPropType = require('ColorPropType'); var ColorPropType = require('ColorPropType');
@ -23,11 +22,13 @@ var ColorPropType = require('ColorPropType');
var requireNativeComponent = require('requireNativeComponent'); var requireNativeComponent = require('requireNativeComponent');
var resolveAssetSource = require('resolveAssetSource'); var resolveAssetSource = require('resolveAssetSource');
var ReactPropTypes = React.PropTypes;
var optionalImageSource = ReactPropTypes.oneOfType([ var optionalImageSource = ReactPropTypes.oneOfType([
Image.propTypes.source, Image.propTypes.source,
// Image.propTypes.source is required but we want it to be optional, so we OR // Image.propTypes.source is required but we want it to be optional, so we OR
// it with a nullable propType. // it with a nullable propType.
ReactPropTypes.oneOf([]) ReactPropTypes.oneOf([]),
]); ]);
/** /**

View File

@ -11,7 +11,6 @@
'use strict'; 'use strict';
var Platform = require('Platform'); var Platform = require('Platform');
var PropTypes = require('react/lib/ReactPropTypes');
var React = require('React'); var React = require('React');
var ReactNative = require('ReactNative'); var ReactNative = require('ReactNative');
var Touchable = require('Touchable'); var Touchable = require('Touchable');
@ -22,6 +21,8 @@ var ensurePositiveDelayProps = require('ensurePositiveDelayProps');
var processColor = require('processColor'); var processColor = require('processColor');
var requireNativeComponent = require('requireNativeComponent'); var requireNativeComponent = require('requireNativeComponent');
var PropTypes = React.PropTypes;
var rippleBackgroundPropType = PropTypes.shape({ var rippleBackgroundPropType = PropTypes.shape({
type: React.PropTypes.oneOf(['RippleAndroid']), type: React.PropTypes.oneOf(['RippleAndroid']),
color: PropTypes.number, color: PropTypes.number,
@ -42,7 +43,7 @@ var TouchableView = requireNativeComponent('RCTView', null, {
nativeOnly: { nativeOnly: {
nativeBackgroundAndroid: backgroundPropType, nativeBackgroundAndroid: backgroundPropType,
nativeForegroundAndroid: backgroundPropType, nativeForegroundAndroid: backgroundPropType,
} },
}); });
type Event = Object; type Event = Object;

View File

@ -12,7 +12,7 @@
'use strict'; 'use strict';
var ColorPropType = require('ColorPropType'); var ColorPropType = require('ColorPropType');
var ReactPropTypes = require('react/lib/ReactPropTypes'); var ReactPropTypes = require('React').PropTypes;
var ShadowPropTypesIOS = { var ShadowPropTypesIOS = {
/** /**

View File

@ -13,7 +13,6 @@
const EdgeInsetsPropType = require('EdgeInsetsPropType'); const EdgeInsetsPropType = require('EdgeInsetsPropType');
const NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); const NativeMethodsMixin = require('react/lib/NativeMethodsMixin');
const PropTypes = require('react/lib/ReactPropTypes');
const React = require('React'); const React = require('React');
const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes'); const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes');
const ReactNativeViewAttributes = require('ReactNativeViewAttributes'); const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
@ -23,6 +22,8 @@ const ViewStylePropTypes = require('ViewStylePropTypes');
const requireNativeComponent = require('requireNativeComponent'); const requireNativeComponent = require('requireNativeComponent');
const PropTypes = React.PropTypes;
const stylePropType = StyleSheetPropType(ViewStylePropTypes); const stylePropType = StyleSheetPropType(ViewStylePropTypes);
const AccessibilityTraits = [ const AccessibilityTraits = [

View File

@ -12,7 +12,7 @@
'use strict'; 'use strict';
var LayoutPropTypes = require('LayoutPropTypes'); var LayoutPropTypes = require('LayoutPropTypes');
var ReactPropTypes = require('react/lib/ReactPropTypes'); var ReactPropTypes = require('React').PropTypes;
var ColorPropType = require('ColorPropType'); var ColorPropType = require('ColorPropType');
var ShadowPropTypesIOS = require('ShadowPropTypesIOS'); var ShadowPropTypesIOS = require('ShadowPropTypesIOS');
var TransformPropTypes = require('TransformPropTypes'); var TransformPropTypes = require('TransformPropTypes');

View File

@ -14,13 +14,14 @@
var React = require('React'); var React = require('React');
var ReactNative = require('ReactNative'); var ReactNative = require('ReactNative');
var ReactElement = require('react/lib/ReactElement'); var ReactElement = require('react/lib/ReactElement');
var ReactPropTypes = require('react/lib/ReactPropTypes');
var UIManager = require('UIManager'); var UIManager = require('UIManager');
var View = require('View'); var View = require('View');
var dismissKeyboard = require('dismissKeyboard'); var dismissKeyboard = require('dismissKeyboard');
var requireNativeComponent = require('requireNativeComponent'); var requireNativeComponent = require('requireNativeComponent');
var ReactPropTypes = React.PropTypes;
var VIEWPAGER_REF = 'viewPager'; var VIEWPAGER_REF = 'viewPager';
type Event = Object; type Event = Object;

View File

@ -16,7 +16,6 @@ var NativeModules = require('NativeModules');
var ImageResizeMode = require('ImageResizeMode'); var ImageResizeMode = require('ImageResizeMode');
var ImageStylePropTypes = require('ImageStylePropTypes'); var ImageStylePropTypes = require('ImageStylePropTypes');
var ViewStylePropTypes = require('ViewStylePropTypes'); var ViewStylePropTypes = require('ViewStylePropTypes');
var PropTypes = require('react/lib/ReactPropTypes');
var React = require('React'); var React = require('React');
var ReactNativeViewAttributes = require('ReactNativeViewAttributes'); var ReactNativeViewAttributes = require('ReactNativeViewAttributes');
var StyleSheet = require('StyleSheet'); var StyleSheet = require('StyleSheet');
@ -30,6 +29,7 @@ var resolveAssetSource = require('resolveAssetSource');
var Set = require('Set'); var Set = require('Set');
var filterObject = require('fbjs/lib/filterObject'); var filterObject = require('fbjs/lib/filterObject');
var PropTypes = React.PropTypes;
var { var {
ImageLoader, ImageLoader,
} = NativeModules; } = NativeModules;

View File

@ -17,7 +17,6 @@ const ImageSourcePropType = require('ImageSourcePropType');
const ImageStylePropTypes = require('ImageStylePropTypes'); const ImageStylePropTypes = require('ImageStylePropTypes');
const NativeMethodsMixin = require('react/lib/NativeMethodsMixin'); const NativeMethodsMixin = require('react/lib/NativeMethodsMixin');
const NativeModules = require('NativeModules'); const NativeModules = require('NativeModules');
const PropTypes = require('react/lib/ReactPropTypes');
const React = require('React'); const React = require('React');
const ReactNativeViewAttributes = require('ReactNativeViewAttributes'); const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
const StyleSheet = require('StyleSheet'); const StyleSheet = require('StyleSheet');
@ -27,6 +26,8 @@ const flattenStyle = require('flattenStyle');
const requireNativeComponent = require('requireNativeComponent'); const requireNativeComponent = require('requireNativeComponent');
const resolveAssetSource = require('resolveAssetSource'); const resolveAssetSource = require('resolveAssetSource');
const PropTypes = React.PropTypes;
const ImageViewManager = NativeModules.ImageViewManager; const ImageViewManager = NativeModules.ImageViewManager;
/** /**

View File

@ -11,7 +11,7 @@
*/ */
'use strict'; 'use strict';
const PropTypes = require('react/lib/ReactPropTypes'); const {PropTypes} = require('React');
const ImageURISourcePropType = PropTypes.shape({ const ImageURISourcePropType = PropTypes.shape({
/** /**

View File

@ -13,11 +13,12 @@
var ImageResizeMode = require('ImageResizeMode'); var ImageResizeMode = require('ImageResizeMode');
var LayoutPropTypes = require('LayoutPropTypes'); var LayoutPropTypes = require('LayoutPropTypes');
var ReactPropTypes = require('react/lib/ReactPropTypes');
var ColorPropType = require('ColorPropType'); var ColorPropType = require('ColorPropType');
var ShadowPropTypesIOS = require('ShadowPropTypesIOS'); var ShadowPropTypesIOS = require('ShadowPropTypesIOS');
var TransformPropTypes = require('TransformPropTypes'); var TransformPropTypes = require('TransformPropTypes');
var ReactPropTypes = require('React').PropTypes;
var ImageStylePropTypes = { var ImageStylePropTypes = {
...LayoutPropTypes, ...LayoutPropTypes,
...ShadowPropTypesIOS, ...ShadowPropTypesIOS,

View File

@ -12,7 +12,6 @@
'use strict'; 'use strict';
var BoxInspector = require('BoxInspector'); var BoxInspector = require('BoxInspector');
var PropTypes = require('react/lib/ReactPropTypes');
var React = require('React'); var React = require('React');
var StyleInspector = require('StyleInspector'); var StyleInspector = require('StyleInspector');
var StyleSheet = require('StyleSheet'); var StyleSheet = require('StyleSheet');
@ -20,12 +19,13 @@ var Text = require('Text');
var TouchableHighlight = require('TouchableHighlight'); var TouchableHighlight = require('TouchableHighlight');
var TouchableWithoutFeedback = require('TouchableWithoutFeedback'); var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
var View = require('View'); var View = require('View');
var {fetch} = require('fetch');
var flattenStyle = require('flattenStyle'); var flattenStyle = require('flattenStyle');
var mapWithSeparator = require('mapWithSeparator'); var mapWithSeparator = require('mapWithSeparator');
var openFileInEditor = require('openFileInEditor'); var openFileInEditor = require('openFileInEditor');
var PropTypes = React.PropTypes;
class ElementProperties extends React.Component { class ElementProperties extends React.Component {
props: { props: {
hierarchy: Array<$FlowFixMe>, hierarchy: Array<$FlowFixMe>,

View File

@ -11,7 +11,7 @@
*/ */
'use strict'; 'use strict';
var PropTypes = require('react/lib/ReactPropTypes'); var {PropTypes} = require('React');
var UIManager = require('UIManager'); var UIManager = require('UIManager');
var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker'); var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');

View File

@ -14,7 +14,6 @@
const AppContainer = require('AppContainer'); const AppContainer = require('AppContainer');
const I18nManager = require('I18nManager'); const I18nManager = require('I18nManager');
const Platform = require('Platform'); const Platform = require('Platform');
const PropTypes = require('react/lib/ReactPropTypes');
const React = require('React'); const React = require('React');
const StyleSheet = require('StyleSheet'); const StyleSheet = require('StyleSheet');
const View = require('View'); const View = require('View');
@ -23,6 +22,8 @@ const deprecatedPropType = require('deprecatedPropType');
const requireNativeComponent = require('requireNativeComponent'); const requireNativeComponent = require('requireNativeComponent');
const RCTModalHostView = requireNativeComponent('RCTModalHostView', null); const RCTModalHostView = requireNativeComponent('RCTModalHostView', null);
const PropTypes = React.PropTypes;
/** /**
* The Modal component is a simple way to present content above an enclosing view. * The Modal component is a simple way to present content above an enclosing view.
* *

View File

@ -11,7 +11,7 @@
*/ */
'use strict'; 'use strict';
var PropTypes = require('react/lib/ReactPropTypes'); var {PropTypes} = require('React');
var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker'); var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');

View File

@ -11,7 +11,7 @@
*/ */
'use strict'; '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 * React Native's layout system is based on Flexbox and is powered both

View File

@ -11,7 +11,7 @@
*/ */
'use strict'; 'use strict';
var PropTypes = require('react/lib/ReactPropTypes'); var PropTypes = require('React').PropTypes;
var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker'); var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');

View File

@ -11,10 +11,9 @@
*/ */
'use strict'; 'use strict';
var ReactPropTypes = require('react/lib/ReactPropTypes');
var deprecatedPropType = require('deprecatedPropType'); var deprecatedPropType = require('deprecatedPropType');
var ArrayOfNumberPropType = ReactPropTypes.arrayOf(ReactPropTypes.number); var ReactPropTypes = require('React').PropTypes;
var TransformMatrixPropType = function( var TransformMatrixPropType = function(
props : Object, props : Object,

View File

@ -11,7 +11,7 @@
*/ */
'use strict'; 'use strict';
var ReactPropTypes = require('react/lib/ReactPropTypes'); var ReactPropTypes = require('React').PropTypes;
var ColorPropType = require('ColorPropType'); var ColorPropType = require('ColorPropType');
var ViewStylePropTypes = require('ViewStylePropTypes'); var ViewStylePropTypes = require('ViewStylePropTypes');