@exodus/react-native-webview 11.26.1-exodus.5 → 11.26.1-exodus.6

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

@@ -0,0 +1,25 @@
+package com.reactnativecommunity.webview;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+public class RNCWebViewPackage implements ReactPackage {
+    @Override
+    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+        return Arrays.<NativeModule>asList(
+          new RNCWebViewModule(reactContext),
+          new RNCWebViewUtils(reactContext)
+        );
+    }
+
+    @Override
+    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+        return Arrays.<ViewManager>asList(new RNCWebViewManager());
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.reactnativecommunity.webview;
+
+import android.webkit.WebView;
+
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.UiThreadUtil;
+
+public class RNCWebViewUtils extends ReactContextBaseJavaModule {
+  public static final String NAME = "RNCWebViewUtils";
+
+  ReactApplicationContext mCallerContext;
+
+  public RNCWebViewUtils(ReactApplicationContext reactContext) {
+    super(reactContext);
+    mCallerContext = reactContext;
+  }
+
+  @Override
+  public String getName() {
+    return NAME;
+  }
+
+  @ReactMethod
+  public void getWebViewDefaultUserAgent(final Promise promise) {
+    UiThreadUtil.runOnUiThread(new Runnable() {
+        @Override
+        public void run() {
+          try {
+            WebView webView = new WebView(mCallerContext);
+
+            // in case we ever use our own UA we need to unset it first the get the original
+            String currentUA = webView.getSettings().getUserAgentString();
+            webView.getSettings().setUserAgentString(null);
+            String webViewUA = webView.getSettings().getUserAgentString();
+
+            // Revert to overriden UA string
+            webView.getSettings().setUserAgentString(currentUA);
+
+            promise.resolve(webViewUA);
+          }
+          catch (Exception e) {
+            promise.reject(NAME, e.getMessage());
+          }
+        }
+    });
+  }
+}

package/index.js

@@ -1,4 +1,7 @@
-import WebView from './lib/WebView';
+import WebView, {
+  RNCWebViewUtils,
+  getWebViewDefaultUserAgent,
+} from './lib/WebView';
 
-export { WebView };
+export { WebView, RNCWebViewUtils, getWebViewDefaultUserAgent };
 export default WebView;

package/lib/WebView.android.js

@@ -1,4 +1,4 @@
-import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
+import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { Text, View, NativeModules, } from 'react-native';
 import BatchedBridge from 'react-native/Libraries/BatchedBridge/BatchedBridge';
 // @ts-expect-error react-native doesn't have this type
@@ -7,6 +7,14 @@ import invariant from 'invariant';
 import RNCWebView from "./WebViewNativeComponent.android";
 import { defaultOriginWhitelist, defaultRenderError, defaultRenderLoading, useWebWiewLogic, versionPasses, } from './WebViewShared';
 import styles from './WebView.styles';
+const { getWebViewDefaultUserAgent } = NativeModules.RNCWebViewUtils;
+let userAgentPromise;
+async function getUserAgent() {
+    if (!userAgentPromise)
+        userAgentPromise = getWebViewDefaultUserAgent();
+    const userAgent = await userAgentPromise;
+    return userAgent || 'unknown';
+}
 const codegenNativeCommands = codegenNativeCommandsUntyped;
 const Commands = codegenNativeCommands({
     supportedCommands: ['goBack', 'goForward', 'reload', 'stopLoading', /* 'injectJavaScript', */ 'requestFocus', 'postMessage', 'clearFormData', 'clearCache', 'clearHistory', 'loadUrl'],
@@ -70,7 +78,12 @@ const WebViewComponent = forwardRef(({ overScrollMode = 'always', javaScriptEnab
     useEffect(() => {
         BatchedBridge.registerCallableModule(messagingModuleName, directEventCallbacks);
     }, [messagingModuleName, directEventCallbacks]);
-    const userAgent = 'chrome/200'; // TODO
+    const [userAgent, setUserAgent] = useState();
+    useEffect(() => {
+        getUserAgent().then(setUserAgent);
+    }, []);
+    if (!userAgent)
+        return null; // stop the rendering until userAgent is known
     const version = (_a = userAgent.match(/chrome\/((?:[0-9]+\.)+[0-9]+)/i)) === null || _a === void 0 ? void 0 : _a[1];
     if (!(versionPasses(version, minimumChromeVersion) && versionPasses(version, hardMinimumChromeVersion))) {
         return (<View style={{ alignSelf: 'flex-start' }}>

package/package.json

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

package/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewPackage.kt

@@ -1,15 +0,0 @@
-package com.reactnativecommunity.webview
-
-import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.ReactApplicationContext
-
-
-class RNCWebViewPackage: ReactPackage {
-  override fun createNativeModules(reactContext: ReactApplicationContext) = listOf(
-    RNCWebViewModule(reactContext)
-  )
-
-  override fun createViewManagers(reactContext: ReactApplicationContext) = listOf(
-    RNCWebViewManager()
-  )
-}