Merge branch 'Genotek/master'

Author: m-abs

README.md

@@ -37,7 +37,7 @@ tns plugin add @nota/nativescript-webview-ext
 
 ### Update minSdkVersion to 19 or higher
 
-Android SDK 19 is required, update `App_Resources/Android/app.gradle`:  
+Android SDK 19 is required, update `App_Resources/Android/app.gradle`:
 ```
 android {
   defaultConfig {
@@ -101,6 +101,7 @@ Custom-scheme support for `iOS <11` was removed because of [ITMS-90809](https://
 | scrollBounce | true / false | iOS: Should the scrollView bounce? Defaults to true. |
 | supportZoom | true / false | Android: should the webview support zoom |
 | viewPortSize | false / view-port string / ViewPortProperties | Set the viewport metadata on load finished. **Note:** WkWebView sets initial-scale=1.0 by default. |
+| limitsNavigationsToAppBoundDomains | false | iOS: allows to enable Service Workers **Note:** If set to true, WKAppBoundDomains also should be set in info.plist. |
 
 | Function | Description |
 | --- | --- |
@@ -150,7 +151,7 @@ Inside the WebView we have the `nsWebViewBridge` for sending events between the
 ```javascript
     window.addEventListener("ns-bridge-ready", function(e) {
         var nsWebViewBridge = e.detail || window.nsWebViewBridge;
-        
+
         // do stuff here
     });
 ```

src/webview-ext-common.ts

@@ -73,6 +73,11 @@ export const scrollBounceProperty = new Property<WebViewExtBase, boolean>({
     valueConverter: booleanConverter,
 });
 
+export const limitsNavigationsToAppBoundDomainsProperty = new Property<WebViewExtBase, boolean>({
+    name: "limitsNavigationsToAppBoundDomains",
+    valueConverter: booleanConverter,
+});
+
 export type ViewPortValue = boolean | ViewPortProperties;
 export const viewPortProperty = new Property<WebViewExtBase, ViewPortValue>({
     name: "viewPortSize",
@@ -1499,3 +1504,4 @@ srcProperty.register(WebViewExtBase);
 supportZoomProperty.register(WebViewExtBase);
 scrollBounceProperty.register(WebViewExtBase);
 viewPortProperty.register(WebViewExtBase);
+limitsNavigationsToAppBoundDomainsProperty.register(WebViewExtBase);

src/webview-ext.android.ts

@@ -39,7 +39,7 @@ const extToBinaryEncoding = new Set<string>(["gif", "jpeg", "jpg", "otf", "png",
 //#region android_native_classes
 let cacheModeMap: Map<CacheMode, number>;
 
-export interface AndroidWebViewClient extends android.webkit.WebViewClient { }
+export interface AndroidWebViewClient extends android.webkit.WebViewClient {}
 
 export interface AndroidWebView extends android.webkit.WebView {
     client: AndroidWebViewClient | null;

src/webview-ext.ios.ts

@@ -1,10 +1,18 @@
 /// <reference path="./types/ios/NotaWebViewExt.d.ts" />
 
 import "@nativescript/core";
-import { alert, confirm, profile, prompt, Trace, File, knownFolders } from "@nativescript/core";
+import { alert, confirm, File, knownFolders, profile, prompt, Trace } from "@nativescript/core";
 import { isEnabledProperty } from "@nativescript/core/ui/core/view";
 import { webViewBridge } from "./nativescript-webview-bridge-loader";
-import { autoInjectJSBridgeProperty, NavigationType, scrollBounceProperty, WebViewExtBase } from "./webview-ext-common";
+import {
+    autoInjectJSBridgeProperty,
+    limitsNavigationsToAppBoundDomainsProperty,
+    NavigationType,
+    scrollBounceProperty,
+    ViewPortProperties,
+    viewPortProperty,
+    WebViewExtBase,
+} from "./webview-ext-common";
 
 export * from "./webview-ext-common";
 
@@ -30,6 +38,7 @@ export class WebViewExt extends WebViewExtBase {
     public readonly supportXLocalScheme = typeof CustomUrlSchemeHandler !== "undefined";
 
     public viewPortSize = { initialScale: 1.0 };
+    private limitsNavigationsToAppBoundDomains = false;
 
     public createNativeView() {
         const configuration = WKWebViewConfiguration.new();
@@ -42,7 +51,7 @@ export class WebViewExt extends WebViewExtBase {
         configuration.userContentController = wkUController;
         configuration.preferences.setValueForKey(true, "allowFileAccessFromFileURLs");
         configuration.setValueForKey(true, "allowUniversalAccessFromFileURLs");
-
+        configuration.limitsNavigationsToAppBoundDomains = this.limitsNavigationsToAppBoundDomains;
         if (this.supportXLocalScheme) {
             this.wkCustomUrlSchemeHandler = new CustomUrlSchemeHandler();
             configuration.setURLSchemeHandlerForURLScheme(this.wkCustomUrlSchemeHandler, this.interceptScheme);
@@ -386,7 +395,6 @@ export class WebViewExt extends WebViewExtBase {
         if (!nativeView) {
             return false;
         }
-
         return nativeView.scrollView.bounces;
     }
 
@@ -399,6 +407,20 @@ export class WebViewExt extends WebViewExtBase {
         nativeView.scrollView.bounces = !!enabled;
     }
 
+    [viewPortProperty.setNative](value: ViewPortProperties) {
+        if (this.src) {
+            this.injectViewPortMeta();
+        }
+    }
+
+    [limitsNavigationsToAppBoundDomainsProperty.setNative](enabled: boolean) {
+        this.limitsNavigationsToAppBoundDomains = enabled;
+    }
+
+    [limitsNavigationsToAppBoundDomainsProperty.getDefault]() {
+        return false;
+    }
+
     [isEnabledProperty.setNative](enabled: boolean) {
         const nativeView = this.nativeViewProtected;
         if (!nativeView) {
@@ -700,7 +722,9 @@ export class WKScriptMessageHandlerNotaImpl extends NSObject implements WKScript
             owner.onWebViewEvent(message.eventName, message.data);
         } catch (err) {
             owner.writeTrace(
-                `userContentControllerDidReceiveScriptMessage(${userContentController}, ${webViewMessage}) - bad message: ${JSON.stringify(webViewMessage.body)}`,
+                `userContentControllerDidReceiveScriptMessage(${userContentController}, ${webViewMessage}) - bad message: ${JSON.stringify(
+                    webViewMessage.body,
+                )}`,
                 Trace.messageType.error,
             );
         }