react-native-webview-bootpay 13.8.41 → 13.13.4-4.alpha.1

package/android/src/{main/java → oldarch}/kr/co/bootpay/webview/BPCWebViewManager.java

@@ -6,13 +6,10 @@ import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.common.MapBuilder;
-import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.views.scroll.ScrollEventType;
-
-import java.util.Map;
-
 import kr.co.bootpay.webview.events.TopCustomMenuSelectionEvent;
 import kr.co.bootpay.webview.events.TopHttpErrorEvent;
 import kr.co.bootpay.webview.events.TopLoadingErrorEvent;
@@ -24,7 +21,9 @@ import kr.co.bootpay.webview.events.TopOpenWindowEvent;
 import kr.co.bootpay.webview.events.TopRenderProcessGoneEvent;
 import kr.co.bootpay.webview.events.TopShouldStartLoadWithRequestEvent;
 
-public class BPCWebViewManager extends SimpleViewManager<BPCWebView> {
+import java.util.Map;
+
+public class BPCWebViewManager extends ViewGroupManager<BPCWebViewWrapper> {
 
     private final BPCWebViewManagerImpl mBPCWebViewManagerImpl;
 
@@ -38,246 +37,246 @@ public class BPCWebViewManager extends SimpleViewManager<BPCWebView> {
     }
 
     @Override
-    public BPCWebView createViewInstance(ThemedReactContext context) {
+    public BPCWebViewWrapper createViewInstance(ThemedReactContext context) {
         return mBPCWebViewManagerImpl.createViewInstance(context);
     }
 
-    public BPCWebView createViewInstance(ThemedReactContext context, BPCWebView webView) {
-      return mBPCWebViewManagerImpl.createViewInstance(context, webView);
+    public BPCWebViewWrapper createViewInstance(ThemedReactContext context, BPCWebView view) {
+      return mBPCWebViewManagerImpl.createViewInstance(context, view);
     }
 
     @ReactProp(name = "allowFileAccess")
-    public void setAllowFileAccess(BPCWebView view, boolean value) {
+    public void setAllowFileAccess(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setAllowFileAccess(view, value);
     }
 
     @ReactProp(name = "allowFileAccessFromFileURLs")
-    public void setAllowFileAccessFromFileURLs(BPCWebView view, boolean value) {
+    public void setAllowFileAccessFromFileURLs(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setAllowFileAccessFromFileURLs(view, value);
 
     }
 
     @ReactProp(name = "allowUniversalAccessFromFileURLs")
-    public void setAllowUniversalAccessFromFileURLs(BPCWebView view, boolean value) {
+    public void setAllowUniversalAccessFromFileURLs(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setAllowUniversalAccessFromFileURLs(view, value);
     }
 
     @ReactProp(name = "allowsFullscreenVideo")
-    public void setAllowsFullscreenVideo(BPCWebView view, boolean value) {
+    public void setAllowsFullscreenVideo(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setAllowsFullscreenVideo(view, value);
     }
 
     @ReactProp(name = "allowsProtectedMedia")
-    public void setAllowsProtectedMedia(BPCWebView view, boolean value) {
+    public void setAllowsProtectedMedia(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setAllowsProtectedMedia(view, value);
     }
 
     @ReactProp(name = "androidLayerType")
-    public void setAndroidLayerType(BPCWebView view, @Nullable String value) {
+    public void setAndroidLayerType(BPCWebViewWrapper view, @Nullable String value) {
         mBPCWebViewManagerImpl.setAndroidLayerType(view, value);
     }
 
     @ReactProp(name = "applicationNameForUserAgent")
-    public void setApplicationNameForUserAgent(BPCWebView view, @Nullable String value) {
+    public void setApplicationNameForUserAgent(BPCWebViewWrapper view, @Nullable String value) {
         mBPCWebViewManagerImpl.setApplicationNameForUserAgent(view, value);
     }
 
     @ReactProp(name = "basicAuthCredential")
-    public void setBasicAuthCredential(BPCWebView view, @Nullable ReadableMap value) {
+    public void setBasicAuthCredential(BPCWebViewWrapper view, @Nullable ReadableMap value) {
         mBPCWebViewManagerImpl.setBasicAuthCredential(view, value);
     }
 
     @ReactProp(name = "cacheEnabled")
-    public void setCacheEnabled(BPCWebView view, boolean value) {
+    public void setCacheEnabled(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setCacheEnabled(view, value);
     }
 
     @ReactProp(name = "cacheMode")
-    public void setCacheMode(BPCWebView view, @Nullable String value) {
+    public void setCacheMode(BPCWebViewWrapper view, @Nullable String value) {
         mBPCWebViewManagerImpl.setCacheMode(view, value);
     }
 
     @ReactProp(name = "domStorageEnabled")
-    public void setDomStorageEnabled(BPCWebView view, boolean value) {
+    public void setDomStorageEnabled(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setDomStorageEnabled(view, value);
     }
 
     @ReactProp(name = "downloadingMessage")
-    public void setDownloadingMessage(BPCWebView view, @Nullable String value) {
+    public void setDownloadingMessage(BPCWebViewWrapper view, @Nullable String value) {
         mBPCWebViewManagerImpl.setDownloadingMessage(value);
     }
 
     @ReactProp(name = "forceDarkOn")
-    public void setForceDarkOn(BPCWebView view, boolean value) {
+    public void setForceDarkOn(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setForceDarkOn(view, value);
     }
 
     @ReactProp(name = "geolocationEnabled")
-    public void setGeolocationEnabled(BPCWebView view, boolean value) {
+    public void setGeolocationEnabled(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setGeolocationEnabled(view, value);
     }
 
     @ReactProp(name = "hasOnScroll")
-    public void setHasOnScroll(BPCWebView view, boolean hasScrollEvent) {
+    public void setHasOnScroll(BPCWebViewWrapper view, boolean hasScrollEvent) {
         mBPCWebViewManagerImpl.setHasOnScroll(view, hasScrollEvent);
     }
 
     @ReactProp(name = "incognito")
-    public void setIncognito(BPCWebView view, boolean value) {
+    public void setIncognito(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setIncognito(view, value);
     }
 
     @ReactProp(name = "injectedJavaScript")
-    public void setInjectedJavaScript(BPCWebView view, @Nullable String value) {
+    public void setInjectedJavaScript(BPCWebViewWrapper view, @Nullable String value) {
         mBPCWebViewManagerImpl.setInjectedJavaScript(view, value);
     }
 
     @ReactProp(name = "injectedJavaScriptBeforeContentLoaded")
-    public void setInjectedJavaScriptBeforeContentLoaded(BPCWebView view, @Nullable String value) {
+    public void setInjectedJavaScriptBeforeContentLoaded(BPCWebViewWrapper view, @Nullable String value) {
         mBPCWebViewManagerImpl.setInjectedJavaScriptBeforeContentLoaded(view, value);
     }
 
     @ReactProp(name = "injectedJavaScriptForMainFrameOnly")
-    public void setInjectedJavaScriptForMainFrameOnly(BPCWebView view, boolean value) {
+    public void setInjectedJavaScriptForMainFrameOnly(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setInjectedJavaScriptForMainFrameOnly(view, value);
 
     }
 
     @ReactProp(name = "injectedJavaScriptBeforeContentLoadedForMainFrameOnly")
-    public void setInjectedJavaScriptBeforeContentLoadedForMainFrameOnly(BPCWebView view, boolean value) {
+    public void setInjectedJavaScriptBeforeContentLoadedForMainFrameOnly(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setInjectedJavaScriptBeforeContentLoadedForMainFrameOnly(view, value);
 
     }
 
     @ReactProp(name = "injectedJavaScriptObject")
-    public void setInjectedJavaScriptObject(BPCWebView view, @Nullable String value) {
+    public void setInjectedJavaScriptObject(BPCWebViewWrapper view, @Nullable String value) {
         mBPCWebViewManagerImpl.setInjectedJavaScriptObject(view, value);
     }
 
     @ReactProp(name = "javaScriptCanOpenWindowsAutomatically")
-    public void setJavaScriptCanOpenWindowsAutomatically(BPCWebView view, boolean value) {
+    public void setJavaScriptCanOpenWindowsAutomatically(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setJavaScriptCanOpenWindowsAutomatically(view, value);
     }
 
     @ReactProp(name = "javaScriptEnabled")
-    public void setJavaScriptEnabled(BPCWebView view, boolean enabled) {
+    public void setJavaScriptEnabled(BPCWebViewWrapper view, boolean enabled) {
         mBPCWebViewManagerImpl.setJavaScriptEnabled(view, enabled);
     }
 
     @ReactProp(name = "lackPermissionToDownloadMessage")
-    public void setLackPermissionToDownloadMessage(BPCWebView view, @Nullable String value) {
+    public void setLackPermissionToDownloadMessage(BPCWebViewWrapper view, @Nullable String value) {
         mBPCWebViewManagerImpl.setLackPermissionToDownloadMessage(value);
     }
 
     @ReactProp(name = "hasOnOpenWindowEvent")
-    public void setHasOnOpenWindowEvent(BPCWebView view, boolean hasEvent) {
+    public void setHasOnOpenWindowEvent(BPCWebViewWrapper view, boolean hasEvent) {
         mBPCWebViewManagerImpl.setHasOnOpenWindowEvent(view, hasEvent);
     }
 
     @ReactProp(name = "mediaPlaybackRequiresUserAction")
-    public void setMediaPlaybackRequiresUserAction(BPCWebView view, boolean value) {
+    public void setMediaPlaybackRequiresUserAction(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setMediaPlaybackRequiresUserAction(view, value);
     }
 
     @ReactProp(name = "messagingEnabled")
-    public void setMessagingEnabled(BPCWebView view, boolean value) {
+    public void setMessagingEnabled(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setMessagingEnabled(view, value);
     }
 
     @ReactProp(name = "menuItems")
-    public void setMenuCustomItems(BPCWebView view, @Nullable ReadableArray items) {
+    public void setMenuCustomItems(BPCWebViewWrapper view, @Nullable ReadableArray items) {
         mBPCWebViewManagerImpl.setMenuCustomItems(view, items);
     }
 
     @ReactProp(name = "messagingModuleName")
-    public void setMessagingModuleName(BPCWebView view, @Nullable String value) {
+    public void setMessagingModuleName(BPCWebViewWrapper view, @Nullable String value) {
         mBPCWebViewManagerImpl.setMessagingModuleName(view, value);
     }
 
     @ReactProp(name = "minimumFontSize")
-    public void setMinimumFontSize(BPCWebView view, int value) {
+    public void setMinimumFontSize(BPCWebViewWrapper view, int value) {
         mBPCWebViewManagerImpl.setMinimumFontSize(view, value);
     }
 
     @ReactProp(name = "mixedContentMode")
-    public void setMixedContentMode(BPCWebView view, @Nullable String value) {
+    public void setMixedContentMode(BPCWebViewWrapper view, @Nullable String value) {
         mBPCWebViewManagerImpl.setMixedContentMode(view, value);
     }
 
     @ReactProp(name = "nestedScrollEnabled")
-    public void setNestedScrollEnabled(BPCWebView view, boolean value) {
+    public void setNestedScrollEnabled(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setNestedScrollEnabled(view, value);
     }
 
     @ReactProp(name = "overScrollMode")
-    public void setOverScrollMode(BPCWebView view, @Nullable String value) {
+    public void setOverScrollMode(BPCWebViewWrapper view, @Nullable String value) {
         mBPCWebViewManagerImpl.setOverScrollMode(view, value);
     }
 
     @ReactProp(name = "saveFormDataDisabled")
-    public void setSaveFormDataDisabled(BPCWebView view, boolean value) {
+    public void setSaveFormDataDisabled(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setSaveFormDataDisabled(view, value);
     }
 
     @ReactProp(name = "scalesPageToFit")
-    public void setScalesPageToFit(BPCWebView view, boolean value) {
+    public void setScalesPageToFit(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setScalesPageToFit(view, value);
     }
 
     @ReactProp(name = "setBuiltInZoomControls")
-    public void setSetBuiltInZoomControls(BPCWebView view, boolean value) {
+    public void setSetBuiltInZoomControls(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setSetBuiltInZoomControls(view, value);
     }
 
     @ReactProp(name = "setDisplayZoomControls")
-    public void setSetDisplayZoomControls(BPCWebView view, boolean value) {
+    public void setSetDisplayZoomControls(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setSetDisplayZoomControls(view, value);
     }
 
     @ReactProp(name = "setSupportMultipleWindows")
-    public void setSetSupportMultipleWindows(BPCWebView view, boolean value) {
+    public void setSetSupportMultipleWindows(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setSetSupportMultipleWindows(view, value);
     }
 
     @ReactProp(name = "showsHorizontalScrollIndicator")
-    public void setShowsHorizontalScrollIndicator(BPCWebView view, boolean value) {
+    public void setShowsHorizontalScrollIndicator(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setShowsHorizontalScrollIndicator(view, value);
     }
 
     @ReactProp(name = "showsVerticalScrollIndicator")
-    public void setShowsVerticalScrollIndicator(BPCWebView view, boolean value) {
+    public void setShowsVerticalScrollIndicator(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setShowsVerticalScrollIndicator(view, value);
     }
 
     @ReactProp(name = "source")
-    public void setSource(BPCWebView view, @Nullable ReadableMap value) {
-        mBPCWebViewManagerImpl.setSource(view, value, false);
+    public void setSource(BPCWebViewWrapper view, @Nullable ReadableMap value) {
+        mBPCWebViewManagerImpl.setSource(view, value);
     }
 
     @ReactProp(name = "textZoom")
-    public void setTextZoom(BPCWebView view, int value) {
+    public void setTextZoom(BPCWebViewWrapper view, int value) {
         mBPCWebViewManagerImpl.setTextZoom(view, value);
     }
 
     @ReactProp(name = "thirdPartyCookiesEnabled")
-    public void setThirdPartyCookiesEnabled(BPCWebView view, boolean value) {
+    public void setThirdPartyCookiesEnabled(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setThirdPartyCookiesEnabled(view, value);
     }
 
     @ReactProp(name = "webviewDebuggingEnabled")
-    public void setWebviewDebuggingEnabled(BPCWebView view, boolean value) {
+    public void setWebviewDebuggingEnabled(BPCWebViewWrapper view, boolean value) {
         mBPCWebViewManagerImpl.setWebviewDebuggingEnabled(view, value);
     }
 
     @ReactProp(name = "userAgent")
-    public void setUserAgent(BPCWebView view, @Nullable String value) {
+    public void setUserAgent(BPCWebViewWrapper view, @Nullable String value) {
         mBPCWebViewManagerImpl.setUserAgent(view, value);
     }
 
     @Override
-    protected void addEventEmitters(@NonNull ThemedReactContext reactContext, BPCWebView view) {
+    protected void addEventEmitters(@NonNull ThemedReactContext reactContext, BPCWebViewWrapper viewWrapper) {
         // Do not register default touch emitter and let WebView implementation handle touches
-        view.setWebViewClient(new BPCWebViewClient());
+        viewWrapper.getWebView().setWebViewClient(new BPCWebViewClient());
     }
 
     @Override
@@ -310,13 +309,19 @@ public class BPCWebViewManager extends SimpleViewManager<BPCWebView> {
     }
 
     @Override
-    public void receiveCommand(@NonNull BPCWebView reactWebView, String commandId, @Nullable ReadableArray args) {
+    public void receiveCommand(@NonNull BPCWebViewWrapper reactWebView, String commandId, @Nullable ReadableArray args) {
         mBPCWebViewManagerImpl.receiveCommand(reactWebView, commandId, args);
         super.receiveCommand(reactWebView, commandId, args);
     }
 
     @Override
-    public void onDropViewInstance(@NonNull BPCWebView view) {
+    protected void onAfterUpdateTransaction(@NonNull BPCWebViewWrapper view) {
+        super.onAfterUpdateTransaction(view);
+        mBPCWebViewManagerImpl.onAfterUpdateTransaction(view);
+    }
+
+    @Override
+    public void onDropViewInstance(@NonNull BPCWebViewWrapper view) {
         mBPCWebViewManagerImpl.onDropViewInstance(view);
         super.onDropViewInstance(view);
     }

package/android/src/{main/java → oldarch}/kr/co/bootpay/webview/BPCWebViewModule.java

@@ -2,9 +2,9 @@ package kr.co.bootpay.webview;
 
 import android.app.DownloadManager;
 import android.net.Uri;
-import android.webkit.ValueCallback;
 
 import androidx.annotation.NonNull;
+import android.webkit.ValueCallback;
 
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;

package/apple/BPCWebView.mm

@@ -8,7 +8,7 @@
 #import <react/renderer/components/BPCWebViewSpec/Props.h>
 #import <react/renderer/components/BPCWebViewSpec/RCTComponentViewHelpers.h>
 
-#import "RCTFabricComponentsPlugins.h"
+#import <React/RCTFabricComponentsPlugins.h>
 
 using namespace facebook::react;
 
@@ -52,11 +52,19 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
     return concreteComponentDescriptorProvider<BPCWebViewComponentDescriptor>();
 }
 
+#if !TARGET_OS_OSX
 // Reproduce the idea from here: https://github.com/facebook/react-native/blob/8bd3edec88148d0ab1f225d2119435681fbbba33/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm#L142
 - (void)prepareForRecycle {
     [super prepareForRecycle];
     [_view destroyWebView];
 }
+#endif // !TARGET_OS_OSX
+
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
++ (void)load
+{
+  [super load];
+}
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
@@ -75,7 +83,7 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
                     .title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
                     .navigationType = stringToOnShouldStartLoadWithRequestNavigationTypeEnum(std::string([[dictionary valueForKey:@"navigationType"] UTF8String])),
                     .canGoBack = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
-                    .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
+                    .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoForward"] boolValue]),
                     .isTopFrame = static_cast<bool>([[dictionary valueForKey:@"isTopFrame"] boolValue]),
                     .loading = static_cast<bool>([[dictionary valueForKey:@"loading"] boolValue]),
                     .mainDocumentURL = std::string([[dictionary valueForKey:@"mainDocumentURL"] UTF8String])
@@ -92,7 +100,7 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
                     .title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
                     .navigationType = stringToOnLoadingStartNavigationTypeEnum(std::string([[dictionary valueForKey:@"navigationType"] UTF8String])),
                     .canGoBack = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
-                    .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
+                    .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoForward"] boolValue]),
                     .loading = static_cast<bool>([[dictionary valueForKey:@"loading"] boolValue]),
                     .mainDocumentURL = std::string([[dictionary valueForKey:@"mainDocumentURL"] UTF8String], [[dictionary valueForKey:@"mainDocumentURL"] lengthOfBytesUsingEncoding:NSUTF8StringEncoding])
                 };
@@ -107,9 +115,9 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
                     .lockIdentifier = [[dictionary valueForKey:@"lockIdentifier"] doubleValue],
                     .title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
                     .code = [[dictionary valueForKey:@"code"] intValue],
-                    .description = std::string([[dictionary valueForKey:@"description"] UTF8String]),
+                    .description = std::string([[dictionary valueForKey:@"description"] UTF8String] ?: ""),
                     .canGoBack = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
-                    .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
+                    .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoForward"] boolValue]),
                     .loading = static_cast<bool>([[dictionary valueForKey:@"loading"] boolValue]),
                     .domain = std::string([[dictionary valueForKey:@"domain"] UTF8String])
                 };
@@ -124,7 +132,7 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
                     .lockIdentifier = [[dictionary valueForKey:@"lockIdentifier"] doubleValue],
                     .title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
                     .canGoBack = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
-                    .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
+                    .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoForward"] boolValue]),
                     .loading = static_cast<bool>([[dictionary valueForKey:@"loading"] boolValue]),
                     .data = std::string([[dictionary valueForKey:@"data"] UTF8String])
                 };
@@ -140,7 +148,7 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
                     .title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
                     .navigationType = stringToOnLoadingFinishNavigationTypeEnum(std::string([[dictionary valueForKey:@"navigationType"] UTF8String], [[dictionary valueForKey:@"navigationType"] lengthOfBytesUsingEncoding:NSUTF8StringEncoding])),
                     .canGoBack = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
-                    .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
+                    .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoForward"] boolValue]),
                     .loading = static_cast<bool>([[dictionary valueForKey:@"loading"] boolValue]),
                     .mainDocumentURL = std::string([[dictionary valueForKey:@"mainDocumentURL"] UTF8String], [[dictionary valueForKey:@"mainDocumentURL"] lengthOfBytesUsingEncoding:NSUTF8StringEncoding])
                 };
@@ -155,7 +163,7 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
                     .lockIdentifier = [[dictionary valueForKey:@"lockIdentifier"] doubleValue],
                     .title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
                     .canGoBack = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
-                    .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
+                    .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoForward"] boolValue]),
                     .loading = static_cast<bool>([[dictionary valueForKey:@"loading"] boolValue]),
                     .progress = [[dictionary valueForKey:@"progress"] doubleValue]
                 };
@@ -170,7 +178,7 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
                     .lockIdentifier = [[dictionary valueForKey:@"lockIdentifier"] doubleValue],
                     .title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
                     .canGoBack = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
-                    .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
+                    .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoForward"] boolValue]),
                     .loading = static_cast<bool>([[dictionary valueForKey:@"loading"] boolValue])
                 };
                 webViewEventEmitter->onContentProcessDidTerminate(data);
@@ -228,9 +236,9 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
                     .lockIdentifier = [[dictionary valueForKey:@"lockIdentifier"] doubleValue],
                     .title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
                     .statusCode = [[dictionary valueForKey:@"statusCode"] intValue],
-                    .description = std::string([[dictionary valueForKey:@"description"] UTF8String]),
+                    .description = std::string([[dictionary valueForKey:@"description"] UTF8String] ?: ""),
                     .canGoBack = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
-                    .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
+                    .canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoForward"] boolValue]),
                     .loading = static_cast<bool>([[dictionary valueForKey:@"loading"] boolValue])
                 };
                 webViewEventEmitter->onHttpError(data);
@@ -272,6 +280,7 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
     REMAP_WEBVIEW_PROP(allowFileAccessFromFileURLs)
     REMAP_WEBVIEW_PROP(allowUniversalAccessFromFileURLs)
     REMAP_WEBVIEW_PROP(allowsInlineMediaPlayback)
+    REMAP_WEBVIEW_PROP(allowsPictureInPictureMediaPlayback)
     REMAP_WEBVIEW_PROP(webviewDebuggingEnabled)
     REMAP_WEBVIEW_PROP(allowsAirPlayForMediaPlayback)
     REMAP_WEBVIEW_PROP(mediaPlaybackRequiresUserAction)
@@ -291,6 +300,7 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
     #endif // !TARGET_OS_OSX
     REMAP_WEBVIEW_PROP(enableApplePay)
     REMAP_WEBVIEW_PROP(pullToRefreshEnabled)
+    REMAP_WEBVIEW_PROP(refreshControlLightMode)
     REMAP_WEBVIEW_PROP(bounces)
     REMAP_WEBVIEW_PROP(useSharedProcessPool)
     REMAP_WEBVIEW_STRING_PROP(userAgent)
@@ -534,4 +544,3 @@ Class<RCTComponentViewProtocol> BPCWebViewCls(void)
 
 @end
 #endif
-

package/apple/BPCWebViewImpl.h

@@ -44,7 +44,15 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
 
 @end
 
+#if !TARGET_OS_OSX
+@interface BPCWebViewImpl : RCTView <UIEditMenuInteractionDelegate, UIGestureRecognizerDelegate>
+
+@property (nonatomic, nullable) UIEditMenuInteraction *editMenuInteraction API_AVAILABLE(ios(16.0));
+#else
 @interface BPCWebViewImpl : RCTView
+#endif // !TARGET_OS_OSX
+
+
 @property (nonatomic, copy) RCTDirectEventBlock onFileDownload;
 @property (nonatomic, copy) RCTDirectEventBlock onLoadingStart;
 @property (nonatomic, copy) RCTDirectEventBlock onLoadingFinish;
@@ -72,6 +80,7 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
 @property (nonatomic, assign) BOOL pagingEnabled;
 @property (nonatomic, assign) CGFloat decelerationRate;
 @property (nonatomic, assign) BOOL allowsInlineMediaPlayback;
+@property (nonatomic, assign) BOOL allowsPictureInPictureMediaPlayback;
 @property (nonatomic, assign) BOOL webviewDebuggingEnabled;
 @property (nonatomic, assign) BOOL allowsAirPlayForMediaPlayback;
 @property (nonatomic, assign) BOOL bounces;
@@ -98,6 +107,7 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
 @property (nonatomic, copy) NSString * _Nullable allowingReadAccessToURL;
 @property (nonatomic, copy) NSDictionary * _Nullable basicAuthCredential;
 @property (nonatomic, assign) BOOL pullToRefreshEnabled;
+@property (nonatomic, assign) BOOL refreshControlLightMode;
 @property (nonatomic, assign) BOOL enableApplePay;
 @property (nonatomic, copy) NSArray<NSDictionary *> * _Nullable menuItems;
 @property (nonatomic, copy) NSArray<NSString *> * _Nullable suppressMenuItems;