Merge pull request #5924 from matrix-org/t3chguy/fix/17069
Disable spaces context switching for when exploring a spacepull/21833/head
commit
62f8c9aab9
|
@ -543,7 +543,9 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
|
||||||
// persist last viewed room from a space
|
// persist last viewed room from a space
|
||||||
|
|
||||||
if (room.isSpaceRoom()) {
|
if (room.isSpaceRoom()) {
|
||||||
this.setActiveSpace(room);
|
// Don't context switch when navigating to the space room
|
||||||
|
// as it will cause you to end up in the wrong room
|
||||||
|
this.setActiveSpace(room, false);
|
||||||
} else if (!this.getSpaceFilteredRoomIds(this.activeSpace).has(room.roomId)) {
|
} else if (!this.getSpaceFilteredRoomIds(this.activeSpace).has(room.roomId)) {
|
||||||
// TODO maybe reverse these first 2 clauses once space panel active is fixed
|
// TODO maybe reverse these first 2 clauses once space panel active is fixed
|
||||||
let parent = this.rootSpaces.find(s => this.spaceFilteredRooms.get(s.roomId)?.has(room.roomId));
|
let parent = this.rootSpaces.find(s => this.spaceFilteredRooms.get(s.roomId)?.has(room.roomId));
|
||||||
|
|
Loading…
Reference in New Issue