Upgrade to react-native-webview v13.8.4

Author: swansontec

ios/Podfile.lock

@@ -460,7 +460,8 @@ PODS:
     - RCTTypeSafety
     - React-Core
     - ReactCommon/turbomodule/core
-  - react-native-webview (13.2.2):
+  - react-native-webview (13.8.4):
+    - RCT-Folly (= 2021.07.22.00)
     - React-Core
   - react-native-zcash (0.6.10):
     - gRPC-Swift (~> 1.8)
@@ -1191,7 +1192,7 @@ SPEC CHECKSUMS:
   react-native-piratechain: 7775af3e8dd813587eab8574d9f46c0ed7148f32
   react-native-safari-view: 955d7160d159241b8e9395d12d10ea0ef863dcdd
   react-native-safe-area-context: 68b07eabfb0d14547d36f6929c0e98d818064f02
-  react-native-webview: b8ec89966713985111a14d6e4bf98d8b54bced0d
+  react-native-webview: fa228e55c53372c2b361d2fa5e415844fa83eabf
   react-native-zcash: a4085aedd9722e186566bdd33079406414b190ef
   React-perflogger: 0cc42978a483a47f3696171dac2e7033936fc82d
   React-RCTActionSheet: ea922b476d24f6d40b8e02ac3228412bd3637468

package.json

@@ -152,7 +152,7 @@
     "react-native-store-review": "^0.4.1",
     "react-native-svg": "^13.9.0",
     "react-native-vector-icons": "^9.2.0",
-    "react-native-webview": "^13.2.2",
+    "react-native-webview": "^13.8.4",
     "react-native-zcash": "^0.6.10",
     "react-redux": "^8.1.1",
     "redux": "^4.2.1",

patches/react-native-webview+13.2.2.patch patches/react-native-webview+13.8.4.patchpatches/react-native-webview+13.2.2.patch renamed to patches/react-native-webview+13.8.4.patch

@@ -1,5 +1,5 @@
 diff --git a/node_modules/react-native-webview/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewModuleImpl.java b/node_modules/react-native-webview/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewModuleImpl.java
-index d5f3533..6e88590 100644
+index d5f3533..b4cc669 100644
 --- a/node_modules/react-native-webview/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewModuleImpl.java
 +++ b/node_modules/react-native-webview/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewModuleImpl.java
 @@ -325,10 +325,6 @@ public class RNCWebViewModuleImpl implements ActivityEventListener {
@@ -13,29 +13,25 @@ index d5f3533..6e88590 100644
 
          boolean result = ContextCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
          if (!result && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-diff --git a/node_modules/react-native-webview/lib/WebViewShared.js b/node_modules/react-native-webview/lib/WebViewShared.js
-index 347e915..167692f 100644
---- a/node_modules/react-native-webview/lib/WebViewShared.js
-+++ b/node_modules/react-native-webview/lib/WebViewShared.js
-@@ -17,7 +17,7 @@ var extractOrigin = function (url) {
-     return result === null ? '' : result[0];
- };
- var originWhitelistToRegex = function (originWhitelist) {
--    return "^".concat(escapeStringRegexp(originWhitelist).replace(/\\\*/g, '.*'));
-+    return "^" + escapeStringRegexp(originWhitelist).replace(/\\\*/g, '.*') + "$";
- };
- var passesWhitelist = function (compiledWhitelist, url) {
-     var origin = extractOrigin(url);
 diff --git a/node_modules/react-native-webview/src/WebViewShared.tsx b/node_modules/react-native-webview/src/WebViewShared.tsx
-index 7e4bc18..759bed8 100644
+index 08905ea..2d8b360 100644
 --- a/node_modules/react-native-webview/src/WebViewShared.tsx
 +++ b/node_modules/react-native-webview/src/WebViewShared.tsx
-@@ -199,6 +199,8 @@ export const useWebViewLogic = ({
-     }
-     // !patch for Android only
-     onLoadProgress?.(event);
-+    // @ts-expect-error
-+    updateNavigationState(event);
-   }, [onLoadProgress]);
+@@ -25,7 +25,7 @@ const extractOrigin = (url: string): string => {
+ };
+ 
+ const originWhitelistToRegex = (originWhitelist: string): string =>
+-  `^${escapeStringRegexp(originWhitelist).replace(/\\\*/g, '.*')}`;
++  `^${escapeStringRegexp(originWhitelist).replace(/\\\*/g, '.*')}$`;
 
-   const onShouldStartLoadWithRequest = useMemo(() =>  createOnShouldStartLoadWithRequest(
+ const passesWhitelist = (compiledWhitelist: readonly string[], url: string) => {
+   const origin = extractOrigin(url);
+@@ -240,6 +240,8 @@ export const useWebViewLogic = ({
+       }
+       // !patch for Android only
+       onLoadProgress?.(event);
++      // @ts-expect-error
++      updateNavigationState(event);
+     },
+     [onLoadProgress]
+   );

yarn.lock

@@ -16152,10 +16152,10 @@ react-native-vector-icons@^9.2.0:
     prop-types "^15.7.2"
     yargs "^16.1.1"
 
-react-native-webview@^13.2.2:
-  version "13.2.2"
-  resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-13.2.2.tgz#06b04db8e1f4ed57a9dc92f4094aa0e41271b89b"
-  integrity sha512-uT70y2GUqQzaj2RwRb/QuKRdXeDjXM6oN3DdPqYQlOOMFTCT8r62fybyjVVRoik8io+KLa5KnmuSoS5B2O1BmA==
+react-native-webview@^13.8.4:
+  version "13.8.4"
+  resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-13.8.4.tgz#03b2870090ad6c326a6460ba2f50e5243eb65a94"
+  integrity sha512-dFoM9EfkAb++ZzycZyKRnjZtNUn85cf6bWp1iBlkgyNml7ULzR1gfaPT3qESoA3K1RfTmf5Xhw0M2In2A3a3wg==
   dependencies:
     escape-string-regexp "2.0.0"
     invariant "2.2.4"