Skip to content

RNSession: Fix the decidePolicyFor handler #225

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

Open
pfeiffer wants to merge 1 commit into
base: hotwire-ios-1.2
Choose a base branch
from
Open

RNSession: Fix the decidePolicyFor handler #225

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
21 changes: 13 additions & 8 deletions packages/turbo/ios/RNSession.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,6 @@ extension RNSession: SessionDelegate {
visitableView?.didFailRequestForVisitable(visitable: visitable, error: error)
}

func session(_ session: Session, openExternalURL url: URL) {
visitableView?.didOpenExternalUrl(url: url)
}

func sessionDidStartFormSubmission(_ session: Session) {
visitableView?.didStartFormSubmission()
}
Expand All @@ -118,11 +114,20 @@ extension RNSession: SessionDelegate {
}

func session(_ session: Session, decidePolicyFor navigationAction: WKNavigationAction) -> WebViewPolicyManager.Decision {
guard let url = navigationAction.request.url else {
return .allow
if navigationAction.shouldReloadPage {
reload()
return .cancel
} else if navigationAction.requestsNewWindow && navigationAction.navigationType == .linkActivated,
let url = navigationAction.request.url {
visitableView?.didOpenExternalUrl(url: url)
return .cancel
} else if navigationAction.shouldOpenURLExternally, let url = navigationAction.request.url {
visitableView?.didOpenExternalUrl(url: url)
return .cancel
} else if navigationAction.navigationType == .linkActivated && navigationAction.isMainFrameNavigation {
return .cancel
}
// regardless of the return value here nothing happens, so we have to manually open external URL
visitableView?.didOpenExternalUrl(url: url)

return .allow
}
}
Expand Down