Merge pull request #4 from phantom/kuba/origin-fixes-alternative

feat: implement passing isMainFrame with on message callbacks

Author: jkadamczyk

.changeset/spotty-feet-shave.md

@@ -0,0 +1,5 @@
+---
+'@phantom/react-native-webview': patch
+---
+
+added isMainFrame to onMessage callbacks

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

@@ -257,7 +257,7 @@ protected void createRNCWebViewBridge(RNCWebView webView) {
             this.bridgeListener = new WebViewCompat.WebMessageListener() {
               @Override
               public void onPostMessage(@NonNull WebView view, @NonNull WebMessageCompat message, @NonNull Uri sourceOrigin, boolean isMainFrame, @NonNull JavaScriptReplyProxy replyProxy) {
-                RNCWebView.this.onMessage(message.getData(), sourceOrigin.toString());
+                RNCWebView.this.onMessage(message.getData(), sourceOrigin.toString(), isMainFrame);
               }
             };
             WebViewCompat.addWebMessageListener(
@@ -339,6 +339,10 @@ public void setInjectedJavaScriptObject(String obj) {
     }
 
     public void onMessage(String message, String sourceUrl) {
+        onMessage(message, sourceUrl, null);
+    }
+
+    public void onMessage(String message, String sourceUrl, @Nullable Boolean isMainFrame) {
         ThemedReactContext reactContext = getThemedReactContext();
         RNCWebView mWebView = this;
 
@@ -352,6 +356,9 @@ public void run() {
                     }
                     WritableMap data = mRNCWebViewClient.createWebViewEvent(webView, sourceUrl);
                     data.putString("data", message);
+                    if (isMainFrame != null) {
+                        data.putBoolean("isMainFrame", isMainFrame);
+                    }
 
                     if (mMessagingJSModule != null) {
                         dispatchDirectMessage(data);
@@ -363,6 +370,9 @@ public void run() {
         } else {
             WritableMap eventData = Arguments.createMap();
             eventData.putString("data", message);
+            if (isMainFrame != null) {
+                eventData.putBoolean("isMainFrame", isMainFrame);
+            }
 
             if (mMessagingJSModule != null) {
                 dispatchDirectMessage(eventData);

apple/RNCWebViewImpl.m

@@ -773,10 +773,12 @@ - (void)userContentController:(WKUserContentController *)userContentController
       _onLoadingFinish(event);
     }
   } else if ([message.name isEqualToString:MessageHandlerName]) {
+    BOOL isMainFrame = message.frameInfo.isMainFrame;
     if (_onMessage) {
       NSMutableDictionary<NSString *, id> *event = [self baseEvent];
       [event addEntriesFromDictionary: @{@"data": message.body}];
       [event addEntriesFromDictionary: @{@"url": message.frameInfo.request.URL.absoluteString}];
+      [event addEntriesFromDictionary: @{@"isMainFrame": @(isMainFrame)}];
       _onMessage(event);
     }
   }

src/RNCWebViewNativeComponent.ts

@@ -29,6 +29,7 @@ export type WebViewMessageEvent = Readonly<{
   canGoForward: boolean;
   lockIdentifier: Double;
   data: string;
+  isMainFrame?: boolean;
 }>;
 export type WebViewOpenWindowEvent = Readonly<{
   targetUrl: string;

src/WebViewTypes.ts

@@ -110,6 +110,7 @@ export type DecelerationRateConstant = 'normal' | 'fast';
 
 export interface WebViewMessage extends WebViewNativeEvent {
   data: string;
+  isMainFrame?: boolean;
 }
 
 export interface WebViewError extends WebViewNativeEvent {