From 33dc0aacaa144fa7487ef764bdfaa89426517ec6 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Mon, 9 Feb 2026 14:19:02 +0200 Subject: [PATCH] Show the empty room list state when filtering by a space that has no children. --- ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift | 4 +++- .../Services/Room/RoomSummary/RoomSummaryProvider.swift | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift b/ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift index 190cb6a94..225b67c37 100644 --- a/ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift +++ b/ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift @@ -137,7 +137,9 @@ struct HomeScreenViewState: BindableState { } var shouldShowEmptyFilterState: Bool { - !bindings.isSearchFieldFocused && bindings.filtersState.isFiltering && visibleRooms.isEmpty + !bindings.isSearchFieldFocused && + (bindings.filtersState.isFiltering || selectedSpaceFilter != nil) && + visibleRooms.isEmpty } var shouldShowFilters: Bool { diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift index e166677ed..82c56803b 100644 --- a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift +++ b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift @@ -136,9 +136,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol { case .rooms(let roomIDs, let filters): var rustFilters = filters.map(\.rustFilter) + baseFilter - if !roomIDs.isEmpty { - rustFilters.append(.identifiers(identifiers: Array(roomIDs))) - } + rustFilters.append(.identifiers(identifiers: Array(roomIDs))) if !filters.contains(.lowPriority), appSettings.lowPriorityFilterEnabled { rustFilters.append(.nonLowPriority)