WebView: onMessage should not break postMessage

facebook · Mar 24, 2018 · ba02b9b · ba02b9b
1 parent 1acef45
commit ba02b9b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/React/Views/RCTWebView.m b/React/Views/RCTWebView.m
@@ -322,6 +322,7 @@ - (void)webViewDidFinishLoad:(UIWebView *)webView
         "}"
 
         "window.postMessage = function(data) {"
+          "window.originalPostMessage.apply(window, arguments);"
           "messageQueue.push(String(data));"
           "processQueue();"
         "};"

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java
@@ -319,6 +319,7 @@ public void onReceiveValue(String value) {
         loadUrl("javascript:(" +
           "window.originalPostMessage = window.postMessage," +
           "window.postMessage = function(data) {" +
+            "window.originalPostMessage.apply(window, arguments);" +
             BRIDGE_NAME + ".postMessage(String(data));" +
           "}" +
         ")");