Skip to content

reload only when user release pulling and it is cross min distance then #31

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

reload only when user release pulling and it is cross min distance then #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae4849f
update
Nov 23, 2015
2eba042
reload only if user release it when pulling down cross min distance
Nov 23, 2015
440d5a6
change code style for unified
Nov 29, 2015
917a6be
change code style
Nov 29, 2015
68b05a6
change code style of origin code ( code not added by me) for eslint c…
Nov 30, 2015
0250cdb
change code style of origin code ( code not added by me) for eslint c…
Nov 30, 2015
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
28 changes: 15 additions & 13 deletions lib/ControlledRefreshableListView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,15 @@ var ControlledRefreshableListView = React.createClass({
onScroll: PropTypes.func,
onResponderGrant: PropTypes.func,
onResponderRelease: PropTypes.func,
waitingForRelease: PropTypes.bool,
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 +65,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,11 +101,9 @@ var ControlledRefreshableListView = React.createClass({

if (this.isTouching || (!this.isTouching && !this.props.ignoreInertialScroll)) {
if (scrollY < -this.props.minPulldownDistance) {
if (!this.props.isRefreshing) {
if (this.props.onRefresh) {
this.props.onRefresh()
}
}
!this.props.isRefreshing && (this.needRefresh = true)
} else if (this.needRefresh) {
this.needRefresh = false
}
}

Expand All @@ -123,6 +121,10 @@ var ControlledRefreshableListView = React.createClass({
this.waitingForRelease = false
this.setState({waitingForRelease: false})
}
if (this.needRefresh) {
this.needRefresh = false
this.props.onRefresh && this.props.onRefresh()
}
if (this.props.onResponderRelease) {
this.props.onResponderRelease.apply(null, arguments)
}
Expand Down Expand Up @@ -153,7 +155,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 @@ -186,10 +188,10 @@ var stylesheet = StyleSheet.create({
fillParent: {
backgroundColor: 'transparent',
position: 'absolute',
top: 0,
left: 0,
right: 0,
bottom: 0,
top: 0,
left: 0,
right: 0,
bottom: 0,
},
// offsetParent: {
// position: 'relative',
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,
prompt: PropTypes.object,
},
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