mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-23 03:25:12 +01:00
Code Issues Projects Releases Wiki Activity

when opening room, focus in grid if already open

Browse Source
This commit is contained in:
Bruno Windels 2020-10-07 13:18:19 +02:00
parent 1ff6d36ec3
commit b9d2da736a
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/domain/session/RoomGridViewModel.js
View File

@ -34,6 +34,9 @@ export class RoomGridViewModel extends ViewModel {
}
setFocusedIndex(idx) {
if (idx === this._selectedIndex) {
return;
}
const oldItem = this._viewModels[this._selectedIndex];
oldItem?.tileVM?.close();
this._selectedIndex = idx;
@ -69,8 +72,8 @@ export class RoomGridViewModel extends ViewModel {
/**
* @package
*/
hasRoomId(roomId) {
return this._viewModels.some(vms => vms?.vm._room.id === roomId);
roomIndex(roomId) {
return this._viewModels.findIndex(vms => vms?.vm._room.id === roomId);
}
/**

8
src/domain/session/SessionViewModel.js
View File

@ -111,8 +111,12 @@ export class SessionViewModel extends ViewModel {
_openRoom(room, roomTileVM) {
// for now, we don't support having the same room opened more than once,
// so bail out if we already have the room open
if (this._gridViewModel?.hasRoomId(room.id)) {
return;
if (this._gridViewModel) {
const roomIndex = this._gridViewModel.roomIndex(room.id);
if (roomIndex >= 0) {
this._gridViewModel.setFocusedIndex(roomIndex);
return;
}
} else if (this._currentRoomViewModel?._room.id === room.id) {
return;
}