From b88a6cf96f6a162a8a8dfa3261f70b93d75b0046 Mon Sep 17 00:00:00 2001 From: kingbri Date: Tue, 26 Jul 2022 21:38:16 -0400 Subject: [PATCH] Search: Fix sheet and results bug for iOS 15 In iOS 15, a searchbar will become inherited if a sheet call is within the searchable view and its children. Migrate the sheet call outside the search results view. Signed-off-by: kingbri --- Ferrite/Views/ContentView.swift | 14 ++++++++++++-- Ferrite/Views/SearchResultsView.swift | 8 -------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Ferrite/Views/ContentView.swift b/Ferrite/Views/ContentView.swift index ff31d6e..5e0010f 100644 --- a/Ferrite/Views/ContentView.swift +++ b/Ferrite/Views/ContentView.swift @@ -10,6 +10,7 @@ import SwiftUI struct ContentView: View { @EnvironmentObject var scrapingModel: ScrapingViewModel @EnvironmentObject var debridManager: DebridManager + @EnvironmentObject var navigationModel: NavigationViewModel @AppStorage("RealDebrid.Enabled") var realDebridEnabled = false @@ -77,9 +78,18 @@ struct ContentView: View { } .navigationTitle("Search") } + .sheet(item: $navigationModel.currentChoiceSheet) { item in + Group { + switch item { + case .magnet: + MagnetChoiceView() + case .batch: + BatchChoiceView() + } + } + .tint(.primary) + } } - - func performSearch() {} } struct ContentView_Previews: PreviewProvider { diff --git a/Ferrite/Views/SearchResultsView.swift b/Ferrite/Views/SearchResultsView.swift index a7dfec4..81a537d 100644 --- a/Ferrite/Views/SearchResultsView.swift +++ b/Ferrite/Views/SearchResultsView.swift @@ -42,14 +42,6 @@ struct SearchResultsView: View { .font(.callout) .fixedSize(horizontal: false, vertical: true) } - .sheet(item: $navigationModel.currentChoiceSheet) { item in - switch item { - case .magnet: - MagnetChoiceView() - case .batch: - BatchChoiceView() - } - } .tint(.primary) .padding(.bottom, 5)