Skip to content

Fix navigation title overlapping with SearchBar in SearchSheetView #142

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
aaronbrethorst merged 1 commit into from
Jan 31, 2026
Merged

Fix navigation title overlapping with SearchBar in SearchSheetView #142

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
96 changes: 54 additions & 42 deletions OTPKit/Sources/OTPKit/Presentation/Sheets/Search/SearchSheetView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import MapKit
struct SearchSheetView: View {
@Environment(\.otpTheme) private var theme
@Environment(\.otpSearchRegion) private var searchRegion
@Environment(\.dismiss) private var dismiss

let selectedMode: LocationMode
let onLocationSelected: OnLocationSelectedHandler
Expand All @@ -25,34 +26,53 @@ struct SearchSheetView: View {
var body: some View {
NavigationView {
VStack(spacing: 0) {
SearchBar(searchText: $searchText) { newValue in
guard let manager = searchManager else { return }
if newValue.isEmpty {
manager.clear()
} else {
manager.search(query: newValue)
VStack(spacing: 0) {
ZStack(alignment: .trailing) {
Text(buildNavigationTitle())
.font(.headline)
.accessibilityAddTraits(.isHeader)
.frame(maxWidth: .infinity)

Button("Cancel") {
dismiss()
}
}
.padding(.horizontal, 16)
.padding(.top, 20)
.padding(.bottom, 12)

SearchBar(searchText: $searchText) { newValue in
guard let manager = searchManager else { return }
if newValue.isEmpty {
manager.clear()
} else {
manager.search(query: newValue)
}
}
.padding(.horizontal, 16)
.padding(.bottom, 12)

Divider()
}
.padding(.horizontal, 16)
.padding(.top, 16)

// Search Results
if let manager = searchManager {
if manager.isSearching {
buildSearchingView()
} else if manager.searchCompletions.isEmpty && !searchText.isEmpty {
buildNoSearchResultsView()
} else if !manager.searchCompletions.isEmpty {
buildSearchResultsView(manager: manager)
.background(Color(UIColor.systemBackground))
Group {
if let manager = searchManager {
if manager.isSearching {
buildSearchingView()
} else if manager.searchCompletions.isEmpty && !searchText.isEmpty {
buildNoSearchResultsView()
} else if !manager.searchCompletions.isEmpty {
buildSearchResultsView(manager: manager)
} else {
buildDefaultView()
}
} else {
buildDefaultView()
}
} else {
buildDefaultView()
}
}
.navigationTitle(buildNavigationTitle())
.navigationBarTitleDisplayMode(.inline)
.toolbar(.hidden, for: .navigationBar)
.ignoresSafeArea(.keyboard, edges: .bottom)
}
.onAppear {
if searchManager == nil {
Expand All @@ -63,35 +83,28 @@ struct SearchSheetView: View {

@ViewBuilder
private func buildDefaultView() -> some View {
// Default state
VStack(spacing: 24) {
CurrentLocationButton { location in
onLocationSelected(location, selectedMode)
}
ScrollView {
VStack(spacing: 24) {
CurrentLocationButton { location in
onLocationSelected(location, selectedMode)
}

FavoritesSectionView(selectedMode: selectedMode) { loc in
onLocationSelected(loc, selectedMode)
} onMoreTapped: {
// more tapped
}
FavoritesSectionView(selectedMode: selectedMode) { loc in
onLocationSelected(loc, selectedMode)
} onMoreTapped: { }

RecentsSectionView(selectedMode: selectedMode) { loc in
onLocationSelected(loc, selectedMode)
} onMoreTapped: {
// more tapped
RecentsSectionView(selectedMode: selectedMode) { loc in
onLocationSelected(loc, selectedMode)
} onMoreTapped: { }
}
.padding(.top, 20)
}
.padding(.top, 20)

Spacer()
}

@ViewBuilder
private func buildSearchingView() -> some View {
// Loading state
VStack(spacing: 16) {
ProgressView()
.scaleEffect(1.2)
ProgressView().scaleEffect(1.2)
Text("Searching...")
.font(.subheadline)
.foregroundColor(theme.secondaryColor)
Expand Down Expand Up @@ -132,7 +145,6 @@ struct SearchSheetView: View {
.listRowSeparator(.hidden)
}
.listStyle(PlainListStyle())
.padding(.top, 16)
}

private func buildNavigationTitle() -> String {
Expand Down
Loading