e2m/dispatch
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent autoscroll flag being cleared on mount by initial scroll tick

Browse Source
This commit is contained in:
Ken-Håvard Lieng 2017-05-08 23:22:53 +02:00
parent 909c31dff8
commit 4dd9671e87
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
assets/bindata.go
View File

File diff suppressed because one or more lines are too long

25
client/src/js/components/MessageBox.js
View File

@ -13,6 +13,7 @@ export default class MessageBox extends PureComponent {
} }
componentDidMount() { componentDidMount() {
this.mounted = true;
this.scrollTop = -1; this.scrollTop = -1;
} }
@ -113,19 +114,21 @@ export default class MessageBox extends PureComponent {
}, 100); }, 100);
handleScroll = ({ scrollTop, clientHeight, scrollHeight }) => { handleScroll = ({ scrollTop, clientHeight, scrollHeight }) => {
if (this.props.hasMoreMessages && if (this.mounted) {
scrollTop <= fetchThreshold && if (this.props.hasMoreMessages &&
scrollTop < this.prevScrollTop && scrollTop <= fetchThreshold &&
!this.loading) { scrollTop < this.prevScrollTop &&
if (this.mouseDown) { !this.loading) {
this.shouldFetch = true; if (this.mouseDown) {
} else { this.shouldFetch = true;
this.fetchMore(); } else {
this.fetchMore();
}
} }
}
this.bottom = scrollTop + clientHeight >= scrollHeight - 10; this.bottom = scrollTop + clientHeight >= scrollHeight - 10;
this.prevScrollTop = scrollTop; this.prevScrollTop = scrollTop;
}
}; };
handleMouseDown = () => { handleMouseDown = () => {