toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix regression when scrolling in search screen (#2339)

Browse source
This commit is contained in:
Elias Nahum 2018-11-14 10:51:29 -03:00 committed by GitHub
parent 67611d0c22
commit e1b1635cf1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
app/screens/search/search.js
View file

@ -120,9 +120,10 @@ export default class Search extends PureComponent {
componentDidUpdate(prevProps) {
const {searchingStatus: status, recent, enableDateSuggestion} = this.props;
const shouldScroll = status === RequestStatus.SUCCESS &&
!this.props.isSearchGettingMore &&
!prevProps.isSearchGettingMore;
const {searchingStatus: prevStatus} = prevProps;
const shouldScroll = prevStatus !== status &&
(status === RequestStatus.SUCCESS || status === RequestStatus.STARTED) &&
!this.props.isSearchGettingMore && !prevProps.isSearchGettingMore;
if (this.props.isLandscape !== prevProps.isLandscape) {
this.refs.searchBar.blur();
@ -701,17 +702,21 @@ export default class Search extends PureComponent {
}
break;
case RequestStatus.FAILURE:
results = [{
id: RequestStatus.FAILURE,
component: (
<View style={style.searching}>
<PostListRetry
retry={this.retry}
theme={theme}
/>
</View>
),
}];
if (postIds.length) {
results = postIds;
} else {
results = [{
id: RequestStatus.FAILURE,
component: (
<View style={style.searching}>
<PostListRetry
retry={this.retry}
theme={theme}
/>
</View>
),
}];
}
break;
}