@momo-kits/webview 0.0.74-beta → 0.72.1

package/index.d.ts

@@ -1,47 +1,2 @@
-import { Component } from 'react';
-// eslint-disable-next-line
-import { IOSWebViewProps, AndroidWebViewProps } from './lib/WebViewTypes';
-
-export { FileDownload, WebViewMessageEvent, WebViewNavigation } from './lib/WebViewTypes';
-
-export type WebViewProps = IOSWebViewProps & AndroidWebViewProps;
-
-declare class WebView extends Component<WebViewProps> {
-    /**
-     * Go back one page in the webview's history.
-     */
-    goBack: () => void;
-
-    /**
-     * Go forward one page in the webview's history.
-     */
-    goForward: () => void;
-
-    /**
-     * Reloads the current page.
-     */
-    reload: () => void;
-
-    /**
-     * Stop loading the current page.
-     */
-    stopLoading(): void;
-
-    /**
-     * Extra Native Component Config.
-     */
-    extraNativeComponentConfig: () => any;
-
-    /**
-     * Executes the JavaScript string.
-     */
-    injectJavaScript: (script: string) => void;
-
-    /**
-     * Focuses on WebView redered page.
-     */
-    requestFocus: () => void;
-}
-
-export { WebView };
+import WebView from './lib/WebView';
 export default WebView;

package/index.js

@@ -1,4 +1,2 @@
-/* eslint-disable */
 import WebView from './lib/WebView';
-
 export default WebView;

package/lib/WebView.android.d.ts

@@ -1,75 +1,7 @@
 import React from 'react';
-import { WebViewRenderProcessGoneEvent, WebViewErrorEvent, WebViewHttpErrorEvent, WebViewMessageEvent, WebViewNavigationEvent, WebViewProgressEvent, AndroidWebViewProps, NativeWebViewAndroid, State } from './WebViewTypes';
-/**
- * Renders a native WebView.
- */
-declare class WebView extends React.Component<AndroidWebViewProps, State> {
-    static defaultProps: {
-        overScrollMode: string;
-        javaScriptEnabled: boolean;
-        thirdPartyCookiesEnabled: boolean;
-        scalesPageToFit: boolean;
-        allowsFullscreenVideo: boolean;
-        allowFileAccess: boolean;
-        saveFormDataDisabled: boolean;
-        cacheEnabled: boolean;
-        androidHardwareAccelerationDisabled: boolean;
-        androidLayerType: string;
-        originWhitelist: string[];
-    };
-    static isFileUploadSupported: () => Promise<any>;
-    startUrl: string | null;
-    state: State;
-    webViewRef: React.RefObject<NativeWebViewAndroid>;
-    messagingModuleName: string;
-    componentDidMount: () => void;
-    getCommands: () => {
-        goForward: number;
-        goBack: number;
-        reload: number;
-        stopLoading: number;
-        postMessage: number;
-        injectJavaScript: number;
-        loadUrl: number;
-        requestFocus: number;
-        clearHistory: number;
-        clearCache: number;
-        clearFormData: number;
-    };
-    goForward: () => void;
-    goBack: () => void;
-    reload: () => void;
-    stopLoading: () => void;
-    requestFocus: () => void;
-    postMessage: (data: string) => void;
-    clearFormData: () => void;
-    clearCache: (includeDiskFiles: boolean) => void;
-    clearHistory: () => void;
-    /**
-     * Injects a javascript string into the referenced WebView. Deliberately does not
-     * return a response because using eval() to return a response breaks this method
-     * on pages with a Content Security Policy that disallows eval(). If you need that
-     * functionality, look into postMessage/onMessage.
-     */
-    injectJavaScript: (data: string) => void;
-    /**
-     * We return an event with a bunch of fields including:
-     *  url, title, loading, canGoBack, canGoForward
-     */
-    updateNavigationState: (event: WebViewNavigationEvent) => void;
-    /**
-     * Returns the native `WebView` node.
-     */
-    getWebViewHandle: () => number;
-    onLoadingStart: (event: WebViewNavigationEvent) => void;
-    onLoadingError: (event: WebViewErrorEvent) => void;
-    onHttpError: (event: WebViewHttpErrorEvent) => void;
-    onRenderProcessGone: (event: WebViewRenderProcessGoneEvent) => void;
-    onLoadingFinish: (event: WebViewNavigationEvent) => void;
-    onMessage: (event: WebViewMessageEvent) => void;
-    onLoadingProgress: (event: WebViewProgressEvent) => void;
-    onShouldStartLoadWithRequestCallback: (shouldStart: boolean, url: string) => void;
-    render(): JSX.Element;
-}
+import { AndroidWebViewProps } from './WebViewTypes';
+declare const WebView: React.ForwardRefExoticComponent<AndroidWebViewProps & React.RefAttributes<{}>> & {
+    isFileUploadSupported: () => Promise<boolean>;
+};
 export default WebView;
 //# sourceMappingURL=WebView.android.d.ts.map

