Skip to content
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

fix(ios): Present js alert on top of the presented VC #5282

Merged
merged 2 commits into from
Nov 30, 2021
Merged

fix(ios): Present js alert on top of the presented VC #5282

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
952597d
fix(ios): Present js alert on top of the presented VC
jcesarmobile Nov 29, 2021
fead186
Don't use presented vc if being dismissed
jcesarmobile Nov 29, 2021
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
7 changes: 6 additions & 1 deletion ios/Capacitor/Capacitor/WebViewDelegationHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,15 @@ internal class WebViewDelegationHandler: NSObject, WKNavigationDelegate, WKUIDel
// MARK: - WKUIDelegate

public func webView(_ webView: WKWebView, runJavaScriptAlertPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping () -> Void) {
guard let viewController = bridge?.viewController else {
guard var viewController = bridge?.viewController else {
completionHandler()
return
}

if let presentedVC = viewController.presentedViewController, !presentedVC.isBeingDismissed {
viewController = presentedVC
}

let alertController = UIAlertController(title: nil, message: message, preferredStyle: .alert)

alertController.addAction(UIAlertAction(title: "Ok", style: .default, handler: { (_) in
Expand Down