Merge pull request #239 from GrahO23/master

Fix duplicate includes from React framework

Author: amsul

ios/RCTWebViewBridge.h

@@ -10,17 +10,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <UIKit/UIKit.h>
-
-#import <React/RCTAutoInsetsProtocol.h>
-#import <React/RCTConvert.h>
-#import <React/RCTEventDispatcher.h>
-#import <React/RCTLog.h>
-#import <React/RCTUtils.h>
 #import <React/RCTView.h>
-#import <React/UIView+React.h>
-
-#import <objc/runtime.h>
 
 @class RCTWebViewBridge;
 

ios/RCTWebViewBridge.m

@@ -12,6 +12,17 @@
 
 #import "RCTWebViewBridge.h"
 
+#import <UIKit/UIKit.h>
+
+#import <React/RCTAutoInsetsProtocol.h>
+#import <React/RCTConvert.h>
+#import <React/RCTEventDispatcher.h>
+#import <React/RCTLog.h>
+#import <React/RCTUtils.h>
+#import <React/RCTView.h>
+#import "UIView+React.h"
+#import <objc/runtime.h>
+
 //This is a very elegent way of defining multiline string in objective-c.
 //source: http://stackoverflow.com/a/23387659/828487
 #define NSStringMultiline(...) [[NSString alloc] initWithCString:#__VA_ARGS__ encoding:NSUTF8StringEncoding]

ios/RCTWebViewBridgeManager.h

@@ -11,9 +11,6 @@
  */
 
 #import <React/RCTViewManager.h>
-#import <React/RCTUIManager.h>
-
-#import "RCTWebViewBridge.h"
 
 @interface RCTWebViewBridgeManager : RCTViewManager
 

ios/RCTWebViewBridgeManager.m

@@ -12,6 +12,11 @@
 
 #import "RCTWebViewBridgeManager.h"
 
+#import <React/RCTBridge.h>
+#import <React/RCTUIManager.h>
+#import "RCTWebViewBridge.h"
+#import "UIView+React.h"
+
 @interface RCTWebViewBridgeManager () <RCTWebViewBridgeDelegate>
 
 @end
@@ -45,7 +50,6 @@ - (UIView *)view
 RCT_EXPORT_VIEW_PROPERTY(onShouldStartLoadWithRequest, RCTDirectEventBlock)
 RCT_REMAP_VIEW_PROPERTY(allowsInlineMediaPlayback, _webView.allowsInlineMediaPlayback, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(onBridgeMessage, RCTDirectEventBlock)
-RCT_REMAP_VIEW_PROPERTY(keyboardDisplayRequiresUserAction, _webView.keyboardDisplayRequiresUserAction, BOOL)
 
 - (NSDictionary<NSString *, id> *)constantsToExport
 {