From 87378cdc906477108820c30067e547e3ec1ecb87 Mon Sep 17 00:00:00 2001 From: Theopolisme Date: Mon, 4 Jul 2016 22:48:57 -0500 Subject: [PATCH 1/3] ActivityIndicatorIOS -> ActivityIndicator --- lib/RefreshingIndicator.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/RefreshingIndicator.js b/lib/RefreshingIndicator.js index 8c0aedd..394a781 100644 --- a/lib/RefreshingIndicator.js +++ b/lib/RefreshingIndicator.js @@ -2,7 +2,7 @@ var React = require('react-native') var { View, Text, - ActivityIndicatorIOS, + ActivityIndicator, PropTypes, StyleSheet, isValidElement, @@ -25,7 +25,7 @@ var RefreshingIndicator = React.createClass({ }, getDefaultProps() { return { - activityIndicatorComponent: ActivityIndicatorIOS, + activityIndicatorComponent: ActivityIndicator, isTouching: false, isRefreshing: false, isWaitingForRelease: false, From 412ccf7a4ab74b1217d50ab9b5b7fd973b4af172 Mon Sep 17 00:00:00 2001 From: Theopolisme Date: Mon, 4 Jul 2016 22:56:17 -0500 Subject: [PATCH 2/3] Stop using react-native as alias for react --- lib/ControlledRefreshableListView.js | 8 +++++--- lib/RefreshableListView.js | 2 +- lib/RefreshingIndicator.js | 14 ++++++++------ lib/createElementFrom.js | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/lib/ControlledRefreshableListView.js b/lib/ControlledRefreshableListView.js index 39b47cb..5a30a1f 100644 --- a/lib/ControlledRefreshableListView.js +++ b/lib/ControlledRefreshableListView.js @@ -1,11 +1,13 @@ -var React = require('react-native') +var React = require('react') +var { + PropTypes +} = React; var { - PropTypes, StyleSheet, View, Platform, PullToRefreshViewAndroid, -} = React +} = require('react-native') var ListView = require('./ListView') var createElementFrom = require('./createElementFrom') var RefreshingIndicator = require('./RefreshingIndicator') diff --git a/lib/RefreshableListView.js b/lib/RefreshableListView.js index 3cd2e27..0c364a4 100644 --- a/lib/RefreshableListView.js +++ b/lib/RefreshableListView.js @@ -1,4 +1,4 @@ -var React = require('react-native') +var React = require('react') var { PropTypes, } = React diff --git a/lib/RefreshingIndicator.js b/lib/RefreshingIndicator.js index 394a781..2439dbd 100644 --- a/lib/RefreshingIndicator.js +++ b/lib/RefreshingIndicator.js @@ -1,13 +1,15 @@ -var React = require('react-native') +var React = require('react') +var { + isValidElement, + createElement, + PropTypes, +} = React; var { View, Text, ActivityIndicator, - PropTypes, - StyleSheet, - isValidElement, - createElement, -} = React + StyleSheet +} = require('react-native') var RefreshingIndicator = React.createClass({ propTypes: { diff --git a/lib/createElementFrom.js b/lib/createElementFrom.js index 965ec6b..2b51d75 100644 --- a/lib/createElementFrom.js +++ b/lib/createElementFrom.js @@ -1,4 +1,4 @@ -var React = require('react-native') +var React = require('react') var { cloneElement, createElement, From 73e1524e99e93086a2a027a460fe6418d2b0f53b Mon Sep 17 00:00:00 2001 From: Theopolisme Date: Tue, 5 Jul 2016 09:40:00 -0500 Subject: [PATCH 3/3] lint --- lib/ControlledRefreshableListView.js | 4 ++-- lib/RefreshingIndicator.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ControlledRefreshableListView.js b/lib/ControlledRefreshableListView.js index 5a30a1f..0ed067b 100644 --- a/lib/ControlledRefreshableListView.js +++ b/lib/ControlledRefreshableListView.js @@ -1,7 +1,7 @@ var React = require('react') var { - PropTypes -} = React; + PropTypes, +} = React var { StyleSheet, View, diff --git a/lib/RefreshingIndicator.js b/lib/RefreshingIndicator.js index 2439dbd..7839f88 100644 --- a/lib/RefreshingIndicator.js +++ b/lib/RefreshingIndicator.js @@ -3,12 +3,12 @@ var { isValidElement, createElement, PropTypes, -} = React; +} = React var { View, Text, ActivityIndicator, - StyleSheet + StyleSheet, } = require('react-native') var RefreshingIndicator = React.createClass({