OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve edge cases with spaces context switching

pull/21833/head
Michael Telatynski 2021-04-22 08:22:11 +01:00
parent 68fb9a78c4
commit ee80c27b2b
1 changed files with 40 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/stores/SpaceStore.tsx
View File

@ -110,30 +110,32 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
return this._suggestedRooms; return this._suggestedRooms;
} }
public async setActiveSpace(space: Room | null) { public async setActiveSpace(space: Room | null, contextSwitch = true) {
if (space === this.activeSpace) return; if (space === this.activeSpace) return;
this._activeSpace = space; this._activeSpace = space;
this.emit(UPDATE_SELECTED_SPACE, this.activeSpace); this.emit(UPDATE_SELECTED_SPACE, this.activeSpace);
this.emit(SUGGESTED_ROOMS, this._suggestedRooms = []); this.emit(SUGGESTED_ROOMS, this._suggestedRooms = []);
// view last selected room from space if (contextSwitch) {
const roomId = window.localStorage.getItem(getLastViewedRoomsStorageKey(this.activeSpace)); // view last selected room from space
const roomId = window.localStorage.getItem(getLastViewedRoomsStorageKey(this.activeSpace));
if (roomId && this.matrixClient?.getRoom(roomId)?.getMyMembership() === "join") { if (roomId && this.matrixClient?.getRoom(roomId)?.getMyMembership() === "join") {
defaultDispatcher.dispatch({ defaultDispatcher.dispatch({
action: "view_room", action: "view_room",
room_id: roomId, room_id: roomId,
}); });
} else if (space) { } else if (space) {
defaultDispatcher.dispatch({ defaultDispatcher.dispatch({
action: "view_room", action: "view_room",
room_id: space.roomId, room_id: space.roomId,
}); });
} else { } else {
defaultDispatcher.dispatch({ defaultDispatcher.dispatch({
action: "view_home_page", action: "view_home_page",
}); });
}
} }
// persist space selected // persist space selected
@ -512,36 +514,30 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
switch (payload.action) { switch (payload.action) {
case "view_room": { case "view_room": {
const room = this.matrixClient?.getRoom(payload.room_id); const room = this.matrixClient?.getRoom(payload.room_id);
if (!room) break;
// persist last viewed room from a space if (room.isSpaceRoom()) {
this.setActiveSpace(room);
// Don't save if the room is a space room. This would cause a problem: } else if (!this.getSpaceFilteredRoomIds(this.activeSpace).has(room.roomId)) {
// When switching to a space home, we first view that room and // TODO maybe reverse these first 2 clauses once space panel active is fixed
// only after that we switch to that space. This causes us to let parent = this.rootSpaces.find(s => this.spaceFilteredRooms.get(s.roomId)?.has(room.roomId));
// save the space home to be the last viewed room in the home if (!parent) {
// space. parent = this.getCanonicalParent(room.roomId);
if (room && !room.isSpaceRoom()) { }
window.localStorage.setItem(getLastViewedRoomsStorageKey(this.activeSpace), payload.room_id); if (!parent) {
} const parents = Array.from(this.parentMap.get(room.roomId) || []);
parent = parents.find(p => this.matrixClient.getRoom(p));
if (room?.getMyMembership() === "join") { }
if (room.isSpaceRoom()) { if (parent) {
this.setActiveSpace(room); // don't trigger a context switch when we are switching a space to match the chosen room
} else if (!this.spaceFilteredRooms.get(this._activeSpace?.roomId || HOME_SPACE).has(room.roomId)) { this.setActiveSpace(parent, false);
// 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));
if (!parent) {
parent = this.getCanonicalParent(room.roomId);
}
if (!parent) {
const parents = Array.from(this.parentMap.get(room.roomId) || []);
parent = parents.find(p => this.matrixClient.getRoom(p));
}
if (parent) {
this.setActiveSpace(parent);
}
} }
} }
// Persist last viewed room from a space
// we don't await setActiveSpace above as we only care about this.activeSpace being up to date
// synchronously for the below code - everything else can and should be async.
window.localStorage.setItem(getLastViewedRoomsStorageKey(this.activeSpace), payload.room_id);
break; break;
} }
case "after_leave_room": case "after_leave_room":