From 9c8e5ab0626fcefe276b8418b4d4b046e1628361 Mon Sep 17 00:00:00 2001 From: ahanriat Date: Fri, 6 May 2016 11:35:18 +0200 Subject: [PATCH] Separate React from React Native --- examples/Basic/index.android.js | 5 +++-- examples/Basic/index.ios.js | 11 ++++++++--- src/BlurView.js | 10 ++++++---- src/VibrancyView.js | 10 ++++++---- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/examples/Basic/index.android.js b/examples/Basic/index.android.js index de41256..46998c2 100644 --- a/examples/Basic/index.android.js +++ b/examples/Basic/index.android.js @@ -4,13 +4,14 @@ */ 'use strict'; -var React = require('react-native'); +var ReactNative = require('react-native'); +var React = require('react'); var { AppRegistry, StyleSheet, Text, View, -} = React; +} = ReactNative; var Basic = React.createClass({ render: function() { diff --git a/examples/Basic/index.ios.js b/examples/Basic/index.ios.js index d67c1bc..0d169e8 100644 --- a/examples/Basic/index.ios.js +++ b/examples/Basic/index.ios.js @@ -1,12 +1,17 @@ -var React = require('react-native'); +var React = require('react'); +var { + Component, + PropTypes +} = React; + +var ReactNative = require('react-native'); var { AppRegistry, StyleSheet, Text, View, Image, - Component, -} = React; +} = ReactNative; const styles = StyleSheet.create({ container: { diff --git a/src/BlurView.js b/src/BlurView.js index d245ff4..084b40e 100644 --- a/src/BlurView.js +++ b/src/BlurView.js @@ -1,9 +1,11 @@ -const React = require('react-native'); +const React = require('react'); const { - requireNativeComponent, - Component + Component, + PropTypes } = React; +const { requireNativeComponent } = require('react-native'); + class BlurView extends Component { render() { return ( @@ -19,7 +21,7 @@ class BlurView extends Component { } BlurView.propTypes = { - blurType: React.PropTypes.string, + blurType: PropTypes.string, }; const NativeBlurView = requireNativeComponent('BlurView', BlurView); diff --git a/src/VibrancyView.js b/src/VibrancyView.js index 29f8411..9d65096 100644 --- a/src/VibrancyView.js +++ b/src/VibrancyView.js @@ -1,9 +1,11 @@ -const React = require('react-native'); +const React = require('react'); const { - requireNativeComponent, - Component + Component, + PropTypes } = React; +const { requireNativeComponent } = require('react-native'); + class VibrancyView extends Component { render() { return ( @@ -19,7 +21,7 @@ class VibrancyView extends Component { } VibrancyView.propTypes = { - blurType: React.PropTypes.string, + blurType: PropTypes.string, }; const NativeVibrancyView = requireNativeComponent('VibrancyView', VibrancyView);