package/lib/WebView.android.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebView.android.d.ts","sourceRoot":"","sources":["../src/WebView.android.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAsB1B,OAAO,EACL,6BAA6B,EAC7B,iBAAiB,EACjB,qBAAqB,EACrB,mBAAmB,EACnB,sBAAsB,EACtB,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EACpB,KAAK,EAEN,MAAM,gBAAgB,CAAC;AAgBxB;;GAEG;AACH,cAAM,OAAQ,SAAQ,KAAK,CAAC,SAAS,CAAC,mBAAmB,EAAE,KAAK,CAAC;IAC/D,MAAM,CAAC,YAAY;;;;;;;;;;;;MAYjB;IAEF,MAAM,CAAC,qBAAqB,qBAG1B;IAEF,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAQ;IAE/B,KAAK,EAAE,KAAK,CAGV;IAGF,UAAU,wCAA2C;IAErD,mBAAmB,SAA0C;IAE7D,iBAAiB,aAEf;IAEF,WAAW;;;;;;;;;;;;MAA+D;IAE1E,SAAS,aAMP;IAEF,MAAM,aAMJ;IAEF,MAAM,aASJ;IAEF,WAAW,aAMT;IAEF,YAAY,aAMV;IAEF,WAAW,yBAMT;IAEF,aAAa,aAMZ;IAED,UAAU,sCAMR;IAEF,YAAY,aAMV;IAEF;;;;;OAKG;IACH,gBAAgB,yBAMd;IAEF;;;OAGG;IACH,qBAAqB,0CAInB;IAEF;;OAEG;IACH,gBAAgB,eAId;IAEF,cAAc,0CAQZ;IAEF,cAAc,qCAeZ;IAEF,WAAW,yCAKV;IAED,mBAAmB,iDAKlB;IAED,eAAe,0CAeb;IAEF,SAAS,uCAKP;IAEF,iBAAiB,wCAcf;IAEF,oCAAoC,8CAWlC;IAEF,MAAM;CAoFP;AAED,eAAe,OAAO,CAAC"}
+{"version":3,"file":"WebView.android.d.ts","sourceRoot":"","sources":["../src/WebView.android.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmF,MAAM,OAAO,CAAC;AAsBxG,OAAO,EACL,mBAAmB,EAEpB,MAAM,gBAAgB,CAAC;AA0LxB,QAAA,MAAM,OAAO;iCAHsB,QAAQ,OAAO,CAAC;CAGqB,CAAC;AAEzE,eAAe,OAAO,CAAC"}

package/lib/WebView.android.js

@@ -1,318 +1,112 @@
-/* eslint-disable */
-import React from 'react';
-import {
-    Image, requireNativeComponent, UIManager as NotTypedUIManager, View, NativeModules, findNodeHandle,
-} from 'react-native';
-import BatchedBridge from 'react-native/Libraries/BatchedBridge/BatchedBridge';
-import invariant from 'invariant';
-import {
-    defaultOriginWhitelist, createOnShouldStartLoadWithRequest, defaultRenderError, defaultRenderLoading,
-} from './WebViewShared';
-import styles from './WebView.styles';
-
-const __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf
-            || ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; })
-            || function (d, b) { for (const p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-}());
-const __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(((resolve) => { resolve(value); })); }
-    return new (P || (P = Promise))(((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());
-    }));
-};
-const __generator = (this && this.__generator) || function (thisArg, body) {
-    let _ = {
-        label: 0, sent() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: []
-    }; let f; let y; let t; let
-        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 };
-    }
-};
-const __rest = (this && this.__rest) || function (s, e) {
-    const 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') {
+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]];
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
         }
-    }
     return t;
 };
