Fix unnecessary loadMore calls when the end of a timeline has been reached (mastodon#9581)

ClearlyClaire · hiyuki2578 · commit bf7283f32ddc · 2019-10-02T10:03:42.000+09:00
Fixes mastodon#9568
diff --git a/app/javascript/mastodon/components/scrollable_list.js b/app/javascript/mastodon/components/scrollable_list.js
@@ -49,7 +49,7 @@ export default class ScrollableList extends PureComponent {
       const { scrollTop, scrollHeight, clientHeight } = this.node;
       const offset = scrollHeight - scrollTop - clientHeight;
 
-      if (400 > offset && this.props.onLoadMore && !this.props.isLoading) {
+      if (400 > offset && this.props.onLoadMore && this.props.hasMore && !this.props.isLoading) {
         this.props.onLoadMore();
       }
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ export default class ScrollableList extends PureComponent {`
`49`	`49`	`const { scrollTop, scrollHeight, clientHeight } = this.node;`
`50`	`50`	`const offset = scrollHeight - scrollTop - clientHeight;`
`51`	`51`
`52`		`- if (400 > offset && this.props.onLoadMore && !this.props.isLoading) {`
	`52`	`+ if (400 > offset && this.props.onLoadMore && this.props.hasMore && !this.props.isLoading) {`
`53`	`53`	`this.props.onLoadMore();`
`54`	`54`	`}`
`55`	`55`