Do not re-position scroll when loading more (inserting items from below) (#7344)

7 years ago · 554653a423
parent 854d974499
commit 554653a423
1 changed files with 1 additions and 1 deletions
--- a/app/javascript/mastodon/components/scrollable_list.js
+++ b/app/javascript/mastodon/components/scrollable_list.js
@ -72,7 +72,7 @@ export default class ScrollableList extends PureComponent {
    const someItemInserted = React.Children.count(prevProps.children) > 0 &&
      React.Children.count(prevProps.children) < React.Children.count(this.props.children) &&
      this.getFirstChildKey(prevProps) !== this.getFirstChildKey(this.props);
-    if (someItemInserted && this.node.scrollTop > 0 || this.state.mouseOver) {
+    if (someItemInserted && this.node.scrollTop > 0 || (this.state.mouseOver && !prevProps.isLoading)) {
      return this.node.scrollHeight - this.node.scrollTop;
    } else {
      return null;