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

Fix home vs all rooms requiring app reload and change default to home

Browse source 
Consolidate ALL_ROOMS and HOME_SPACE storage
Fix behaviour when recalled room is no longer part of the target space
Improve tests
This commit is contained in:
Michael Telatynski 2021-07-27 21:11:47 +01:00
parent ec173e74e6
commit 0a9d3302ba
4 changed files with 100 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/components/views/spaces/SpacePanel.tsx
View file

@ -137,15 +137,22 @@ const InnerSpacePanel = React.memo<IInnerSpacePanelProps>(({ children, isPanelCo
const [invites, spaces, activeSpace] = useSpaces();
const activeSpaces = activeSpace ? [activeSpace] : [];
const homeNotificationState = SpaceStore.spacesTweakAllRoomsEnabled
? RoomNotificationStateStore.instance.globalState : SpaceStore.instance.getNotificationState(HOME_SPACE);
let homeTooltip: string;
let homeNotificationState: NotificationState;
if (SpaceStore.instance.allRoomsInHome) {
homeTooltip = _t("All rooms");
homeNotificationState = RoomNotificationStateStore.instance.globalState;
} else {
homeTooltip = _t("Home");
homeNotificationState = SpaceStore.instance.getNotificationState(HOME_SPACE);
}
return <div className="mx_SpaceTreeLevel">
<SpaceButton
className="mx_SpaceButton_home"
onClick={() => SpaceStore.instance.setActiveSpace(null)}
selected={!activeSpace}
tooltip={SpaceStore.spacesTweakAllRoomsEnabled ? _t("All rooms") : _t("Home")}
tooltip={homeTooltip}
notificationState={homeNotificationState}
isNarrow={isPanelCollapsed}
/>