Skip to content

fix(ios): always invoke WebKit completion handlers #32

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

fix(ios): always invoke WebKit completion handlers #32

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
45 changes: 26 additions & 19 deletions src/webview/index.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,8 @@ export class WKNavigationDelegateNotaImpl extends NSObject implements WKNavigati
Trace.write(`webViewDecidePolicyForNavigationActionDecisionHandler: "${url}"`, WebViewTraceCategory, Trace.messageType.info);
}
if (!url) {
decisionHandler(WKNavigationActionPolicy.Cancel);

return;
}

Expand Down Expand Up @@ -683,8 +685,11 @@ export class WKNavigationDelegateNotaImpl extends NSObject implements WKNavigati
WebViewTraceCategory,
Trace.messageType.info
);
decisionHandler(WKNavigationActionPolicy.Cancel);
}
// WebKit raises an ObjC exception when an unused decision handler is deallocated,
// so every code path must call it exactly once regardless of tracing.
decisionHandler(WKNavigationActionPolicy.Cancel);

return;
}
decisionHandler(WKNavigationActionPolicy.Allow);
Expand Down Expand Up @@ -817,18 +822,20 @@ export class WKUIDelegateNotaImpl extends NSObject implements WKUIDelegate {
*/
public webViewRunJavaScriptAlertPanelWithMessageInitiatedByFrameCompletionHandler(webView: WKWebView, message: string, frame: WKFrameInfo, completionHandler: () => void): void {
const owner = this.owner.get();
if (!owner) {
return;
}

let gotResponse = false;
owner._webAlert(message, () => {
const respond = () => {
if (!gotResponse) {
gotResponse = true;
completionHandler();
}
};

gotResponse = true;
});
// _webAlert returns false when nothing is listening, so respond ourselves
// rather than leaving the handler uncalled.
if (!owner || !owner._webAlert(message, respond)) {
respond();
}
}

/**
Expand All @@ -841,18 +848,18 @@ export class WKUIDelegateNotaImpl extends NSObject implements WKUIDelegate {
completionHandler: (confirmed: boolean) => void
): void {
const owner = this.owner.get();
if (!owner) {
return;
}

let gotResponse = false;
owner._webConfirm(message, (confirmed: boolean) => {
const respond = (confirmed = false) => {
if (!gotResponse) {
gotResponse = true;
completionHandler(confirmed);
}
};

gotResponse = true;
});
if (!owner || !owner._webConfirm(message, respond)) {
respond();
}
}

/**
Expand All @@ -866,18 +873,18 @@ export class WKUIDelegateNotaImpl extends NSObject implements WKUIDelegate {
completionHandler: (response: string) => void
): void {
const owner = this.owner.get();
if (!owner) {
return;
}

let gotResponse = false;
owner._webPrompt(message, defaultText, (response: string) => {
const respond = (response: string = null) => {
if (!gotResponse) {
gotResponse = true;
completionHandler(response);
}
};

gotResponse = true;
});
if (!owner || !owner._webPrompt(message, defaultText, respond)) {
respond();
}
}

webViewCreateWebViewWithConfigurationForNavigationActionWindowFeatures(
Expand Down