Check initialIndex in callback (#3065)

mattermost · Aug 1, 2019 · 361528d · 361528d
1 parent f71d956
commit 361528d
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/app/components/post_list/post_list.js b/app/components/post_list/post_list.js
@@ -201,10 +201,8 @@ export default class PostList extends PureComponent {
     };
 
     handleScrollToIndexFailed = () => {
-        requestAnimationFrame(() => {
-            this.hasDoneInitialScroll = false;
-            this.scrollToInitialIndexIfNeeded(1, 1);
-        });
+        this.hasDoneInitialScroll = false;
+        this.scrollToInitialIndexIfNeeded(1, 1);
     };
 
     handleSetScrollToBottom = () => {
@@ -291,11 +289,10 @@ export default class PostList extends PureComponent {
         if (
             width > 0 &&
             height > 0 &&
-            this.props.initialIndex > 0 &&
             !this.hasDoneInitialScroll
         ) {
             requestAnimationFrame(() => {
-                if (this.flatListRef?.current) {
+                if (this.props.initialIndex > 0 && this.flatListRef?.current) {
                     this.flatListRef.current.scrollToIndex({
                         animated: false,
                         index: this.props.initialIndex,