@exodus/react-native-webview 11.26.1-exodus.0 → 11.26.1-exodus.10

package/lib/WebView.ios.js

@@ -1,65 +1,17 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import React, { forwardRef, useCallback, useImperativeHandle, useRef } from 'react';
-import { Image, View, NativeModules, } from 'react-native';
+import { Text, View, NativeModules, Platform, } from 'react-native';
 import invariant from 'invariant';
 // @ts-expect-error react-native doesn't have this type
 import codegenNativeCommandsUntyped from 'react-native/Libraries/Utilities/codegenNativeCommands';
 import RNCWebView from "./WebViewNativeComponent.ios";
-import { defaultOriginWhitelist, defaultRenderError, defaultRenderLoading, useWebWiewLogic, } from './WebViewShared';
+import { defaultOriginWhitelist, defaultRenderError, defaultRenderLoading, useWebWiewLogic, versionPasses, } from './WebViewShared';
 import styles from './WebView.styles';
-var codegenNativeCommands = codegenNativeCommandsUntyped;
-var Commands = codegenNativeCommands({
-    supportedCommands: ['goBack', 'goForward', 'reload', 'stopLoading', 'injectJavaScript', 'requestFocus', 'postMessage', 'loadUrl']
+const codegenNativeCommands = codegenNativeCommandsUntyped;
+const Commands = codegenNativeCommands({
+    supportedCommands: ['goBack', 'goForward', 'reload', 'stopLoading', /* 'injectJavaScript', */ 'requestFocus', 'postMessage', 'loadUrl'],
 });
-var resolveAssetSource = Image.resolveAssetSource;
-var processDecelerationRate = function (decelerationRate) {
-    var newDecelerationRate = decelerationRate;
+const processDecelerationRate = (decelerationRate) => {
+    let newDecelerationRate = decelerationRate;
     if (newDecelerationRate === 'normal') {
         newDecelerationRate = 0.998;
     }
@@ -68,56 +20,72 @@ var processDecelerationRate = function (decelerationRate) {
     }
     return newDecelerationRate;
 };
-var RNCWebViewManager = NativeModules.RNCWebViewManager;
-var useWarnIfChanges = function (value, name) {
-    var ref = useRef(value);
+const RNCWebViewManager = NativeModules.RNCWebViewManager;
+const useWarnIfChanges = (value, name) => {
+    const ref = useRef(value);
     if (ref.current !== value) {
-        console.warn("Changes to property ".concat(name, " do nothing after the initial render."));
+        console.warn(`Changes to property ${name} do nothing after the initial render.`);
         ref.current = value;
     }
 };
-var WebViewComponent = forwardRef(function (_a, ref) {
-    var _b = _a.javaScriptEnabled, javaScriptEnabled = _b === void 0 ? true : _b, _c = _a.cacheEnabled, cacheEnabled = _c === void 0 ? true : _c, _d = _a.originWhitelist, originWhitelist = _d === void 0 ? defaultOriginWhitelist : _d, _e = _a.useSharedProcessPool, useSharedProcessPool = _e === void 0 ? true : _e, _f = _a.textInteractionEnabled, textInteractionEnabled = _f === void 0 ? true : _f, injectedJavaScript = _a.injectedJavaScript, injectedJavaScriptBeforeContentLoaded = _a.injectedJavaScriptBeforeContentLoaded, _g = _a.injectedJavaScriptForMainFrameOnly, injectedJavaScriptForMainFrameOnly = _g === void 0 ? true : _g, _h = _a.injectedJavaScriptBeforeContentLoadedForMainFrameOnly, injectedJavaScriptBeforeContentLoadedForMainFrameOnly = _h === void 0 ? true : _h, startInLoadingState = _a.startInLoadingState, onNavigationStateChange = _a.onNavigationStateChange, onLoadStart = _a.onLoadStart, onError = _a.onError, onLoad = _a.onLoad, onLoadEnd = _a.onLoadEnd, onLoadProgress = _a.onLoadProgress, onContentProcessDidTerminateProp = _a.onContentProcessDidTerminate, onFileDownload = _a.onFileDownload, onHttpErrorProp = _a.onHttpError, onMessageProp = _a.onMessage, renderLoading = _a.renderLoading, renderError = _a.renderError, style = _a.style, containerStyle = _a.containerStyle, source = _a.source, nativeConfig = _a.nativeConfig, allowsInlineMediaPlayback = _a.allowsInlineMediaPlayback, allowsAirPlayForMediaPlayback = _a.allowsAirPlayForMediaPlayback, mediaPlaybackRequiresUserAction = _a.mediaPlaybackRequiresUserAction, dataDetectorTypes = _a.dataDetectorTypes, incognito = _a.incognito, decelerationRateProp = _a.decelerationRate, onShouldStartLoadWithRequestProp = _a.onShouldStartLoadWithRequest, otherProps = __rest(_a, ["javaScriptEnabled", "cacheEnabled", "originWhitelist", "useSharedProcessPool", "textInteractionEnabled", "injectedJavaScript", "injectedJavaScriptBeforeContentLoaded", "injectedJavaScriptForMainFrameOnly", "injectedJavaScriptBeforeContentLoadedForMainFrameOnly", "startInLoadingState", "onNavigationStateChange", "onLoadStart", "onError", "onLoad", "onLoadEnd", "onLoadProgress", "onContentProcessDidTerminate", "onFileDownload", "onHttpError", "onMessage", "renderLoading", "renderError", "style", "containerStyle", "source", "nativeConfig", "allowsInlineMediaPlayback", "allowsAirPlayForMediaPlayback", "mediaPlaybackRequiresUserAction", "dataDetectorTypes", "incognito", "decelerationRate", "onShouldStartLoadWithRequest"]);
-    var webViewRef = useRef(null);
-    var onShouldStartLoadWithRequestCallback = useCallback(function (shouldStart, _url, lockIdentifier) {
-        if (lockIdentifier === void 0) { lockIdentifier = 0; }
-        var viewManager = (nativeConfig === null || nativeConfig === void 0 ? void 0 : nativeConfig.viewManager)
-            || RNCWebViewManager;
+/**
+ * Harcoded defaults for security.
+ */
+const mediaPlaybackRequiresUserAction = true;
+// iOS only configs
+const allowsInlineMediaPlayback = true;
+const useSharedProcessPool = false;
+const sharedCookiesEnabled = false;
+const enableApplePay = false;
+const dataDetectorTypes = 'none';
+const hardMinimumIOSVersion = '12.5.6 <13, 13.6.1 <14, 14.8.1 <15, 15.7.1';
+const WebViewComponent = forwardRef(({ javaScriptEnabled = true, cacheEnabled = true, originWhitelist = defaultOriginWhitelist, textInteractionEnabled = true, injectedJavaScript, injectedJavaScriptBeforeContentLoaded, startInLoadingState, onLoadStart, onError, onLoad, onLoadEnd, onMessage: onMessageProp, renderLoading, renderError, style, containerStyle, source, incognito, validateMeta, validateData, decelerationRate: decelerationRateProp, onShouldStartLoadWithRequest: onShouldStartLoadWithRequestProp, minimumIOSVersion, unsupportedVersionComponent: UnsupportedVersionComponent, ...otherProps }, ref) => {
+    const webViewRef = useRef(null);
+    const onShouldStartLoadWithRequestCallback = useCallback((shouldStart, _url, lockIdentifier = 0) => {
+        const viewManager = RNCWebViewManager;
         viewManager.startLoadWithResult(!!shouldStart, lockIdentifier);
-    }, [nativeConfig === null || nativeConfig === void 0 ? void 0 : nativeConfig.viewManager]);
-    var _j = useWebWiewLogic({
-        onNavigationStateChange: onNavigationStateChange,
-        onLoad: onLoad,
-        onError: onError,
-        onHttpErrorProp: onHttpErrorProp,
-        onLoadEnd: onLoadEnd,
-        onLoadProgress: onLoadProgress,
-        onLoadStart: onLoadStart,
-        onMessageProp: onMessageProp,
-        startInLoadingState: startInLoadingState,
-        originWhitelist: originWhitelist,
-        onShouldStartLoadWithRequestProp: onShouldStartLoadWithRequestProp,
-        onShouldStartLoadWithRequestCallback: onShouldStartLoadWithRequestCallback,
-        onContentProcessDidTerminateProp: onContentProcessDidTerminateProp
-    }), onLoadingStart = _j.onLoadingStart, onShouldStartLoadWithRequest = _j.onShouldStartLoadWithRequest, onMessage = _j.onMessage, viewState = _j.viewState, setViewState = _j.setViewState, lastErrorEvent = _j.lastErrorEvent, onHttpError = _j.onHttpError, onLoadingError = _j.onLoadingError, onLoadingFinish = _j.onLoadingFinish, onLoadingProgress = _j.onLoadingProgress, onContentProcessDidTerminate = _j.onContentProcessDidTerminate;
-    useImperativeHandle(ref, function () { return ({
-        goForward: function () { return Commands.goForward(webViewRef.current); },
-        goBack: function () { return Commands.goBack(webViewRef.current); },
-        reload: function () {
+    }, []);
+    const { onLoadingStart, onShouldStartLoadWithRequest, onMessage, viewState, setViewState, lastErrorEvent, onLoadingError, onLoadingFinish, onLoadingProgress } = useWebWiewLogic({
+        onLoad,
+        onError,
+        onLoadEnd,
+        onLoadStart,
+        onMessageProp,
+        startInLoadingState,
+        originWhitelist,
+        onShouldStartLoadWithRequestProp,
+        onShouldStartLoadWithRequestCallback,
+        validateMeta,
+        validateData,
+    });
+    useImperativeHandle(ref, () => ({
+        goForward: () => Commands.goForward(webViewRef.current),
+        goBack: () => Commands.goBack(webViewRef.current),
+        reload: () => {
             setViewState('LOADING');
             Commands.reload(webViewRef.current);
         },
-        stopLoading: function () { return Commands.stopLoading(webViewRef.current); },
-        postMessage: function (data) { return Commands.postMessage(webViewRef.current, data); },
-        injectJavaScript: function (data) { return Commands.injectJavaScript(webViewRef.current, data); },
-        requestFocus: function () { return Commands.requestFocus(webViewRef.current); }
-    }); }, [setViewState, webViewRef]);
+        stopLoading: () => Commands.stopLoading(webViewRef.current),
+        postMessage: (data) => Commands.postMessage(webViewRef.current, data),
+        // injectJavaScript: (data: string) => Commands.injectJavaScript(webViewRef.current, data),
+        requestFocus: () => Commands.requestFocus(webViewRef.current),
+    }), [setViewState, webViewRef]);
     useWarnIfChanges(allowsInlineMediaPlayback, 'allowsInlineMediaPlayback');
-    useWarnIfChanges(allowsAirPlayForMediaPlayback, 'allowsAirPlayForMediaPlayback');
     useWarnIfChanges(incognito, 'incognito');
     useWarnIfChanges(mediaPlaybackRequiresUserAction, 'mediaPlaybackRequiresUserAction');
     useWarnIfChanges(dataDetectorTypes, 'dataDetectorTypes');
-    var otherView = null;
+    const version = String(Platform.Version);
+    if (!(versionPasses(version, minimumIOSVersion) && versionPasses(version, hardMinimumIOSVersion))) {
+        if (UnsupportedVersionComponent) {
+            return <UnsupportedVersionComponent />;
+        }
+        return (<View style={{ alignSelf: 'flex-start' }}>
+        <Text style={{ color: 'red' }}>
+          iOS version is outdated and insecure. Update it to continue.
+        </Text>
+      </View>);
+    }
+    let otherView = null;
     if (viewState === 'LOADING') {
         otherView = (renderLoading || defaultRenderLoading)();
     }
@@ -126,24 +94,21 @@ var WebViewComponent = forwardRef(function (_a, ref) {
         otherView = (renderError || defaultRenderError)(lastErrorEvent.domain, lastErrorEvent.code, lastErrorEvent.description);
     }
     else if (viewState !== 'IDLE') {
-        console.error("RNCWebView invalid state encountered: ".concat(viewState));
+        console.error(`RNCWebView invalid state encountered: ${viewState}`);
     }
-    var webViewStyles = [styles.container, styles.webView, style];
-    var webViewContainerStyle = [styles.container, containerStyle];
-    var decelerationRate = processDecelerationRate(decelerationRateProp);
-    var NativeWebView = (nativeConfig === null || nativeConfig === void 0 ? void 0 : nativeConfig.component)
-        || RNCWebView;
-    var webView = (<NativeWebView key="webViewKey" {...otherProps} javaScriptEnabled={javaScriptEnabled} cacheEnabled={cacheEnabled} useSharedProcessPool={useSharedProcessPool} textInteractionEnabled={textInteractionEnabled} decelerationRate={decelerationRate} messagingEnabled={typeof onMessageProp === 'function'} onLoadingError={onLoadingError} onLoadingFinish={onLoadingFinish} onLoadingProgress={onLoadingProgress} onFileDownload={onFileDownload} onLoadingStart={onLoadingStart} onHttpError={onHttpError} onMessage={onMessage} onShouldStartLoadWithRequest={onShouldStartLoadWithRequest} onContentProcessDidTerminate={onContentProcessDidTerminate} injectedJavaScript={injectedJavaScript} injectedJavaScriptBeforeContentLoaded={injectedJavaScriptBeforeContentLoaded} injectedJavaScriptForMainFrameOnly={injectedJavaScriptForMainFrameOnly} injectedJavaScriptBeforeContentLoadedForMainFrameOnly={injectedJavaScriptBeforeContentLoadedForMainFrameOnly} dataDetectorTypes={dataDetectorTypes} allowsAirPlayForMediaPlayback={allowsAirPlayForMediaPlayback} allowsInlineMediaPlayback={allowsInlineMediaPlayback} incognito={incognito} mediaPlaybackRequiresUserAction={mediaPlaybackRequiresUserAction} ref={webViewRef} 
+    const webViewStyles = [styles.container, styles.webView, style];
+    const webViewContainerStyle = [styles.container, containerStyle];
+    const decelerationRate = processDecelerationRate(decelerationRateProp);
+    const NativeWebView = RNCWebView;
+    const webView = (<NativeWebView key="webViewKey" {...otherProps} enableApplePay={enableApplePay} javaScriptEnabled={javaScriptEnabled} cacheEnabled={cacheEnabled} dataDetectorTypes={dataDetectorTypes} useSharedProcessPool={useSharedProcessPool} textInteractionEnabled={textInteractionEnabled} decelerationRate={decelerationRate} messagingEnabled={typeof onMessageProp === 'function'} onLoadingError={onLoadingError} onLoadingFinish={onLoadingFinish} onLoadingProgress={onLoadingProgress} onLoadingStart={onLoadingStart} onMessage={onMessage} onShouldStartLoadWithRequest={onShouldStartLoadWithRequest} injectedJavaScript={injectedJavaScript} injectedJavaScriptBeforeContentLoaded={injectedJavaScriptBeforeContentLoaded} allowsInlineMediaPlayback={allowsInlineMediaPlayback} incognito={incognito} mediaPlaybackRequiresUserAction={mediaPlaybackRequiresUserAction} ref={webViewRef} sharedCookiesEnabled={sharedCookiesEnabled} 
     // TODO: find a better way to type this.
-    source={resolveAssetSource(source)} style={webViewStyles} {...nativeConfig === null || nativeConfig === void 0 ? void 0 : nativeConfig.props}/>);
+    source={source} style={webViewStyles}/>);
     return (<View style={webViewContainerStyle}>
       {webView}
       {otherView}
     </View>);
 });
 // no native implementation for iOS, depends only on permissions
-var isFileUploadSupported = function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
-    return [2 /*return*/, true];
-}); }); };
-var WebView = Object.assign(WebViewComponent, { isFileUploadSupported: isFileUploadSupported });
+const isFileUploadSupported = async () => true;
+const WebView = Object.assign(WebViewComponent, { isFileUploadSupported });
 export default WebView;

package/lib/WebView.js

@@ -2,10 +2,10 @@ import React from 'react';
 import { Text, View } from 'react-native';
 // This "dummy" WebView is to render something for unsupported platforms,
 // like for example Expo SDK "web" platform.
-var WebView = function () { return (<View style={{ alignSelf: 'flex-start' }}>
+const WebView = () => (<View style={{ alignSelf: 'flex-start' }}>
 		<Text style={{ color: 'red' }}>
 			React Native WebView does not support this platform.
 		</Text>
-	</View>); };
+	</View>);
 export { WebView };
 export default WebView;

package/lib/WebView.styles.js

@@ -1,8 +1,8 @@
 import { StyleSheet } from 'react-native';
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
     container: {
         flex: 1,
-        overflow: 'hidden'
+        overflow: 'hidden',
     },
     loadingOrErrorView: {
         position: 'absolute',
@@ -14,20 +14,20 @@ var styles = StyleSheet.create({
         backgroundColor: 'white'
     },
     loadingProgressBar: {
-        height: 20
+        height: 20,
     },
     errorText: {
         fontSize: 14,
         textAlign: 'center',
-        marginBottom: 2
+        marginBottom: 2,
     },
     errorTextTitle: {
         fontSize: 15,
         fontWeight: '500',
-        marginBottom: 10
+        marginBottom: 10,
     },
     webView: {
-        backgroundColor: '#ffffff'
-    }
+        backgroundColor: '#ffffff',
+    },
 });
 export default styles;

package/lib/WebViewNativeComponent.android.js

@@ -1,3 +1,3 @@
 import { requireNativeComponent } from "react-native";
-var RNCWebView = requireNativeComponent('RNCWebView');
+const RNCWebView = requireNativeComponent('RNCWebView');
 export default RNCWebView;

package/lib/WebViewNativeComponent.ios.js

@@ -1,3 +1,3 @@
 import { requireNativeComponent } from "react-native";
-var RNCWebView = requireNativeComponent('RNCWebView');
+const RNCWebView = requireNativeComponent('RNCWebView');
 export default RNCWebView;

package/lib/WebViewShared.d.ts

@@ -1,37 +1,33 @@
 import React from 'react';
-import { OnShouldStartLoadWithRequest, ShouldStartLoadRequestEvent, WebViewError, WebViewErrorEvent, WebViewHttpErrorEvent, WebViewMessageEvent, WebViewNavigation, WebViewNavigationEvent, WebViewProgressEvent, WebViewRenderProcessGoneEvent, WebViewTerminatedEvent } from './WebViewTypes';
-declare const defaultOriginWhitelist: readonly ["http://*", "https://*"];
+import { OnShouldStartLoadWithRequest, ShouldStartLoadRequestEvent, WebViewError, WebViewErrorEvent, WebViewMessageEvent, WebViewMessage, WebViewNavigationEvent, WebViewProgressEvent, WebViewNativeEvent } from './WebViewTypes';
+declare const defaultOriginWhitelist: readonly ["https://*"];
 declare const createOnShouldStartLoadWithRequest: (loadRequest: (shouldStart: boolean, url: string, lockIdentifier: number) => void, originWhitelist: readonly string[], onShouldStartLoadWithRequest?: OnShouldStartLoadWithRequest | undefined) => ({ nativeEvent }: ShouldStartLoadRequestEvent) => void;
 declare const defaultRenderLoading: () => JSX.Element;
 declare const defaultRenderError: (errorDomain: string | undefined, errorCode: number, errorDesc: string) => JSX.Element;
 export { defaultOriginWhitelist, createOnShouldStartLoadWithRequest, defaultRenderLoading, defaultRenderError, };
-export declare const useWebWiewLogic: ({ startInLoadingState, onNavigationStateChange, onLoadStart, onLoad, onLoadProgress, onLoadEnd, onError, onHttpErrorProp, onMessageProp, onRenderProcessGoneProp, onContentProcessDidTerminateProp, originWhitelist, onShouldStartLoadWithRequestProp, onShouldStartLoadWithRequestCallback, }: {
+export declare const useWebWiewLogic: ({ startInLoadingState, onLoadStart, onLoad, onLoadEnd, onError, onMessageProp, originWhitelist, onShouldStartLoadWithRequestProp, onShouldStartLoadWithRequestCallback, validateMeta, validateData, }: {
     startInLoadingState?: boolean | undefined;
-    onNavigationStateChange?: ((event: WebViewNavigation) => void) | undefined;
     onLoadStart?: ((event: WebViewNavigationEvent) => void) | undefined;
     onLoad?: ((event: WebViewNavigationEvent) => void) | undefined;
-    onLoadProgress?: ((event: WebViewProgressEvent) => void) | undefined;
     onLoadEnd?: ((event: WebViewNavigationEvent | WebViewErrorEvent) => void) | undefined;
     onError?: ((event: WebViewErrorEvent) => void) | undefined;
-    onHttpErrorProp?: ((event: WebViewHttpErrorEvent) => void) | undefined;
-    onMessageProp?: ((event: WebViewMessageEvent) => void) | undefined;
-    onRenderProcessGoneProp?: ((event: WebViewRenderProcessGoneEvent) => void) | undefined;
-    onContentProcessDidTerminateProp?: ((event: WebViewTerminatedEvent) => void) | undefined;
+    onMessageProp?: ((event: WebViewMessage) => void) | undefined;
     originWhitelist: readonly string[];
     onShouldStartLoadWithRequestProp?: OnShouldStartLoadWithRequest | undefined;
     onShouldStartLoadWithRequestCallback: (shouldStart: boolean, url: string, lockIdentifier?: number | undefined) => void;
+    validateMeta: (event: WebViewNativeEvent) => WebViewNativeEvent;
+    validateData: (data: object) => object;
 }) => {
     onShouldStartLoadWithRequest: ({ nativeEvent }: ShouldStartLoadRequestEvent) => void;
     onLoadingStart: (event: WebViewNavigationEvent) => void;
     onLoadingProgress: (event: WebViewProgressEvent) => void;
     onLoadingError: (event: WebViewErrorEvent) => void;
     onLoadingFinish: (event: WebViewNavigationEvent) => void;
-    onHttpError: (event: WebViewHttpErrorEvent) => void;
-    onRenderProcessGone: (event: WebViewRenderProcessGoneEvent) => void;
-    onContentProcessDidTerminate: (event: WebViewTerminatedEvent) => void;
     onMessage: (event: WebViewMessageEvent) => void;
+    passesWhitelist: (url: string) => boolean | null;
     viewState: "IDLE" | "LOADING" | "ERROR";
     setViewState: React.Dispatch<React.SetStateAction<"IDLE" | "LOADING" | "ERROR">>;
     lastErrorEvent: WebViewError | null;
 };
+export declare const versionPasses: (version: string | undefined, minimum: string | undefined) => boolean;
 //# sourceMappingURL=WebViewShared.d.ts.map

package/lib/WebViewShared.js

@@ -1,44 +1,34 @@
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 import escapeStringRegexp from 'escape-string-regexp';
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 import { Linking, View, ActivityIndicator, Text, Platform } from 'react-native';
 import styles from './WebView.styles';
-var defaultOriginWhitelist = ['http://*', 'https://*'];
-var extractOrigin = function (url) {
-    var result = /^[A-Za-z][A-Za-z0-9+\-.]+:(\/\/)?[^/]*/.exec(url);
+const defaultOriginWhitelist = ['https://*'];
+const extractOrigin = (url) => {
+    const result = /^[A-Za-z][A-Za-z0-9+\-.]+:(\/\/)?[^/]*/.exec(url);
     return result === null ? '' : result[0];
 };
-var originWhitelistToRegex = function (originWhitelist) {
-    return "^".concat(escapeStringRegexp(originWhitelist).replace(/\\\*/g, '.*'));
-};
-var passesWhitelist = function (compiledWhitelist, url) {
-    var origin = extractOrigin(url);
-    return compiledWhitelist.some(function (x) { return new RegExp(x).test(origin); });
+const originWhitelistToRegex = (originWhitelist) => `^${escapeStringRegexp(originWhitelist).replace(/\\\*/g, '.*')}$`;
+const _passesWhitelist = (compiledWhitelist, url) => {
+    const origin = extractOrigin(url);
+    if (!origin)
+        return false;
+    if (origin !== new URL(url).origin)
+        return null;
+    return compiledWhitelist.some(x => new RegExp(x).test(origin));
 };
-var compileWhitelist = function (originWhitelist) {
-    return __spreadArray(['about:blank'], (originWhitelist || []), true).map(originWhitelistToRegex);
-};
-var createOnShouldStartLoadWithRequest = function (loadRequest, originWhitelist, onShouldStartLoadWithRequest) {
-    return function (_a) {
-        var nativeEvent = _a.nativeEvent;
-        var shouldStart = true;
-        var url = nativeEvent.url, lockIdentifier = nativeEvent.lockIdentifier;
-        if (!passesWhitelist(compileWhitelist(originWhitelist), url)) {
-            Linking.canOpenURL(url).then(function (supported) {
-                if (supported) {
+const compileWhitelist = (originWhitelist) => ['about:blank', ...(originWhitelist || [])].map(originWhitelistToRegex);
+const createOnShouldStartLoadWithRequest = (loadRequest, originWhitelist, onShouldStartLoadWithRequest) => {
+    return ({ nativeEvent }) => {
+        let shouldStart = true;
+        const { url, lockIdentifier, isTopFrame } = nativeEvent;
+        if (!_passesWhitelist(compileWhitelist(originWhitelist), url)) {
+            Linking.canOpenURL(url).then((supported) => {
+                if (supported && isTopFrame && /^https:\/\//.test(url)) {
                     return Linking.openURL(url);
                 }
-                console.warn("Can't open url: ".concat(url));
+                console.warn(`Can't open url: ${url}`);
                 return undefined;
-            })["catch"](function (e) {
+            }).catch(e => {
                 console.warn('Error opening URL: ', e);
             });
             shouldStart = false;
@@ -49,32 +39,41 @@ var createOnShouldStartLoadWithRequest = function (loadRequest, originWhitelist,
         loadRequest(shouldStart, url, lockIdentifier);
     };
 };
-var defaultRenderLoading = function () { return (<View style={styles.loadingOrErrorView}>
+const defaultRenderLoading = () => (<View style={styles.loadingOrErrorView}>
     <ActivityIndicator />
-  </View>); };
-var defaultRenderError = function (errorDomain, errorCode, errorDesc) { return (<View style={styles.loadingOrErrorView}>
+  </View>);
+const defaultRenderError = (errorDomain, errorCode, errorDesc) => (<View style={styles.loadingOrErrorView}>
     <Text style={styles.errorTextTitle}>Error loading page</Text>
-    <Text style={styles.errorText}>{"Domain: ".concat(errorDomain)}</Text>
-    <Text style={styles.errorText}>{"Error Code: ".concat(errorCode)}</Text>
-    <Text style={styles.errorText}>{"Description: ".concat(errorDesc)}</Text>
-  </View>); };
+    <Text style={styles.errorText}>{`Domain: ${errorDomain}`}</Text>
+    <Text style={styles.errorText}>{`Error Code: ${errorCode}`}</Text>
+    <Text style={styles.errorText}>{`Description: ${errorDesc}`}</Text>
+  </View>);
 export { defaultOriginWhitelist, createOnShouldStartLoadWithRequest, defaultRenderLoading, defaultRenderError, };
-export var useWebWiewLogic = function (_a) {
-    var startInLoadingState = _a.startInLoadingState, onNavigationStateChange = _a.onNavigationStateChange, onLoadStart = _a.onLoadStart, onLoad = _a.onLoad, onLoadProgress = _a.onLoadProgress, onLoadEnd = _a.onLoadEnd, onError = _a.onError, onHttpErrorProp = _a.onHttpErrorProp, onMessageProp = _a.onMessageProp, onRenderProcessGoneProp = _a.onRenderProcessGoneProp, onContentProcessDidTerminateProp = _a.onContentProcessDidTerminateProp, originWhitelist = _a.originWhitelist, onShouldStartLoadWithRequestProp = _a.onShouldStartLoadWithRequestProp, onShouldStartLoadWithRequestCallback = _a.onShouldStartLoadWithRequestCallback;
-    var _b = useState(startInLoadingState ? "LOADING" : "IDLE"), viewState = _b[0], setViewState = _b[1];
-    var _c = useState(null), lastErrorEvent = _c[0], setLastErrorEvent = _c[1];
-    var startUrl = useRef(null);
-    var updateNavigationState = useCallback(function (event) {
-        onNavigationStateChange === null || onNavigationStateChange === void 0 ? void 0 : onNavigationStateChange(event.nativeEvent);
-    }, [onNavigationStateChange]);
-    var onLoadingStart = useCallback(function (event) {
+export const useWebWiewLogic = ({ startInLoadingState, onLoadStart, onLoad, onLoadEnd, onError, onMessageProp, originWhitelist, onShouldStartLoadWithRequestProp, onShouldStartLoadWithRequestCallback, validateMeta, validateData, }) => {
+    const [viewState, setViewState] = useState(startInLoadingState ? "LOADING" : "IDLE");
+    const [lastErrorEvent, setLastErrorEvent] = useState(null);
+    const startUrl = useRef(null);
+    const passesWhitelist = (url) => {
+        if (!url || typeof url !== 'string')
+            return false;
+        return _passesWhitelist(compileWhitelist(originWhitelist), url);
+    };
+    const passesWhitelistUse = useCallback(passesWhitelist, [originWhitelist]);
+    const extractMeta = (nativeEvent) => ({
+        url: String(nativeEvent.url),
+        loading: Boolean(nativeEvent.loading),
+        title: String(nativeEvent.title),
+        canGoBack: Boolean(nativeEvent.canGoBack),
+        canGoForward: Boolean(nativeEvent.canGoForward),
+        lockIdentifier: Number(nativeEvent.lockIdentifier),
+    });
+    const onLoadingStart = useCallback((event) => {
         // Needed for android
         startUrl.current = event.nativeEvent.url;
         // !Needed for android
         onLoadStart === null || onLoadStart === void 0 ? void 0 : onLoadStart(event);
-        updateNavigationState(event);
-    }, [onLoadStart, updateNavigationState]);
-    var onLoadingError = useCallback(function (event) {
+    }, [onLoadStart]);
+    const onLoadingError = useCallback((event) => {
         event.persist();
         if (onError) {
             onError(event);
@@ -90,55 +89,86 @@ export var useWebWiewLogic = function (_a) {
         setViewState('ERROR');
         setLastErrorEvent(event.nativeEvent);
     }, [onError, onLoadEnd]);
-    var onHttpError = useCallback(function (event) {
-        onHttpErrorProp === null || onHttpErrorProp === void 0 ? void 0 : onHttpErrorProp(event);
-    }, [onHttpErrorProp]);
-    // Android Only
-    var onRenderProcessGone = useCallback(function (event) {
-        onRenderProcessGoneProp === null || onRenderProcessGoneProp === void 0 ? void 0 : onRenderProcessGoneProp(event);
-    }, [onRenderProcessGoneProp]);
-    // !Android Only
-    // iOS Only
-    var onContentProcessDidTerminate = useCallback(function (event) {
-        onContentProcessDidTerminateProp === null || onContentProcessDidTerminateProp === void 0 ? void 0 : onContentProcessDidTerminateProp(event);
-    }, [onContentProcessDidTerminateProp]);
-    // !iOS Only
-    var onLoadingFinish = useCallback(function (event) {
+    const onLoadingFinish = useCallback((event) => {
         onLoad === null || onLoad === void 0 ? void 0 : onLoad(event);
         onLoadEnd === null || onLoadEnd === void 0 ? void 0 : onLoadEnd(event);
-        var url = event.nativeEvent.url;
+        const { nativeEvent: { url } } = event;
+        if (!passesWhitelistUse(url))
+            return;
         // on Android, only if url === startUrl
         if (Platform.OS !== "android" || url === startUrl.current) {
             setViewState('IDLE');
         }
         // !on Android, only if url === startUrl
-        updateNavigationState(event);
-    }, [onLoad, onLoadEnd, updateNavigationState]);
-    var onMessage = useCallback(function (event) {
-        onMessageProp === null || onMessageProp === void 0 ? void 0 : onMessageProp(event);
-    }, [onMessageProp]);
-    var onLoadingProgress = useCallback(function (event) {
-        var progress = event.nativeEvent.progress;
+        // REMOVED: updateNavigationState(event);
+    }, [onLoad, onLoadEnd, passesWhitelistUse]);
+    const onMessage = useCallback((event) => {
+        const { nativeEvent } = event;
+        if (!passesWhitelistUse(nativeEvent.url))
+            return;
+        // TODO: can/should we perform any other validation?
+        const data = JSON.stringify(validateData(JSON.parse(nativeEvent.data)));
+        const meta = validateMeta(extractMeta(nativeEvent));
+        onMessageProp === null || onMessageProp === void 0 ? void 0 : onMessageProp({ ...meta, data });
+    }, [onMessageProp, passesWhitelistUse, validateData, validateMeta]);
+    const onLoadingProgress = useCallback((event) => {
+        const { nativeEvent: { progress } } = event;
+        if (!passesWhitelistUse(event.nativeEvent.url))
+            return;
         // patch for Android only
         if (Platform.OS === "android" && progress === 1) {
-            setViewState(function (prevViewState) { return prevViewState === 'LOADING' ? 'IDLE' : prevViewState; });
+            setViewState(prevViewState => prevViewState === 'LOADING' ? 'IDLE' : prevViewState);
         }
         // !patch for Android only
-        onLoadProgress === null || onLoadProgress === void 0 ? void 0 : onLoadProgress(event);
-    }, [onLoadProgress]);
-    var onShouldStartLoadWithRequest = useMemo(function () { return createOnShouldStartLoadWithRequest(onShouldStartLoadWithRequestCallback, originWhitelist, onShouldStartLoadWithRequestProp); }, [originWhitelist, onShouldStartLoadWithRequestProp, onShouldStartLoadWithRequestCallback]);
+        // REMOVED: onLoadProgress?.(event);
+    }, [passesWhitelistUse]);
+    const onShouldStartLoadWithRequest = useMemo(() => createOnShouldStartLoadWithRequest(onShouldStartLoadWithRequestCallback, originWhitelist, onShouldStartLoadWithRequestProp), [originWhitelist, onShouldStartLoadWithRequestProp, onShouldStartLoadWithRequestCallback]);
     return {
-        onShouldStartLoadWithRequest: onShouldStartLoadWithRequest,
-        onLoadingStart: onLoadingStart,
-        onLoadingProgress: onLoadingProgress,
-        onLoadingError: onLoadingError,
-        onLoadingFinish: onLoadingFinish,
-        onHttpError: onHttpError,
-        onRenderProcessGone: onRenderProcessGone,
-        onContentProcessDidTerminate: onContentProcessDidTerminate,
-        onMessage: onMessage,
-        viewState: viewState,
-        setViewState: setViewState,
-        lastErrorEvent: lastErrorEvent
+        onShouldStartLoadWithRequest,
+        onLoadingStart,
+        onLoadingProgress,
+        onLoadingError,
+        onLoadingFinish,
+        onMessage,
+        passesWhitelist,
+        viewState,
+        setViewState,
+        lastErrorEvent,
     };
 };
+export const versionPasses = (version, minimum) => {
+    if (!version || !minimum)
+        return false;
+    if (typeof version !== 'string' || typeof minimum !== 'string')
+        return false;
+    if (minimum.includes(', ')) {
+        // We have a set of possible versions
+        const variants = minimum.split(', ');
+        // Every entry but the last one should be with an upper bound
+        if (!variants.slice(0, -1).every(x => x.includes(' <')))
+            return false;
+        return variants.some(x => versionPasses(version, x)); // Any match passes
+    }
+    if (minimum.includes(' <')) {
+        const [min, max, ...rest] = minimum.split(' <');
+        if (rest.length > 0)
+            return false;
+        // Last check is required for correctness/formatting validation
+        return versionPasses(version, min) && !versionPasses(version, max) && versionPasses(max, version);
+    }
+    const versionRegex = /^[0-9]+(\.[0-9]+)*$/;
+    if (!versionRegex.test(version) || !versionRegex.test(minimum))
+        return false;
+    const versionParts = version.split('.').map(Number);
+    const minimumParts = minimum.split('.').map(Number);
+    const len = Math.max(versionParts.length, minimumParts.length);
+    for (let i = 0; i < len; i += 1) {
+        const ver = versionParts[i] || 0;
+        const min = minimumParts[i] || 0;
+        if (ver > min)
+            return true;
+        if (ver < min)
+            return false;
+    }
+    return true; // equals
+};