Merge pull request #2811 from matrix-org/bwindels/disable-typing-jump-prevention

Hotfix: disable typing notifs jumping prevention for now
pull/21833/head
Bruno Windels 2019-03-21 10:19:40 +00:00 committed by GitHub
commit 03dbc0b2cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 27 deletions

View File

@ -216,8 +216,6 @@ module.exports = React.createClass({
this._lastSetScroll = undefined; this._lastSetScroll = undefined;
} }
this._checkBlockShrinking();
this.props.onScroll(ev); this.props.onScroll(ev);
this.checkFillState(); this.checkFillState();
@ -234,7 +232,6 @@ module.exports = React.createClass({
// where it ought to be, and set off pagination requests if necessary. // where it ought to be, and set off pagination requests if necessary.
checkScroll: function() { checkScroll: function() {
this._restoreSavedScrollState(); this._restoreSavedScrollState();
this._checkBlockShrinking();
this.checkFillState(); this.checkFillState();
}, },
@ -691,36 +688,14 @@ module.exports = React.createClass({
* jumping when the typing indicator gets replaced by a smaller message. * jumping when the typing indicator gets replaced by a smaller message.
*/ */
blockShrinking: function() { blockShrinking: function() {
const messageList = this.refs.itemlist; // Disabled for now because of https://github.com/vector-im/riot-web/issues/9205
if (messageList) {
const currentHeight = messageList.clientHeight;
messageList.style.minHeight = `${currentHeight}px`;
}
}, },
/** /**
* Clear the previously set min height * Clear the previously set min height
*/ */
clearBlockShrinking: function() { clearBlockShrinking: function() {
const messageList = this.refs.itemlist; // Disabled for now because of https://github.com/vector-im/riot-web/issues/9205
if (messageList) {
messageList.style.minHeight = null;
}
},
_checkBlockShrinking: function() {
const sn = this._getScrollNode();
const scrollState = this.scrollState;
if (!scrollState.stuckAtBottom) {
const spaceBelowViewport = sn.scrollHeight - (sn.scrollTop + sn.clientHeight);
// only if we've scrolled up 200px from the bottom
// should we clear the min-height used by the typing notifications,
// otherwise we might still see it jump as the whitespace disappears
// when scrolling up from the bottom
if (spaceBelowViewport >= 200) {
this.clearBlockShrinking();
}
}
}, },
render: function() { render: function() {