Merge 1114c00f8a into 2d24131910

android/build.gradle

@@ -134,4 +134,5 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+  implementation 'androidx.webkit:webkit:1.2.0'
 }

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

@@ -43,6 +43,9 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.core.content.ContextCompat;
 import androidx.core.util.Pair;
+import androidx.webkit.WebViewAssetLoader;
+import androidx.webkit.WebViewAssetLoader.ResourcesPathHandler;
+import androidx.webkit.WebViewAssetLoader.AssetsPathHandler;
 
 import com.facebook.common.logging.FLog;
 import com.facebook.react.views.scroll.ScrollEvent;
@@ -149,6 +152,8 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
   protected @Nullable String mUserAgent = null;
   protected @Nullable String mUserAgentWithApplicationName = null;
 
+  private static WebViewAssetLoader assetLoader;
+
   public RNCWebViewManager() {
     mWebViewConfig = new WebViewConfig() {
       public void configWebView(WebView webView) {
@@ -196,6 +201,13 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     }
     setMixedContentMode(webView, "never");
 
+    if (assetLoader == null) {
+      assetLoader = new WebViewAssetLoader.Builder()
+        .addPathHandler("/assets/", new AssetsPathHandler(reactContext))
+        .addPathHandler("/res/", new ResourcesPathHandler(reactContext))
+        .build();
+    }
+
     // Fixes broken full-screen modals/galleries due to body height being 0.
     webView.setLayoutParams(
       new LayoutParams(LayoutParams.MATCH_PARENT,
@@ -778,6 +790,12 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     protected RNCWebView.ProgressChangedFilter progressChangedFilter = null;
     protected @Nullable String ignoreErrFailedForThisURL = null;
 
+    @Override
+    public WebResourceResponse shouldInterceptRequest(WebView view,
+                                                      WebResourceRequest request) {
+      return assetLoader.shouldInterceptRequest(request.getUrl());
+    }
+
     public void setIgnoreErrFailedForThisURL(@Nullable String url) {
       ignoreErrFailedForThisURL = url;
     }

docs/Guide.md

@@ -89,6 +89,20 @@ class MyWeb extends Component {
 }
 ```
 
+**Access local assets by WebViewAssetLoader on android x**
+
+Android x provide a new way to access assets, by using WebViewAssetLoader. now we can access assets via uri **https://appassets.androidplatform.net/assets/some-assets**
+
+For example:
+
+```tsx
+<WebView
+  source={{
+    uri: 'https://appassets.androidplatform.net/assets/index.html',
+  }}
+/>
+```
+
 </details>
 
 ### Controlling navigation state changes