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

fix filling conditions

pull/21833/head
Bruno Windels 2019-03-27 11:35:38 +01:00
parent f2f3661b7e
commit 5d53913e35
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,17 +317,20 @@ module.exports = React.createClass({
this._isFilling = true; this._isFilling = true;
} }
const itemlist = this.refs.itemlist;
const contentHeight = this._getMessagesHeight(); const firstTile = itemlist && itemlist.firstElementChild;
const contentTop = contentHeight - this._getListHeight(); const contentTop = firstTile && firstTile.offsetTop;
const contentScrollTop = sn.scrollTop + contentTop;
const fillPromises = []; const fillPromises = [];
if (contentScrollTop < sn.clientHeight) { // if scrollTop gets to 1 screen from the top of the first tile,
// try backward filling
if (!firstTile || (sn.scrollTop - contentTop) < sn.clientHeight) {
// need to back-fill // need to back-fill
fillPromises.push(this._maybeFill(depth, true)); fillPromises.push(this._maybeFill(depth, true));
} }
if (contentScrollTop > contentHeight - sn.clientHeight * 2) { // if scrollTop gets to 2 screens from the end (so 1 screen below viewport),
// try forward filling
if ((sn.scrollHeight - sn.scrollTop) < sn.clientHeight * 2) {
// need to forward-fill // need to forward-fill
fillPromises.push(this._maybeFill(depth, false)); fillPromises.push(this._maybeFill(depth, false));
} }