Merge branch 'develop' into travis/3pid-invites

This commit is contained in:
Travis Ralston 2020-09-14 11:50:08 -06:00
commit 61e8d3e3d7
8 changed files with 130 additions and 27 deletions

View file

@ -198,7 +198,8 @@ export default class ScrollPanel extends React.Component {
}
onScroll = ev => {
if (this.props.resizeNotifier.isResizing) return; // skip scroll events caused by resizing
// skip scroll events caused by resizing
if (this.props.resizeNotifier && this.props.resizeNotifier.isResizing) return;
debuglog("onScroll", this._getScrollNode().scrollTop);
this._scrollTimeout.restart();
this._saveScrollState();