Skip to content

fix bug: spinner will appear and disappear indefinetely if user pulls but never releases #24

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
manask88 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix bug: spinner will appear and disappear indefinetely if user pulls but never releases #24

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
55 changes: 27 additions & 28 deletions lib/ControlledRefreshableListView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ var ControlledRefreshableListView = React.createClass({
onResponderRelease: PropTypes.func,
renderHeaderWrapper: (props, propName, componentName) => {
if (props[propName]) {
return new Error("The 'renderHeaderWrapper' prop is no longer used");
return new Error("The 'renderHeaderWrapper' prop is no longer used")
}
},
refreshingIndictatorComponent: (props, propName, componentName) => {
if (props[propName]) {
return new Error("The 'refreshingIndictatorComponent' prop has been renamed to 'refreshingIndicatorComponent'");
return new Error("The 'refreshingIndictatorComponent' prop has been renamed to 'refreshingIndicatorComponent'")
}
},
},
Expand All @@ -64,7 +64,6 @@ var ControlledRefreshableListView = React.createClass({
},
componentWillReceiveProps(nextProps) {
if (!this.props.isRefreshing && nextProps.isRefreshing && this.isTouching) {

this.waitingForRelease = true
this.setState({waitingForRelease: true})
}
Expand Down Expand Up @@ -101,7 +100,7 @@ var ControlledRefreshableListView = React.createClass({

if (this.isTouching || (!this.isTouching && !this.props.ignoreInertialScroll)) {
if (scrollY < -this.props.minPulldownDistance) {
if (!this.props.isRefreshing) {
if (!this.props.isRefreshing && !this.state.waitingForRelease) {
if (this.props.onRefresh) {
this.props.onRefresh()
}
Expand Down Expand Up @@ -139,7 +138,7 @@ var ControlledRefreshableListView = React.createClass({
this.refs[LISTVIEW_REF].setNativeProps(props)
},
isWaitingForRelease() {
return this.waitingForRelease || this.props.waitingForRelease
return this.waitingForRelease || this.state.waitingForRelease
},
isReleaseUpdate(oldProps, oldState, newProps, newState) {
return (
Expand All @@ -153,7 +152,7 @@ var ControlledRefreshableListView = React.createClass({
isRefreshing,
description: refreshDescription,
prompt: refreshPrompt,
pulldownDistance: -(this.lastScrollY || 0)
pulldownDistance: -(this.lastScrollY || 0),
}
return createElementFrom(this.props.refreshingIndicatorComponent, refreshingIndicatorProps)
},
Expand Down Expand Up @@ -181,32 +180,32 @@ var ControlledRefreshableListView = React.createClass({

var stylesheet = StyleSheet.create({
container: {
// flex: 1,
flex: 1,
},
fillParent: {
backgroundColor: 'transparent',
position: 'absolute',
top: 0,
left: 0,
right: 0,
bottom: 0,
},
// offsetParent: {
// position: 'relative',
// },
// positionTopLeft: {
// position: 'absolute',
// top: 0,
// left: 0,
// },
// fill: {
// flex: 1
// },
// center: {
// flex: 1,
// justifyContent: 'space-around',
// alignItems: 'center',
// },
top: 0,
left: 0,
right: 0,
bottom: 0,
},
offsetParent: {
position: 'relative',
},
positionTopLeft: {
position: 'absolute',
top: 0,
left: 0,
},
fill: {
flex: 1,
},
center: {
flex: 1,
justifyContent: 'space-around',
alignItems: 'center',
},
})

ControlledRefreshableListView.DataSource = ListView.DataSource
Expand Down
6 changes: 4 additions & 2 deletions lib/RefreshingIndicator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ var RefreshingIndicator = React.createClass({
activityIndicatorComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
stylesheet: PropTypes.object,
description: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
isRefreshing: PropTypes.bool.isRequired,
prompt: PropTypes.string,
},
getDefaultProps() {
return {
Expand All @@ -23,9 +25,9 @@ var RefreshingIndicator = React.createClass({
renderDescription(styles) {
return (
<Text style={styles.description}>
{this.props.isRefreshing ? this.props.description : this.props.prompt}
{this.props.isRefreshing ? this.props.description : this.props.prompt}
</Text>
);
)
},
renderActivityIndicator(styles) {
if (!this.props.isRefreshing) return null
Expand Down