Merge branch 'master' into android-download-try-catch

.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

@@ -437,6 +437,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);
@@ -446,14 +451,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")

apple/RNCWebView.m

@@ -878,7 +878,7 @@ static NSDictionary* customCertificatesForHost;
  */
 -(UIViewController *)topViewControllerWithRootViewController:(UIViewController *)viewController{
   if (viewController==nil) return nil;
-  if (viewController.presentedViewController!=nil) {
+  if (viewController.presentedViewController!=nil && viewController.presentedViewController.isBeingPresented) {
     return [self topViewControllerWithRootViewController:viewController.presentedViewController];
   } else if ([viewController isKindOfClass:[UITabBarController class]]){
     return [self topViewControllerWithRootViewController:[(UITabBarController *)viewController selectedViewController]];

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.4.0",
+  "version": "10.4.1",
   "homepage": "https://github.com/react-native-community/react-native-webview#readme",
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",