mirror of
https://github.com/element-hq/element-web
synced 2024-11-28 20:38:55 +03:00
Merge pull request #58 from matrix-org/rav/yet_more_scroll_fixes
Fix issue with rooms not scrolling down when new events arrive
This commit is contained in:
commit
6ee0c72340
1 changed files with 1 additions and 9 deletions
|
@ -318,11 +318,7 @@ module.exports = React.createClass({
|
||||||
|
|
||||||
if (this.state.searchResults) return;
|
if (this.state.searchResults) return;
|
||||||
|
|
||||||
if (this.needsScrollReset) {
|
this._restoreSavedScrollState();
|
||||||
if (DEBUG_SCROLL) console.log("Resetting scroll position after tile count change");
|
|
||||||
this._restoreSavedScrollState();
|
|
||||||
this.needsScrollReset = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// have to fill space in case we're accepting an invite
|
// have to fill space in case we're accepting an invite
|
||||||
if (!this.state.paginating) this.fillSpace();
|
if (!this.state.paginating) this.fillSpace();
|
||||||
|
@ -683,10 +679,6 @@ module.exports = React.createClass({
|
||||||
}
|
}
|
||||||
++count;
|
++count;
|
||||||
}
|
}
|
||||||
if (count != this.lastEventTileCount) {
|
|
||||||
if (DEBUG_SCROLL) console.log("Queuing scroll reset (event count changed; now "+count+"; was "+this.lastEventTileCount+")");
|
|
||||||
this.needsScrollReset = true;
|
|
||||||
}
|
|
||||||
this.lastEventTileCount = count;
|
this.lastEventTileCount = count;
|
||||||
return ret;
|
return ret;
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue