Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,9 @@ protected void createRNCWebViewBridge(RNCWebView webView) {
@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());
if (isMainFrame) {
RNCWebView.this.onMessage(message.getData(), sourceOrigin.toString());
}
}
};
WebViewCompat.addWebMessageListener(
Expand Down
2 changes: 1 addition & 1 deletion apple/RNCWebViewImpl.m
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ - (void)userContentController:(WKUserContentController *)userContentController
_disablePromptDuringLoading = NO;
}
} else if ([message.name isEqualToString:MessageHandlerName]) {
if (_onMessage) {
if (_onMessage && message.frameInfo.mainFrame) {
NSMutableDictionary<NSString *, id> *event = [self baseEvent];
[event addEntriesFromDictionary: @{@"data": message.body}];
[event addEntriesFromDictionary: @{@"url": message.frameInfo.request.URL.absoluteString}];
Expand Down
Loading