@exodus/react-native-webview 11.26.1-exodus.3 → 11.26.1-exodus.30

package/android/src/main/java/com/reactnativecommunity/webview/events/{TopHttpErrorEvent.kt → TopNewWindowEvent.kt}

@@ -5,12 +5,12 @@ import com.facebook.react.uimanager.events.Event
 import com.facebook.react.uimanager.events.RCTEventEmitter
 
 /**
- * Event emitted when a http error is received from the server.
+ * Event emitted when the WebView opens a new Window (i.e: target=_blank)
  */
-class TopHttpErrorEvent(viewId: Int, private val mEventData: WritableMap) :
-  Event<TopHttpErrorEvent>(viewId) {
+class TopOpenWindowEvent(viewId: Int, private val mEventData: WritableMap) :
+  Event<TopOpenWindowEvent>(viewId) {
   companion object {
-    const val EVENT_NAME = "topHttpError"
+    const val EVENT_NAME = "topOpenWindow"
   }
 
   override fun getEventName(): String = EVENT_NAME
@@ -22,4 +22,4 @@ class TopHttpErrorEvent(viewId: Int, private val mEventData: WritableMap) :
   override fun dispatch(rctEventEmitter: RCTEventEmitter) =
     rctEventEmitter.receiveEvent(viewTag, eventName, mEventData)
 
-}
+}

package/apple/RNCWebView.h

@@ -42,15 +42,13 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *_Nonnull)request
 @property (nonatomic, assign) BOOL messagingEnabled;
 @property (nonatomic, copy) NSString * _Nullable injectedJavaScript;
 @property (nonatomic, copy) NSString * _Nullable injectedJavaScriptBeforeContentLoaded;
-@property (nonatomic, assign) BOOL injectedJavaScriptForMainFrameOnly;
-@property (nonatomic, assign) BOOL injectedJavaScriptBeforeContentLoadedForMainFrameOnly;
 @property (nonatomic, assign) BOOL scrollEnabled;
 @property (nonatomic, assign) BOOL sharedCookiesEnabled;
 @property (nonatomic, assign) BOOL autoManageStatusBarEnabled;
 @property (nonatomic, assign) BOOL pagingEnabled;
 @property (nonatomic, assign) CGFloat decelerationRate;
 @property (nonatomic, assign) BOOL allowsInlineMediaPlayback;
-@property (nonatomic, assign) BOOL allowsAirPlayForMediaPlayback;
+@property (nonatomic, assign) BOOL webviewDebuggingEnabled;
 @property (nonatomic, assign) BOOL bounces;
 @property (nonatomic, assign) BOOL mediaPlaybackRequiresUserAction;
 #if WEBKIT_IOS_10_APIS_AVAILABLE
@@ -64,17 +62,12 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *_Nonnull)request
 @property (nonatomic, assign) BOOL incognito;
 @property (nonatomic, assign) BOOL useSharedProcessPool;
 @property (nonatomic, copy) NSString * _Nullable userAgent;
-@property (nonatomic, copy) NSString * _Nullable applicationNameForUserAgent;
 @property (nonatomic, assign) BOOL cacheEnabled;
 @property (nonatomic, assign) BOOL javaScriptEnabled;
-@property (nonatomic, assign) BOOL allowFileAccessFromFileURLs;
-@property (nonatomic, assign) BOOL allowUniversalAccessFromFileURLs;
 @property (nonatomic, assign) BOOL allowsLinkPreview;
 @property (nonatomic, assign) BOOL showsHorizontalScrollIndicator;
 @property (nonatomic, assign) BOOL showsVerticalScrollIndicator;
 @property (nonatomic, assign) BOOL directionalLockEnabled;
-@property (nonatomic, assign) BOOL ignoreSilentHardwareSwitch;
-@property (nonatomic, copy) NSString * _Nullable allowingReadAccessToURL;
 @property (nonatomic, copy) NSDictionary * _Nullable basicAuthCredential;
 @property (nonatomic, assign) BOOL pullToRefreshEnabled;
 @property (nonatomic, assign) BOOL enableApplePay;

