Merge branch 'master' into update-ssl-error-to-top-level-only

.github/workflows/windows-ci.yml

@@ -15,17 +15,10 @@ jobs:
       with:
         node-version: '12.9.1'
 
-    - name: Install Visual Studio components
-      shell: powershell
-      run: .\.github\workflows\scripts\install-vs-features.ps1 Microsoft.VisualStudio.Component.VC.v141.x86.x64,Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141
-
     - name: Setup MSBuild
       uses: microsoft/setup-msbuild@v1.0.0
       with:
         vs-version: 16.5
-       
-    - name: Setup NuGet
-      uses: NuGet/setup-nuget@v1.0.2
 
     - name: Check node modules cache
       uses: actions/cache@v1
@@ -45,13 +38,14 @@ jobs:
       run: |
         yarn build
         yarn tsc
- 
-    - name: NuGet restore
-      run: nuget restore example\windows\WebViewWindows.sln
 
     - name: Build x64 release
-      run: msbuild example\windows\WebViewWindows.sln /p:Configuration=Release /p:Platform=x64 -m
+      shell: powershell
+      run: npx react-native run-windows --root example --arch x64 --release --no-packager --no-deploy --logging
 
+    # Workaround for a bug in package searching during deploy.
+    # The deploy script only searches windows/{*/bin/x64/Release,Release/*}, but the build step above placed the pakcages at windows/x64/Release.
+    # Copy the packages to Windows/Release before deploying.
     - name: Deploy
       shell: powershell
       run: |

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

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.DownloadManager;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
@@ -14,8 +13,7 @@ import android.net.http.SslError;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
-import androidx.annotation.RequiresApi;
-import androidx.core.content.ContextCompat;
+import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
@@ -28,6 +26,7 @@ import android.webkit.CookieManager;
 import android.webkit.DownloadListener;
 import android.webkit.GeolocationPermissions;
 import android.webkit.JavascriptInterface;
+import android.webkit.RenderProcessGoneDetail;
 import android.webkit.SslErrorHandler;
 import android.webkit.PermissionRequest;
 import android.webkit.URLUtil;
@@ -40,6 +39,12 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.FrameLayout;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.core.content.ContextCompat;
+import androidx.core.util.Pair;
+
+import com.facebook.common.logging.FLog;
 import com.facebook.react.views.scroll.ScrollEvent;
 import com.facebook.react.views.scroll.ScrollEventType;
 import com.facebook.react.views.scroll.OnScrollDispatchHelper;
@@ -63,6 +68,7 @@ import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.events.ContentSizeChangeEvent;
 import com.facebook.react.uimanager.events.Event;
 import com.facebook.react.uimanager.events.EventDispatcher;
+import com.reactnativecommunity.webview.RNCWebViewModule.ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState;
 import com.reactnativecommunity.webview.events.TopLoadingErrorEvent;
 import com.reactnativecommunity.webview.events.TopHttpErrorEvent;
 import com.reactnativecommunity.webview.events.TopLoadingFinishEvent;
@@ -70,6 +76,7 @@ import com.reactnativecommunity.webview.events.TopLoadingProgressEvent;
 import com.reactnativecommunity.webview.events.TopLoadingStartEvent;
 import com.reactnativecommunity.webview.events.TopMessageEvent;
 import com.reactnativecommunity.webview.events.TopShouldStartLoadWithRequestEvent;
+import com.reactnativecommunity.webview.events.TopRenderProcessGoneEvent;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -82,8 +89,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-
-import javax.annotation.Nullable;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Manages instances of {@link WebView}
@@ -111,6 +117,7 @@ import javax.annotation.Nullable;
  */
 @ReactModule(name = RNCWebViewManager.REACT_CLASS)
 public class RNCWebViewManager extends SimpleViewManager<WebView> {
+  private static final String TAG = "RNCWebViewManager";
 
   public static final int COMMAND_GO_BACK = 1;
   public static final int COMMAND_GO_FORWARD = 2;
@@ -134,6 +141,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
   // Use `webView.loadUrl("about:blank")` to reliably reset the view
   // state and release page resources (including any running JavaScript).
   protected static final String BLANK_URL = "about:blank";
+  protected static final int SHOULD_OVERRIDE_URL_LOADING_TIMEOUT = 250;
   protected WebViewConfig mWebViewConfig;
 
   protected RNCWebChromeClient mWebChromeClient = null;
@@ -297,6 +305,21 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     }
   }
 
+  @ReactProp(name = "androidLayerType")
+  public void setLayerType(WebView view, String layerTypeString) {
+    int layerType = View.LAYER_TYPE_NONE;
+    switch (layerTypeString) {
+        case "hardware":
+          layerType = View.LAYER_TYPE_HARDWARE;
+          break;
+        case "software":
+          layerType = View.LAYER_TYPE_SOFTWARE;
+          break;
+    }
+    view.setLayerType(layerType, null);
+  }
+
+
   @ReactProp(name = "overScrollMode")
   public void setOverScrollMode(WebView view, String overScrollModeString) {
     Integer overScrollMode;
@@ -430,6 +453,11 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
 
   @ReactProp(name = "incognito")
   public void setIncognito(WebView view, boolean enabled) {
+    // Don't do anything when incognito is disabled
+    if (!enabled) {
+      return;
+    }
+
     // Remove all previous cookies
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
       CookieManager.getInstance().removeAllCookies(null);
@@ -439,14 +467,14 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
 
     // Disable caching
     view.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
-    view.getSettings().setAppCacheEnabled(!enabled);
+    view.getSettings().setAppCacheEnabled(false);
     view.clearHistory();
-    view.clearCache(enabled);
+    view.clearCache(true);
 
     // No form data or autofill enabled
     view.clearFormData();
-    view.getSettings().setSavePassword(!enabled);
-    view.getSettings().setSaveFormData(!enabled);
+    view.getSettings().setSavePassword(false);
+    view.getSettings().setSaveFormData(false);
   }
 
   @ReactProp(name = "source")
@@ -576,6 +604,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     export.put(TopShouldStartLoadWithRequestEvent.EVENT_NAME, MapBuilder.of("registrationName", "onShouldStartLoadWithRequest"));
     export.put(ScrollEventType.getJSEventName(ScrollEventType.SCROLL), MapBuilder.of("registrationName", "onScroll"));
     export.put(TopHttpErrorEvent.EVENT_NAME, MapBuilder.of("registrationName", "onHttpError"));
+    export.put(TopRenderProcessGoneEvent.EVENT_NAME, MapBuilder.of("registrationName", "onRenderProcessGone"));
     return export;
   }
 
@@ -772,7 +801,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
       mLastLoadFailed = false;
 
       RNCWebView reactWebView = (RNCWebView) webView;
-      reactWebView.callInjectedJavaScriptBeforeContentLoaded();       
+      reactWebView.callInjectedJavaScriptBeforeContentLoaded();
 
       dispatchEvent(
         webView,
@@ -783,15 +812,52 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
 
     @Override
     public boolean shouldOverrideUrlLoading(WebView view, String url) {
-      progressChangedFilter.setWaitingForCommandLoadUrl(true);
-      dispatchEvent(
-        view,
-        new TopShouldStartLoadWithRequestEvent(
-          view.getId(),
-          createWebViewEvent(view, url)));
-      return true;
-    }
+      final RNCWebView rncWebView = (RNCWebView) view;
+      final boolean isJsDebugging = ((ReactContext) view.getContext()).getJavaScriptContextHolder().get() == 0;
+
+      if (!isJsDebugging && rncWebView.mCatalystInstance != null) {
+        final Pair<Integer, AtomicReference<ShouldOverrideCallbackState>> lock = RNCWebViewModule.shouldOverrideUrlLoadingLock.getNewLock();
+        final int lockIdentifier = lock.first;
+        final AtomicReference<ShouldOverrideCallbackState> lockObject = lock.second;
 
+        final WritableMap event = createWebViewEvent(view, url);
+        event.putInt("lockIdentifier", lockIdentifier);
+        rncWebView.sendDirectMessage("onShouldStartLoadWithRequest", event);
+
+        try {
+          assert lockObject != null;
+          synchronized (lockObject) {
+            final long startTime = SystemClock.elapsedRealtime();
+            while (lockObject.get() == ShouldOverrideCallbackState.UNDECIDED) {
+              if (SystemClock.elapsedRealtime() - startTime > SHOULD_OVERRIDE_URL_LOADING_TIMEOUT) {
+                FLog.w(TAG, "Did not receive response to shouldOverrideUrlLoading in time, defaulting to allow loading.");
+                RNCWebViewModule.shouldOverrideUrlLoadingLock.removeLock(lockIdentifier);
+                return false;
+              }
+              lockObject.wait(SHOULD_OVERRIDE_URL_LOADING_TIMEOUT);
+            }
+          }
+        } catch (InterruptedException e) {
+          FLog.e(TAG, "shouldOverrideUrlLoading was interrupted while waiting for result.", e);
+          RNCWebViewModule.shouldOverrideUrlLoadingLock.removeLock(lockIdentifier);
+          return false;
+        }
+
+        final boolean shouldOverride = lockObject.get() == ShouldOverrideCallbackState.SHOULD_OVERRIDE;
+        RNCWebViewModule.shouldOverrideUrlLoadingLock.removeLock(lockIdentifier);
+
+        return shouldOverride;
+      } else {
+        FLog.w(TAG, "Couldn't use blocking synchronous call for onShouldStartLoadWithRequest due to debugging or missing Catalyst instance, falling back to old event-and-load.");
+        progressChangedFilter.setWaitingForCommandLoadUrl(true);
+        dispatchEvent(
+          view,
+          new TopShouldStartLoadWithRequestEvent(
+            view.getId(),
+            createWebViewEvent(view, url)));
+        return true;
+      }
+    }
 
     @TargetApi(Build.VERSION_CODES.N)
     @Override
