OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2638 from matrix-org/bwindels/typingnotifswhitespacefix2 

Fix excessive timeline whitespace
pull/21833/head
Bruno Windels 2019-02-14 16:38:20 +01:00 committed by GitHub
parent 690f3ede12 9e260ad96b
commit abf96fd420
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/structures/ScrollPanel.js
View File

@ -211,6 +211,14 @@ module.exports = React.createClass({
// forget what we wanted, so don't overwrite the saved state unless // forget what we wanted, so don't overwrite the saved state unless
// this appears to be a user-initiated scroll. // this appears to be a user-initiated scroll.
if (sn.scrollTop != this._lastSetScroll) { if (sn.scrollTop != this._lastSetScroll) {
// when scrolling, we don't care about disappearing typing notifs shrinking the timeline
// this might cause the scrollbar to resize in case the max-height was not correct
// but that's better than ending up with a lot of whitespace at the bottom of the timeline.
// we need to above check because when showing the typing notifs, an onScroll event is also triggered
if (!this.isAtBottom()) {
this.clearBlockShrinking();
}
this._saveScrollState(); this._saveScrollState();
} else { } else {
debuglog("Ignoring scroll echo"); debuglog("Ignoring scroll echo");