Merge branch 'kemcake-master'

Author: alinz

ios/RCTWebViewBridge.h

@@ -37,6 +37,7 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
 @property (nonatomic, strong) NSURL *URL;
 @property (nonatomic, assign) UIEdgeInsets contentInset;
 @property (nonatomic, assign) BOOL automaticallyAdjustContentInsets;
+@property (nonatomic, assign) BOOL hideKeyboardAccessoryView;
 @property (nonatomic, copy) NSString *injectedJavaScript;
 
 - (void)goForward;

ios/RCTWebViewBridge.m

@@ -25,11 +25,20 @@
 //source: http://stackoverflow.com/a/23387659/828487
 #define NSStringMultiline(...) [[NSString alloc] initWithCString:#__VA_ARGS__ encoding:NSUTF8StringEncoding]
 
-
 //we don'e need this one since it has been defined in RCTWebView.m
 //NSString *const RCTJSNavigationScheme = @"react-js-navigation";
 NSString *const RCTWebViewBridgeSchema = @"wvb";
 
+// runtime trick to remove UIWebview keyboard default toolbar
+// see: http://stackoverflow.com/questions/19033292/ios-7-uiwebview-keyboard-issue/19042279#19042279
+@interface _SwizzleHelper : NSObject @end
+@implementation _SwizzleHelper
+-(id)inputAccessoryView
+{
+  return nil;
+}
+@end
+
 @interface RCTWebViewBridge () <UIWebViewDelegate, RCTAutoInsetsProtocol>
 
 @property (nonatomic, copy) RCTDirectEventBlock onLoadingStart;
@@ -165,6 +174,37 @@ - (void)refreshContentInset
                       updateOffset:YES];
 }
 
+-(void)setHideKeyboardAccessoryView:(BOOL)hideKeyboardAccessoryView
+{
+  if (!hideKeyboardAccessoryView) {
+    return;
+  }
+    
+  UIView* subview;
+  for (UIView* view in _webView.scrollView.subviews) {
+    if([[view.class description] hasPrefix:@"UIWeb"])
+      subview = view;
+  }
+
+  if(subview == nil) return;
+
+  NSString* name = [NSString stringWithFormat:@"%@_SwizzleHelper", subview.class.superclass];
+  Class newClass = NSClassFromString(name);
+
+  if(newClass == nil)
+  {
+    newClass = objc_allocateClassPair(subview.class, [name cStringUsingEncoding:NSASCIIStringEncoding], 0);
+    if(!newClass) return;
+        
+    Method method = class_getInstanceMethod([_SwizzleHelper class], @selector(inputAccessoryView));
+      class_addMethod(newClass, @selector(inputAccessoryView), method_getImplementation(method), method_getTypeEncoding(method));
+        
+    objc_registerClassPair(newClass);
+  }
+
+  object_setClass(subview, newClass);
+}
+
 #pragma mark - UIWebViewDelegate methods
 
 - (BOOL)webView:(__unused UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request

ios/RCTWebViewBridgeManager.m

@@ -44,6 +44,7 @@ - (UIView *)view
 RCT_EXPORT_VIEW_PROPERTY(injectedJavaScript, NSString)
 RCT_EXPORT_VIEW_PROPERTY(contentInset, UIEdgeInsets)
 RCT_EXPORT_VIEW_PROPERTY(automaticallyAdjustContentInsets, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(hideKeyboardAccessoryView, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(onLoadingStart, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onLoadingFinish, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onLoadingError, RCTDirectEventBlock)

webview-bridge/index.ios.js

@@ -101,6 +101,8 @@ var WebViewBridge = React.createClass({
      * Will be called once the message is being sent from webview
      */
     onBridgeMessage: PropTypes.func,
+
+    hideKeyboardAccessoryView: PropTypes.bool,
   },
 
   getInitialState: function() {
@@ -171,7 +173,7 @@ var WebViewBridge = React.createClass({
         });
       }
     };
-    
+
     const props = {...this.props};
     delete props.onBridgeMessage;
     delete props.onShouldStartLoadWithRequest;