From 294d2da2b3d9ffa0971b266d5751e25ac05992e6 Mon Sep 17 00:00:00 2001 From: Tim Rijavec Date: Mon, 15 May 2017 16:34:42 +0100 Subject: [PATCH] Replaced React and RN PropTypes with prop-types package --- elements/ClipPath.js | 3 ++- elements/Image.js | 3 ++- elements/LinearGradient.js | 3 ++- elements/Path.js | 3 ++- elements/Pattern.js | 3 ++- elements/Polygon.js | 3 ++- elements/Polyline.js | 3 ++- elements/RadialGradient.js | 3 ++- elements/Stop.js | 3 ++- elements/Svg.js | 4 ++-- elements/Symbol.js | 3 ++- elements/TSpan.js | 3 ++- elements/Text.js | 3 ++- elements/TextPath.js | 3 ++- elements/Use.js | 3 ++- lib/extract/extractViewBox.js | 3 ++- lib/props.js | 2 +- package.json | 3 ++- 18 files changed, 35 insertions(+), 19 deletions(-) diff --git a/elements/ClipPath.js b/elements/ClipPath.js index acaa872d..afde0fc5 100644 --- a/elements/ClipPath.js +++ b/elements/ClipPath.js @@ -1,4 +1,5 @@ -import React, {Component, PropTypes} from 'react'; +import React, {Component} from 'react'; +import PropTypes from 'prop-types'; import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import {ClipPathAttributes} from '../lib/attributes'; diff --git a/elements/Image.js b/elements/Image.js index 673ab9ca..e77e7a71 100644 --- a/elements/Image.js +++ b/elements/Image.js @@ -1,4 +1,5 @@ -import React, {PropTypes} from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { Image } from 'react-native'; import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import {ImageAttributes} from '../lib/attributes'; diff --git a/elements/LinearGradient.js b/elements/LinearGradient.js index c6174cb2..9de03389 100644 --- a/elements/LinearGradient.js +++ b/elements/LinearGradient.js @@ -1,4 +1,5 @@ -import React, {PropTypes, Component} from 'react'; +import React, {Component} from 'react'; +import PropTypes from 'prop-types'; import {numberProp} from '../lib/props'; import extractGradient from '../lib/extract/extractGradient'; import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; diff --git a/elements/Path.js b/elements/Path.js index ac22e5d4..b883f17f 100644 --- a/elements/Path.js +++ b/elements/Path.js @@ -1,4 +1,5 @@ -import React, {PropTypes} from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import {PathAttributes} from '../lib/attributes'; import Shape from './Shape'; diff --git a/elements/Pattern.js b/elements/Pattern.js index a0d8104a..c73313ef 100644 --- a/elements/Pattern.js +++ b/elements/Pattern.js @@ -1,4 +1,5 @@ -import {Component, PropTypes} from 'react'; +import {Component} from 'react'; +import PropTypes from 'prop-types'; import {numberProp} from '../lib/props'; export default class extends Component{ diff --git a/elements/Polygon.js b/elements/Polygon.js index 7e55f0b0..d0e18f1d 100644 --- a/elements/Polygon.js +++ b/elements/Polygon.js @@ -1,4 +1,5 @@ -import React, {Component, PropTypes} from 'react'; +import React, {Component} from 'react'; +import PropTypes from 'prop-types'; import Path from './Path'; import {pathProps} from '../lib/props'; import extractPolyPoints from '../lib/extract/extractPolyPoints'; diff --git a/elements/Polyline.js b/elements/Polyline.js index a582aee2..5520c21d 100644 --- a/elements/Polyline.js +++ b/elements/Polyline.js @@ -1,4 +1,5 @@ -import React, {Component, PropTypes} from 'react'; +import React, {Component} from 'react'; +import PropTypes from 'prop-types'; import Path from './Path'; import {pathProps} from '../lib/props'; import extractPolyPoints from '../lib/extract/extractPolyPoints'; diff --git a/elements/RadialGradient.js b/elements/RadialGradient.js index 5fabdeba..a143b1d9 100644 --- a/elements/RadialGradient.js +++ b/elements/RadialGradient.js @@ -1,4 +1,5 @@ -import React, {PropTypes, Component} from 'react'; +import React, {Component} from 'react'; +import PropTypes from 'prop-types'; import {numberProp} from '../lib/props'; import extractGradient from '../lib/extract/extractGradient'; import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; diff --git a/elements/Stop.js b/elements/Stop.js index f9c81311..69363e61 100644 --- a/elements/Stop.js +++ b/elements/Stop.js @@ -1,4 +1,5 @@ -import {Component, PropTypes} from 'react'; +import {Component} from 'react'; +import PropTypes from 'prop-types'; import {numberProp} from '../lib/props'; export default class extends Component{ diff --git a/elements/Svg.js b/elements/Svg.js index 2cd3560f..64de7755 100644 --- a/elements/Svg.js +++ b/elements/Svg.js @@ -1,7 +1,7 @@ import React, { - Component, - PropTypes + Component } from 'react'; +import PropTypes from 'prop-types'; import { View, requireNativeComponent, diff --git a/elements/Symbol.js b/elements/Symbol.js index 792efc96..30b5e86a 100644 --- a/elements/Symbol.js +++ b/elements/Symbol.js @@ -1,4 +1,5 @@ -import React, {Component, PropTypes} from 'react'; +import React, {Component} from 'react'; +import PropTypes from 'prop-types'; import extractViewBox from '../lib/extract/extractViewBox'; import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import {SymbolAttributes} from '../lib/attributes'; diff --git a/elements/TSpan.js b/elements/TSpan.js index 153fc460..19031678 100644 --- a/elements/TSpan.js +++ b/elements/TSpan.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import extractText from '../lib/extract/extractText'; import {numberProp, pathProps, fontProps} from '../lib/props'; diff --git a/elements/Text.js b/elements/Text.js index 7f5399d6..b083dce3 100644 --- a/elements/Text.js +++ b/elements/Text.js @@ -1,4 +1,5 @@ -import React, {PropTypes} from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import extractText from '../lib/extract/extractText'; import {numberProp, pathProps, fontProps} from '../lib/props'; diff --git a/elements/TextPath.js b/elements/TextPath.js index 095e9dd7..9406cde4 100644 --- a/elements/TextPath.js +++ b/elements/TextPath.js @@ -1,4 +1,5 @@ -import React, {PropTypes} from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import {TextPathAttributes} from '../lib/attributes'; import extractText from '../lib/extract/extractText'; diff --git a/elements/Use.js b/elements/Use.js index 9623c29b..a5131c9c 100644 --- a/elements/Use.js +++ b/elements/Use.js @@ -1,4 +1,5 @@ -import React, {PropTypes} from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import extractProps from '../lib/extract/extractProps'; import {pathProps, numberProp} from '../lib/props'; diff --git a/lib/extract/extractViewBox.js b/lib/extract/extractViewBox.js index 2730e89a..06e4cbb1 100644 --- a/lib/extract/extractViewBox.js +++ b/lib/extract/extractViewBox.js @@ -1,5 +1,6 @@ -import React, {Component, PropTypes} from 'react'; +import React, {Component} from 'react'; +import PropTypes from 'prop-types'; import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import {ViewBoxAttributes} from '../attributes'; diff --git a/lib/props.js b/lib/props.js index 9621f1c6..70799b8e 100644 --- a/lib/props.js +++ b/lib/props.js @@ -1,4 +1,4 @@ -import {PropTypes} from 'react'; +import PropTypes from 'prop-types'; import {PanResponder} from 'react-native'; const numberProp = PropTypes.oneOfType([PropTypes.string, PropTypes.number]); diff --git a/package.json b/package.json index 644895fa..5208158b 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,8 @@ }, "peerDependencies": { "react-native": ">=0.44.0", - "react": "16.0.0-alpha.6" + "react": "16.0.0-alpha.6", + "prop-types": "^15.5.8" }, "dependencies": { "color": "^0.11.1",