@exodus/react-native-webview 11.26.1-exodus.12 → 11.26.1-exodus.14

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

@@ -338,6 +338,11 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     CookieManager.getInstance().setAcceptThirdPartyCookies(view, enabled);
   }
 
+  @ReactProp(name = "webviewDebuggingEnabled")
+  public void setWebviewDebuggingEnabled(WebView view, boolean value) {
+      ((RNCWebView) view).setWebContentsDebuggingEnabled(value);
+  }
+
   @ReactProp(name = "textZoom")
   public void setTextZoom(WebView view, int value) {
     view.getSettings().setTextZoom(value);
@@ -430,12 +435,6 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
   @ReactProp(name = "source")
   public void setSource(WebView view, @Nullable ReadableMap source) {
     if (source != null) {
-      if (source.hasKey("html")) {
-        String html = source.getString("html");
-        String baseUrl = source.hasKey("baseUrl") ? source.getString("baseUrl") : "";
-        view.loadDataWithBaseURL(baseUrl, html, HTML_MIME_TYPE, HTML_ENCODING, null);
-        return;
-      }
       if (source.hasKey("uri")) {
         String url = source.getString("uri");
         String previousUrl = view.getUrl();

package/apple/RNCWebView.h

@@ -48,6 +48,7 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *_Nonnull)request
 @property (nonatomic, assign) BOOL pagingEnabled;
 @property (nonatomic, assign) CGFloat decelerationRate;
 @property (nonatomic, assign) BOOL allowsInlineMediaPlayback;
+@property (nonatomic, assign) BOOL webviewDebuggingEnabled;
 @property (nonatomic, assign) BOOL bounces;
 @property (nonatomic, assign) BOOL mediaPlaybackRequiresUserAction;
 #if WEBKIT_IOS_10_APIS_AVAILABLE

package/apple/RNCWebView.m

@@ -406,6 +406,13 @@ RCTAutoInsetsProtocol>
     }
 #endif
     
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 130300 || \
+    __IPHONE_OS_VERSION_MAX_ALLOWED >= 160400 || \
+    __TV_OS_VERSION_MAX_ALLOWED >= 160400
+    if (@available(macOS 13.3, iOS 16.4, tvOS 16.4, *))
+      _webView.inspectable = _webviewDebuggingEnabled;
+#endif
+
     [self addSubview:_webView];
     [self setHideKeyboardAccessoryView: _savedHideKeyboardAccessoryView];
     [self setKeyboardDisplayRequiresUserAction: _savedKeyboardDisplayRequiresUserAction];
@@ -431,6 +438,16 @@ RCTAutoInsetsProtocol>
   _webView.allowsBackForwardNavigationGestures = _allowsBackForwardNavigationGestures;
 }
 
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 130300 || \
+    __IPHONE_OS_VERSION_MAX_ALLOWED >= 160400 || \
+    __TV_OS_VERSION_MAX_ALLOWED >= 160400
+- (void)setWebviewDebuggingEnabled:(BOOL)webviewDebuggingEnabled {
+  _webviewDebuggingEnabled = webviewDebuggingEnabled;
+  if (@available(macOS 13.3, iOS 16.4, tvOS 16.4, *))
+      _webView.inspectable = _webviewDebuggingEnabled;
+}
+#endif
+
 - (void)removeFromSuperview
 {
   if (_webView) {
@@ -615,16 +632,6 @@ RCTAutoInsetsProtocol>
 
 - (void)visitSource
 {
-  // Check for a static html source first
-  NSString *html = [RCTConvert NSString:_source[@"html"]];
-  if (html) {
-    NSURL *baseURL = [RCTConvert NSURL:_source[@"baseUrl"]];
-    if (!baseURL) {
-      baseURL = [NSURL URLWithString:@"about:blank"];
-    }
-    [_webView loadHTMLString:html baseURL:baseURL];
-    return;
-  }
   // Add cookie for subsequent resource requests sent by page itself, if cookie was set in headers on WebView
   NSString *headerCookie = [RCTConvert NSString:_source[@"headers"][@"cookie"]];
   if(headerCookie) {

package/apple/RNCWebViewManager.m

@@ -63,6 +63,7 @@ RCT_EXPORT_VIEW_PROPERTY(injectedJavaScript, NSString)
 RCT_EXPORT_VIEW_PROPERTY(injectedJavaScriptBeforeContentLoaded, NSString)
 RCT_EXPORT_VIEW_PROPERTY(javaScriptEnabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(allowsInlineMediaPlayback, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(webviewDebuggingEnabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(mediaPlaybackRequiresUserAction, BOOL)
 #if WEBKIT_IOS_10_APIS_AVAILABLE
 RCT_EXPORT_VIEW_PROPERTY(dataDetectorTypes, WKDataDetectorTypes)

package/lib/WebView.android.js

@@ -1,5 +1,5 @@
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
-import { Text, Image, View, NativeModules, } from 'react-native';
+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
 import codegenNativeCommandsUntyped from 'react-native/Libraries/Utilities/codegenNativeCommands';
@@ -19,7 +19,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.
  */
@@ -124,7 +123,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} 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} 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} 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 { Text, Image, View, NativeModules, Platform, } 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';
@@ -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') {
@@ -103,7 +102,7 @@ const WebViewComponent = forwardRef(({ javaScriptEnabled = true, cacheEnabled =
     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}/>);
+    source={source} style={webViewStyles}/>);
     return (<View style={webViewContainerStyle}>
       {webView}
       {otherView}

package/lib/WebViewTypes.d.ts

@@ -146,6 +146,7 @@ export interface CommonNativeWebViewProps extends ViewProps {
     injectedJavaScript?: string;
     injectedJavaScriptBeforeContentLoaded?: string;
     mediaPlaybackRequiresUserAction?: boolean;
+    webviewDebuggingEnabled?: boolean;
     messagingEnabled: boolean;
     onScroll?: (event: WebViewScrollEvent) => void;
     onLoadingError: (event: WebViewErrorEvent) => void;
@@ -713,6 +714,10 @@ export interface WebViewSharedProps extends ViewProps {
      * An object that specifies the credentials of a user to be used for basic authentication.
      */
     basicAuthCredential?: BasicAuthCredential;
+    /**
+     * Enables WebView remote debugging using Chrome (Android) or Safari (iOS).
+     */
+    webviewDebuggingEnabled?: boolean;
     /**
      * Event metadata validation.
      */

package/package.json

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