Skip to content

fix(ios): skip subframe intercepts, improve auth popup support #31

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
modos189 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(ios): skip subframe intercepts, improve auth popup support #31

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
9 changes: 7 additions & 2 deletions src/webview/index.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,11 @@ export class WKNavigationDelegateNotaImpl extends NSObject implements WKNavigati
}
}

const isMainFrame = !navigationAction.targetFrame || navigationAction.targetFrame.mainFrame;
if (!isMainFrame) {
decisionHandler(WKNavigationActionPolicy.Allow);
return;
}
const shouldOverrideUrlLoading = owner._onShouldOverrideUrlLoading(url, httpMethod, navType);
if (shouldOverrideUrlLoading === true) {
if (Trace.isEnabled()) {
Expand All @@ -683,8 +688,8 @@ export class WKNavigationDelegateNotaImpl extends NSObject implements WKNavigati
WebViewTraceCategory,
Trace.messageType.info
);
decisionHandler(WKNavigationActionPolicy.Cancel);
}
decisionHandler(WKNavigationActionPolicy.Cancel);
return;
}
decisionHandler(WKNavigationActionPolicy.Allow);
Expand Down Expand Up @@ -905,7 +910,7 @@ export class WKUIDelegateNotaImpl extends NSObject implements WKUIDelegate {
popupWebView.customUserAgent = webView.customUserAgent;
}

let currentVC = UIApplication.sharedApplication.keyWindow.rootViewController;
let currentVC = webView.window ? webView.window.rootViewController : null;
while (currentVC && currentVC.presentedViewController) {
currentVC = currentVC.presentedViewController;
}
Expand Down