@@ -844,11 +910,11 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
           case SslError.SSL_UNTRUSTED:
             description = "The certificate authority is not trusted";
             break;
-          default: 
+          default:
             description = "Unknown SSL Error";
             break;
         }
-        
+
         description = descriptionPrefix + description;
 
         this.onReceivedError(
@@ -858,7 +924,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
           failingUrl
         );
     }
-    
+
     @Override
     public void onReceivedError(
       WebView webView,
@@ -915,6 +981,41 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
       }
     }
 
+    @TargetApi(Build.VERSION_CODES.O)
+    @Override
+    public boolean onRenderProcessGone(WebView webView, RenderProcessGoneDetail detail) {
+        // WebViewClient.onRenderProcessGone was added in O.
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            return false;
+        }
+        super.onRenderProcessGone(webView, detail);
+
+        if(detail.didCrash()){
+          Log.e("RNCWebViewManager", "The WebView rendering process crashed.");
+        }
+        else{
+          Log.w("RNCWebViewManager", "The WebView rendering process was killed by the system.");
+        }
+
+        // if webView is null, we cannot return any event
+        // since the view is already dead/disposed
+        // still prevent the app crash by returning true.
+        if(webView == null){
+          return true;
+        }
+
+        WritableMap event = createWebViewEvent(webView, webView.getUrl());
+        event.putBoolean("didCrash", detail.didCrash());
+
+        dispatchEvent(
+          webView,
+          new TopRenderProcessGoneEvent(webView.getId(), event)
+        );
+
+        // returning false would crash the app.
+        return true;
+    }
+
     protected void emitFinishEvent(WebView webView, String url) {
       dispatchEvent(
         webView,
@@ -1121,6 +1222,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
      */
     public RNCWebView(ThemedReactContext reactContext) {
       super(reactContext);
+      this.createCatalystInstance();
       progressChangedFilter = new ProgressChangedFilter();
     }
 
@@ -1229,7 +1331,6 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
 
       if (enabled) {
         addJavascriptInterface(createRNCWebViewBridge(this), JAVASCRIPT_INTERFACE);
-        this.createCatalystInstance();
       } else {
         removeJavascriptInterface(JAVASCRIPT_INTERFACE);
       }
@@ -1285,7 +1386,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
             data.putString("data", message);
 
             if (mCatalystInstance != null) {
-              mContext.sendDirectMessage(data);
+              mContext.sendDirectMessage("onMessage", data);
             } else {
               dispatchEvent(webView, new TopMessageEvent(webView.getId(), data));
             }
@@ -1296,21 +1397,21 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
         eventData.putString("data", message);
 
         if (mCatalystInstance != null) {
-          this.sendDirectMessage(eventData);
+          this.sendDirectMessage("onMessage", eventData);
         } else {
           dispatchEvent(this, new TopMessageEvent(this.getId(), eventData));
         }
       }
     }
 
