Skip to content

Commit d570bc7

Browse files
committed
Merge pull request ptomasroos#247 from OpenSports/master
Make RN 0.24+ compatible
2 parents 3b3effd + 5200549 commit d570bc7

File tree

6 files changed

+18
-12
lines changed

6 files changed

+18
-12
lines changed

Button.android.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
const React = require('react-native');
1+
const ReactNative = require('react-native');
22
const {
33
TouchableNativeFeedback,
44
View,
5-
} = React;
5+
} = ReactNative;
66

77
const Button = (props) => {
88
return <TouchableNativeFeedback

Button.ios.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
const React = require('react-native');
1+
const ReactNative = require('react-native');
22
const {
33
TouchableOpacity,
44
View,
5-
} = React;
5+
} = ReactNative;
66

77
const Button = (props) => {
88
return <TouchableOpacity {...props}>

DefaultTabBar.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
const React = require('react-native');
1+
const React = require('react');
2+
const ReactNative = require('react-native');
23
const {
34
StyleSheet,
45
Text,
56
View,
67
Animated,
7-
} = React;
8+
} = ReactNative;
89
const Button = require('./Button');
910

1011
const DefaultTabBar = React.createClass({

ScrollableTabBar.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const React = require('react-native');
1+
const React = require('react');
2+
const ReactNative = require('react-native');
23
const {
34
View,
45
Animated,
@@ -9,7 +10,7 @@ const {
910
Platform,
1011
findNodeHandle,
1112
Dimensions,
12-
} = React;
13+
} = ReactNative;
1314

1415
const TAB_HEIGHT = 50;
1516
const WINDOW_WIDTH = Dimensions.get('window').width;

examples/FacebookTabsExample/FacebookTabsExample.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, {
1+
import React from 'react';
2+
import {
23
StyleSheet,
34
Text,
45
View,

index.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
const React = require('react-native');
1+
const React = require('react');
2+
const {
3+
PropTypes
4+
} = React;
5+
const ReactNative = require('react-native');
26
const {
37
Dimensions,
48
View,
@@ -7,9 +11,8 @@ const {
711
Platform,
812
StyleSheet,
913
ViewPagerAndroid,
10-
PropTypes,
1114
InteractionManager,
12-
} = React;
15+
} = ReactNative;
1316

1417
const DefaultTabBar = require('./DefaultTabBar');
1518
const ScrollableTabBar = require('./ScrollableTabBar');

0 commit comments

Comments
 (0)