package/apple/RNCWebView.m

@@ -54,13 +54,11 @@ UIScrollViewDelegate,
 #endif // !TARGET_OS_OSX
 RCTAutoInsetsProtocol>
 
-@property (nonatomic, copy) RCTDirectEventBlock onFileDownload;
 @property (nonatomic, copy) RCTDirectEventBlock onLoadingStart;
 @property (nonatomic, copy) RCTDirectEventBlock onLoadingFinish;
 @property (nonatomic, copy) RCTDirectEventBlock onLoadingError;
 @property (nonatomic, copy) RCTDirectEventBlock onLoadingProgress;
 @property (nonatomic, copy) RCTDirectEventBlock onShouldStartLoadWithRequest;
-@property (nonatomic, copy) RCTDirectEventBlock onHttpError;
 @property (nonatomic, copy) RCTDirectEventBlock onMessage;
 @property (nonatomic, copy) RCTDirectEventBlock onScroll;
 @property (nonatomic, copy) RCTDirectEventBlock onContentProcessDidTerminate;
@@ -122,9 +120,7 @@ RCTAutoInsetsProtocol>
     _savedStatusBarHidden = RCTSharedApplication().statusBarHidden;
 #endif // !TARGET_OS_OSX
     _injectedJavaScript = nil;
-    _injectedJavaScriptForMainFrameOnly = YES;
     _injectedJavaScriptBeforeContentLoaded = nil;
-    _injectedJavaScriptBeforeContentLoadedForMainFrameOnly = YES;
     
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
     _savedContentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
@@ -139,15 +135,6 @@ RCTAutoInsetsProtocol>
   }
   
 #if !TARGET_OS_OSX
-  [[NSNotificationCenter defaultCenter]addObserver:self
-                                          selector:@selector(appDidBecomeActive)
-                                              name:UIApplicationDidBecomeActiveNotification
-                                            object:nil];
-  
-  [[NSNotificationCenter defaultCenter]addObserver:self
-                                          selector:@selector(appWillResignActive)
-                                              name:UIApplicationWillResignActiveNotification
-                                            object:nil];
   if (@available(iOS 12.0, *)) {
     // Workaround for a keyboard dismissal bug present in iOS 12
     // https://openradar.appspot.com/radar?id=5018321736957952
@@ -306,30 +293,23 @@ RCTAutoInsetsProtocol>
 {
   WKWebViewConfiguration *wkWebViewConfig = [WKWebViewConfiguration new];
   WKPreferences *prefs = [[WKPreferences alloc]init];
-  BOOL _prefsUsed = YES;
   if (!_javaScriptEnabled) {
     prefs.javaScriptEnabled = NO;
-    _prefsUsed = YES;
-  }
-  if (_allowUniversalAccessFromFileURLs) {
-    [wkWebViewConfig setValue:@TRUE forKey:@"allowUniversalAccessFromFileURLs"];
-  }
-  if (_allowFileAccessFromFileURLs) {
-    [prefs setValue:@TRUE forKey:@"allowFileAccessFromFileURLs"];
-    _prefsUsed = YES;
   }
+
+  // NOTE: defaults, recheck?
+  // [wkWebViewConfig setValue:@FALSE forKey:@"allowUniversalAccessFromFileURLs"];
+  // [prefs setValue:@FALSE forKey:@"allowFileAccessFromFileURLs"];
+
   [prefs setValue:@FALSE forKey:@"javaScriptCanOpenWindowsAutomatically"];
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 140500 /* iOS 14.5 */
   if (@available(iOS 14.5, *)) {
     if (!_textInteractionEnabled) {
       [prefs setValue:@FALSE forKey:@"textInteractionEnabled"];
-      _prefsUsed = YES;
     }
   }
 #endif
-  if (_prefsUsed) {
-    wkWebViewConfig.preferences = prefs;
-  }
+  wkWebViewConfig.preferences = prefs;
   if (_incognito) {
     wkWebViewConfig.websiteDataStore = [WKWebsiteDataStore nonPersistentDataStore];
   } else if (_cacheEnabled) {
@@ -364,7 +344,7 @@ RCTAutoInsetsProtocol>
   [self resetupScripts:wkWebViewConfig];
   
   if(@available(ios 9.0, *)) {
-    wkWebViewConfig.allowsAirPlayForMediaPlayback = _allowsAirPlayForMediaPlayback;
+    wkWebViewConfig.allowsAirPlayForMediaPlayback = NO;
   }
   
 #if !TARGET_OS_OSX
@@ -379,10 +359,6 @@ RCTAutoInsetsProtocol>
 #endif
 #endif // !TARGET_OS_OSX
   
-  if (_applicationNameForUserAgent) {
-    wkWebViewConfig.applicationNameForUserAgent = [NSString stringWithFormat:@"%@ %@", wkWebViewConfig.applicationNameForUserAgent, _applicationNameForUserAgent];
-  }
-  
   return wkWebViewConfig;
 }
 
@@ -430,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];
@@ -455,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) {
@@ -466,10 +459,6 @@ RCTAutoInsetsProtocol>
     _webView.scrollView.delegate = nil;
 #endif // !TARGET_OS_OSX
     _webView = nil;
-    if (_onContentProcessDidTerminate) {
-      NSMutableDictionary<NSString *, id> *event = [self baseEvent];
-      _onContentProcessDidTerminate(event);
-    }
   }
   
   [super removeFromSuperview];
