From ed26c438b2f7ab6f97562a4c6edf0c0f8dccf2c8 Mon Sep 17 00:00:00 2001 From: Anton Kuznetsov Date: Wed, 9 Aug 2017 21:58:23 +0300 Subject: [PATCH] React.PropTypes => PropTypes --- package.json | 1 + src/ExNavigationBar.js | 3 ++- src/ExNavigationComponents.js | 9 +++++---- src/ExNavigationPropTypes.js | 2 +- src/ExNavigationProvider.js | 3 ++- src/ExNavigationStack.js | 15 ++++++++------- src/ExNavigationStackItem.js | 3 ++- src/ExUnsupportedNativeView.js | 2 +- src/drawer/ExNavigationDrawer.js | 7 ++++--- src/navigation-experimental/NavigationCard.js | 3 +-- .../NavigationCardStack.js | 2 +- src/navigation-experimental/NavigationHeader.js | 2 +- .../NavigationHeaderBackButton.js | 3 ++- .../NavigationHeaderTitle.js | 3 ++- .../NavigationPropTypes.js | 5 ++--- .../NavigationTransitioner.js | 3 +-- src/shared-element/ExNavigationSharedElement.js | 3 ++- .../ExNavigationSharedElementGroup.js | 3 ++- src/sliding-tab/ExNavigationSlidingTab.js | 7 ++++--- src/tab/ExNavigationTab.js | 7 ++++--- 20 files changed, 48 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index 92d4e15..43f5098 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "invariant": "^2.2.1", "lodash": "^4.6.1", "mirror-creator": "^1.1.0", + "prop-types": "^15.5.10", "react-addons-pure-render-mixin": "^15.5.2", "react-addons-shallow-compare": "15.5.2", "react-clone-referenced-element": "^1.0.1", diff --git a/src/ExNavigationBar.js b/src/ExNavigationBar.js index ab1d370..7ef256a 100644 --- a/src/ExNavigationBar.js +++ b/src/ExNavigationBar.js @@ -1,4 +1,4 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; import { Animated, Image, @@ -9,6 +9,7 @@ import { View, ViewPropTypes, } from 'react-native'; +import PropTypes from 'prop-types'; import PureComponent from './utils/PureComponent'; import { unsupportedNativeView } from './ExUnsupportedNativeView'; import { withNavigation } from './ExNavigationComponents'; diff --git a/src/ExNavigationComponents.js b/src/ExNavigationComponents.js index 6c22eb8..4d893e5 100644 --- a/src/ExNavigationComponents.js +++ b/src/ExNavigationComponents.js @@ -2,7 +2,8 @@ * @flow */ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import UUID from 'uuid-js'; @@ -231,7 +232,7 @@ export const createFocusableComponent = (WrappedComponent: ReactClass) => { _wrappedInstance: ReactElement; static childContextTypes = { - isFocused: React.PropTypes.bool, + isFocused: PropTypes.bool, }; getChildContext() { @@ -329,11 +330,11 @@ export const createFocusAwareComponent = ( ) => { class FocusAwareComponent extends React.Component { static contextTypes = { - isFocused: React.PropTypes.bool, + isFocused: PropTypes.bool, }; static childContextTypes = { - isFocused: React.PropTypes.bool, + isFocused: PropTypes.bool, }; _wrappedInstance: ReactElement; diff --git a/src/ExNavigationPropTypes.js b/src/ExNavigationPropTypes.js index 744598e..7cdcf72 100644 --- a/src/ExNavigationPropTypes.js +++ b/src/ExNavigationPropTypes.js @@ -1,4 +1,4 @@ -import { PropTypes } from 'react'; +import PropTypes from 'prop-types'; export const NavigationPropType = PropTypes.shape({ getNavigator: PropTypes.func.isRequired, diff --git a/src/ExNavigationProvider.js b/src/ExNavigationProvider.js index 56b4ab2..7428d75 100644 --- a/src/ExNavigationProvider.js +++ b/src/ExNavigationProvider.js @@ -2,8 +2,9 @@ * @flow */ -import React, { PropTypes } from 'react'; +import React from 'react'; import { View, StyleSheet } from 'react-native'; +import PropTypes from 'prop-types'; import storeShape from 'react-redux/lib/utils/storeShape'; diff --git a/src/ExNavigationStack.js b/src/ExNavigationStack.js index f0f718f..f78e158 100644 --- a/src/ExNavigationStack.js +++ b/src/ExNavigationStack.js @@ -4,6 +4,7 @@ import React from 'react'; import { Animated, Platform, StyleSheet, View } from 'react-native'; +import PropTypes from 'prop-types'; import NavigationExperimental from './navigation-experimental'; import _ from 'lodash'; @@ -273,16 +274,16 @@ class ExNavigationStack extends PureComponent { }; static contextTypes = { - parentNavigatorUID: React.PropTypes.string, - headerComponent: React.PropTypes.func, - alertBarComponent: React.PropTypes.func, + parentNavigatorUID: PropTypes.string, + headerComponent: PropTypes.func, + alertBarComponent: PropTypes.func, }; static childContextTypes = { - parentNavigatorUID: React.PropTypes.string, - navigator: React.PropTypes.instanceOf(ExNavigationStackContext), - headerComponent: React.PropTypes.func, - alertBarComponent: React.PropTypes.func, + parentNavigatorUID: PropTypes.string, + navigator: PropTypes.instanceOf(ExNavigationStackContext), + headerComponent: PropTypes.func, + alertBarComponent: PropTypes.func, }; getChildContext() { diff --git a/src/ExNavigationStackItem.js b/src/ExNavigationStackItem.js index b7fbc66..d2dee60 100644 --- a/src/ExNavigationStackItem.js +++ b/src/ExNavigationStackItem.js @@ -1,5 +1,6 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; import { Animated, StyleSheet } from 'react-native'; +import PropTypes from 'prop-types'; import PureComponent from './utils/PureComponent'; diff --git a/src/ExUnsupportedNativeView.js b/src/ExUnsupportedNativeView.js index bc5348b..b6c3dfd 100644 --- a/src/ExUnsupportedNativeView.js +++ b/src/ExUnsupportedNativeView.js @@ -1,4 +1,4 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; import { View } from 'react-native'; export function unsupportedNativeView(name) { diff --git a/src/drawer/ExNavigationDrawer.js b/src/drawer/ExNavigationDrawer.js index 2ec9b66..c284bff 100644 --- a/src/drawer/ExNavigationDrawer.js +++ b/src/drawer/ExNavigationDrawer.js @@ -4,6 +4,7 @@ import React, { Children } from 'react'; import { StyleSheet, View } from 'react-native'; +import PropTypes from 'prop-types'; import DrawerLayout from 'react-native-drawer-layout-polyfill'; import PureComponent from '../utils/PureComponent'; import StaticContainer from 'react-static-container'; @@ -97,12 +98,12 @@ class ExNavigationDrawer extends PureComponent { }; static contextTypes = { - parentNavigatorUID: React.PropTypes.string, + parentNavigatorUID: PropTypes.string, }; static childContextTypes = { - parentNavigatorUID: React.PropTypes.string, - navigator: React.PropTypes.instanceOf(ExNavigationDrawerContext), + parentNavigatorUID: PropTypes.string, + navigator: PropTypes.instanceOf(ExNavigationDrawerContext), }; getChildContext() { diff --git a/src/navigation-experimental/NavigationCard.js b/src/navigation-experimental/NavigationCard.js index fccdff6..80235f7 100644 --- a/src/navigation-experimental/NavigationCard.js +++ b/src/navigation-experimental/NavigationCard.js @@ -39,6 +39,7 @@ const NavigationPagerStyleInterpolator = require('./NavigationPagerStyleInterpol const NavigationPointerEventsContainer = require('./NavigationPointerEventsContainer'); const NavigationPropTypes = require('./NavigationPropTypes'); const React = require('react'); +const PropTypes = require('prop-types'); import type { NavigationPanPanHandlers, @@ -55,8 +56,6 @@ type Props = NavigationSceneRendererProps & { style: any, }; -const {PropTypes} = React; - /** * Component that renders the scene as card for the . */ diff --git a/src/navigation-experimental/NavigationCardStack.js b/src/navigation-experimental/NavigationCardStack.js index 65491a7..7fa946e 100644 --- a/src/navigation-experimental/NavigationCardStack.js +++ b/src/navigation-experimental/NavigationCardStack.js @@ -43,9 +43,9 @@ const { View, ViewPropTypes, } = require('react-native'); +const PropTypes = require('prop-types'); const { NativeAnimatedModule } = NativeModules; -const { PropTypes } = React; const { Directions } = NavigationCardStackPanResponder; import type { diff --git a/src/navigation-experimental/NavigationHeader.js b/src/navigation-experimental/NavigationHeader.js index f5873ad..6f6c1ed 100644 --- a/src/navigation-experimental/NavigationHeader.js +++ b/src/navigation-experimental/NavigationHeader.js @@ -37,6 +37,7 @@ const NavigationHeaderTitle = require('./NavigationHeaderTitle'); const NavigationPropTypes = require('./NavigationPropTypes'); const React = require('react'); const ReactNative = require('react-native'); +const PropTypes = require('prop-types'); const ReactComponentWithPureRenderMixin = require('react-addons-pure-render-mixin'); const { @@ -80,7 +81,6 @@ type SubViewName = 'left' | 'title' | 'right'; const APPBAR_HEIGHT = Platform.OS === 'ios' ? 44 : 56; const STATUSBAR_HEIGHT = Platform.OS === 'ios' ? 20 : 0; -const { PropTypes } = React; class NavigationHeader extends React.Component { props: Props; diff --git a/src/navigation-experimental/NavigationHeaderBackButton.js b/src/navigation-experimental/NavigationHeaderBackButton.js index 3359f31..e8f70a3 100644 --- a/src/navigation-experimental/NavigationHeaderBackButton.js +++ b/src/navigation-experimental/NavigationHeaderBackButton.js @@ -24,6 +24,7 @@ const React = require('react'); const ReactNative = require('react-native'); +const PropTypes = require('prop-types'); const { I18nManager, @@ -46,7 +47,7 @@ const NavigationHeaderBackButton = (props: Props) => ( ); NavigationHeaderBackButton.propTypes = { - onPress: React.PropTypes.func.isRequired + onPress: PropTypes.func.isRequired }; const styles = StyleSheet.create({ diff --git a/src/navigation-experimental/NavigationHeaderTitle.js b/src/navigation-experimental/NavigationHeaderTitle.js index b4a1421..260e462 100644 --- a/src/navigation-experimental/NavigationHeaderTitle.js +++ b/src/navigation-experimental/NavigationHeaderTitle.js @@ -33,6 +33,7 @@ const React = require('react'); const ReactNative = require('react-native'); +const PropTypes = require('prop-types'); const { Platform, StyleSheet, View, Text, ViewPropTypes } = ReactNative; @@ -72,7 +73,7 @@ const styles = StyleSheet.create({ }); NavigationHeaderTitle.propTypes = { - children: React.PropTypes.node.isRequired, + children: PropTypes.node.isRequired, style: ViewPropTypes.style, textStyle: Text.propTypes.style, }; diff --git a/src/navigation-experimental/NavigationPropTypes.js b/src/navigation-experimental/NavigationPropTypes.js index 70428c4..cff48a1 100644 --- a/src/navigation-experimental/NavigationPropTypes.js +++ b/src/navigation-experimental/NavigationPropTypes.js @@ -23,11 +23,10 @@ import type { const {Animated} = require('react-native'); const React = require('react'); - -const {PropTypes} = React; +const PropTypes = require('prop-types'); /* NavigationAction */ -const action = PropTypes.shape({ +const action = PropTypes.shape({ type: PropTypes.string.isRequired, }); diff --git a/src/navigation-experimental/NavigationTransitioner.js b/src/navigation-experimental/NavigationTransitioner.js index c232aa4..c2074a2 100644 --- a/src/navigation-experimental/NavigationTransitioner.js +++ b/src/navigation-experimental/NavigationTransitioner.js @@ -14,6 +14,7 @@ const {Animated, Easing, StyleSheet, View} = require('react-native'); const NavigationPropTypes = require('./NavigationPropTypes'); const NavigationScenesReducer = require('./NavigationScenesReducer'); const React = require('react'); +const PropTypes = require('prop-types'); const invariant = require('fbjs/lib/invariant'); @@ -45,8 +46,6 @@ type State = { scenes: Array, }; -const {PropTypes} = React; - const DefaultTransitionSpec = { duration: 250, easing: Easing.inOut(Easing.ease), diff --git a/src/shared-element/ExNavigationSharedElement.js b/src/shared-element/ExNavigationSharedElement.js index 0fcc273..92994e2 100644 --- a/src/shared-element/ExNavigationSharedElement.js +++ b/src/shared-element/ExNavigationSharedElement.js @@ -2,8 +2,9 @@ * @flow */ -import React, { Component, PropTypes, cloneElement } from 'react'; +import React, { Component, cloneElement } from 'react'; import { UIManager, findNodeHandle } from 'react-native'; +import PropTypes from 'prop-types'; import invariant from 'invariant'; import type { diff --git a/src/shared-element/ExNavigationSharedElementGroup.js b/src/shared-element/ExNavigationSharedElementGroup.js index 13124f4..ab9b588 100644 --- a/src/shared-element/ExNavigationSharedElementGroup.js +++ b/src/shared-element/ExNavigationSharedElementGroup.js @@ -3,8 +3,9 @@ */ import _ from 'lodash'; -import React, { cloneElement, Children, Component, PropTypes } from 'react'; +import React, { cloneElement, Children, Component } from 'react'; import { Animated, Easing, View } from 'react-native'; +import PropTypes from 'prop-types'; import UUID from 'uuid-js'; diff --git a/src/sliding-tab/ExNavigationSlidingTab.js b/src/sliding-tab/ExNavigationSlidingTab.js index 1aa9eb8..a8f1d91 100644 --- a/src/sliding-tab/ExNavigationSlidingTab.js +++ b/src/sliding-tab/ExNavigationSlidingTab.js @@ -4,6 +4,7 @@ import React, { Children } from 'react'; import { Platform, StyleSheet, View } from 'react-native'; +import PropTypes from 'prop-types'; import PureComponent from '../utils/PureComponent'; import StaticContainer from 'react-static-container'; @@ -92,12 +93,12 @@ class ExNavigationSlidingTab extends PureComponent { }; static contextTypes = { - parentNavigatorUID: React.PropTypes.string, + parentNavigatorUID: PropTypes.string, }; static childContextTypes = { - parentNavigatorUID: React.PropTypes.string, - navigator: React.PropTypes.instanceOf(ExNavigationTabContext), + parentNavigatorUID: PropTypes.string, + navigator: PropTypes.instanceOf(ExNavigationTabContext), }; constructor(props, context) { diff --git a/src/tab/ExNavigationTab.js b/src/tab/ExNavigationTab.js index 02d382a..32ca1d3 100644 --- a/src/tab/ExNavigationTab.js +++ b/src/tab/ExNavigationTab.js @@ -4,6 +4,7 @@ import React, { Children } from 'react'; import { StyleSheet, View } from 'react-native'; +import PropTypes from 'prop-types'; import PureComponent from '../utils/PureComponent'; import StaticContainer from 'react-static-container'; @@ -98,12 +99,12 @@ class ExNavigationTab extends PureComponent { }; static contextTypes = { - parentNavigatorUID: React.PropTypes.string, + parentNavigatorUID: PropTypes.string, }; static childContextTypes = { - parentNavigatorUID: React.PropTypes.string, - navigator: React.PropTypes.instanceOf(ExNavigationTabContext), + parentNavigatorUID: PropTypes.string, + navigator: PropTypes.instanceOf(ExNavigationTabContext), }; getChildContext() {