diff --git a/elements/Circle.js b/elements/Circle.js index 2451bc9c..bec72705 100644 --- a/elements/Circle.js +++ b/elements/Circle.js @@ -1,6 +1,4 @@ -import { - PropTypes -} from 'react-native'; +import {PropTypes} from 'react'; import Shape, {CIRCLE} from './Shape'; import {circleProps, pathProps, fillProps, strokeProps} from '../lib/props'; diff --git a/elements/ClipPath.js b/elements/ClipPath.js index e932337f..5d92bfea 100644 --- a/elements/ClipPath.js +++ b/elements/ClipPath.js @@ -1,7 +1,4 @@ -import React, { - Component, - PropTypes -} from 'react-native'; +import React, {Component, PropTypes} from 'react'; import {NativeGroup} from './G'; import {set, remove} from '../lib/extract/extractClipping'; diff --git a/elements/Defs.js b/elements/Defs.js index 15e45afb..70b3b0ab 100644 --- a/elements/Defs.js +++ b/elements/Defs.js @@ -1,9 +1,4 @@ -import React, { - Children, - Component, - cloneElement, - PropTypes -} from 'react-native'; +import React, {Children, Component, cloneElement, PropTypes} from 'react'; import {NativeGroup} from './G'; let map = {}; diff --git a/elements/Ellipse.js b/elements/Ellipse.js index bfbcb537..d9beb4b3 100644 --- a/elements/Ellipse.js +++ b/elements/Ellipse.js @@ -1,6 +1,4 @@ -import { - PropTypes -} from 'react-native'; +import {PropTypes} from 'react'; import Shape, {ELLIPSE} from './Shape'; import {ellipseProps, pathProps, fillProps, strokeProps} from '../lib/props'; diff --git a/elements/G.js b/elements/G.js index ce12cbe7..b1a492ae 100644 --- a/elements/G.js +++ b/elements/G.js @@ -1,8 +1,5 @@ -import React, { - Component, - PropTypes -} from 'react-native'; -import createReactNativeComponentClass from 'react-native/Libraries/ReactNative/createReactNativeComponentClass'; +import React, {Component, PropTypes} from 'react'; +import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; import Defs from './Defs'; import _ from 'lodash'; import {GroupAttributes} from '../lib/attributes'; diff --git a/elements/Gradient.js b/elements/Gradient.js index c6b213c7..00a787dc 100644 --- a/elements/Gradient.js +++ b/elements/Gradient.js @@ -1,7 +1,4 @@ -import React, { - Component, - Children -} from 'react-native'; +import React, {Children, Component} from 'react'; import {NativeGroup} from './G'; import {set, remove} from '../lib/extract/patterns'; import percentToFloat from '../lib/percentToFloat'; diff --git a/elements/Image.js b/elements/Image.js index b336096e..f780d52f 100644 --- a/elements/Image.js +++ b/elements/Image.js @@ -1,12 +1,9 @@ -import React, { - Component, - PropTypes -} from 'react-native'; +import React, {Component, PropTypes} from 'react'; import extractProps from '../lib/extract/extractProps'; import {ImageAttributes} from '../lib/attributes'; import {numberProp} from '../lib/props'; import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource'; -import createReactNativeComponentClass from 'react-native/Libraries/ReactNative/createReactNativeComponentClass'; +import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; import formatPercentageProps from '../lib/formatPercentageProps'; class Image extends Component{ diff --git a/elements/Line.js b/elements/Line.js index ea1e9e2b..52b13503 100644 --- a/elements/Line.js +++ b/elements/Line.js @@ -1,6 +1,4 @@ -import { - PropTypes -} from 'react-native'; +import {PropTypes} from 'react'; import Shape, {LINE} from './Shape'; import {lineProps, pathProps, fillProps, strokeProps} from '../lib/props'; diff --git a/elements/LinearGradient.js b/elements/LinearGradient.js index 5f284c70..2c8e4a62 100644 --- a/elements/LinearGradient.js +++ b/elements/LinearGradient.js @@ -1,6 +1,4 @@ -import { - PropTypes -} from 'react-native'; +import {PropTypes} from 'react'; import stopsOpacity from '../lib/stopsOpacity'; import {numberProp} from '../lib/props'; diff --git a/elements/Path.js b/elements/Path.js index 54b801f2..39f47e6e 100644 --- a/elements/Path.js +++ b/elements/Path.js @@ -1,10 +1,7 @@ -import React, { - Component, - PropTypes -} from 'react-native'; +import React, {Component, PropTypes} from 'react'; import _ from 'lodash'; import Defs from './Defs'; -import createReactNativeComponentClass from 'react-native/Libraries/ReactNative/createReactNativeComponentClass'; +import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; import extractProps from '../lib/extract/extractProps'; import SerializablePath from '../lib/SerializablePath'; import {PathAttributes} from '../lib/attributes'; diff --git a/elements/Pattern.js b/elements/Pattern.js index d3464fbb..63e79e92 100644 --- a/elements/Pattern.js +++ b/elements/Pattern.js @@ -1,7 +1,4 @@ -import { - Component, - PropTypes -} from 'react-native'; +import {Component, PropTypes} from 'react'; let propType = PropTypes.oneOfType([PropTypes.string, PropTypes.number]); diff --git a/elements/Polygon.js b/elements/Polygon.js index 789bcbc8..86afd122 100644 --- a/elements/Polygon.js +++ b/elements/Polygon.js @@ -1,7 +1,4 @@ -import React, { - Component, - PropTypes -} from 'react-native'; +import React, {Component, PropTypes} from 'react'; import Path from './Path'; import {pathProps} from '../lib/props'; diff --git a/elements/Polyline.js b/elements/Polyline.js index a1eb7cee..d6255cd7 100644 --- a/elements/Polyline.js +++ b/elements/Polyline.js @@ -1,7 +1,4 @@ -import React, { - Component, - PropTypes -} from 'react-native'; +import React, {Component, PropTypes} from 'react'; import Path from './Path'; import {pathProps} from '../lib/props'; diff --git a/elements/RadialGradient.js b/elements/RadialGradient.js index 142fdab8..8577d46f 100644 --- a/elements/RadialGradient.js +++ b/elements/RadialGradient.js @@ -1,6 +1,4 @@ -import { - PropTypes -} from 'react-native'; +import {PropTypes} from 'react'; import stopsOpacity from '../lib/stopsOpacity'; import {numberProp} from '../lib/props'; import Gradient from './Gradient'; diff --git a/elements/Rect.js b/elements/Rect.js index 8e0b0445..f17f74ea 100644 --- a/elements/Rect.js +++ b/elements/Rect.js @@ -1,6 +1,4 @@ -import { - PropTypes -} from 'react-native'; +import {PropTypes} from 'react'; import Shape, {RECT} from './Shape'; import {rectProps, pathProps, fillProps, strokeProps} from '../lib/props'; diff --git a/elements/Shape.js b/elements/Shape.js index a3319bba..52254e4b 100644 --- a/elements/Shape.js +++ b/elements/Shape.js @@ -1,12 +1,10 @@ -import React, { - Component -} from 'react-native'; +import React, {Component} from 'react'; import './Path'; // must import Path first, don`t know why. without this will throw an `Super expression must either be null or a function, not undefined` import _ from 'lodash'; import extractProps from '../lib/extract/extractProps'; import {ShapeAttributes} from '../lib/attributes'; import formatPercentageProps from '../lib/formatPercentageProps'; -import createReactNativeComponentClass from 'react-native/Libraries/ReactNative/createReactNativeComponentClass'; +import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; import {circleProps, ellipseProps, lineProps, rectProps} from '../lib/props'; /** diff --git a/elements/Stop.js b/elements/Stop.js index 41e35913..776dea6c 100644 --- a/elements/Stop.js +++ b/elements/Stop.js @@ -1,7 +1,4 @@ -import { - Component, - PropTypes -} from 'react-native'; +import {Component, PropTypes} from 'react'; class Stop extends Component{ static displayName = 'Stop'; static propTypes = { diff --git a/elements/Svg.js b/elements/Svg.js index 0ebe2924..4437ef8e 100644 --- a/elements/Svg.js +++ b/elements/Svg.js @@ -1,11 +1,5 @@ -import React, { - Component, - PropTypes, - Children, - cloneElement, - View, - requireNativeComponent -} from 'react-native'; +import React, {Children, Component, cloneElement, PropTypes} from 'react'; +import {View, requireNativeComponent} from "react-native"; import ViewBox from './ViewBox'; // Svg - Root node of all Svg elements diff --git a/elements/Symbol.js b/elements/Symbol.js index 940ab7dc..510eb8fb 100644 --- a/elements/Symbol.js +++ b/elements/Symbol.js @@ -1,7 +1,4 @@ -import React, { - Component, - PropTypes -} from 'react-native'; +import React, {Component, PropTypes} from 'react'; import ViewBox from './ViewBox'; import Defs from './Defs'; diff --git a/elements/Text.js b/elements/Text.js index 17279790..d2a357da 100644 --- a/elements/Text.js +++ b/elements/Text.js @@ -1,10 +1,7 @@ -import React, { - Component, - PropTypes -} from 'react-native'; +import React, {Component, PropTypes} from 'react'; import Defs from './Defs'; import _ from 'lodash'; -import createReactNativeComponentClass from 'react-native/Libraries/ReactNative/createReactNativeComponentClass'; +import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; import extractProps from '../lib/extract/extractProps'; import extractText from '../lib/extract/extractText'; import {TextAttributes} from '../lib/attributes'; diff --git a/elements/Use.js b/elements/Use.js index 8860f755..7f42dee0 100644 --- a/elements/Use.js +++ b/elements/Use.js @@ -1,7 +1,4 @@ -import React, { - Component, - PropTypes -} from 'react-native'; +import React, {Component, PropTypes} from 'react'; import Defs from './Defs'; class Use extends Component{ static displayName = 'Use'; diff --git a/elements/ViewBox.js b/elements/ViewBox.js index 2f9f6e3d..ace5300d 100644 --- a/elements/ViewBox.js +++ b/elements/ViewBox.js @@ -1,6 +1,4 @@ -import React, { - Component -} from 'react-native'; +import React, {Component} from 'react'; import G from './G'; import extractViewbox from '../lib/extract/extractViewbox'; diff --git a/lib/numberProp.js b/lib/numberProp.js index 9188cf19..6680d7a3 100644 --- a/lib/numberProp.js +++ b/lib/numberProp.js @@ -1,4 +1,2 @@ -import { - PropTypes -} from 'react-native'; +import {PropTypes} from "react"; export default PropTypes.oneOfType([PropTypes.string, PropTypes.number]); diff --git a/lib/props.js b/lib/props.js index 5f43c014..304c7be8 100644 --- a/lib/props.js +++ b/lib/props.js @@ -1,6 +1,4 @@ -import { - PropTypes -} from 'react-native'; +import {PropTypes} from "react"; const numberProp = PropTypes.oneOfType([PropTypes.string, PropTypes.number]); diff --git a/package.json b/package.json index 1c87faa8..4ea3e526 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,6 @@ } }, "peerDependencies": { - "react-native": "^0.24.0" + "react-native": "^0.25.0" } }