michael/cinny
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity

Fix open room from search always open same space

Browse source
This commit is contained in:
Ajay Bura 2022-08-21 08:51:13 +05:30
parent 715e6648ae
commit 76c16ce294
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/client/state/navigation.js
View file

@ -39,7 +39,7 @@ class Navigation extends EventEmitter {
} }
_mapRoomToSpace(roomId) { _mapRoomToSpace(roomId) {
const { roomList } = this.initMatrix; const { roomList, accountData } = this.initMatrix;
if ( if (
this.selectedTab === cons.tabs.HOME this.selectedTab === cons.tabs.HOME
&& roomList.rooms.has(roomId) && roomList.rooms.has(roomId)
@ -61,13 +61,21 @@ class Navigation extends EventEmitter {
const parents = roomList.roomIdToParents.get(roomId); const parents = roomList.roomIdToParents.get(roomId);
if (!parents) return; if (!parents) return;
if (parents.has(this.selectedSpaceId)) {
[...parents].forEach((pId) => { this.spaceToRoom.set(this.selectedSpaceId, {
this.spaceToRoom.set(pId, {
roomId, roomId,
timestamp: Date.now(), timestamp: Date.now(),
}); });
}); } else if (accountData.categorizedSpaces.has(this.selectedSpaceId)) {
const categories = roomList.getCategorizedSpaces([this.selectedSpaceId]);
const parent = [...parents].find((pId) => categories.has(pId));
if (parent) {
this.spaceToRoom.set(parent, {
roomId,
timestamp: Date.now(),
});
}
}
} }
_selectRoom(roomId, eventId) { _selectRoom(roomId, eventId) {