imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

25
src/components/structures/GroupGridView.js
View file

@ -28,10 +28,22 @@ export default class RoomGridView extends React.Component {
super(props);
this.state = {
roomStores: OpenRoomsStore.getRoomStores(),
activeRoomStore: OpenRoomsStore.getActiveRoomStore(),
};
this.onRoomsChanged = this.onRoomsChanged.bind(this);
}
componentDidUpdate(_, prevState) {
const store = this.state.activeRoomStore;
if (store) {
store.getDispatcher().dispatch({action: 'focus_composer'});
}
}
componentDidMount() {
this.componentDidUpdate();
}
componentWillMount() {
this._unmounted = false;
this._openRoomsStoreRegistration = OpenRoomsStore.addListener(this.onRoomsChanged);
@ -61,6 +73,16 @@ export default class RoomGridView extends React.Component {
}
}
_setActive(i) {
const store = OpenRoomsStore.getRoomStoreAt(i);
if (store !== this.state.activeRoomStore) {
dis.dispatch({
action: 'group_grid_set_active',
room_id: store.getRoomId(),
});
}
}
render() {
let roomStores = this.state.roomStores.slice(0, 6);
const emptyCount = 6 - roomStores.length;
@ -76,10 +98,11 @@ export default class RoomGridView extends React.Component {
"mx_GroupGridView_tile": true,
"mx_GroupGridView_activeTile": isActive,
});
return (<section key={roomStore.getRoomId()} className={tileClasses}>
return (<section onClick={() => {this._setActive(i)}} key={roomStore.getRoomId()} className={tileClasses}>
<RoomView
collapsedRhs={true}
roomViewStore={roomStore}
isActive={isActive}
/>
</section>);
} else {