restore scroll position after hiding typing notifs with checkScroll

pull/21833/head
Bruno Windels 2019-03-20 17:38:05 +01:00
parent 85d305430f
commit 3e13a11372
2 changed files with 3 additions and 3 deletions

View File

@ -647,6 +647,9 @@ module.exports = React.createClass({
// update the scrollPanel, we tell it to apply
// the shrinking prevention once the typing notifs are hidden
scrollPanel.updatePreventShrinking();
// order is important here as checkScroll will scroll down to
// reveal added padding to balance the notifs disappearing.
scrollPanel.checkScroll();
}
},

View File

@ -789,9 +789,6 @@ module.exports = React.createClass({
const offsetDiff = offsetFromBottom - currentOffset;
if (offsetDiff > 0) {
balanceElement.style.paddingBottom = `${offsetDiff}px`;
if (this.scrollState.stuckAtBottom) {
sn.scrollTop = sn.scrollHeight;
}
debuglog("update prevent shrinking ", offsetDiff, "px from bottom");
} else if (offsetDiff < 0) {
shouldClear = true;