kiwix/kiwix-apple
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-apple.git synced 2025-09-23 03:32:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add up and down navigation for search results

Browse Source
This commit is contained in:
Balazs Perlaki-Horvath 2025-04-13 22:35:51 +02:00 committed by Kelson
parent 7e5a66184c
commit e40ae723e8
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Views/SearchResults.swift
View File

@ -22,6 +22,7 @@ struct SearchResults: View {
@Environment(\.dismissSearch) private var dismissSearch
@Environment(\.horizontalSizeClass) private var horizontalSizeClass
@Environment(\.managedObjectContext) private var managedObjectContext
@Environment(\.isSearching) private var isSearching
@EnvironmentObject private var viewModel: SearchViewModel
@EnvironmentObject private var navigation: NavigationViewModel
@FocusState private var focusedSearchItem: URL? // macOS only
@ -35,6 +36,17 @@ struct SearchResults: View {
var body: some View {
Group {
#if os(macOS)
// Special hidden button to enable down key response when
// search is active, to go to search results
if isSearching, focusedSearchItem == nil {
Button(action: {
focusedSearchItem = viewModel.results.first?.url
}, label: {})
.hidden()
.keyboardShortcut(.downArrow, modifiers: [])
}
#endif
if zimFiles.isEmpty {
Message(text: LocalString.search_result_zimfile_empty_message)
} else if horizontalSizeClass == .regular {
@ -120,7 +132,10 @@ struct SearchResults: View {
case .down: nextIndex = viewModel.results.index(after: index)
default: nextIndex = viewModel.results.startIndex
}
if (viewModel.results.startIndex..<viewModel.results.endIndex).contains(nextIndex) {
if nextIndex < viewModel.results.startIndex {
$focusedSearchItem.wrappedValue = nil
NotificationCenter.default.post(name: .zimSearch, object: nil)
} else if (viewModel.results.startIndex..<viewModel.results.endIndex).contains(nextIndex) {
$focusedSearchItem.wrappedValue = viewModel.results[nextIndex].url
}
}