@@ -591,6 +580,14 @@ RCTAutoInsetsProtocol>
   }
 }
 #endif
+
+- (NSMutableDictionary<NSString *, id> *)baseEventWithScriptMessage:(WKScriptMessage *)message {
+    NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+    NSString *messageOriginURL = message.frameInfo.request.URL.absoluteString ?: @"";
+    event[@"url"] = messageOriginURL;
+    return event;
+}
+
 /**
  * This method is called whenever JavaScript running within the web view calls:
  *   - window.webkit.messageHandlers[MessageHandlerName].postMessage
@@ -600,13 +597,13 @@ RCTAutoInsetsProtocol>
 {
   if ([message.name isEqualToString:HistoryShimName]) {
     if (_onLoadingFinish) {
-      NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+      NSMutableDictionary<NSString *, id> *event = [self baseEventWithScriptMessage:message];
       [event addEntriesFromDictionary: @{@"navigationType": message.body}];
       _onLoadingFinish(event);
     }
   } else if ([message.name isEqualToString:MessageHandlerName]) {
     if (_onMessage) {
-      NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+      NSMutableDictionary<NSString *, id> *event = [self baseEventWithScriptMessage:message];
       [event addEntriesFromDictionary: @{@"data": message.body}];
       _onMessage(event);
     }
@@ -624,17 +621,6 @@ RCTAutoInsetsProtocol>
   }
 }
 
-- (void)setAllowingReadAccessToURL:(NSString *)allowingReadAccessToURL
-{
-  if (![_allowingReadAccessToURL isEqualToString:allowingReadAccessToURL]) {
-    _allowingReadAccessToURL = [allowingReadAccessToURL copy];
-    
-    if (_webView != nil) {
-      [self visitSource];
-    }
-  }
-}
-
 #if !TARGET_OS_OSX
 - (void)setContentInset:(UIEdgeInsets)contentInset
 {
@@ -682,8 +668,10 @@ RCTAutoInsetsProtocol>
       [_webView loadRequest:request];
     }
     else {
-      NSURL* readAccessUrl = _allowingReadAccessToURL ? [RCTConvert NSURL:_allowingReadAccessToURL] : request.URL;
-      [_webView loadFileURL:request.URL allowingReadAccessToURL:readAccessUrl];
+      // WARNING: UNREACHABLE, non-host loads (file urls)
+      // Clear the webview
+      [_webView loadHTMLString:@"" baseURL:nil];
+      return;
     }
   }];
 }
@@ -872,7 +860,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];
@@ -1147,10 +1135,6 @@ RCTAutoInsetsProtocol>
 - (void)webViewWebContentProcessDidTerminate:(WKWebView *)webView
 {
   RCTLogWarn(@"Webview Process Terminated");
-  if (_onContentProcessDidTerminate) {
-    NSMutableDictionary<NSString *, id> *event = [self baseEvent];
-    _onContentProcessDidTerminate(event);
-  }
 }
 
 /**
@@ -1162,36 +1146,19 @@ RCTAutoInsetsProtocol>
                     decisionHandler:(void (^)(WKNavigationResponsePolicy))decisionHandler
 {
   WKNavigationResponsePolicy policy = WKNavigationResponsePolicyAllow;
-  if (_onHttpError && navigationResponse.forMainFrame) {
+  if (navigationResponse.forMainFrame) {
     if ([navigationResponse.response isKindOfClass:[NSHTTPURLResponse class]]) {
       NSHTTPURLResponse *response = (NSHTTPURLResponse *)navigationResponse.response;
       NSInteger statusCode = response.statusCode;
       
-      if (statusCode >= 400) {
-        NSMutableDictionary<NSString *, id> *httpErrorEvent = [self baseEvent];
-        [httpErrorEvent addEntriesFromDictionary: @{
-          @"url": response.URL.absoluteString,
-          @"statusCode": @(statusCode)
-        }];
-        
-        _onHttpError(httpErrorEvent);
-      }
-      
       NSString *disposition = nil;
       if (@available(iOS 13, *)) {
         disposition = [response valueForHTTPHeaderField:@"Content-Disposition"];
       }
       BOOL isAttachment = disposition != nil && [disposition hasPrefix:@"attachment"];
       if (isAttachment || !navigationResponse.canShowMIMEType) {
-        if (_onFileDownload) {
-          policy = WKNavigationResponsePolicyCancel;
-          
-          NSMutableDictionary<NSString *, id> *downloadEvent = [self baseEvent];
-          [downloadEvent addEntriesFromDictionary: @{
-            @"downloadUrl": (response.URL).absoluteString,
-          }];
-          _onFileDownload(downloadEvent);
-        }
+        policy = WKNavigationResponsePolicyCancel;
+        // File downloads are cancelled
       }
     }
   }
@@ -1252,37 +1219,6 @@ RCTAutoInsetsProtocol>
   }];
 }
 
--(void)forceIgnoreSilentHardwareSwitch:(BOOL)initialSetup
-{
-  NSString *mp3Str = @"data:audio/mp3;base64,//tAxAAAAAAAAAAAAAAAAAAAAAAASW5mbwAAAA8AAAAFAAAESAAzMzMzMzMzMzMzMzMzMzMzMzMzZmZmZmZmZmZmZmZmZmZmZmZmZmaZmZmZmZmZmZmZmZmZmZmZmZmZmczMzMzMzMzMzMzMzMzMzMzMzMzM//////////////////////////8AAAA5TEFNRTMuMTAwAZYAAAAAAAAAABQ4JAMGQgAAOAAABEhNIZS0AAAAAAD/+0DEAAPH3Yz0AAR8CPqyIEABp6AxjG/4x/XiInE4lfQDFwIIRE+uBgZoW4RL0OLMDFn6E5v+/u5ehf76bu7/6bu5+gAiIQGAABQIUJ0QolFghEn/9PhZQpcUTpXMjo0OGzRCZXyKxoIQzB2KhCtGobpT9TRVj/3Pmfp+f8X7Pu1B04sTnc3s0XhOlXoGVCMNo9X//9/r6a10TZEY5DsxqvO7mO5qFvpFCmKIjhpSItGsUYcRO//7QsQRgEiljQIAgLFJAbIhNBCa+JmorCbOi5q9nVd2dKnusTMQg4MFUlD6DQ4OFijwGAijRMfLbHG4nLVTjydyPlJTj8pfPflf9/5GD950A5e+jsrmNZSjSirjs1R7hnkia8vr//l/7Nb+crvr9Ok5ZJOylUKRxf/P9Zn0j2P4pJYXyKkeuy5wUYtdmOu6uobEtFqhIJViLEKIjGxchGev/L3Y0O3bwrIOszTBAZ7Ih28EUaSOZf/7QsQfg8fpjQIADN0JHbGgQBAZ8T//y//t/7d/2+f5m7MdCeo/9tdkMtGLbt1tqnabRroO1Qfvh20yEbei8nfDXP7btW7f9/uO9tbe5IvHQbLlxpf3DkAk0ojYcv///5/u3/7PTfGjPEPUvt5D6f+/3Lea4lz4tc4TnM/mFPrmalWbboeNiNyeyr+vufttZuvrVrt/WYv3T74JFo8qEDiJqJrmDTs///v99xDku2xG02jjunrICP/7QsQtA8kpkQAAgNMA/7FgQAGnobgfghgqA+uXwWQ3XFmGimSbe2X3ksY//KzK1a2k6cnNWOPJnPWUsYbKqkh8RJzrVf///P///////4vyhLKHLrCb5nIrYIUss4cthigL1lQ1wwNAc6C1pf1TIKRSkt+a//z+yLVcwlXKSqeSuCVQFLng2h4AFAFgTkH+Z/8jTX/zr//zsJV/5f//5UX/0ZNCNCCaf5lTCTRkaEdhNP//n/KUjf/7QsQ5AEhdiwAAjN7I6jGddBCO+WGTQ1mXrYatSAgaykxBTUUzLjEwMKqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqg==";
-  NSString *scr;
-  if (initialSetup) {
-    scr = [NSString stringWithFormat:@"var s=new Audio('%@');s.id='wkwebviewAudio';s.controls=false;s.loop=true;s.play();document.body.appendChild(s);true", mp3Str];
-  } else {
-    scr = [NSString stringWithFormat:@"var s=document.getElementById('wkwebviewAudio');s.src=null;s.parentNode.removeChild(s);s=null;s=new Audio('%@');s.id='wkwebviewAudio';s.controls=false;s.loop=true;s.play();document.body.appendChild(s);true", mp3Str];
-  }
-  [self evaluateJS: scr thenCall: nil];
-}
-
--(void)disableIgnoreSilentSwitch
-{
-  [self evaluateJS: @"document.getElementById('wkwebviewAudio').src=null;true" thenCall: nil];
-}
-
--(void)appDidBecomeActive
-{
-  if (_ignoreSilentHardwareSwitch) {
-    [self forceIgnoreSilentHardwareSwitch:false];
-  }
-}
-
--(void)appWillResignActive
-{
-  if (_ignoreSilentHardwareSwitch) {
-    [self disableIgnoreSilentSwitch];
-  }
-}
-
 /**
  * Called when the navigation is complete.
  * @see https://fburl.com/rtys6jlb
@@ -1290,10 +1226,6 @@ RCTAutoInsetsProtocol>
 - (void)webView:(WKWebView *)webView
 didFinishNavigation:(WKNavigation *)navigation
 {
-  if (_ignoreSilentHardwareSwitch) {
-    [self forceIgnoreSilentHardwareSwitch:true];
-  }
-
   if (_onLoadingFinish) {
     _onLoadingFinish([self baseEvent]);
   }
@@ -1389,7 +1321,7 @@ didFinishNavigation:(WKNavigation *)navigation
   
   self.atEndScript = source == nil ? nil : [[WKUserScript alloc] initWithSource:source
                                                                   injectionTime:WKUserScriptInjectionTimeAtDocumentEnd
-                                                               forMainFrameOnly:_injectedJavaScriptForMainFrameOnly];
+                                                               forMainFrameOnly:YES];
   
   if(_webView != nil){
     [self resetupScripts:_webView.configuration];
@@ -1401,23 +1333,13 @@ didFinishNavigation:(WKNavigation *)navigation
   
   self.atStartScript = source == nil ? nil : [[WKUserScript alloc] initWithSource:source
                                                                     injectionTime:WKUserScriptInjectionTimeAtDocumentStart
-                                                                 forMainFrameOnly:_injectedJavaScriptBeforeContentLoadedForMainFrameOnly];
+                                                                 forMainFrameOnly:YES];
   
   if(_webView != nil){
     [self resetupScripts:_webView.configuration];
   }
 }
 
-- (void)setInjectedJavaScriptForMainFrameOnly:(BOOL)mainFrameOnly {
-  _injectedJavaScriptForMainFrameOnly = mainFrameOnly;
-  [self setInjectedJavaScript:_injectedJavaScript];
-}
-
-- (void)setInjectedJavaScriptBeforeContentLoadedForMainFrameOnly:(BOOL)mainFrameOnly {
-  _injectedJavaScriptBeforeContentLoadedForMainFrameOnly = mainFrameOnly;
-  [self setInjectedJavaScriptBeforeContentLoaded:_injectedJavaScriptBeforeContentLoaded];
-}
-
 - (void)setMessagingEnabled:(BOOL)messagingEnabled {
   _messagingEnabled = messagingEnabled;
   
@@ -1434,9 +1356,6 @@ didFinishNavigation:(WKNavigation *)navigation
       "};", MessageHandlerName, MessageHandlerName
     ]
     injectionTime:WKUserScriptInjectionTimeAtDocumentStart
-    /* TODO: For a separate (minor) PR: use logic like this (as react-native-wkwebview does) so that messaging can be used in all frames if desired.
-     *       I am keeping it as YES for consistency with previous behaviour. */
-    // forMainFrameOnly:_messagingEnabledForMainFrameOnly
     forMainFrameOnly:YES
   ] :
   nil;

