OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

dont render who is typing tile when no room available (like in notif panel)

pull/21833/head
Bruno Windels 2018-11-30 13:53:30 +01:00
parent 8f4292399b
commit 0212df922a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/structures/MessagePanel.js
View File

@ -664,6 +664,11 @@ module.exports = React.createClass({
}, },
); );
let whoIsTyping;
if (this.props.room) {
whoIsTyping = (<WhoIsTypingTile room={this.props.room} onVisible={this._scrollDownIfAtBottom} />);
}
return ( return (
<ScrollPanel ref="scrollPanel" className={className} <ScrollPanel ref="scrollPanel" className={className}
onScroll={this.props.onScroll} onScroll={this.props.onScroll}
@ -674,7 +679,7 @@ module.exports = React.createClass({
stickyBottom={this.props.stickyBottom}> stickyBottom={this.props.stickyBottom}>
{ topSpinner } { topSpinner }
{ this._getEventTiles() } { this._getEventTiles() }
<WhoIsTypingTile room={this.props.room} onVisible={this._scrollDownIfAtBottom} /> { whoIsTyping }
{ bottomSpinner } { bottomSpinner }
</ScrollPanel> </ScrollPanel>
); );