Fix regression when scrolling in search screen (#2339)

mattermost · Nov 14, 2018 · 8a7dabf · 8a7dabf
1 parent c1b2667
commit 8a7dabf
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/app/screens/search/search.js b/app/screens/search/search.js
@@ -121,9 +121,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();
@@ -702,17 +703,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;
         }