Skip to content

Commit b136671

Browse files
committed
Merge branch 'cornedor-rn-0.26-support'
2 parents 959866b + 86bb930 commit b136671

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

DefaultViewPageIndicator.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
'use strict';
22

3-
var React = require('react-native');
3+
var React = require('react');
4+
var ReactNative = require('react-native');
45
var {
56
Dimensions,
67
StyleSheet,
78
Text,
89
TouchableOpacity,
910
View,
1011
Animated,
11-
} = React;
12+
} = ReactNative;
1213

1314
var deviceWidth = Dimensions.get('window').width;
1415
var DOT_SIZE = 6;

ViewPager.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
'use strict';
22

3-
var React = require('react-native');
3+
var React = require('react');
4+
var { PropTypes } = React;
5+
6+
var ReactNative = require('react-native');
47
var {
58
Dimensions,
69
Text,
710
View,
811
TouchableOpacity,
912
PanResponder,
1013
Animated,
11-
PropTypes,
1214
StyleSheet,
13-
} = React;
15+
} = ReactNative;
1416

1517
var StaticRenderer = require('react-native/Libraries/Components/StaticRenderer');
1618
var TimerMixin = require('react-timer-mixin');

0 commit comments

Comments
 (0)