swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-11 13:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2652 - Room list looping and fighting scrolling after filtering

Browse Source 
- also fixes filtering empty state vertical centering
This commit is contained in:
Stefan Ceriu 2024-04-23 12:16:10 +03:00
parent 23d5089287
commit 89927f1357
3 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift
View File

@ -121,6 +121,18 @@ struct HomeScreenViewState: BindableState {
var shouldShowEmptyFilterState: Bool {
!bindings.isSearchFieldFocused && bindings.filtersState.isFiltering && visibleRooms.isEmpty
}
var shouldShowFilters: Bool {
!bindings.isSearchFieldFocused
}
var shouldShowRecoveryKeyConfirmationBanner: Bool {
securityBannerMode == .recoveryKeyConfirmation
}
var shouldShowInvitesButton: Bool {
!ServiceLocator.shared.settings.roomListInvitesEnabled && hasPendingInvitations && !bindings.isSearchFieldFocused
}
}
struct HomeScreenViewStateBindings {

56
ElementX/Sources/Screens/HomeScreen/View/HomeScreenContent.swift
View File

@ -14,6 +14,7 @@
// limitations under the License.
//
import Compound
import SwiftUI
struct HomeScreenContent: View {
@ -54,10 +55,7 @@ struct HomeScreenContent: View {
case .rooms:
LazyVStack(spacing: 0) {
Section {
if context.viewState.shouldShowEmptyFilterState {
RoomListFiltersEmptyStateView(state: context.filtersState)
.frame(height: geometry.size.height)
} else {
if !context.viewState.shouldShowEmptyFilterState {
HomeScreenRoomList(context: context)
}
} header: {
@ -88,12 +86,19 @@ struct HomeScreenContent: View {
.onChange(of: context.viewState.visibleRooms) { _ in
updateVisibleRange()
}
.background(
Button("", action: {
.background {
Button("") {
context.send(viewAction: .globalSearch)
})
}
.keyboardShortcut(KeyEquivalent("k"), modifiers: [.command])
)
}
.overlay {
if context.viewState.shouldShowEmptyFilterState {
RoomListFiltersEmptyStateView(state: context.filtersState)
.background(.compound.bgCanvasDefault)
.frame(maxWidth: .infinity, maxHeight: .infinity)
}
}
.scrollDismissesKeyboard(.immediately)
.scrollDisabled(context.viewState.roomListMode == .skeletons)
.scrollBounceBehavior(context.viewState.roomListMode == .empty ? .basedOnSize : .automatic)
@ -104,24 +109,29 @@ struct HomeScreenContent: View {
@ViewBuilder
private var topSection: some View {
VStack(spacing: 0) {
if !context.isSearchFieldFocused {
RoomListFiltersView(state: $context.filtersState)
}
if context.viewState.securityBannerMode == .recoveryKeyConfirmation {
HomeScreenRecoveryKeyConfirmationBanner(context: context)
}
if context.viewState.hasPendingInvitations, !context.isSearchFieldFocused, !ServiceLocator.shared.settings.roomListInvitesEnabled {
HomeScreenInvitesButton(title: L10n.actionInvitesList, hasBadge: context.viewState.hasUnreadPendingInvitations) {
context.send(viewAction: .selectInvites)
// An empty VStack causes glitches within the room list
if context.viewState.shouldShowFilters ||
context.viewState.shouldShowRecoveryKeyConfirmationBanner ||
context.viewState.shouldShowInvitesButton {
VStack(spacing: 0) {
if context.viewState.shouldShowFilters {
RoomListFiltersView(state: $context.filtersState)
}
if context.viewState.shouldShowRecoveryKeyConfirmationBanner {
HomeScreenRecoveryKeyConfirmationBanner(context: context)
}
if context.viewState.shouldShowInvitesButton {
HomeScreenInvitesButton(title: L10n.actionInvitesList, hasBadge: context.viewState.hasUnreadPendingInvitations) {
context.send(viewAction: .selectInvites)
}
.accessibilityIdentifier(A11yIdentifiers.homeScreen.invites)
.frame(maxWidth: .infinity, alignment: .trailing)
}
.accessibilityIdentifier(A11yIdentifiers.homeScreen.invites)
.frame(maxWidth: .infinity, alignment: .trailing)
}
.background(Color.compound.bgCanvasDefault)
}
.background(Color.compound.bgCanvasDefault)
}
@ViewBuilder

1
changelog.d/2652.bugfix Normal file
View File

@ -0,0 +1 @@
Fix room list looping and fighting scrolling after filtering