scroll down when showing typing notif and stuck at bottom

This commit is contained in:
Bruno Windels 2018-11-13 09:15:16 +01:00
parent e2c57ba2ef
commit 8ddd2dd078
2 changed files with 18 additions and 2 deletions

View file

@ -631,6 +631,13 @@ module.exports = React.createClass({
}
},
_scrollDownIfAtBottom: function() {
const scrollPanel = this.refs.scrollPanel;
if (scrollPanel) {
scrollPanel.checkScroll();
}
},
onResize: function() {
dis.dispatch({ action: 'timeline_resize' }, true);
},
@ -667,7 +674,7 @@ module.exports = React.createClass({
stickyBottom={this.props.stickyBottom}>
{ topSpinner }
{ this._getEventTiles() }
<WhoIsTypingTile room={this.props.room} />
<WhoIsTypingTile room={this.props.room} onVisible={this._scrollDownIfAtBottom} />
{ bottomSpinner }
</ScrollPanel>
);

View file

@ -29,7 +29,7 @@ module.exports = React.createClass({
propTypes: {
// the room this statusbar is representing.
room: PropTypes.object.isRequired,
onVisible: PropTypes.func,
// Number of names to display in typing indication. E.g. set to 3, will
// result in "X, Y, Z and 100 others are typing."
whoIsTypingLimit: PropTypes.number,
@ -51,6 +51,15 @@ module.exports = React.createClass({
MatrixClientPeg.get().on("RoomMember.typing", this.onRoomMemberTyping);
},
componentDidUpdate: function(_, prevState) {
if (this.props.onVisible &&
!prevState.usersTyping.length &&
this.state.usersTyping.length)
{
this.props.onVisible();
}
},
componentWillUnmount: function() {
// we may have entirely lost our client as we're logging out before clicking login on the guest bar...
const client = MatrixClientPeg.get();