Merge fd704e4764 into 19896fc810

ios/RNCWebView.h

@@ -29,6 +29,7 @@
 @property (nonatomic, weak) id<RNCWebViewDelegate> _Nullable delegate;
 @property (nonatomic, copy) NSDictionary * _Nullable source;
 @property (nonatomic, assign) BOOL messagingEnabled;
+@property (nonatomic, copy) NSArray  * _Nullable messageHandlers;
 @property (nonatomic, copy) NSString * _Nullable injectedJavaScript;
 @property (nonatomic, copy) NSString * _Nullable injectedJavaScriptBeforeContentLoaded;
 @property (nonatomic, assign) BOOL scrollEnabled;

ios/RNCWebView.m

@@ -230,6 +230,12 @@ static NSDictionary* customCertificatesForHost;
   [wkWebViewConfig.userContentController addUserScript:script];
 
   if (_messagingEnabled) {
+    for (NSString *handler in _messageHandlers)
+    {
+        [wkWebViewConfig.userContentController addScriptMessageHandler:[[RNCWeakScriptMessageDelegate alloc] initWithDelegate:self]
+        name:handler];
+    }
+      
     [wkWebViewConfig.userContentController addScriptMessageHandler:[[RNCWeakScriptMessageDelegate alloc] initWithDelegate:self]
                                                               name:MessageHandlerName];
 
@@ -523,6 +529,15 @@ static NSDictionary* customCertificatesForHost;
       [event addEntriesFromDictionary: @{@"data": message.body}];
       _onMessage(event);
     }
+  } else {
+    if (_onMessage) {
+      NSMutableDictionary<NSString *, id> *event = [self baseEvent];
+      if (message.body) {
+        [event addEntriesFromDictionary: @{@"data":  message.body}];
+      }
+      [event addEntriesFromDictionary: @{@"handler": message.name}];
+      _onMessage(event);
+    }
   }
 }
 
@@ -1076,7 +1091,7 @@ static NSDictionary* customCertificatesForHost;
         _onHttpError(event);
       }
     }
-  }  
+  }
 
   decisionHandler(WKNavigationResponsePolicyAllow);
 }

ios/RNCWebViewManager.m

@@ -70,6 +70,7 @@ RCT_EXPORT_VIEW_PROPERTY(contentInsetAdjustmentBehavior, UIScrollViewContentInse
  * Expose methods to enable messaging the webview.
  */
 RCT_EXPORT_VIEW_PROPERTY(messagingEnabled, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(messageHandlers, NSArray)
 RCT_EXPORT_VIEW_PROPERTY(onMessage, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onScroll, RCTDirectEventBlock)