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

take into account that node might not be in DOM while updating height

pull/21833/head
Bruno Windels 2019-03-20 11:00:27 +01:00
parent 88f039fe44
commit c306181fcd
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -624,12 +624,18 @@ module.exports = React.createClass({
this._bottomGrowth = 0;
const newHeight = this._getListHeight();
if (this.scrollState.stuckAtBottom) {
const scrollState = this.scrollState;
if (scrollState.stuckAtBottom) {
itemlist.style.height = `${newHeight}px`;
sn.scrollTop = sn.scrollHeight;
debuglog("xxx updateHeight to", newHeight);
} else {
} else if (scrollState.trackedScrollToken) {
const trackedNode = this._getTrackedNode();
// if the timeline has been reloaded
// this can be called before scrollToBottom or whatever has been called
// so don't do anything of the node has disappeared from
// the currently filled piece of the timeline
if (trackedNode) {
const oldTop = trackedNode.offsetTop;
itemlist.style.height = `${newHeight}px`;
const newTop = trackedNode.offsetTop;
@ -637,6 +643,7 @@ module.exports = React.createClass({
sn.scrollTop = sn.scrollTop + topDiff;
debuglog("xxx updateHeight to", newHeight, topDiff, Date.now() - startTs);
}
}
},
_getTrackedNode() {