Skip to content

fix: use NavigationLink for browser buttons in FeedDetailPage #133

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
graycreate merged 1 commit into from
Dec 29, 2025
Merged

fix: use NavigationLink for browser buttons in FeedDetailPage #133

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
63 changes: 47 additions & 16 deletions V2er/View/FeedDetail/FeedDetailPage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ struct FeedDetailPage: StateView, KeyboardReadable, InstanceIdentifiable {
@Environment(\.isPresented) private var isPresented
@Environment(\.dismiss) var dismiss
@EnvironmentObject private var store: Store
@State private var showingSafari = false
@State private var safariURL: URL?
@State private var showingMobileWeb = false
@State private var mobileWebURL: URL?
@State private var selectedImage: UIImage? = nil
@State private var isUploadingImage = false
@State private var navigateToBrowserURL: URL? = nil
@State private var navigateToSafariURL: URL? = nil

private var useBuiltinBrowser: Bool {
store.appState.settingState.useBuiltinBrowser
}

var bindingState: Binding<FeedDetailState> {
if store.appState.feedDetailStates[instanceId] == nil {
Expand Down Expand Up @@ -106,16 +108,43 @@ struct FeedDetailPage: StateView, KeyboardReadable, InstanceIdentifiable {

var body: some View {
contentView
.sheet(isPresented: $showingSafari) {
if let url = safariURL {
SafariView(url: url)
}
}
.sheet(isPresented: $showingMobileWeb) {
if let url = mobileWebURL {
MobileWebView(url: url)
.background(
Group {
// Use NavigationLink for InAppBrowser (iOS 26 bug workaround)
NavigationLink(
destination: Group {
if let url = navigateToBrowserURL {
InAppBrowserView(url: url)
}
},
isActive: Binding(
get: { navigateToBrowserURL != nil },
set: { if !$0 { navigateToBrowserURL = nil } }
)
) {
EmptyView()
}
.hidden()

// Use NavigationLink for SafariView (iOS 26 bug workaround)
NavigationLink(
destination: Group {
if let url = navigateToSafariURL {
SafariView(url: url)
.ignoresSafeArea()
.navigationBarHidden(true)
}
},
isActive: Binding(
get: { navigateToSafariURL != nil },
set: { if !$0 { navigateToSafariURL = nil } }
)
) {
EmptyView()
}
.hidden()
}
}
)
}

@ViewBuilder
Expand Down Expand Up @@ -473,10 +502,12 @@ struct FeedDetailPage: StateView, KeyboardReadable, InstanceIdentifiable {
}

Button {
// Use MobileWebView with mobile User-Agent for better mobile experience
if let url = URL(string: APIService.baseUrlString + "/t/\(id)") {
mobileWebURL = url
showingMobileWeb = true
if useBuiltinBrowser {
navigateToBrowserURL = url
} else {
navigateToSafariURL = url
}
}
} label: {
Label("使用浏览器打开", systemImage: "safari")
Expand Down
Loading