Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Space Panel use SettingsStore instead of SpaceStore as source of truth (
Browse files Browse the repository at this point in the history
  • Loading branch information
t3chguy authored Dec 17, 2021
1 parent 63e69d9 commit 6761ef9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 1 addition & 3 deletions src/components/views/spaces/SpacePanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,7 @@ export const HomeButtonContextMenu = ({
hideHeader,
...props
}: ComponentProps<typeof SpaceContextMenu>) => {
const allRoomsInHome = useEventEmitterState(SpaceStore.instance, UPDATE_HOME_BEHAVIOUR, () => {
return SpaceStore.instance.allRoomsInHome;
});
const allRoomsInHome = useSettingValue<boolean>("Spaces.allRoomsInHome");

return <IconizedContextMenu
{...props}
Expand Down
7 changes: 5 additions & 2 deletions src/stores/spaces/SpaceStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,9 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
private _invitedSpaces = new Set<Room>();
private spaceOrderLocalEchoMap = new Map<string, string>();
private _restrictedJoinRuleSupport?: IRoomCapability;
private _allRoomsInHome: boolean = SettingsStore.getValue("Spaces.allRoomsInHome");
private _enabledMetaSpaces: MetaSpace[] = []; // set by onReady
// The following properties are set by onReady as they live in account_data
private _allRoomsInHome = false;
private _enabledMetaSpaces: MetaSpace[] = [];

constructor() {
super(defaultDispatcher, {});
Expand Down Expand Up @@ -1042,6 +1043,8 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
const enabledMetaSpaces = SettingsStore.getValue("Spaces.enabledMetaSpaces");
this._enabledMetaSpaces = metaSpaceOrder.filter(k => enabledMetaSpaces[k]) as MetaSpace[];

this._allRoomsInHome = SettingsStore.getValue("Spaces.allRoomsInHome");

this.rebuildSpaceHierarchy(); // trigger an initial update

// restore selected state from last session if any and still valid
Expand Down

0 comments on commit 6761ef9

Please sign in to comment.