@exodus/react-native-webview 11.26.1-exodus.2 → 11.26.1-exodus.4

package/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java

@@ -699,17 +699,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
           RNCWebView reactWebView = (RNCWebView) root;
           JSONObject eventInitDict = new JSONObject();
           eventInitDict.put("data", args.getString(0));
-          reactWebView.evaluateJavascriptWithFallback("(function () {" +
-            "var event;" +
-            "var data = " + eventInitDict.toString() + ";" +
-            "try {" +
-            "event = new MessageEvent('message', data);" +
-            "} catch (e) {" +
-            "event = document.createEvent('MessageEvent');" +
-            "event.initMessageEvent('message', true, true, data.data, data.origin, data.lastEventId, data.source);" +
-            "}" +
-            "document.dispatchEvent(event);" +
-            "})();");
+          reactWebView.evaluateJavascriptWithFallback("document.dispatchEvent(new MessageEvent('message', " + eventInitDict.toString() + "));");
         } catch (JSONException e) {
           throw new RuntimeException(e);
         }
@@ -1249,7 +1239,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     public void onGeolocationPermissionsShowPrompt(String origin, GeolocationPermissions.Callback callback) {
 
       // Always deny
-      callback.invoke(origin, true, false);
+      callback.invoke(origin, false, false);
 
     }
 

package/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewModule.java

@@ -95,28 +95,6 @@ public class RNCWebViewModule extends ReactContextBaseJavaModule implements Acti
     }
   }
 
-  private PermissionListener getWebviewFileDownloaderPermissionListener(String downloadingMessage, String lackPermissionToDownloadMessage) {
-    return new PermissionListener() {
-      @Override
-      public boolean onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        switch (requestCode) {
-          case FILE_DOWNLOAD_PERMISSION_REQUEST: {
-            // If request is cancelled, the result arrays are empty.
-            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-              if (downloadRequest != null) {
-                downloadFile(downloadingMessage);
-              }
-            } else {
-              Toast.makeText(getCurrentActivity().getApplicationContext(), lackPermissionToDownloadMessage, Toast.LENGTH_LONG).show();
-            }
-            return true;
-          }
-        }
-        return false;
-      }
-    };
-  }
-
   public RNCWebViewModule(ReactApplicationContext reactContext) {
     super(reactContext);
     reactContext.addActivityEventListener(this);
@@ -321,21 +299,6 @@ public class RNCWebViewModule extends ReactContextBaseJavaModule implements Acti
     Toast.makeText(getCurrentActivity().getApplicationContext(), downloadingMessage, Toast.LENGTH_LONG).show();
   }
 