package/apple/RNCWebViewManager.m

@@ -54,23 +54,16 @@ RCT_EXPORT_MODULE()
 }
 
 RCT_EXPORT_VIEW_PROPERTY(source, NSDictionary)
-RCT_EXPORT_VIEW_PROPERTY(onFileDownload, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onLoadingStart, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onLoadingFinish, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onLoadingError, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onLoadingProgress, RCTDirectEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onHttpError, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onShouldStartLoadWithRequest, RCTDirectEventBlock)
-RCT_EXPORT_VIEW_PROPERTY(onContentProcessDidTerminate, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(injectedJavaScript, NSString)
 RCT_EXPORT_VIEW_PROPERTY(injectedJavaScriptBeforeContentLoaded, NSString)
-RCT_EXPORT_VIEW_PROPERTY(injectedJavaScriptForMainFrameOnly, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(injectedJavaScriptBeforeContentLoadedForMainFrameOnly, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(javaScriptEnabled, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(allowFileAccessFromFileURLs, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(allowUniversalAccessFromFileURLs, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(allowsInlineMediaPlayback, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(allowsAirPlayForMediaPlayback, 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)
@@ -82,10 +75,8 @@ RCT_EXPORT_VIEW_PROPERTY(hideKeyboardAccessoryView, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(allowsBackForwardNavigationGestures, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(incognito, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(pagingEnabled, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(applicationNameForUserAgent, NSString)
 RCT_EXPORT_VIEW_PROPERTY(cacheEnabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(allowsLinkPreview, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(allowingReadAccessToURL, NSString)
 RCT_EXPORT_VIEW_PROPERTY(basicAuthCredential, NSDictionary)
 
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
@@ -269,8 +260,8 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
     _shouldStartLoadLock = nil;
     return returnValue;
   } else {
-    RCTLogWarn(@"Did not receive response to shouldStartLoad in time, defaulting to YES");
-    return YES;
+    RCTLogWarn(@"Did not receive response to shouldStartLoad in time, defaulting to NO");
+    return NO;
   }
 }
 

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,12 +1,20 @@
-import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
-import { View, NativeModules, } from 'react-native';
+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
 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 { defaultOriginWhitelist, defaultDeeplinkWhitelist, 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'],
@@ -18,17 +26,13 @@ let uniqueRef = 0;
 /**
  * Harcoded default for security.
  */
-const allowFileAccessFromFileURLs = false;
-const allowUniversalAccessFromFileURLs = false;
-const injectedJavaScriptForMainFrameOnly = true;
-const injectedJavaScriptBeforeContentLoadedForMainFrameOnly = true;
 const mediaPlaybackRequiresUserAction = true;
 // Android only
-const allowsFullscreenVideo = false;
-const allowFileAccess = false;
 const setSupportMultipleWindows = true;
 const mixedContentMode = 'never';
-const WebViewComponent = forwardRef(({ overScrollMode = 'always', javaScriptEnabled = true, thirdPartyCookiesEnabled = true, scalesPageToFit = true, saveFormDataDisabled = false, cacheEnabled = true, androidHardwareAccelerationDisabled = false, androidLayerType = "none", originWhitelist = defaultOriginWhitelist, setBuiltInZoomControls = true, setDisplayZoomControls = false, nestedScrollEnabled = false, startInLoadingState, onNavigationStateChange, onLoadStart, onError, onLoad, onLoadEnd, onLoadProgress, onHttpError: onHttpErrorProp, onRenderProcessGone: onRenderProcessGoneProp, onMessage: onMessageProp, renderLoading, renderError, style, containerStyle, source, onShouldStartLoadWithRequest: onShouldStartLoadWithRequestProp, ...otherProps }, ref) => {
+const hardMinimumChromeVersion = '100.0'; // TODO: determinime a good lower bound
+const WebViewComponent = forwardRef(({ overScrollMode = 'always', javaScriptEnabled = true, thirdPartyCookiesEnabled = true, scalesPageToFit = true, saveFormDataDisabled = false, cacheEnabled = true, androidHardwareAccelerationDisabled = false, androidLayerType = "none", originWhitelist = defaultOriginWhitelist, deeplinkWhitelist = defaultDeeplinkWhitelist, setBuiltInZoomControls = true, setDisplayZoomControls = false, nestedScrollEnabled = false, startInLoadingState, onLoadStart, onError, onLoad, onLoadEnd, onMessage: onMessageProp, onOpenWindow: onOpenWindowProp, renderLoading, renderError, style, containerStyle, source, onShouldStartLoadWithRequest: onShouldStartLoadWithRequestProp, validateMeta, validateData, minimumChromeVersion, unsupportedVersionComponent: UnsupportedVersionComponent, ...otherProps }, ref) => {
+    var _a;
     const messagingModuleName = useRef(`WebViewMessageHandler${uniqueRef += 1}`).current;
     const webViewRef = useRef(null);
     const onShouldStartLoadWithRequestCallback = useCallback((shouldStart, url, lockIdentifier) => {
@@ -39,35 +43,37 @@ const WebViewComponent = forwardRef(({ overScrollMode = 'always', javaScriptEnab
             Commands.loadUrl(webViewRef.current, url);
         }
     }, []);
-    const { onLoadingStart, onShouldStartLoadWithRequest, onMessage, viewState, setViewState, lastErrorEvent, onHttpError, onLoadingError, onLoadingFinish, onLoadingProgress, onRenderProcessGone } = useWebWiewLogic({
-        onNavigationStateChange,
+    const { onLoadingStart, onShouldStartLoadWithRequest, onMessage, viewState, setViewState, lastErrorEvent, onLoadingError, onLoadingFinish, onLoadingProgress, onOpenWindow, passesWhitelist } = useWebWiewLogic({
         onLoad,
         onError,
-        onHttpErrorProp,
         onLoadEnd,
-        onLoadProgress,
         onLoadStart,
-        onRenderProcessGoneProp,
         onMessageProp,
+        onOpenWindowProp,
         startInLoadingState,
         originWhitelist,
+        deeplinkWhitelist,
         onShouldStartLoadWithRequestProp,
         onShouldStartLoadWithRequestCallback,
+        validateMeta,
+        validateData,
     });
     useImperativeHandle(ref, () => ({
-        goForward: () => Commands.goForward(webViewRef.current),
-        goBack: () => Commands.goBack(webViewRef.current),
+        goForward: () => webViewRef.current && Commands.goForward(webViewRef.current),
+        goBack: () => webViewRef.current && Commands.goBack(webViewRef.current),
         reload: () => {
             setViewState('LOADING');
-            Commands.reload(webViewRef.current);
+            if (webViewRef.current) {
+                Commands.reload(webViewRef.current);
+            }
         },
-        stopLoading: () => Commands.stopLoading(webViewRef.current),
-        postMessage: (data) => Commands.postMessage(webViewRef.current, data),
+        stopLoading: () => webViewRef.current && Commands.stopLoading(webViewRef.current),
+        postMessage: (data) => webViewRef.current && Commands.postMessage(webViewRef.current, data),
         // injectJavaScript: (data: string) => Commands.injectJavaScript(webViewRef.current, data),
-        requestFocus: () => Commands.requestFocus(webViewRef.current),
-        clearFormData: () => Commands.clearFormData(webViewRef.current),
-        clearCache: (includeDiskFiles) => Commands.clearCache(webViewRef.current, includeDiskFiles),
-        clearHistory: () => Commands.clearHistory(webViewRef.current),
+        requestFocus: () => webViewRef.current && Commands.requestFocus(webViewRef.current),
+        clearFormData: () => webViewRef.current && Commands.clearFormData(webViewRef.current),
+        clearCache: (includeDiskFiles) => webViewRef.current && Commands.clearCache(webViewRef.current, includeDiskFiles),
+        clearHistory: () => webViewRef.current && Commands.clearHistory(webViewRef.current),
     }), [setViewState, webViewRef]);
     const directEventCallbacks = useMemo(() => ({
         onShouldStartLoadWithRequest,
@@ -76,6 +82,23 @@ const WebViewComponent = forwardRef(({ overScrollMode = 'always', javaScriptEnab
     useEffect(() => {
         BatchedBridge.registerCallableModule(messagingModuleName, directEventCallbacks);
     }, [messagingModuleName, directEventCallbacks]);
+    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))) {
+        if (UnsupportedVersionComponent) {
+            return <UnsupportedVersionComponent />;
+        }
+        return (<View style={{ alignSelf: 'flex-start' }}>
+        <Text style={{ color: 'red' }}>
+          Chrome version is outdated and insecure. Update it to continue.
+        </Text>
+      </View>);
+    }
     let otherView = null;
     if (viewState === 'LOADING') {
         otherView = (renderLoading || defaultRenderLoading)();
@@ -97,10 +120,14 @@ const WebViewComponent = forwardRef(({ overScrollMode = 'always', javaScriptEnab
             console.warn('WebView: `source.body` is not supported when using GET.');
         }
     }
+    if (typeof source === "object" && 'uri' in source && !passesWhitelist(source.uri)) {
+        // eslint-disable-next-line
+        source = { uri: "about:blank" };
+    }
     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} 
+    const webView = <NativeWebView key="webViewKey" {...otherProps} messagingEnabled={typeof onMessageProp === 'function'} messagingModuleName={messagingModuleName} onLoadingError={onLoadingError} onLoadingFinish={onLoadingFinish} onLoadingProgress={onLoadingProgress} onLoadingStart={onLoadingStart} onMessage={onMessage} onOpenWindow={onOpenWindow} onShouldStartLoadWithRequest={onShouldStartLoadWithRequest} ref={webViewRef} 
     // TODO: find a better way to type this.
-    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}/>;
+    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}