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

take (potentially clipped) content height into account for filling

pull/21833/head
Bruno Windels 2019-03-19 16:51:39 +01:00
parent 469511aa44
commit 2bcced72ad
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,11 +298,14 @@ module.exports = React.createClass({
// `---------' - // `---------' -
// //
if (sn.scrollTop < sn.clientHeight) { const contentHeight = this._getMessagesHeight();
const contentTop = contentHeight - this._getListHeight();
const contentScrollTop = sn.scrollTop + contentTop;
if (contentScrollTop < sn.clientHeight) {
// need to back-fill // need to back-fill
this._maybeFill(true); this._maybeFill(true);
} }
if (sn.scrollTop > sn.scrollHeight - sn.clientHeight * 2) { if (contentScrollTop > contentHeight - sn.clientHeight * 2) {
// need to forward-fill // need to forward-fill
this._maybeFill(false); this._maybeFill(false);
} }