Skip to content

Bookings: Fix pull to refresh issue in search mode #16422

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

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

Bookings: Fix pull to refresh issue in search mode #16422

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fc7a6e
Fix separator on top of list
itsmeichigo Dec 2, 2025
bd7ecb8
Update search content view to fix refreshable
itsmeichigo Dec 2, 2025
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
71 changes: 46 additions & 25 deletions WooCommerce/Classes/Bookings/BookingList/BookingListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ private extension BookingListView {
loadingView
case .results:
bookingList(with: viewModel.bookings,
isSearching: false,
onNextPage: { viewModel.onLoadNextPageAction() },
onRefresh: { await viewModel.onRefreshAction() })
}
Expand All @@ -66,15 +67,18 @@ private extension BookingListView {
}

var searchContentView: some View {
VStack {
VStack(spacing: 0) {
if searchViewModel.isSearching {
loadingView
} else if searchViewModel.searchResults.isEmpty {
header
emptyStateView(isSearching: true) {
await searchViewModel.onRefreshAction()
}
} else {
header
bookingList(with: searchViewModel.searchResults,
isSearching: true,
onNextPage: { searchViewModel.onLoadNextPageAction() },
onRefresh: { await searchViewModel.onRefreshAction() })
}
Expand Down Expand Up @@ -103,24 +107,20 @@ private extension BookingListView {
}

func bookingList(with bookings: [Booking],
isSearching: Bool,
onNextPage: @escaping () -> Void,
onRefresh: @escaping () async -> Void) -> some View {
List(selection: $selectedBooking) {
Section {
ForEach(bookings) { item in
bookingItem(item)
.tag(item)
if isSearching {
bookingListSection(with: bookings, onNextPage: onNextPage)
} else {
Section {
bookingListSection(with: bookings, onNextPage: onNextPage)
} header: {
header
.listRowInsets(EdgeInsets())
.textCase(nil)
}

InfiniteScrollIndicator(showContent: viewModel.shouldShowBottomActivityIndicator)
.padding(.top, BookingListViewLayout.viewPadding)
.onAppear {
onNextPage()
}
} header: {
header
.listRowInsets(EdgeInsets())
.textCase(nil)
}
}
.apply {
Expand All @@ -131,17 +131,32 @@ private extension BookingListView {
$0.listStyle(.plain)
} else {
$0.listStyle(.grouped)
.scrollContentBackground(.hidden)
}
}
.listStyle(.grouped)
.scrollContentBackground(.hidden)
.listSectionSeparator(.hidden, edges: .top)
.background(Color(.listBackground))
.refreshable {
await onRefresh()
}
}

@ViewBuilder
func bookingListSection(with bookings: [Booking], onNextPage: @escaping () -> Void) -> some View {
ForEach(bookings) { item in
bookingItem(item)
.if(item == bookings.first) {
$0.listSectionSeparator(.hidden, edges: .top)
}
.tag(item)
}

InfiniteScrollIndicator(showContent: viewModel.shouldShowBottomActivityIndicator)
.padding(.top, BookingListViewLayout.viewPadding)
.onAppear {
onNextPage()
}
}

func bookingItem(_ booking: Booking) -> some View {
VStack(alignment: .leading, spacing: BookingListViewLayout.bookingSummaryBadgeSpacing) {
VStack(alignment: .leading, spacing: BookingListViewLayout.bookingSummarySpacing) {
Expand Down Expand Up @@ -181,13 +196,19 @@ private extension BookingListView {
func emptyStateView(isSearching: Bool, onRefresh: @escaping () async -> Void) -> some View {
GeometryReader { proxy in
ScrollView {
LazyVStack(spacing: 0, pinnedViews: .sectionHeaders) {
Section {
emptyStateContent(isSearching: isSearching)
.frame(minWidth: proxy.size.width,
minHeight: proxy.size.height - BookingListViewLayout.defaultHeaderHeight * scale)
} header: {
header
if isSearching {
emptyStateContent(isSearching: isSearching)
.frame(minWidth: proxy.size.width,
minHeight: proxy.size.height)
} else {
LazyVStack(spacing: 0, pinnedViews: .sectionHeaders) {
Section {
emptyStateContent(isSearching: isSearching)
.frame(minWidth: proxy.size.width,
minHeight: proxy.size.height - BookingListViewLayout.defaultHeaderHeight * scale)
} header: {
header
}
}
}
}
Expand Down
Loading