javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(WebView): allow JS bound window frame navigation to be intercepted through loadStarted (#9430)

Browse Source
This commit is contained in:
Nathan Walker
2021-06-01 16:35:43 -07:00
committed by GitHub
parent d3bc4d5b82
commit 3806b85fce
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/core/ui/web-view/index.ios.ts
View File

@@ -96,6 +96,24 @@ class WKNavigationDelegateImpl extends NSObject implements WKNavigationDelegate
}
}
@NativeClass
class WKUIDelegateImpl extends NSObject implements WKUIDelegate {
public static ObjCProtocols = [WKUIDelegate];
public static initWithOwner(owner: WeakRef<WebView>): WKUIDelegateImpl {
const handler = <WKUIDelegateImpl>WKUIDelegateImpl.new();
handler._owner = owner;
return handler;
}
private _owner: WeakRef<WebView>;
webViewCreateWebViewWithConfigurationForNavigationActionWindowFeatures(webView: WKWebView, configuration: WKWebViewConfiguration, navigationAction: WKNavigationAction, windowFeatures: WKWindowFeatures): WKWebView {
if (navigationAction && (!navigationAction.targetFrame || (navigationAction.targetFrame && !navigationAction.targetFrame.mainFrame))) {
webView.loadRequest(navigationAction.request);
}
return null;
}
}
@NativeClass
@ObjCClass(UIScrollViewDelegate)
class UIScrollViewDelegateImpl extends NSObject implements UIScrollViewDelegate {
@@ -138,8 +156,9 @@ class UIScrollViewDelegateImpl extends NSObject implements UIScrollViewDelegate
export class WebView extends WebViewBase {
nativeViewProtected: WKWebView;
private _delegate: any;
private _scrollDelegate: any;
private _delegate: WKNavigationDelegateImpl;
private _scrollDelegate: UIScrollViewDelegateImpl;
private _uiDelegate: WKUIDelegateImpl;
_maximumZoomScale;
_minimumZoomScale;
@@ -164,8 +183,10 @@ export class WebView extends WebViewBase {
super.initNativeView();
this._delegate = WKNavigationDelegateImpl.initWithOwner(new WeakRef(this));
this._scrollDelegate = UIScrollViewDelegateImpl.initWithOwner(new WeakRef(this));
this._uiDelegate = WKUIDelegateImpl.initWithOwner(new WeakRef(this));
this.ios.navigationDelegate = this._delegate;
this.ios.scrollView.delegate = this._scrollDelegate;
this.ios.UIDelegate = this._uiDelegate;
}
@profile