clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-20 02:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: avoid search exit on app background

Browse Source
This commit is contained in:
Tienson Qin
2026-05-19 04:50:38 +08:00
parent 326eebefdc
commit 0d79279c4f
1 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
ios/App/App/LiquidTabsRootView.swift
View File

@@ -355,6 +355,34 @@ private struct SearchTabHost26: View {
@Environment(\.isSearching) private var isSearching
@State private var wasSearching: Bool = false
@State private var suppressSearchDismissalForAppLifecycle = false
@State private var searchDismissalRequestId = 0
private func cancelPendingSearchDismissal() {
searchDismissalRequestId += 1
}
private func scheduleSearchDismissal() {
guard wasSearching else { return }
searchDismissalRequestId += 1
let currentRequestId = searchDismissalRequestId
DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
guard searchDismissalRequestId == currentRequestId,
wasSearching,
!suppressSearchDismissalForAppLifecycle,
case .search = selectedTab.wrappedValue,
let firstId = firstTabId else {
return
}
wasSearching = false
searchPath = NavigationPath()
selectedTab.wrappedValue = .content(0)
store.selectedId = firstId
}
}
var body: some View {
NavigationStack(path: $searchPath) {
@@ -375,16 +403,31 @@ private struct SearchTabHost26: View {
.onChange(of: isSearching) { searching in
if searching {
wasSearching = true
} else if wasSearching,
case .search = selectedTab.wrappedValue,
let firstId = firstTabId {
wasSearching = false
searchPath = NavigationPath()
selectedTab.wrappedValue = .content(0)
store.selectedId = firstId
cancelPendingSearchDismissal()
} else {
scheduleSearchDismissal()
}
}
.onReceive(NotificationCenter.default.publisher(
for: UIApplication.willResignActiveNotification
)) { _ in
suppressSearchDismissalForAppLifecycle = true
wasSearching = false
cancelPendingSearchDismissal()
}
.onReceive(NotificationCenter.default.publisher(
for: UIApplication.didEnterBackgroundNotification
)) { _ in
suppressSearchDismissalForAppLifecycle = true
wasSearching = false
cancelPendingSearchDismissal()
}
.onReceive(NotificationCenter.default.publisher(
for: UIApplication.didBecomeActiveNotification
)) { _ in
suppressSearchDismissalForAppLifecycle = false
wasSearching = isSearching
}
}
}