mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-23 09:46:09 +03:00
Code Issues Projects Releases Packages Wiki Activity

restore scroll position after hiding typing notifs with checkScroll

Browse source
This commit is contained in:
Bruno Windels 2019-03-20 17:38:05 +01:00
parent 85d305430f
commit 3e13a11372
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/structures/MessagePanel.js
View file

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

3
src/components/structures/ScrollPanel.js
View file

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