matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Code Activity

emit focus_composer after updating the active room in GroupGridView

Browse Source 
also change the active room from there so RoomView is oblivious
to grid view stuff
This commit is contained in:
Bruno Windels
2018-11-22 15:13:03 +00:00
parent fbfbefe4fe
commit 9a24249fb5
3 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/structures/RoomView.js
View File

@ -1470,10 +1470,6 @@ module.exports = React.createClass({
}
},
_onMainClicked: function() {
dis.dispatch({action: 'group_grid_set_active', room_id: this.state.room.roomId });
},
render: function() {
const RoomHeader = sdk.getComponent('rooms.RoomHeader');
const MessageComposer = sdk.getComponent('rooms.MessageComposer');
@ -1821,7 +1817,7 @@ module.exports = React.createClass({
const rightPanel = this.state.room ? <RightPanel roomId={this.state.room.roomId} /> : undefined;
return (
<main className={"mx_RoomView" + (inCall ? " mx_RoomView_inCall" : "")} ref="roomView" onClick={this._onMainClicked}>
<main className={"mx_RoomView" + (inCall ? " mx_RoomView_inCall" : "")} ref="roomView">
<RoomHeader ref="header" room={this.state.room} searchInfo={searchInfo}
oobData={this.props.oobData}
editing={this.state.editingRoomSettings}