tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into merge-upstream

Browse Source
This commit is contained in:
David Yip
2018-05-04 03:23:57 -05:00
parent 2d392fb3b8 c61ddd8249
commit da70208b45
10 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/components/scrollable_list.js
View File

@ -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;