-
-const UIManager = NotTypedUIManager;
-const RNCWebView = requireNativeComponent('RNCWebView');
-const { resolveAssetSource } = Image;
+import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
+import { Image, View, NativeModules, } from 'react-native';
+import BatchedBridge from 'react-native/Libraries/BatchedBridge/BatchedBridge';
+// @ts-expect-error react-native doesn't have this type
+import codegenNativeCommandsUntyped from 'react-native/Libraries/Utilities/codegenNativeCommands';
+import invariant from 'invariant';
+import RNCWebView from "./WebViewNativeComponent.android";
+import { defaultOriginWhitelist, defaultRenderError, defaultRenderLoading, useWebWiewLogic, } from './WebViewShared';
+import styles from './WebView.styles';
+var codegenNativeCommands = codegenNativeCommandsUntyped;
+var Commands = codegenNativeCommands({
+    supportedCommands: ['goBack', 'goForward', 'reload', 'stopLoading', 'injectJavaScript', 'requestFocus', 'postMessage', 'clearFormData', 'clearCache', 'clearHistory', 'loadUrl']
+});
+var resolveAssetSource = Image.resolveAssetSource;
 /**
  * A simple counter to uniquely identify WebView instances. Do not use this for anything else.
  */
-let uniqueRef = 0;
-/**
- * Renders a native WebView.
- */
-const WebView = /** @class */ (function (_super) {
-    __extends(WebView, _super);
-    function WebView() {
-        const _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.startUrl = null;
-        _this.state = {
-            viewState: _this.props.startInLoadingState ? 'LOADING' : 'IDLE',
-            lastErrorEvent: null
-        };
-        _this.webViewRef = React.createRef();
-        _this.messagingModuleName = `WebViewMessageHandler${uniqueRef += 1}`;
-        _this.componentDidMount = function () {
-            BatchedBridge.registerCallableModule(_this.messagingModuleName, _this);
-        };
-        _this.getCommands = function () { return UIManager.getViewManagerConfig('RNCWebView').Commands; };
-        _this.goForward = function () {
-            UIManager.dispatchViewManagerCommand(_this.getWebViewHandle(), _this.getCommands().goForward, undefined);
-        };
-        _this.goBack = function () {
-            UIManager.dispatchViewManagerCommand(_this.getWebViewHandle(), _this.getCommands().goBack, undefined);
-        };
-        _this.reload = function () {
-            _this.setState({
-                viewState: 'LOADING'
-            });
-            UIManager.dispatchViewManagerCommand(_this.getWebViewHandle(), _this.getCommands().reload, undefined);
-        };
-        _this.stopLoading = function () {
-            UIManager.dispatchViewManagerCommand(_this.getWebViewHandle(), _this.getCommands().stopLoading, undefined);
-        };
-        _this.requestFocus = function () {
-            UIManager.dispatchViewManagerCommand(_this.getWebViewHandle(), _this.getCommands().requestFocus, undefined);
-        };
-        _this.postMessage = function (data) {
-            UIManager.dispatchViewManagerCommand(_this.getWebViewHandle(), _this.getCommands().postMessage, [String(data)]);
-        };
-        _this.clearFormData = function () {
-            UIManager.dispatchViewManagerCommand(_this.getWebViewHandle(), _this.getCommands().clearFormData, undefined);
-        };
-        _this.clearCache = function (includeDiskFiles) {
-            UIManager.dispatchViewManagerCommand(_this.getWebViewHandle(), _this.getCommands().clearCache, [includeDiskFiles]);
-        };
-        _this.clearHistory = function () {
-            UIManager.dispatchViewManagerCommand(_this.getWebViewHandle(), _this.getCommands().clearHistory, undefined);
-        };
-        /**
-         * Injects a javascript string into the referenced WebView. Deliberately does not
-         * return a response because using eval() to return a response breaks this method
-         * on pages with a Content Security Policy that disallows eval(). If you need that
-         * functionality, look into postMessage/onMessage.
-         */
-        _this.injectJavaScript = function (data) {
-            UIManager.dispatchViewManagerCommand(_this.getWebViewHandle(), _this.getCommands().injectJavaScript, [data]);
-        };
-        /**
-         * We return an event with a bunch of fields including:
-         *  url, title, loading, canGoBack, canGoForward
-         */
-        _this.updateNavigationState = function (event) {
-            if (_this.props.onNavigationStateChange) {
-                _this.props.onNavigationStateChange(event.nativeEvent);
-            }
-        };
-        /**
-         * Returns the native `WebView` node.
-         */
-        _this.getWebViewHandle = function () {
-            const nodeHandle = findNodeHandle(_this.webViewRef.current);
-            invariant(nodeHandle != null, 'nodeHandle expected to be non-null');
-            return nodeHandle;
-        };
-        _this.onLoadingStart = function (event) {
-            const { onLoadStart } = _this.props;
-            const { url } = event.nativeEvent;
-            _this.startUrl = url;
-            if (onLoadStart) {
-                onLoadStart(event);
-            }
-            _this.updateNavigationState(event);
-        };
-        _this.onLoadingError = function (event) {
-            event.persist(); // persist this event because we need to store it
-            const _a = _this.props; const { onError } = _a; const
-                { onLoadEnd } = _a;
-            if (onError) {
-                onError(event);
-            }
-            if (onLoadEnd) {
-                onLoadEnd(event);
-            }
-            console.warn('Encountered an error loading page', event.nativeEvent);
-            _this.setState({
-                lastErrorEvent: event.nativeEvent,
-                viewState: 'ERROR'
-            });
-        };
-        _this.onHttpError = function (event) {
-            const { onHttpError } = _this.props;
-            if (onHttpError) {
-                onHttpError(event);
-            }
-        };
-        _this.onRenderProcessGone = function (event) {
-            const { onRenderProcessGone } = _this.props;
-            if (onRenderProcessGone) {
-                onRenderProcessGone(event);
-            }
-        };
-        _this.onLoadingFinish = function (event) {
-            const _a = _this.props; const { onLoad } = _a; const
-                { onLoadEnd } = _a;
-            const { url } = event.nativeEvent;
-            if (onLoad) {
-                onLoad(event);
-            }
-            if (onLoadEnd) {
-                onLoadEnd(event);
-            }
-            if (url === _this.startUrl) {
-                _this.setState({
-                    viewState: 'IDLE'
-                });
-            }
-            _this.updateNavigationState(event);
-        };
-        _this.onMessage = function (event) {
-            const { onMessage } = _this.props;
-            if (onMessage) {
-                onMessage(event);
-            }
-        };
-        _this.onLoadingProgress = function (event) {
-            const { onLoadProgress } = _this.props;
-            const { progress } = event.nativeEvent;
-            if (progress === 1) {
-                _this.setState((state) => {
-                    if (state.viewState === 'LOADING') {
-                        return { viewState: 'IDLE' };
-                    }
-                    return null;
-                });
-            }
-            if (onLoadProgress) {
-                onLoadProgress(event);
-            }
-        };
-        _this.onShouldStartLoadWithRequestCallback = function (shouldStart, url) {
-            if (shouldStart) {
-                UIManager.dispatchViewManagerCommand(_this.getWebViewHandle(), _this.getCommands().loadUrl, [String(url)]);
-            }
-        };
-        return _this;
+var uniqueRef = 0;
+var WebViewComponent = forwardRef(function (_a, ref) {
+    var _b = _a.overScrollMode, overScrollMode = _b === void 0 ? 'always' : _b, _c = _a.javaScriptEnabled, javaScriptEnabled = _c === void 0 ? true : _c, _d = _a.thirdPartyCookiesEnabled, thirdPartyCookiesEnabled = _d === void 0 ? true : _d, _e = _a.scalesPageToFit, scalesPageToFit = _e === void 0 ? true : _e, _f = _a.allowsFullscreenVideo, allowsFullscreenVideo = _f === void 0 ? false : _f, _g = _a.allowFileAccess, allowFileAccess = _g === void 0 ? false : _g, _h = _a.saveFormDataDisabled, saveFormDataDisabled = _h === void 0 ? false : _h, _j = _a.cacheEnabled, cacheEnabled = _j === void 0 ? true : _j, _k = _a.androidHardwareAccelerationDisabled, androidHardwareAccelerationDisabled = _k === void 0 ? false : _k, _l = _a.androidLayerType, androidLayerType = _l === void 0 ? "none" : _l, _m = _a.originWhitelist, originWhitelist = _m === void 0 ? defaultOriginWhitelist : _m, _o = _a.setSupportMultipleWindows, setSupportMultipleWindows = _o === void 0 ? true : _o, _p = _a.setBuiltInZoomControls, setBuiltInZoomControls = _p === void 0 ? true : _p, _q = _a.setDisplayZoomControls, setDisplayZoomControls = _q === void 0 ? false : _q, _r = _a.nestedScrollEnabled, nestedScrollEnabled = _r === void 0 ? false : _r, startInLoadingState = _a.startInLoadingState, onNavigationStateChange = _a.onNavigationStateChange, onLoadStart = _a.onLoadStart, onError = _a.onError, onLoad = _a.onLoad, onLoadEnd = _a.onLoadEnd, onLoadProgress = _a.onLoadProgress, onHttpErrorProp = _a.onHttpError, onRenderProcessGoneProp = _a.onRenderProcessGone, onMessageProp = _a.onMessage, renderLoading = _a.renderLoading, renderError = _a.renderError, style = _a.style, containerStyle = _a.containerStyle, source = _a.source, nativeConfig = _a.nativeConfig, onShouldStartLoadWithRequestProp = _a.onShouldStartLoadWithRequest, otherProps = __rest(_a, ["overScrollMode", "javaScriptEnabled", "thirdPartyCookiesEnabled", "scalesPageToFit", "allowsFullscreenVideo", "allowFileAccess", "saveFormDataDisabled", "cacheEnabled", "androidHardwareAccelerationDisabled", "androidLayerType", "originWhitelist", "setSupportMultipleWindows", "setBuiltInZoomControls", "setDisplayZoomControls", "nestedScrollEnabled", "startInLoadingState", "onNavigationStateChange", "onLoadStart", "onError", "onLoad", "onLoadEnd", "onLoadProgress", "onHttpError", "onRenderProcessGone", "onMessage", "renderLoading", "renderError", "style", "containerStyle", "source", "nativeConfig", "onShouldStartLoadWithRequest"]);
+    var messagingModuleName = useRef("WebViewMessageHandler".concat(uniqueRef += 1)).current;
+    var webViewRef = useRef(null);
+    var onShouldStartLoadWithRequestCallback = useCallback(function (shouldStart, url, lockIdentifier) {
+        if (lockIdentifier) {
+            NativeModules.RNCWebView.onShouldStartLoadWithRequestCallback(shouldStart, lockIdentifier);
+        }
+        else if (shouldStart) {
+            Commands.loadUrl(webViewRef.current, url);
+        }
+    }, []);
+    var _s = useWebWiewLogic({
+        onNavigationStateChange: onNavigationStateChange,
+        onLoad: onLoad,
+        onError: onError,
+        onHttpErrorProp: onHttpErrorProp,
+        onLoadEnd: onLoadEnd,
+        onLoadProgress: onLoadProgress,
+        onLoadStart: onLoadStart,
+        onRenderProcessGoneProp: onRenderProcessGoneProp,
+        onMessageProp: onMessageProp,
+        startInLoadingState: startInLoadingState,
+        originWhitelist: originWhitelist,
+        onShouldStartLoadWithRequestProp: onShouldStartLoadWithRequestProp,
+        onShouldStartLoadWithRequestCallback: onShouldStartLoadWithRequestCallback
+    }), onLoadingStart = _s.onLoadingStart, onShouldStartLoadWithRequest = _s.onShouldStartLoadWithRequest, onMessage = _s.onMessage, viewState = _s.viewState, setViewState = _s.setViewState, lastErrorEvent = _s.lastErrorEvent, onHttpError = _s.onHttpError, onLoadingError = _s.onLoadingError, onLoadingFinish = _s.onLoadingFinish, onLoadingProgress = _s.onLoadingProgress, onRenderProcessGone = _s.onRenderProcessGone;
+    useImperativeHandle(ref, function () { return ({
+        goForward: function () { return Commands.goForward(webViewRef.current); },
+        goBack: function () { return Commands.goBack(webViewRef.current); },
+        reload: function () {
+            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); },
+        clearFormData: function () { return Commands.clearFormData(webViewRef.current); },
+        clearCache: function (includeDiskFiles) { return Commands.clearCache(webViewRef.current, includeDiskFiles); },
+        clearHistory: function () { return Commands.clearHistory(webViewRef.current); }
+    }); }, [setViewState, webViewRef]);
+    var directEventCallbacks = useMemo(function () { return ({
+        onShouldStartLoadWithRequest: onShouldStartLoadWithRequest,
+        onMessage: onMessage
+    }); }, [onMessage, onShouldStartLoadWithRequest]);
+    useEffect(function () {
+        BatchedBridge.registerCallableModule(messagingModuleName, directEventCallbacks);
+    }, [messagingModuleName, directEventCallbacks]);
+    var otherView = null;
+    if (viewState === 'LOADING') {
+        otherView = (renderLoading || defaultRenderLoading)();
+    }
+    else if (viewState === 'ERROR') {
+        invariant(lastErrorEvent != null, 'lastErrorEvent expected to be non-null');
+        otherView = (renderError || defaultRenderError)(lastErrorEvent.domain, lastErrorEvent.code, lastErrorEvent.description);
     }
-    WebView.prototype.render = function () {
-        const _a = this.props; const { onMessage } = _a; const onShouldStartLoadWithRequestProp = _a.onShouldStartLoadWithRequest; const { originWhitelist } = _a; const { renderError } = _a; const { renderLoading } = _a; const { source } = _a; const { style } = _a; const { containerStyle } = _a; const _b = _a.nativeConfig; const nativeConfig = _b === void 0 ? {} : _b; const
-            otherProps = __rest(_a, ['onMessage', 'onShouldStartLoadWithRequest', 'originWhitelist', 'renderError', 'renderLoading', 'source', 'style', 'containerStyle', 'nativeConfig']);
-        let otherView = null;
-        if (this.state.viewState === 'LOADING') {
-            otherView = (renderLoading || defaultRenderLoading)();
-        } else if (this.state.viewState === 'ERROR') {
-            const errorEvent = this.state.lastErrorEvent;
-            invariant(errorEvent != null, 'lastErrorEvent expected to be non-null');
-            otherView = (renderError || defaultRenderError)(errorEvent.domain, errorEvent.code, errorEvent.description);
-        } else if (this.state.viewState !== 'IDLE') {
-            console.error(`RNCWebView invalid state encountered: ${this.state.viewState}`);
+    else if (viewState !== 'IDLE') {
+        console.error("RNCWebView invalid state encountered: ".concat(viewState));
+    }
+    var webViewStyles = [styles.container, styles.webView, style];
+    var webViewContainerStyle = [styles.container, containerStyle];
+    if (typeof source !== "number" && source && 'method' in source) {
+        if (source.method === 'POST' && source.headers) {
+            console.warn('WebView: `source.headers` is not supported when using POST.');
         }
-        const webViewStyles = [styles.container, styles.webView, style];
-        const webViewContainerStyle = [styles.container, containerStyle];
-        if (typeof source !== 'number' && source && 'method' in source) {
-            if (source.method === 'POST' && source.headers) {
-                console.warn('WebView: `source.headers` is not supported when using POST.');
-            } else if (source.method === 'GET' && source.body) {
-                console.warn('WebView: `source.body` is not supported when using GET.');
-            }
+        else if (source.method === 'GET' && source.body) {
+            console.warn('WebView: `source.body` is not supported when using GET.');
         }
-        const NativeWebView = nativeConfig.component || RNCWebView;
-        const onShouldStartLoadWithRequest = createOnShouldStartLoadWithRequest(this.onShouldStartLoadWithRequestCallback,
-        // casting cause it's in the default props
-            originWhitelist, onShouldStartLoadWithRequestProp);
-        const webView = (
-            <NativeWebView
-                key="webViewKey"
-                {...otherProps}
-                messagingEnabled={typeof onMessage === 'function'}
-                messagingModuleName={this.messagingModuleName}
-                onLoadingError={this.onLoadingError}
-                onLoadingFinish={this.onLoadingFinish}
-                onLoadingProgress={this.onLoadingProgress}
-                onLoadingStart={this.onLoadingStart}
-                onHttpError={this.onHttpError}
-                onRenderProcessGone={this.onRenderProcessGone}
-                onMessage={this.onMessage}
-                onShouldStartLoadWithRequest={onShouldStartLoadWithRequest}
-                ref={this.webViewRef}
-                // TODO: find a better way to type this.
-                source={resolveAssetSource(source)}
-                style={webViewStyles}
-                {...nativeConfig.props}
-            />
-        );
-        return (
-            <View style={webViewContainerStyle}>
-                {webView}
-                {otherView}
-            </View>
-        );
-    };
-    WebView.defaultProps = {
-        overScrollMode: 'always',
-        javaScriptEnabled: true,
-        thirdPartyCookiesEnabled: true,
-        scalesPageToFit: true,
-        allowsFullscreenVideo: false,
-        allowFileAccess: false,
-        saveFormDataDisabled: false,
-        cacheEnabled: true,
-        androidHardwareAccelerationDisabled: false,
-        androidLayerType: 'none',
-        originWhitelist: defaultOriginWhitelist
-    };
-    WebView.isFileUploadSupported = function () {
-        return __awaiter(void 0, void 0, void 0, function () {
-            return __generator(this, (_a) =>
-            // native implementation should return "true" only for Android 5+
-                [2 /* return */, NativeModules.RNCWebView.isFileUploadSupported()]
-            );
-        });
-    };
-    return WebView;
-}(React.Component));
+    }
+    var NativeWebView = (nativeConfig === null || nativeConfig === void 0 ? void 0 : nativeConfig.component) || RNCWebView;
+    var webView = <NativeWebView key="webViewKey" {...otherProps} messagingEnabled={typeof onMessageProp === 'function'} messagingModuleName={messagingModuleName} onLoadingError={onLoadingError} onLoadingFinish={onLoadingFinish} onLoadingProgress={onLoadingProgress} onLoadingStart={onLoadingStart} onHttpError={onHttpError} onRenderProcessGone={onRenderProcessGone} onMessage={onMessage} onShouldStartLoadWithRequest={onShouldStartLoadWithRequest} ref={webViewRef} 
+    // TODO: find a better way to type this.
+    source={resolveAssetSource(source)} style={webViewStyles} overScrollMode={overScrollMode} javaScriptEnabled={javaScriptEnabled} thirdPartyCookiesEnabled={thirdPartyCookiesEnabled} scalesPageToFit={scalesPageToFit} allowsFullscreenVideo={allowsFullscreenVideo} allowFileAccess={allowFileAccess} saveFormDataDisabled={saveFormDataDisabled} cacheEnabled={cacheEnabled} androidHardwareAccelerationDisabled={androidHardwareAccelerationDisabled} androidLayerType={androidLayerType} setSupportMultipleWindows={setSupportMultipleWindows} setBuiltInZoomControls={setBuiltInZoomControls} setDisplayZoomControls={setDisplayZoomControls} nestedScrollEnabled={nestedScrollEnabled} {...nativeConfig === null || nativeConfig === void 0 ? void 0 : nativeConfig.props}/>;
+    return (<View style={webViewContainerStyle}>
+      {webView}
+      {otherView}
+    </View>);
+});
+// native implementation should return "true" only for Android 5+
+var isFileUploadSupported = NativeModules.RNCWebView.isFileUploadSupported();
+var WebView = Object.assign(WebViewComponent, { isFileUploadSupported: isFileUploadSupported });
 export default WebView;

package/lib/WebView.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { IOSWebViewProps, AndroidWebViewProps } from './WebViewTypes';
-export declare type WebViewProps = IOSWebViewProps & AndroidWebViewProps;
+import { IOSWebViewProps, AndroidWebViewProps, WindowsWebViewProps } from './WebViewTypes';
+export declare type WebViewProps = IOSWebViewProps & AndroidWebViewProps & WindowsWebViewProps;
 declare const WebView: React.FunctionComponent<WebViewProps>;
 export { WebView };
 export default WebView;

package/lib/WebView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebView.d.ts","sourceRoot":"","sources":["../src/WebView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAEtE,oBAAY,YAAY,GAAG,eAAe,GAAG,mBAAmB,CAAC;AAMjE,QAAA,MAAM,OAAO,EAAE,KAAK,CAAC,iBAAiB,CAAC,YAAY,CAMlD,CAAC;AAEF,OAAO,EAAE,OAAO,EAAE,CAAC;AACnB,eAAe,OAAO,CAAC"}
+{"version":3,"file":"WebView.d.ts","sourceRoot":"","sources":["../src/WebView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE3F,oBAAY,YAAY,GAAG,eAAe,GAAG,mBAAmB,GAAG,mBAAmB,CAAC;AAIvF,QAAA,MAAM,OAAO,EAAE,KAAK,CAAC,iBAAiB,CAAC,YAAY,CAMlD,CAAC;AAEF,OAAO,EAAE,OAAO,EAAE,CAAC;AACnB,eAAe,OAAO,CAAC"}