-  public boolean grantFileDownloaderPermissions(String downloadingMessage, String lackPermissionToDownloadMessage) {
-    // Permission not required for Android Q and above
-    if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
-      return true;
-    }
-
-    boolean result = ContextCompat.checkSelfPermission(getCurrentActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
-    if (!result && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-      PermissionAwareActivity activity = getPermissionAwareActivity();
-      activity.requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, FILE_DOWNLOAD_PERMISSION_REQUEST, getWebviewFileDownloaderPermissionListener(downloadingMessage, lackPermissionToDownloadMessage));
-    }
-
-    return result;
-  }
-
   protected boolean needsCameraPermission() {
     boolean needed = false;
 

package/apple/RNCWebView.m

@@ -872,7 +872,7 @@ RCTAutoInsetsProtocol>
 {
   NSDictionary *eventInitDict = @{@"data": message};
   NSString *source = [NSString
-                      stringWithFormat:@"window.dispatchEvent(new MessageEvent('message', %@));",
+                      stringWithFormat:@"document.dispatchEvent(new MessageEvent('message', %@));",
                       RCTJSONStringify(eventInitDict, NULL)
   ];
   [self injectJavaScript: source];

package/lib/WebView.android.js

@@ -1,5 +1,5 @@
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
-import { Image, View, NativeModules, } from 'react-native';
+import { 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';
@@ -11,7 +11,6 @@ const codegenNativeCommands = codegenNativeCommandsUntyped;
 const Commands = codegenNativeCommands({
     supportedCommands: ['goBack', 'goForward', 'reload', 'stopLoading', /* 'injectJavaScript', */ 'requestFocus', 'postMessage', 'clearFormData', 'clearCache', 'clearHistory', 'loadUrl'],
 });
-const { resolveAssetSource } = Image;
 /**
  * A simple counter to uniquely identify WebView instances. Do not use this for anything else.
  */
@@ -101,7 +100,7 @@ const WebViewComponent = forwardRef(({ overScrollMode = 'always', javaScriptEnab
     const NativeWebView = RNCWebView;
     const 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} injectedJavaScriptForMainFrameOnly={injectedJavaScriptForMainFrameOnly} injectedJavaScriptBeforeContentLoadedForMainFrameOnly={injectedJavaScriptBeforeContentLoadedForMainFrameOnly} 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} allowFileAccessFromFileURLs={allowFileAccessFromFileURLs} allowUniversalAccessFromFileURLs={allowUniversalAccessFromFileURLs} saveFormDataDisabled={saveFormDataDisabled} cacheEnabled={cacheEnabled} androidHardwareAccelerationDisabled={androidHardwareAccelerationDisabled} androidLayerType={androidLayerType} setSupportMultipleWindows={setSupportMultipleWindows} setBuiltInZoomControls={setBuiltInZoomControls} setDisplayZoomControls={setDisplayZoomControls} mixedContentMode={mixedContentMode} nestedScrollEnabled={nestedScrollEnabled} mediaPlaybackRequiresUserAction={mediaPlaybackRequiresUserAction}/>;
+    source={source} style={webViewStyles} overScrollMode={overScrollMode} javaScriptEnabled={javaScriptEnabled} thirdPartyCookiesEnabled={thirdPartyCookiesEnabled} scalesPageToFit={scalesPageToFit} allowsFullscreenVideo={allowsFullscreenVideo} allowFileAccess={allowFileAccess} allowFileAccessFromFileURLs={allowFileAccessFromFileURLs} allowUniversalAccessFromFileURLs={allowUniversalAccessFromFileURLs} saveFormDataDisabled={saveFormDataDisabled} cacheEnabled={cacheEnabled} androidHardwareAccelerationDisabled={androidHardwareAccelerationDisabled} androidLayerType={androidLayerType} setSupportMultipleWindows={setSupportMultipleWindows} setBuiltInZoomControls={setBuiltInZoomControls} setDisplayZoomControls={setDisplayZoomControls} mixedContentMode={mixedContentMode} nestedScrollEnabled={nestedScrollEnabled} mediaPlaybackRequiresUserAction={mediaPlaybackRequiresUserAction}/>;
     return (<View style={webViewContainerStyle}>
       {webView}
       {otherView}

package/lib/WebView.ios.js

@@ -1,5 +1,5 @@
 import React, { forwardRef, useCallback, useImperativeHandle, useRef } from 'react';
-import { Image, View, NativeModules, } from 'react-native';
+import { View, NativeModules, } 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';
@@ -10,7 +10,6 @@ const codegenNativeCommands = codegenNativeCommandsUntyped;
 const Commands = codegenNativeCommands({
     supportedCommands: ['goBack', 'goForward', 'reload', 'stopLoading', /* 'injectJavaScript', */ 'requestFocus', 'postMessage', 'loadUrl'],
 });
-const { resolveAssetSource } = Image;
 const processDecelerationRate = (decelerationRate) => {
     let newDecelerationRate = decelerationRate;
     if (newDecelerationRate === 'normal') {
@@ -100,7 +99,7 @@ const WebViewComponent = forwardRef(({ javaScriptEnabled = true, cacheEnabled =
     const NativeWebView = RNCWebView;
     const webView = (<NativeWebView key="webViewKey" {...otherProps} allowFileAccessFromFileURLs={allowFileAccessFromFileURLs} allowUniversalAccessFromFileURLs={allowUniversalAccessFromFileURLs} enableApplePay={enableApplePay} javaScriptEnabled={javaScriptEnabled} cacheEnabled={cacheEnabled} dataDetectorTypes={dataDetectorTypes} 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} allowsAirPlayForMediaPlayback={allowsAirPlayForMediaPlayback} allowsInlineMediaPlayback={allowsInlineMediaPlayback} incognito={incognito} mediaPlaybackRequiresUserAction={mediaPlaybackRequiresUserAction} ref={webViewRef} sharedCookiesEnabled={sharedCookiesEnabled} 
     // TODO: find a better way to type this.
-    source={resolveAssetSource(source)} style={webViewStyles}/>);
+    source={source} style={webViewStyles}/>);
     return (<View style={webViewContainerStyle}>
       {webView}
       {otherView}

package/lib/WebViewShared.js

@@ -1,6 +1,6 @@
 import escapeStringRegexp from 'escape-string-regexp';
 import React, { useCallback, useMemo, useRef, useState } from 'react';
-import { Linking, View, ActivityIndicator, Text, Platform } from 'react-native';
+import { View, ActivityIndicator, Text, Platform } from 'react-native';
 import styles from './WebView.styles';
 const defaultOriginWhitelist = ['http://*', 'https://*'];
 const extractOrigin = (url) => {
@@ -18,15 +18,6 @@ const createOnShouldStartLoadWithRequest = (loadRequest, originWhitelist, onShou
         let shouldStart = true;
         const { url, lockIdentifier } = nativeEvent;
         if (!passesWhitelist(compileWhitelist(originWhitelist), url)) {
-            Linking.canOpenURL(url).then((supported) => {
-                if (supported) {
-                    return Linking.openURL(url);
-                }
-                console.warn(`Can't open url: ${url}`);
-                return undefined;
-            }).catch(e => {
-                console.warn('Error opening URL: ', e);
-            });
             shouldStart = false;
         }
         else if (onShouldStartLoadWithRequest) {

package/package.json

@@ -9,7 +9,7 @@
     "Thibault Malbranche <malbranche.thibault@gmail.com>"
   ],
   "license": "MIT",
-  "version": "11.26.1-exodus.2",
+  "version": "11.26.1-exodus.4",
   "homepage": "https://github.com/ExodusMovement/react-native-webview#readme",
   "scripts": {
     "android": "react-native run-android",