Make it so that when a user chooses a source to filter, only filter that specific source when a search occurs. Also fix the "no results found" overlay text by checking if the search bar textfield is being edited or not by modifiying ESSearchable. Signed-off-by: kingbri <bdashore3@proton.me>
54 lines
1.9 KiB
Swift
54 lines
1.9 KiB
Swift
//
|
|
// SearchResultsView.swift
|
|
// Ferrite
|
|
//
|
|
// Created by Brian Dashore on 3/28/23.
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
struct SearchResultsView: View {
|
|
@Environment(\.esIsSearching) var isSearching
|
|
@Environment(\.esDismissSearch) var dismissSearch
|
|
|
|
@EnvironmentObject var scrapingModel: ScrapingViewModel
|
|
@EnvironmentObject var navModel: NavigationViewModel
|
|
@EnvironmentObject var pluginManager: PluginManager
|
|
|
|
@AppStorage("Behavior.UsesRandomSearchText") var usesRandomSearchText: Bool = false
|
|
|
|
var body: some View {
|
|
ForEach(scrapingModel.searchResults, id: \.self) { result in
|
|
if pluginManager.filteredInstalledSources.isEmpty || pluginManager.filteredInstalledSources.contains(where: { result.source == $0.name }) {
|
|
SearchResultButtonView(result: result)
|
|
}
|
|
}
|
|
.onChange(of: scrapingModel.searchText) { newText in
|
|
if newText.isEmpty, isSearching {
|
|
navModel.getSearchPrompt()
|
|
}
|
|
}
|
|
.onChange(of: navModel.selectedTab) { tab in
|
|
// Cancel the search if tab is switched while search is in progress
|
|
if tab != .search, scrapingModel.runningSearchTask != nil {
|
|
scrapingModel.searchResults = []
|
|
scrapingModel.runningSearchTask?.cancel()
|
|
scrapingModel.runningSearchTask = nil
|
|
dismissSearch()
|
|
}
|
|
}
|
|
.onChange(of: scrapingModel.searchResults) { _ in
|
|
// Cleans up any leftover search results in the event of an abrupt cancellation
|
|
if !isSearching {
|
|
scrapingModel.searchResults = []
|
|
}
|
|
}
|
|
.onChange(of: isSearching) { newValue in
|
|
if !newValue {
|
|
scrapingModel.searchResults = []
|
|
scrapingModel.runningSearchTask?.cancel()
|
|
scrapingModel.runningSearchTask = nil
|
|
}
|
|
}
|
|
}
|
|
}
|