Skip to content

New Room List: Don't clear filters on space change #30903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2025
Merged

New Room List: Don't clear filters on space change #30903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/components/viewmodels/roomlist/useFilteredRooms.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ import RoomListStoreV3, {
type RoomsResult,
} from "../../../stores/room-list-v3/RoomListStoreV3";
import { useEventEmitter } from "../../../hooks/useEventEmitter";
import SpaceStore from "../../../stores/spaces/SpaceStore";
import { UPDATE_SELECTED_SPACE } from "../../../stores/spaces";

/**
* Provides information about a primary filter.
Expand Down Expand Up @@ -74,9 +72,6 @@ export function useFilteredRooms(): FilteredRooms {
setRoomsResult(newRooms);
}, []);

// Reset filters when active space changes
useEventEmitter(SpaceStore.instance, UPDATE_SELECTED_SPACE, () => setPrimaryFilter(undefined));

const filterUndefined = (array: (FilterKey | undefined)[]): FilterKey[] =>
array.filter((f) => f !== undefined) as FilterKey[];

Expand Down
6 changes: 3 additions & 3 deletions test/unit-tests/components/viewmodels/roomlist/RoomListViewModel-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ describe("RoomListViewModel", () => {
expect(vm.current.activePrimaryFilter).toEqual(vm.current.primaryFilters[i]);
});

it("should remove all filters when active space is changed", async () => {
it("should not remove all filters when active space is changed", async () => {
mockAndCreateRooms();
const { result: vm } = renderHook(() => useRoomListViewModel());

Expand All @@ -141,8 +141,8 @@ describe("RoomListViewModel", () => {
// Simulate a space change
await act(() => SpaceStore.instance.emit(UPDATE_SELECTED_SPACE));

// Primary filer should have been unapplied
expect(vm.current.activePrimaryFilter).toEqual(undefined);
// Primary filter should remain unchanged
expect(vm.current.activePrimaryFilter?.name).toEqual("People");
});
});

Expand Down
Loading