Skip to content

Make compatible with RN 0.26.1 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
digitalcatnip wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make compatible with RN 0.26.1 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
'use strict';

var React = require('react-native');
import React, { Component, } from 'react';
var tweenState = require('react-tween-state');

var {
import {
Image,
StyleSheet,
TouchableHighlight,
View
} = React;
} from 'react-native';

var styles = require('./styles');
var images = require('./images');
Expand All @@ -18,31 +18,31 @@ var SPIN_DURATION = 1000;
var ProgressHUDMixin = {
getInitialState() {
return {
is_hud_visible: false
is_hud_visible: false,
};
},

showProgressHUD() {
this.setState({
is_hud_visible: true
is_hud_visible: true,
});
},

dismissProgressHUD() {
this.setState({
is_hud_visible: false
is_hud_visible: false,
});
},

childContextTypes: {
showProgressHUD: React.PropTypes.func,
dismissProgressHUD: React.PropTypes.func
dismissProgressHUD: React.PropTypes.func,
},

getChildContext() {
return {
showProgressHUD: this.showProgressHUD,
dismissProgressHUD: this.dismissProgressHUD
dismissProgressHUD: this.dismissProgressHUD,
};
},
};
Expand All @@ -52,11 +52,11 @@ var ProgressHUD = React.createClass({

contextTypes: {
showProgressHUD: React.PropTypes.func.isRequired,
dismissProgressHUD: React.PropTypes.func
dismissProgressHUD: React.PropTypes.func,
},

statics: {
Mixin: ProgressHUDMixin
Mixin: ProgressHUDMixin,
},

propTypes: {
Expand Down Expand Up @@ -98,7 +98,7 @@ var ProgressHUD = React.createClass({
this.tweenState('rotate_deg', {
easing: tweenState.easingTypes.linear,
duration: SPIN_DURATION,
endValue: this.state.rotate_deg === 0 ? 360 : this.state.rotate_deg + 360
endValue: this.state.rotate_deg === 0 ? 360 : this.state.rotate_deg + 360,
});
},

Expand All @@ -124,27 +124,27 @@ var ProgressHUD = React.createClass({
<TouchableHighlight
key="ProgressHUD"
style={[styles.overlay, {
backgroundColor: this.props.overlayColor
backgroundColor: this.props.overlayColor,
}]}
onPress={this._clickHandler}
underlayColor={this.props.overlayColor}
activeOpacity={1}
>
<View
style={[styles.container, {
left: this.getTweeningValue('left')
left: this.getTweeningValue('left'),
}]}
>
<Image
style={[styles.spinner, {
backgroundColor: this.props.color,
transform: [
{rotate: deg}
]
{ rotate: deg },
],
}]}
source={{
uri: 'data:image/png;base64,' + images['1x'],
isStatic: true
isStatic: true,
}}
>
<View style={styles.inner_spinner}>
Expand All @@ -154,7 +154,7 @@ var ProgressHUD = React.createClass({
</TouchableHighlight>
/*jshint ignore:end */
);
}
},
});


Expand Down
3 changes: 1 addition & 2 deletions src/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
'use strict';

var React = require('react-native');

var { StyleSheet } = React;
import { StyleSheet } from 'react-native';

var styles = StyleSheet.create({
overlay: {
Expand Down