-    protected void sendDirectMessage(WritableMap data) {
+    protected void sendDirectMessage(final String method, WritableMap data) {
       WritableNativeMap event = new WritableNativeMap();
       event.putMap("nativeEvent", data);
 
       WritableNativeArray params = new WritableNativeArray();
       params.pushMap(event);
 
-      mCatalystInstance.callFunction(messagingModuleName, "onMessage", params);
+      mCatalystInstance.callFunction(messagingModuleName, method, params);
     }
 
     protected void onScrollChanged(int x, int y, int oldX, int oldY) {

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

@@ -12,9 +12,11 @@ import android.os.Environment;
 import android.os.Parcelable;
 import android.provider.MediaStore;
 
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
+import androidx.core.util.Pair;
 
 import android.util.Log;
 import android.webkit.MimeTypeMap;
@@ -35,6 +37,8 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.concurrent.atomic.AtomicReference;
 
 import static android.app.Activity.RESULT_OK;
 
@@ -50,6 +54,35 @@ public class RNCWebViewModule extends ReactContextBaseJavaModule implements Acti
   private File outputVideo;
   private DownloadManager.Request downloadRequest;
 
+  protected static class ShouldOverrideUrlLoadingLock {
+    protected enum ShouldOverrideCallbackState {
+      UNDECIDED,
+      SHOULD_OVERRIDE,
+      DO_NOT_OVERRIDE,
+    }
+
+    private int nextLockIdentifier = 0;
+    private final HashMap<Integer, AtomicReference<ShouldOverrideCallbackState>> shouldOverrideLocks = new HashMap<>();
+
+    public synchronized Pair<Integer, AtomicReference<ShouldOverrideCallbackState>> getNewLock() {
+      final int lockIdentifier = nextLockIdentifier++;
+      final AtomicReference<ShouldOverrideCallbackState> shouldOverride = new AtomicReference<>(ShouldOverrideCallbackState.UNDECIDED);
+      shouldOverrideLocks.put(lockIdentifier, shouldOverride);
+      return new Pair<>(lockIdentifier, shouldOverride);
+    }
+
+    @Nullable
+    public synchronized AtomicReference<ShouldOverrideCallbackState> getLock(Integer lockIdentifier) {
+      return shouldOverrideLocks.get(lockIdentifier);
+    }
+
+    public synchronized void removeLock(Integer lockIdentifier) {
+      shouldOverrideLocks.remove(lockIdentifier);
+    }
+  }
+
+  protected static final ShouldOverrideUrlLoadingLock shouldOverrideUrlLoadingLock = new ShouldOverrideUrlLoadingLock();
+
   private enum MimeType {
     DEFAULT("*/*"),
     IMAGE("image"),
@@ -105,6 +138,17 @@ public class RNCWebViewModule extends ReactContextBaseJavaModule implements Acti
     promise.resolve(result);
   }
 
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  public void onShouldStartLoadWithRequestCallback(final boolean shouldStart, final int lockIdentifier) {
+    final AtomicReference<ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState> lockObject = shouldOverrideUrlLoadingLock.getLock(lockIdentifier);
+    if (lockObject != null) {
+      synchronized (lockObject) {
+        lockObject.set(shouldStart ? ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState.DO_NOT_OVERRIDE : ShouldOverrideUrlLoadingLock.ShouldOverrideCallbackState.SHOULD_OVERRIDE);
+        lockObject.notify();
+      }
+    }
+  }
+
   public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
 
     if (filePathCallback == null && filePathCallbackLegacy == null) {
@@ -273,7 +317,7 @@ public class RNCWebViewModule extends ReactContextBaseJavaModule implements Acti
 
   public boolean grantFileDownloaderPermissions() {
     // Permission not required for Android Q and above
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+    if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
       return true;
     }
 

android/src/main/java/com/reactnativecommunity/webview/events/TopRenderProcessGoneEvent.kt

@@ -0,0 +1,26 @@
+package com.reactnativecommunity.webview.events
+
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+import com.facebook.react.uimanager.events.RCTEventEmitter
+
+/**
+ * Event emitted when the WebView's process has crashed or
+   was killed by the OS.
+ */
+class TopRenderProcessGoneEvent(viewId: Int, private val mEventData: WritableMap) :
+  Event<TopRenderProcessGoneEvent>(viewId) {
+  companion object {
+    const val EVENT_NAME = "topRenderProcessGone"
+  }
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun canCoalesce(): Boolean = false
+
+  override fun getCoalescingKey(): Short = 0
+
+  override fun dispatch(rctEventEmitter: RCTEventEmitter) =
+    rctEventEmitter.receiveEvent(viewTag, eventName, mEventData)
+
+}

android/src/main/java/com/reactnativecommunity/webview/events/TopShouldStartLoadWithRequestEvent.kt

@@ -14,6 +14,8 @@ class TopShouldStartLoadWithRequestEvent(viewId: Int, private val mData: Writabl
 
   init {
     mData.putString("navigationType", "other")
+    // Android does not raise shouldOverrideUrlLoading for inner frames
+    mData.putBoolean("isTopFrame", true)
   }
 
   override fun getEventName(): String = EVENT_NAME

apple/RNCWebView.h

@@ -62,6 +62,12 @@
 @property (nonatomic, assign) BOOL directionalLockEnabled;
 @property (nonatomic, assign) BOOL ignoreSilentHardwareSwitch;
 @property (nonatomic, copy) NSString * _Nullable allowingReadAccessToURL;
+@property (nonatomic, assign) BOOL pullToRefreshEnabled;
+@property (nonatomic, weak) UIRefreshControl * refreshControl;
+
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 /* iOS 13 */
+@property (nonatomic, assign) WKContentMode contentMode;
+#endif
 
 + (void)setClientAuthenticationCredential:(nullable NSURLCredential*)credential;
 + (void)setCustomCertificatesForHost:(nullable NSDictionary *)certificates;
@@ -71,5 +77,7 @@
 - (void)goBack;
 - (void)reload;
 - (void)stopLoading;
+- (void)addPullToRefreshControl;
+- (void)pullToRefresh:(UIRefreshControl *)refreshControl;
 
 @end

apple/RNCWebView.m

@@ -226,6 +226,14 @@ static NSDictionary* customCertificatesForHost;
   }
   wkWebViewConfig.userContentController = [WKUserContentController new];
 
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 /* iOS 13 */
+  if (@available(iOS 13.0, *)) {
+    WKWebpagePreferences *pagePrefs = [[WKWebpagePreferences alloc]init];
+    pagePrefs.preferredContentMode = _contentMode;
+    wkWebViewConfig.defaultWebpagePreferences = pagePrefs;
+  }
+#endif
+
   // Shim the HTML5 history API:
   [wkWebViewConfig.userContentController addScriptMessageHandler:[[RNCWeakScriptMessageDelegate alloc] initWithDelegate:self]
                                                             name:HistoryShimName];
@@ -267,9 +275,13 @@ static NSDictionary* customCertificatesForHost;
     _webView.UIDelegate = self;
     _webView.navigationDelegate = self;
 #if !TARGET_OS_OSX
+    if (_pullToRefreshEnabled) {
+        [self addPullToRefreshControl];
+    }
     _webView.scrollView.scrollEnabled = _scrollEnabled;
     _webView.scrollView.pagingEnabled = _pagingEnabled;
-    _webView.scrollView.bounces = _bounces;
+      //For UIRefreshControl to work correctly, the bounces should always be true
+    _webView.scrollView.bounces = _pullToRefreshEnabled || _bounces; 
     _webView.scrollView.showsHorizontalScrollIndicator = _showsHorizontalScrollIndicator;
     _webView.scrollView.showsVerticalScrollIndicator = _showsVerticalScrollIndicator;
     _webView.scrollView.directionalLockEnabled = _directionalLockEnabled;
@@ -300,7 +312,6 @@ static NSDictionary* customCertificatesForHost;
   _webView.allowsBackForwardNavigationGestures = _allowsBackForwardNavigationGestures;
 }
 
-
 - (void)removeFromSuperview
 {
     if (_webView) {
@@ -869,40 +880,9 @@ static NSDictionary* customCertificatesForHost;
  * topViewController
  */
 -(UIViewController *)topViewController{
-    UIViewController *controller = [self topViewControllerWithRootViewController:[self getCurrentWindow].rootViewController];
-    return controller;
+    return RCTPresentedViewController();
 }
 
-/**
- * topViewControllerWithRootViewController
- */
--(UIViewController *)topViewControllerWithRootViewController:(UIViewController *)viewController{
-  if (viewController==nil) return nil;
-  if (viewController.presentedViewController!=nil) {
-    return [self topViewControllerWithRootViewController:viewController.presentedViewController];
-  } else if ([viewController isKindOfClass:[UITabBarController class]]){
-    return [self topViewControllerWithRootViewController:[(UITabBarController *)viewController selectedViewController]];
-  } else if ([viewController isKindOfClass:[UINavigationController class]]){
-    return [self topViewControllerWithRootViewController:[(UINavigationController *)viewController visibleViewController]];
-  } else {
-    return viewController;
-  }
-}
-/**
- * getCurrentWindow
- */
--(UIWindow *)getCurrentWindow{
-  UIWindow *window = [UIApplication sharedApplication].keyWindow;
-  if (window.windowLevel!=UIWindowLevelNormal) {
-    for (UIWindow *wid in [UIApplication sharedApplication].windows) {
-      if (window.windowLevel==UIWindowLevelNormal) {
-        window = wid;
-        break;
-      }
-    }
-  }
-  return window;
-}
 #endif // !TARGET_OS_OSX
 
 /**
@@ -929,13 +909,15 @@ static NSDictionary* customCertificatesForHost;
 
   WKNavigationType navigationType = navigationAction.navigationType;
   NSURLRequest *request = navigationAction.request;
+  BOOL isTopFrame = [request.URL isEqual:request.mainDocumentURL];
 
   if (_onShouldStartLoadWithRequest) {
     NSMutableDictionary<NSString *, id> *event = [self baseEvent];
     [event addEntriesFromDictionary: @{
       @"url": (request.URL).absoluteString,
       @"mainDocumentURL": (request.mainDocumentURL).absoluteString,
-      @"navigationType": navigationTypes[@(navigationType)]
+      @"navigationType": navigationTypes[@(navigationType)],
+      @"isTopFrame": @(isTopFrame)
     }];
     if (![self.delegate webView:self
       shouldStartLoadForRequest:event
@@ -947,7 +929,6 @@ static NSDictionary* customCertificatesForHost;
 
   if (_onLoadingStart) {
     // We have this check to filter out iframe requests and whatnot
-    BOOL isTopFrame = [request.URL isEqual:request.mainDocumentURL];
     if (isTopFrame) {
       NSMutableDictionary<NSString *, id> *event = [self baseEvent];
       [event addEntriesFromDictionary: @{
@@ -1147,6 +1128,35 @@ static NSDictionary* customCertificatesForHost;
   }
 }
 
+- (void)addPullToRefreshControl
+{
+    UIRefreshControl *refreshControl = [[UIRefreshControl alloc] init];
+    _refreshControl = refreshControl;
+    [_webView.scrollView addSubview: refreshControl];
+    [refreshControl addTarget:self action:@selector(pullToRefresh:) forControlEvents: UIControlEventValueChanged];
+}
+
+- (void)pullToRefresh:(UIRefreshControl *)refreshControl
+{
+    [self reload];
+    [refreshControl endRefreshing];
+}
+
+#if !TARGET_OS_OSX
+- (void)setPullToRefreshEnabled:(BOOL)pullToRefreshEnabled
+{
+    _pullToRefreshEnabled = pullToRefreshEnabled;
+    
+    if (pullToRefreshEnabled) {
+        [self addPullToRefreshControl];
+    } else {
+        [_refreshControl removeFromSuperview];
+    }
+
+    [self setBounces:_bounces];
+}
+#endif // !TARGET_OS_OSX
+
 - (void)stopLoading
 {
   [_webView stopLoading];
@@ -1156,11 +1166,11 @@ static NSDictionary* customCertificatesForHost;
 - (void)setBounces:(BOOL)bounces
 {
   _bounces = bounces;
-  _webView.scrollView.bounces = bounces;
+    //For UIRefreshControl to work correctly, the bounces should always be true
+  _webView.scrollView.bounces = _pullToRefreshEnabled || bounces;
 }
 #endif // !TARGET_OS_OSX
 
-
 - (void)setInjectedJavaScript:(NSString *)source {
   _injectedJavaScript = source;
 

apple/RNCWebViewManager.m

@@ -14,6 +14,16 @@
 @interface RNCWebViewManager () <RNCWebViewDelegate>
 @end
 
+@implementation RCTConvert (WKWebView)
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 /* iOS 13 */
+RCT_ENUM_CONVERTER(WKContentMode, (@{
+    @"recommended": @(WKContentModeRecommended),
+    @"mobile": @(WKContentModeMobile),
+    @"desktop": @(WKContentModeDesktop),
+}), WKContentModeRecommended, integerValue)
+#endif
+@end
+
 @implementation RNCWebViewManager
 {
   NSConditionLock *_shouldStartLoadLock;
@@ -70,6 +80,10 @@ RCT_EXPORT_VIEW_PROPERTY(allowingReadAccessToURL, NSString)
 RCT_EXPORT_VIEW_PROPERTY(contentInsetAdjustmentBehavior, UIScrollViewContentInsetAdjustmentBehavior)
 #endif
 
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 /* iOS 13 */
+RCT_EXPORT_VIEW_PROPERTY(contentMode, WKContentMode)
+#endif
+
 /**
  * Expose methods to enable messaging the webview.
  */
@@ -89,6 +103,10 @@ RCT_EXPORT_METHOD(postMessage:(nonnull NSNumber *)reactTag message:(NSString *)m
   }];
 }
 
+RCT_CUSTOM_VIEW_PROPERTY(pullToRefreshEnabled, BOOL, RNCWebView) {
+    view.pullToRefreshEnabled = json == nil ? false : [RCTConvert BOOL: json];
+}
+
 RCT_CUSTOM_VIEW_PROPERTY(bounces, BOOL, RNCWebView) {
   view.bounces = json == nil ? true : [RCTConvert BOOL: json];
 }

docs/Debugging.md

@@ -15,12 +15,14 @@ It's possible to debug WebView contents in the iOS simulator or on a device usin
 3. Safari -> Develop -> [device name] -> [app name] -> [url - title]
 4. You can now debug the WebView contents just as you would on the web
 
-##### Note:
+##### Notes:
 
 When debugging on device you must enable Web Inspector in your device settings:
 
 Settings -> Safari -> Advanced -> Web Inspector
 
+Also, if you don't see your device in the Develop menu, and you started Safari before you started your simulator, try restarting Safari.
+
 ### Android & Chrome
 
 It's possible to debug WebView contents in the Android emulator or on a device using Chrome DevTools.

docs/Guide.md

@@ -305,6 +305,7 @@ export default class App extends Component {
             uri:
               'https://github.com/react-native-community/react-native-webview',
           }}
+          onMessage={(event) => {}}
           injectedJavaScript={runFirst}
         />
       </View>
@@ -313,7 +314,7 @@ export default class App extends Component {
 }
 ```
 
-This runs the JavaScript in the `runFirst` string once the page is loaded. In this case, you can see that both the body style was changed to red and the alert showed up after 2 seconds.
+This runs the JavaScript in the `runFirst` string once the page is loaded. In this case, you can see that both the body style was changed to red and the alert showed up after 2 seconds. An `onMessage` event is required as well to inject the JavaScript code into the WebView.
 
 By setting `injectedJavaScriptForMainFrameOnly: false`, the JavaScript injection will occur on all frames (not just the main frame) if supported for the given platform. For example, if a page contains an iframe, the javascript will be injected into that iframe as well with this set to `false`. (Note this is not supported on Android.) There is also `injectedJavaScriptBeforeContentLoadedForMainFrameOnly` for injecting prior to content loading. Read more about this in the [Reference](./Reference.md#injectedjavascriptformainframeonly).
 

docs/Reference.md

@@ -13,6 +13,7 @@ This document lays out the current public properties and methods for the React N
 - [`mediaPlaybackRequiresUserAction`](Reference.md#mediaplaybackrequiresuseraction)
 - [`nativeConfig`](Reference.md#nativeconfig)
 - [`onError`](Reference.md#onerror)
+- [`onRenderProcessGone`](Reference.md#onRenderProcessGone)
 - [`onLoad`](Reference.md#onload)
 - [`onLoadEnd`](Reference.md#onloadend)
 - [`onLoadStart`](Reference.md#onloadstart)
@@ -34,6 +35,7 @@ This document lays out the current public properties and methods for the React N
 - [`javaScriptEnabled`](Reference.md#javascriptenabled)
 - [`javaScriptCanOpenWindowsAutomatically`](Reference.md#javascriptcanopenwindowsautomatically)
 - [`androidHardwareAccelerationDisabled`](Reference.md#androidHardwareAccelerationDisabled)
+- [`androidLayerType`](Reference.md#androidLayerType)
 - [`mixedContentMode`](Reference.md#mixedcontentmode)
 - [`thirdPartyCookiesEnabled`](Reference.md#thirdpartycookiesenabled)
 - [`userAgent`](Reference.md#useragent)
@@ -44,6 +46,7 @@ This document lays out the current public properties and methods for the React N
 - [`overScrollMode`](Reference.md#overscrollmode)
 - [`contentInset`](Reference.md#contentinset)
 - [`contentInsetAdjustmentBehavior`](Reference.md#contentInsetAdjustmentBehavior)
+- [`contentMode`](Reference.md#contentMode)
 - [`dataDetectorTypes`](Reference.md#datadetectortypes)
 - [`scrollEnabled`](Reference.md#scrollenabled)
 - [`directionalLockEnabled`](Reference.md#directionalLockEnabled)
@@ -65,6 +68,7 @@ This document lays out the current public properties and methods for the React N
 - [`allowsLinkPreview`](Reference.md#allowsLinkPreview)
 - [`sharedCookiesEnabled`](Reference.md#sharedCookiesEnabled)
 - [`textZoom`](Reference.md#textZoom)
+- [`pullToRefreshEnabled`](Reference.md#pullToRefreshEnabled)
 - [`ignoreSilentHardwareSwitch`](Reference.md#ignoreSilentHardwareSwitch)
 - [`onFileDownload`](Reference.md#onFileDownload)
 
@@ -88,7 +92,7 @@ This document lays out the current public properties and methods for the React N
 
 ## Props
 
-### `source`
+### `source`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Loads static HTML or a URI (with optional headers) in the WebView. Note that static HTML will require setting [`originWhitelist`](Reference.md#originwhitelist) to `["*"]`.
 
@@ -114,7 +118,7 @@ _Note that using static HTML requires the WebView property [originWhiteList](Ref
 
 ---
 
-### `automaticallyAdjustContentInsets`
+### `automaticallyAdjustContentInsets`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Controls whether to adjust the content inset for web views that are placed behind a navigation bar, tab bar, or toolbar. The default value is `true`.
 
@@ -124,7 +128,7 @@ Controls whether to adjust the content inset for web views that are placed behin
 
 ---
 
-### `injectedJavaScript`
+### `injectedJavaScript`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Set this to provide JavaScript that will be injected into the web page after the document finishes loading, but before other subresources finish loading.
 
@@ -156,7 +160,7 @@ const INJECTED_JAVASCRIPT = `(function() {
 
 ---
 
-### `injectedJavaScriptBeforeContentLoaded`
+### `injectedJavaScriptBeforeContentLoaded`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Set this to provide JavaScript that will be injected into the web page after the document element is created, but before other subresources finish loading.
 
@@ -188,7 +192,7 @@ const INJECTED_JAVASCRIPT = `(function() {
 
 ---
 
-### `injectedJavaScriptForMainFrameOnly`
+### `injectedJavaScriptForMainFrameOnly`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 If `true` (default; mandatory for Android), loads the `injectedJavaScript` only into the main frame.
 
@@ -200,7 +204,7 @@ If `false`, (only supported on iOS and macOS), loads it into all frames (e.g. if
 
 ---
 
-### `injectedJavaScriptBeforeContentLoadedForMainFrameOnly`
+### `injectedJavaScriptBeforeContentLoadedForMainFrameOnly`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 If `true` (default; mandatory for Android), loads the `injectedJavaScriptBeforeContentLoaded` only into the main frame.
 
@@ -212,7 +216,7 @@ If `false`, (only supported on iOS and macOS), loads it into all frames (e.g. if
 
 ---
 
-### `mediaPlaybackRequiresUserAction`
+### `mediaPlaybackRequiresUserAction`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Boolean that determines whether HTML5 audio and video requires the user to tap them before they start playing. The default value is `true`. (Android API minimum version 17).
 
@@ -224,7 +228,7 @@ NOTE: the default `true` value might cause some videos to hang loading on iOS. S
 
 ---
 
-### `nativeConfig`
+### `nativeConfig`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Override the native component used to render the WebView. Enables a custom native WebView which uses the same JavaScript as the original WebView.
 
@@ -240,7 +244,7 @@ The `nativeConfig` prop expects an object with the following keys:
 
 ---
 
-### `onError`
+### `onError`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Function that is invoked when the `WebView` load fails.
 
@@ -280,7 +284,7 @@ url
 
 ---
 
-### `onLoad`
+### `onLoad`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Function that is invoked when the `WebView` has finished loading.
 
@@ -313,7 +317,7 @@ url
 
 ---
 
-### `onLoadEnd`
+### `onLoadEnd`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Function that is invoked when the `WebView` load succeeds or fails.
 
@@ -347,7 +351,7 @@ url
 
 ---
 
-### `onLoadStart`
+### `onLoadStart`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Function that is invoked when the `WebView` starts loading.
 
@@ -381,7 +385,7 @@ url
 
 ---
 
-### `onLoadProgress`
+### `onLoadProgress`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Function that is invoked when the `WebView` is loading.
 
@@ -414,7 +418,7 @@ url
 
 ---
 
-### `onHttpError`
+### `onHttpError`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Function that is invoked when the `WebView` receives an http error.
 
@@ -458,7 +462,40 @@ url
 
 ---
 
-### `onMessage`
+### `onRenderProcessGone`[⬆](#props-index)<!-- Link generated with jump2header -->
+
+Function that is invoked when the `WebView` process crashes or is killed by the OS on Android.
+
+> **_Note_**
+> Android API minimum level 26. Android Only
+
+| Type     | Required |
+| -------- | -------- |
+| function | No       |
+
+Example:
+
+```jsx
+<WebView
+  source={{ uri: 'https://reactnative.dev' }}
+  onRenderProcessGone={syntheticEvent => {
+    const { nativeEvent } = syntheticEvent;
+    console.warn(
+      'WebView Crashed: ',
+      nativeEvent.didCrash,
+    );
+  }}
+/>
+```
+
+Function passed to `onRenderProcessGone` is called with a SyntheticEvent wrapping a nativeEvent with these properties:
+
+```
+didCrash
+```
+---
+
+### `onMessage`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Function that is invoked when the webview calls `window.ReactNativeWebView.postMessage`. Setting this property will inject this global into your webview.
 
@@ -472,7 +509,7 @@ To learn more, read the [Communicating between JS and Native](Guide.md#communica
 
 ---
 
-### `onNavigationStateChange`
+### `onNavigationStateChange`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Function that is invoked when the `WebView` loading starts or ends.
 
@@ -508,7 +545,7 @@ Note that this method will not be invoked on hash URL changes (e.g. from `https:
 
 ---
 
-### `onContentProcessDidTerminate`
+### `onContentProcessDidTerminate`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Function that is invoked when the `WebView` content process is terminated.
 
@@ -542,7 +579,7 @@ url
 
 ---
 
-### `originWhitelist`
+### `originWhitelist`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 List of origin strings to allow being navigated to. The strings allow wildcards and get matched against _just_ the origin (not the full URL). If the user taps to navigate to a new page but the new page is not in this whitelist, the URL will be handled by the OS. The default whitelisted origins are "http://*" and "https://*".
 
@@ -562,7 +599,7 @@ Example:
 
 ---
 
-### `renderError`
+### `renderError`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Function that returns a view to show if there's an error.
 
@@ -583,7 +620,7 @@ The function passed to `renderError` will be called with the name of the error
 
 ---
 
-### `renderLoading`
+### `renderLoading`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Function that returns a loading indicator. The startInLoadingState prop must be set to true in order to use this prop.
 
@@ -603,7 +640,7 @@ Example:
 
 ---
 
-### `scalesPageToFit`
+### `scalesPageToFit`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Boolean that controls whether the web content is scaled to fit the view and enables the user to change the scale. The default value is `true`.
 
@@ -613,7 +650,7 @@ Boolean that controls whether the web content is scaled to fit the view and enab
 
 ---
 
-### `onShouldStartLoadWithRequest`
+### `onShouldStartLoadWithRequest`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Function that allows custom handling of any web view requests. Return `true` from the function to continue loading the request and `false` to stop loading.
 
@@ -647,11 +684,12 @@ canGoForward
 lockIdentifier
 mainDocumentURL (iOS only)
 navigationType
+isTopFrame
 ```
 
 ---
 
-### `startInLoadingState`
+### `startInLoadingState`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Boolean value that forces the `WebView` to show the loading view on the first load. This prop must be set to `true` in order for the `renderLoading` prop to work.
 
@@ -661,7 +699,7 @@ Boolean value that forces the `WebView` to show the loading view on the first lo
 
 ---
 
-### `style`
+### `style`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 A style object that allow you to customize the `WebView` style. Please note that there are default styles (example: you need to add `flex: 0` to the style if you want to use `height` property).
 
@@ -680,7 +718,7 @@ Example:
 
 ---
 
-### `containerStyle`
+### `containerStyle`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 A style object that allow you to customize the `WebView` container style. Please note that there are default styles (example: you need to add `flex: 0` to the style if you want to use `height` property).
 
@@ -699,7 +737,7 @@ Example:
 
 ---
 
-### `decelerationRate`
+### `decelerationRate`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 A floating-point number that determines how quickly the scroll view decelerates after the user lifts their finger. You may also use the string shortcuts `"normal"` and `"fast"` which match the underlying iOS settings for `UIScrollViewDecelerationRateNormal` and `UIScrollViewDecelerationRateFast` respectively:
 
@@ -712,7 +750,7 @@ A floating-point number that determines how quickly the scroll view decelerates
 
 ---
 
-### `domStorageEnabled`
+### `domStorageEnabled`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Boolean value to control whether DOM Storage is enabled. Used only in Android.
 
@@ -722,7 +760,7 @@ Boolean value to control whether DOM Storage is enabled. Used only in Android.
 
 ---
 
-### `javaScriptEnabled`
+### `javaScriptEnabled`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Boolean value to enable JavaScript in the `WebView`. The default value is `true`.
 
@@ -732,7 +770,7 @@ Boolean value to enable JavaScript in the `WebView`. The default value is `true`
 
 ---
 
-### `javaScriptCanOpenWindowsAutomatically`
+### `javaScriptCanOpenWindowsAutomatically`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 A Boolean value indicating whether JavaScript can open windows without user interaction. The default value is `false`.
 
@@ -742,9 +780,9 @@ A Boolean value indicating whether JavaScript can open windows without user inte
 
 ---
 
-### `androidHardwareAccelerationDisabled`
+### `androidHardwareAccelerationDisabled`[⬆](#props-index)<!-- Link generated with jump2header -->
 
-Boolean value to disable Hardware Acceleration in the `WebView`. Used on Android only as Hardware Acceleration is a feature only for Android. The default value is `false`.
+**Deprecated.** Use the `androidLayerType` prop instead. 
 
 | Type | Required | Platform |
 | ---- | -------- | -------- |
@@ -752,7 +790,25 @@ Boolean value to disable Hardware Acceleration in the `WebView`. Used on Android
 
 ---
 
-### `mixedContentMode`
+### `androidLayerType`[⬆](#props-index)<!-- Link generated with jump2header -->
+
+Specifies the layer type. 
+
+Possible values for `androidLayerType` are:
+
+- `none` (default) - The view does not have a layer.
+- `software` - The view has a software layer. A software layer is backed by a bitmap and causes the view to be rendered using Android's software rendering pipeline, even if hardware acceleration is enabled.
+- `hardware` - The view has a hardware layer. A hardware layer is backed by a hardware specific texture and causes the view to be rendered using Android's hardware rendering pipeline, but only if hardware acceleration is turned on for the view hierarchy.
+
+Avoid setting both `androidLayerType` and `androidHardwareAccelerationDisabled` props at the same time, as this may cause undefined behaviour.
+
+| Type   | Required | Platform |
+| ------ | -------- | -------- |
+| string | No       | Android  |
+
+---
+
+### `mixedContentMode`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Specifies the mixed content mode. i.e WebView will allow a secure origin to load content from any other origin.
 
@@ -768,7 +824,7 @@ Possible values for `mixedContentMode` are:
 
 ---
 
-### `thirdPartyCookiesEnabled`
+### `thirdPartyCookiesEnabled`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Boolean value to enable third party cookies in the `WebView`. Used on Android Lollipop and above only as third party cookies are enabled by default on Android Kitkat and below and on iOS. The default value is `true`. For more on cookies, read the [Guide](Guide.md#Managing-Cookies)
 
@@ -778,7 +834,7 @@ Boolean value to enable third party cookies in the `WebView`. Used on Android Lo
 
 ---
 
-### `userAgent`
+### `userAgent`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Sets the user-agent for the `WebView`.
 
@@ -788,7 +844,7 @@ Sets the user-agent for the `WebView`.
 
 ---
 
-### `applicationNameForUserAgent`
+### `applicationNameForUserAgent`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Append to the existing user-agent. Setting `userAgent` will override this.
 
@@ -806,7 +862,7 @@ Append to the existing user-agent. Setting `userAgent` will override this.
 // Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 DemoApp/1.1.0
 ```
 
-### `allowsFullscreenVideo`
+### `allowsFullscreenVideo`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Boolean that determines whether videos are allowed to be played in fullscreen. The default value is `false`.
 
@@ -816,7 +872,7 @@ Boolean that determines whether videos are allowed to be played in fullscreen. T
 
 ---
 
-### `allowsInlineMediaPlayback`
+### `allowsInlineMediaPlayback`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Boolean that determines whether HTML5 videos play inline or use the native full-screen controller. The default value is `false`.
 
@@ -830,7 +886,7 @@ Boolean that determines whether HTML5 videos play inline or use the native full-
 
 ---
 
-### `bounces`
+### `bounces`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Boolean value that determines whether the web view bounces when it reaches the edge of the content. The default value is `true`.
 
@@ -840,7 +896,7 @@ Boolean value that determines whether the web view bounces when it reaches the e
 
 ---
 
-### `overScrollMode`
+### `overScrollMode`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Specifies the over scroll mode.
 
@@ -856,7 +912,7 @@ Possible values for `overScrollMode` are:
 
 ---
 
-### `contentInset`
+### `contentInset`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 The amount by which the web view content is inset from the edges of the scroll view. Defaults to {top: 0, left: 0, bottom: 0, right: 0}.
 
@@ -866,7 +922,7 @@ The amount by which the web view content is inset from the edges of the scroll v
 
 ---
 
-### `contentInsetAdjustmentBehavior`
+### `contentInsetAdjustmentBehavior`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 This property specifies how the safe area insets are used to modify the content area of the scroll view. The default value of this property is "never". Available on iOS 11 and later. Defaults to `never`.
 
@@ -883,7 +939,25 @@ Possible values:
 
 ---
 
-### `dataDetectorTypes`
+### `contentMode`[⬆](#props-index)<!-- Link generated with jump2header -->
+
+Controls the type of content to load. Available on iOS 13 and later. Defaults to `recommended`, which loads mobile content on iPhone & iPad Mini but desktop content on larger iPads.
+
+See [Introducing Desktop-class Browsing on iPad](https://developer.apple.com/videos/play/wwdc2019/203/) for more.
+
+Possible values:
+
+- `recommended`
+- `mobile`
+- `desktop`
+
+| Type   | Required | Platform |
+| ------ | -------- | -------- |
+| string | No       | iOS      |
+
+---
+
+### `dataDetectorTypes`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Determines the types of data converted to clickable URLs in the web view's content. By default only phone numbers are detected.
 
@@ -907,7 +981,7 @@ Possible values for `dataDetectorTypes` are:
 
 ---
 
-### `scrollEnabled`
+### `scrollEnabled`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Boolean value that determines whether scrolling is enabled in the `WebView`. The default value is `true`. Setting this to `false` will prevent the webview from moving the document body when the keyboard appears over an input.
 
@@ -917,7 +991,7 @@ Boolean value that determines whether scrolling is enabled in the `WebView`. The
 
 ---
 
-### `directionalLockEnabled`
+### `directionalLockEnabled`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 A Boolean value that determines whether scrolling is disabled in a particular direction.
 The default value is `true`.
@@ -928,7 +1002,7 @@ The default value is `true`.
 
 ---
 
-### `showsHorizontalScrollIndicator`
+### `showsHorizontalScrollIndicator`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Boolean value that determines whether a horizontal scroll indicator is shown in the `WebView`. The default value is `true`.
 
@@ -938,7 +1012,7 @@ Boolean value that determines whether a horizontal scroll indicator is shown in
 
 ---
 
-### `showsVerticalScrollIndicator`
+### `showsVerticalScrollIndicator`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Boolean value that determines whether a vertical scroll indicator is shown in the `WebView`. The default value is `true`.
 
@@ -948,7 +1022,7 @@ Boolean value that determines whether a vertical scroll indicator is shown in th
 
 ---
 
-### `geolocationEnabled`
+### `geolocationEnabled`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Set whether Geolocation is enabled in the `WebView`. The default value is `false`. Used only in Android.
 
@@ -958,7 +1032,7 @@ Set whether Geolocation is enabled in the `WebView`. The default value is `false
 
 ---
 
-### `allowFileAccessFromFileURLs`
+### `allowFileAccessFromFileURLs`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Boolean that sets whether JavaScript running in the context of a file scheme URL should be allowed to access content from other file scheme URLs. The default value is `false`.
 
@@ -968,7 +1042,7 @@ Boolean that sets whether JavaScript running in the context of a file scheme URL
 
 ---
 
-### `allowUniversalAccessFromFileURLs`
+### `allowUniversalAccessFromFileURLs`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Boolean that sets whether JavaScript running in the context of a file scheme URL should be allowed to access content from any origin. Including accessing content from other file scheme URLs. The default value is `false`.
 
@@ -978,7 +1052,7 @@ Boolean that sets whether JavaScript running in the context of a file scheme URL
 
 ---
 
-### `allowingReadAccessToURL`
+### `allowingReadAccessToURL`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 A String value that indicates which URLs the WebView's file can then reference in scripts, AJAX requests, and CSS imports. This is only used in for WebViews that are loaded with a source.uri set to a `'file://'` URL. If not provided, the default is to only allow read access to the URL provided in source.uri itself.
 
@@ -988,7 +1062,7 @@ A String value that indicates which URLs the WebView's file can then reference i
 
 ---
 
-### `url`
+### `url`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 **Deprecated.** Use the `source` prop instead.
 
@@ -998,7 +1072,7 @@ A String value that indicates which URLs the WebView's file can then reference i
 
 ---
 
-### `html`
+### `html`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 **Deprecated.** Use the `source` prop instead.
 
@@ -1008,7 +1082,7 @@ A String value that indicates which URLs the WebView's file can then reference i
 
 ---
 
-### `keyboardDisplayRequiresUserAction`
+### `keyboardDisplayRequiresUserAction`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 If false, web content can programmatically display the keyboard. The default value is `true`.
 
@@ -1018,7 +1092,7 @@ If false, web content can programmatically display the keyboard. The default val
 
 ---
 
-### `hideKeyboardAccessoryView`
+### `hideKeyboardAccessoryView`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 If true, this will hide the keyboard accessory view (< > and Done).
 
@@ -1028,7 +1102,7 @@ If true, this will hide the keyboard accessory view (< > and Done).
 
 ---
 
-### `allowsBackForwardNavigationGestures`
+### `allowsBackForwardNavigationGestures`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 If true, this will be able horizontal swipe gestures. The default value is `false`.
 
@@ -1038,7 +1112,7 @@ If true, this will be able horizontal swipe gestures. The default value is `fals
 
 ---
 
-### `incognito`
+### `incognito`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Does not store any data within the lifetime of the WebView.
 
@@ -1048,7 +1122,7 @@ Does not store any data within the lifetime of the WebView.
 
 ---
 
-### `allowFileAccess`
+### `allowFileAccess`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 If true, this will allow access to the file system via `file://` URI's. The default value is `false`.
 
@@ -1058,7 +1132,7 @@ If true, this will allow access to the file system via `file://` URI's. The defa
 
 ---
 
-### `saveFormDataDisabled`
+### `saveFormDataDisabled`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Sets whether the WebView should disable saving form data. The default value is `false`. This function does not have any effect from Android API level 26 onwards as there is an Autofill feature which stores form data.
 
@@ -1068,7 +1142,7 @@ Sets whether the WebView should disable saving form data. The default value is `
 
 ---
 
-### `cacheEnabled`
+### `cacheEnabled`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Sets whether WebView should use browser caching.
 
@@ -1078,7 +1152,7 @@ Sets whether WebView should use browser caching.
 
 ---
 
-### `cacheMode`
+### `cacheMode`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Overrides the way the cache is used. The way the cache is used is based on the navigation type. For a normal page load, the cache is checked and content is re-validated as needed. When navigating back, content is not revalidated, instead the content is just retrieved from the cache. This property allows the client to override this behavior.
 
@@ -1095,7 +1169,7 @@ Possible values are:
 
 ---
 
-### `pagingEnabled`
+### `pagingEnabled`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 If the value of this property is true, the scroll view stops on multiples of the scroll view’s bounds when the user scrolls. The default value is false.
 
@@ -1105,7 +1179,7 @@ If the value of this property is true, the scroll view stops on multiples of the
 
 ---
 
-### `allowsLinkPreview`
+### `allowsLinkPreview`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 A Boolean value that determines whether pressing on a link displays a preview of the destination for the link. In iOS this property is available on devices that support 3D Touch. In iOS 10 and later, the default value is true; before that, the default value is false.
 
@@ -1115,7 +1189,7 @@ A Boolean value that determines whether pressing on a link displays a preview of
 
 ---
 
-### `sharedCookiesEnabled`
+### `sharedCookiesEnabled`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 Set `true` if shared cookies from `[NSHTTPCookieStorage sharedHTTPCookieStorage]` should used for every load request in the WebView. The default value is `false`. For more on cookies, read the [Guide](Guide.md#Managing-Cookies)
 
@@ -1125,7 +1199,7 @@ Set `true` if shared cookies from `[NSHTTPCookieStorage sharedHTTPCookieStorage]
 
 ---
 
-### `textZoom`
+### `textZoom`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 If the user has set a custom font size in the Android system, an undesirable scale of the site interface in WebView occurs.
 
@@ -1139,7 +1213,17 @@ Example:
 
 `<WebView textZoom={100} />`
 
-### `ignoreSilentHardwareSwitch`
+---
+
+### `pullToRefreshEnabled`[⬆](#props-index)<!-- Link generated with jump2header -->
+
+Boolean value that determines whether a pull to refresh gesture is available in the `WebView`. The default value is `false`. If `true`, sets `bounces` automatically to `true`.
+
+| Type    | Required | Platform |
+| ------- | -------- | -------- |
+| boolean | No       | iOS      |
+
+### `ignoreSilentHardwareSwitch`[⬆](#props-index)<!-- Link generated with jump2header -->
 
 (ios only)
 
@@ -1149,7 +1233,7 @@ When set to true the hardware silent switch is ignored. Default: `false`
 | ------- | -------- | -------- |
 | boolean | No       | iOS      |
 
-### `onFileDownload`
+### `onFileDownload`[⬆](#props-index)<!-- Link generated with jump2header -->
 This property is iOS-only.
 
 Function that is invoked when the client needs to download a file.
@@ -1183,13 +1267,13 @@ Example:
 
 ## Methods
 
-### `extraNativeComponentConfig()`
+### `extraNativeComponentConfig()`[⬆](#methods-index)<!-- Link generated with jump2header -->
 
 ```javascript
 static extraNativeComponentConfig()
 ```
 
-### `goForward()`
+### `goForward()`[⬆](#methods-index)<!-- Link generated with jump2header -->
 
 ```javascript
 goForward();
@@ -1197,7 +1281,7 @@ goForward();
 
 Go forward one page in the web view's history.
 
-### `goBack()`
+### `goBack()`[⬆](#methods-index)<!-- Link generated with jump2header -->
 
 ```javascript
 goBack();
@@ -1205,7 +1289,7 @@ goBack();
 
 Go back one page in the web view's history.
 
-### `reload()`
+### `reload()`[⬆](#methods-index)<!-- Link generated with jump2header -->
 
 ```javascript
 reload();
@@ -1213,7 +1297,7 @@ reload();
 
 Reloads the current page.
 
-### `stopLoading()`
+### `stopLoading()`[⬆](#methods-index)<!-- Link generated with jump2header -->
 
 ```javascript
 stopLoading();
@@ -1221,7 +1305,7 @@ stopLoading();
 
 Stop loading the current page.
 
-### `injectJavaScript(str)`
+### `injectJavaScript(str)`[⬆](#methods-index)<!-- Link generated with jump2header -->
 
 ```javascript
 injectJavaScript('... javascript string ...');
@@ -1231,7 +1315,7 @@ Executes the JavaScript string.
 
 To learn more, read the [Communicating between JS and Native](Guide.md#communicating-between-js-and-native) guide.
 
-### `requestFocus()`
+### `requestFocus()`[⬆](#methods-index)<!-- Link generated with jump2header -->
 
 ```javascript
 requestFocus();
@@ -1239,14 +1323,14 @@ requestFocus();
 
 Request the webView to ask for focus. (People working on TV apps might want having a look at this!)
 
-### `postMessage(str)`
+### `postMessage(str)`[⬆](#methods-index)<!-- Link generated with jump2header -->
 
 ```javascript
 postMessage('message');
 ```
 Post a message to WebView, handled by [`onMessage`](Reference.md#onmessage).
 
-### `clearFormData()`
+### `clearFormData()`[⬆](#methods-index)<!-- Link generated with jump2header -->
 
 (android only)
 
@@ -1256,7 +1340,7 @@ clearFormData();
 
 Removes the autocomplete popup from the currently focused form field, if present. [developer.android.com reference](<https://developer.android.com/reference/android/webkit/WebView.html#clearFormData()>)
 
-### `clearCache(bool)`
+### `clearCache(bool)`[⬆](#methods-index)<!-- Link generated with jump2header -->
 
 (android only)
 
@@ -1266,7 +1350,7 @@ clearCache(true);
 
 Clears the resource cache. Note that the cache is per-application, so this will clear the cache for all WebViews used. [developer.android.com reference](<https://developer.android.com/reference/android/webkit/WebView.html#clearCache(boolean)>)
 
-### `clearHistory()`
+### `clearHistory()`[⬆](#methods-index)<!-- Link generated with jump2header -->
 
 (android only)
 

index.d.ts

@@ -41,6 +41,29 @@ declare class WebView extends Component<WebViewProps> {
      * Focuses on WebView redered page.
      */
     requestFocus: () => void;
+    
+     /**
+     * Posts a message to WebView.
+     */
+    postMessage: (message: string) => void;
+    
+     /**
+     * (Android only)
+     * Removes the autocomplete popup from the currently focused form field, if present.
+     */
+    clearFormData: () => void;
+
+     /**
+     * (Android only)
+     * Clears the resource cache. Note that the cache is per-application, so this will clear the cache for all WebViews used.
+     */
+    clearCache: (clear: boolean) => void;
+
+     /**
+     * (Android only)
+     * Tells this WebView to clear its internal back/forward list.
+     */
+    clearHistory: () => void;
 }
 
 export {WebView};

metro.config.windows.js

@@ -35,6 +35,8 @@ module.exports = {
       new RegExp(
         `${path.resolve(__dirname, 'windows').replace(/[/\\]/g, '/')}.*`,
       ),
+      // Avoid error EBUSY: resource busy or locked, open '...\vnext\msbuild.ProjectImports.zip' when building 'vnext\Microsoft.ReactNative.sln' with '/bl'
+      /.*\.ProjectImports\.zip/,
     ]),
   },
   transformer: {

package.json

@@ -8,7 +8,7 @@
     "Thibault Malbranche <malbranche.thibault@gmail.com>"
   ],
   "license": "MIT",
-  "version": "10.3.1",
+  "version": "10.8.3",
   "homepage": "https://github.com/react-native-community/react-native-webview#readme",
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
@@ -29,8 +29,7 @@
     "type": "Component"
   },
   "peerDependencies": {
-    "react": "16.11.0",
-    "react-native": ">=0.60 <0.63"
+    "react-native": ">=0.60 <0.64"
   },
   "dependencies": {
     "escape-string-regexp": "2.0.0",

src/WebView.android.tsx

@@ -21,6 +21,7 @@ import {
   defaultRenderLoading,
 } from './WebViewShared';
 import {
+  WebViewRenderProcessGoneEvent,
   WebViewErrorEvent,
   WebViewHttpErrorEvent,
   WebViewMessageEvent,
@@ -60,6 +61,7 @@ class WebView extends React.Component<AndroidWebViewProps, State> {
     saveFormDataDisabled: false,
     cacheEnabled: true,
     androidHardwareAccelerationDisabled: false,
+    androidLayerType: 'none',
     originWhitelist: defaultOriginWhitelist,
   };
 
@@ -75,6 +77,7 @@ class WebView extends React.Component<AndroidWebViewProps, State> {
     lastErrorEvent: null,
   };
 
+  onShouldStartLoadWithRequest: ReturnType<typeof createOnShouldStartLoadWithRequest> | null = null;
 
   webViewRef = React.createRef<NativeWebViewAndroid>();
 
@@ -228,6 +231,13 @@ class WebView extends React.Component<AndroidWebViewProps, State> {
     }
   }
 
+  onRenderProcessGone = (event: WebViewRenderProcessGoneEvent) => {
+    const { onRenderProcessGone } = this.props;
+    if (onRenderProcessGone) {
+      onRenderProcessGone(event);
+    }
+  }
+
   onLoadingFinish = (event: WebViewNavigationEvent) => {
     const { onLoad, onLoadEnd } = this.props;
     const { nativeEvent: { url } } = event;
@@ -271,8 +281,11 @@ class WebView extends React.Component<AndroidWebViewProps, State> {
   onShouldStartLoadWithRequestCallback = (
     shouldStart: boolean,
     url: string,
+    lockIdentifier?: number,
   ) => {
-    if (shouldStart) {
+    if (lockIdentifier) {
+      NativeModules.RNCWebView.onShouldStartLoadWithRequestCallback(shouldStart, lockIdentifier);
+    } else if (shouldStart) {
       UIManager.dispatchViewManagerCommand(
         this.getWebViewHandle(),
         this.getCommands().loadUrl,
@@ -329,7 +342,7 @@ class WebView extends React.Component<AndroidWebViewProps, State> {
     const NativeWebView
       = (nativeConfig.component as typeof NativeWebViewAndroid) || RNCWebView;
 
-    const onShouldStartLoadWithRequest = createOnShouldStartLoadWithRequest(
+    this.onShouldStartLoadWithRequest = createOnShouldStartLoadWithRequest(
       this.onShouldStartLoadWithRequestCallback,
       // casting cause it's in the default props
       originWhitelist as readonly string[],
@@ -347,8 +360,9 @@ class WebView extends React.Component<AndroidWebViewProps, State> {
         onLoadingProgress={this.onLoadingProgress}
         onLoadingStart={this.onLoadingStart}
         onHttpError={this.onHttpError}
+        onRenderProcessGone={this.onRenderProcessGone}
         onMessage={this.onMessage}
-        onShouldStartLoadWithRequest={onShouldStartLoadWithRequest}
+        onShouldStartLoadWithRequest={this.onShouldStartLoadWithRequest}
         ref={this.webViewRef}
         // TODO: find a better way to type this.
         source={resolveAssetSource(source as ImageSourcePropType)}

src/WebViewShared.tsx

@@ -2,8 +2,8 @@ import escapeStringRegexp from 'escape-string-regexp';
 import React from 'react';
 import { Linking, View, ActivityIndicator, Text } from 'react-native';
 import {
-  WebViewNavigationEvent,
   OnShouldStartLoadWithRequest,
+  ShouldStartLoadRequestEvent,
 } from './WebViewTypes';
 import styles from './WebView.styles';
 
@@ -39,7 +39,7 @@ const createOnShouldStartLoadWithRequest = (
   originWhitelist: readonly string[],
   onShouldStartLoadWithRequest?: OnShouldStartLoadWithRequest,
 ) => {
-  return ({ nativeEvent }: WebViewNavigationEvent) => {
+  return ({ nativeEvent }: ShouldStartLoadRequestEvent) => {
     let shouldStart = true;
     const { url, lockIdentifier } = nativeEvent;
 

src/WebViewTypes.ts

@@ -113,6 +113,10 @@ export interface WebViewNavigation extends WebViewNativeEvent {
   mainDocumentURL?: string;
 }
 
+export interface ShouldStartLoadRequest extends WebViewNavigation {
+  isTopFrame: boolean;
+}
+
 export interface FileDownload {
   downloadUrl: string;
 }
@@ -137,6 +141,10 @@ export interface WebViewHttpError extends WebViewNativeEvent {
   statusCode: number;
 }
 
+export interface WebViewRenderProcessGoneDetail {
+  didCrash: boolean;
+}
+
 export type WebViewEvent = NativeSyntheticEvent<WebViewNativeEvent>;
 
 export type WebViewProgressEvent = NativeSyntheticEvent<
@@ -145,6 +153,8 @@ export type WebViewProgressEvent = NativeSyntheticEvent<
 
 export type WebViewNavigationEvent = NativeSyntheticEvent<WebViewNavigation>;
 
+export type ShouldStartLoadRequestEvent = NativeSyntheticEvent<ShouldStartLoadRequest>;
+
 export type FileDownloadEvent = NativeSyntheticEvent<FileDownload>;
 
 export type WebViewMessageEvent = NativeSyntheticEvent<WebViewMessage>;
@@ -155,6 +165,8 @@ export type WebViewTerminatedEvent = NativeSyntheticEvent<WebViewNativeEvent>;
 
 export type WebViewHttpErrorEvent = NativeSyntheticEvent<WebViewHttpError>;
 
+export type WebViewRenderProcessGoneEvent = NativeSyntheticEvent<WebViewRenderProcessGoneDetail>;
+
 export type DataDetectorTypes =
   | 'phoneNumber'
   | 'link'
@@ -170,6 +182,8 @@ export type OverScrollModeType = 'always' | 'content' | 'never';
 
 export type CacheMode = 'LOAD_DEFAULT' | 'LOAD_CACHE_ONLY' | 'LOAD_CACHE_ELSE_NETWORK' | 'LOAD_NO_CACHE';
 
+export type AndroidLayerType = 'none' | 'software' | 'hardware';
+
 export interface WebViewSourceUri {
   /**
    * The URI to load in the `WebView`. Can be a local or remote file.
@@ -232,7 +246,7 @@ export interface WebViewNativeConfig {
 }
 
 export type OnShouldStartLoadWithRequest = (
-  event: WebViewNavigation,
+  event: ShouldStartLoadRequest,
 ) => boolean;
 
 export interface CommonNativeWebViewProps extends ViewProps {
@@ -252,7 +266,7 @@ export interface CommonNativeWebViewProps extends ViewProps {
   onLoadingStart: (event: WebViewNavigationEvent) => void;
   onHttpError: (event: WebViewHttpErrorEvent) => void;
   onMessage: (event: WebViewMessageEvent) => void;
-  onShouldStartLoadWithRequest: (event: WebViewNavigationEvent) => void;
+  onShouldStartLoadWithRequest: (event: ShouldStartLoadRequestEvent) => void;
   showsHorizontalScrollIndicator?: boolean;
   showsVerticalScrollIndicator?: boolean;
   // TODO: find a better way to type this.
@@ -260,7 +274,7 @@ export interface CommonNativeWebViewProps extends ViewProps {
   source: any;
   userAgent?: string;
   /**
-   * Append to the existing user-agent. Overriden if `userAgent` is set.
+   * Append to the existing user-agent. Overridden if `userAgent` is set.
    */
   applicationNameForUserAgent?: string;
 }
@@ -272,11 +286,13 @@ export interface AndroidNativeWebViewProps extends CommonNativeWebViewProps {
   allowFileAccessFromFileURLs?: boolean;
   allowUniversalAccessFromFileURLs?: boolean;
   androidHardwareAccelerationDisabled?: boolean;
+  androidLayerType?: AndroidLayerType;
   domStorageEnabled?: boolean;
   geolocationEnabled?: boolean;
   javaScriptEnabled?: boolean;
   mixedContentMode?: 'never' | 'always' | 'compatibility';
   onContentSizeChange?: (event: WebViewEvent) => void;
+  onRenderProcessGone?: (event: WebViewRenderProcessGoneEvent) => void;
   overScrollMode?: OverScrollModeType;
   saveFormDataDisabled?: boolean;
   textZoom?: number;
@@ -285,12 +301,9 @@ export interface AndroidNativeWebViewProps extends CommonNativeWebViewProps {
   readonly urlPrefixesForDefaultIntent?: string[];
 }
 
-export enum ContentInsetAdjustmentBehavior {
-  automatic = 'automatic',
-  scrollableAxes = 'scrollableAxes',
-  never = 'never',
-  always = 'always'
-};
+export declare type ContentInsetAdjustmentBehavior = 'automatic' | 'scrollableAxes' | 'never' | 'always';
+
+export declare type ContentMode = 'recommended' | 'mobile' | 'desktop';
 
 export interface IOSNativeWebViewProps extends CommonNativeWebViewProps {
   allowingReadAccessToURL?: string;
@@ -301,6 +314,7 @@ export interface IOSNativeWebViewProps extends CommonNativeWebViewProps {
   bounces?: boolean;
   contentInset?: ContentInsetProp;
   contentInsetAdjustmentBehavior?: ContentInsetAdjustmentBehavior;
+  contentMode?: ContentMode;
   readonly dataDetectorTypes?: DataDetectorTypes | DataDetectorTypes[];
   decelerationRate?: number;
   directionalLockEnabled?: boolean;
@@ -398,6 +412,18 @@ export interface IOSWebViewProps extends WebViewSharedProps {
    */
   contentInset?: ContentInsetProp;
 
+  /**
+   * Defaults to `recommended`, which loads mobile content on iPhone
+   * and iPad Mini but desktop content on other iPads.
+   *
+   * Possible values are:
+   * - `'recommended'`
+   * - `'mobile'`
+   * - `'desktop'`
+   * @platform ios
+   */
+  contentMode?: ContentMode;
+
   /**
    * Determines the types of data converted to clickable URLs in the web view's content.
    * By default only phone numbers are detected.
@@ -523,6 +549,15 @@ export interface IOSWebViewProps extends WebViewSharedProps {
   */
   injectedJavaScriptBeforeContentLoadedForMainFrameOnly?: boolean;
 
+  /**
+   * Boolean value that determines whether a pull to refresh gesture is
+   * available in the `WebView`. The default value is `false`.
+   * If `true`, sets `bounces` automatically to `true`
+   * @platform ios
+   *
+  */
+  pullToRefreshEnabled?: boolean;
+
   /**
    * Function that is invoked when the client needs to download a file.
    *
@@ -683,6 +718,12 @@ export interface AndroidWebViewProps extends WebViewSharedProps {
   onNavigationStateChange?: (event: WebViewNavigation) => void;
   onContentSizeChange?: (event: WebViewEvent) => void;
 
+  /**
+   * Function that is invoked when the `WebView` process crashes or is killed by the OS.
+   * Works only on Android (minimum API level 26).
+   */
+  onRenderProcessGone?: (event: WebViewRenderProcessGoneEvent) => void;
+
   /**
    * https://developer.android.com/reference/android/webkit/WebSettings.html#setCacheMode(int)
    * Set the cacheMode. Possible values are:
@@ -721,7 +762,7 @@ export interface AndroidWebViewProps extends WebViewSharedProps {
    */
   geolocationEnabled?: boolean;
 
-  
+
   /**
    * Boolean that sets whether JavaScript running in the context of a file
    * scheme URL should be allowed to access content from other file scheme URLs.
@@ -766,6 +807,18 @@ export interface AndroidWebViewProps extends WebViewSharedProps {
    */
   androidHardwareAccelerationDisabled?: boolean;
 
+    /**
+   * https://developer.android.com/reference/android/webkit/WebView#setLayerType(int,%20android.graphics.Paint)
+   * Sets the layerType. Possible values are:
+   *
+   * - `'none'` (default)
+   * - `'software'`
+   * - `'hardware'`
+   *
+   * @platform android
+   */
+  androidLayerType?: AndroidLayerType;
+
   /**
    * Boolean value to enable third party cookies in the `WebView`. Used on
    * Android Lollipop and above only as third party cookies are enabled by
@@ -973,4 +1026,9 @@ export interface WebViewSharedProps extends ViewProps {
    * Should caching be enabled. Default is true.
    */
   cacheEnabled?: boolean;
+
+  /**
+   * Append to the existing user-agent. Overridden if `userAgent` is set.
+   */
+  applicationNameForUserAgent?: string;
 }