add requestFocus property

.gitignore

@@ -1,2 +1,5 @@
 node_modules
 .DS_Store
+
+.tags
+.tags1

android/src/main/java/com/github/alinz/reactnativewebviewbridge/JavascriptBridge.java

@@ -17,13 +17,13 @@ public JavascriptBridge(WebView webView) {
     }
 
     @JavascriptInterface
-    public void send(String message) {
+    public void nativeAndroidSend(String message) {
         WritableMap event = Arguments.createMap();
         event.putString("message", message);
         ReactContext reactContext = (ReactContext) this.webView.getContext();
-        reactContext.getJSModule(RCTEventEmitter.class).receiveEvent(
-                this.webView.getId(),
-                "topChange",
-                event);
+        reactContext
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                .emit("WebViewBridgeMessageEvent", event);
+
     }
-}
+}

android/src/main/java/com/github/alinz/reactnativewebviewbridge/WebViewBridgeManager.java

@@ -1,12 +1,16 @@
 package com.github.alinz.reactnativewebviewbridge;
 
+import android.content.Context;
 import android.webkit.WebView;
 
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.views.webview.ReactWebViewManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Map;
 
@@ -15,7 +19,17 @@
 public class WebViewBridgeManager extends ReactWebViewManager {
     private static final String REACT_CLASS = "RCTWebViewBridge";
 
-    public static final int COMMAND_SEND_TO_BRIDGE = 101;
+    public static final int COMMAND_INJECT_WEBVIEW_BRIDGE = 101;
+    public static final int COMMAND_INJECT_RPC = 102;
+    public static final int COMMAND_SEND_TO_BRIDGE = 103;
+
+    private ReactApplicationContext reactApplicationContext;
+
+    public WebViewBridgeManager(ReactApplicationContext reactApplicationContext) {
+        super();
+        //we need to know the context because we need to load files from asset
+        this.reactApplicationContext = reactApplicationContext;
+    }
 
     @Override
     public String getName() {
@@ -29,6 +43,8 @@ Map<String, Integer> getCommandsMap() {
         Map<String, Integer> commandsMap = super.getCommandsMap();
 
         commandsMap.put("sendToBridge", COMMAND_SEND_TO_BRIDGE);
+        commandsMap.put("injectWebViewBridge", COMMAND_INJECT_WEBVIEW_BRIDGE);
+        commandsMap.put("injectRPC", COMMAND_INJECT_RPC);
 
         return commandsMap;
     }
@@ -48,13 +64,56 @@ public void receiveCommand(WebView root, int commandId, @Nullable ReadableArray
             case COMMAND_SEND_TO_BRIDGE:
                 sendToBridge(root, args.getString(0));
                 break;
+            case COMMAND_INJECT_WEBVIEW_BRIDGE:
+                injectWebViewBridgeScript(root);
+                break;
+            case COMMAND_INJECT_RPC:
+                injectWebViewBridgeRPCScript(root);
+                break;
             default:
                 //do nothing!!!!
         }
     }
 
+    private static String inputStreamToString(InputStream input) throws IOException {
+        StringBuilder builder = new StringBuilder();
+        int ch;
+        while((ch = input.read()) != -1){
+            builder.append((char)ch);
+        }
+        input.close();
+        return builder.toString();
+    }
+
+    private static String loadAsset(String filename, final Context context) {
+        String output = null;
+
+        try {
+            InputStream inputStream = context.getAssets().open(filename);
+            output = inputStreamToString(inputStream);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return output;
+    }
+
+    private void injectWebViewBridgeScript(WebView root) {
+        String injectContent = loadAsset("WebViewBridge.js", this.reactApplicationContext);
+        if (injectContent != null) {
+            evaluateJavascript(root, injectContent);
+        }
+    }
+
+    private void injectWebViewBridgeRPCScript(WebView root) {
+        String injectContent = loadAsset("WebViewBridgeRPC.js", this.reactApplicationContext);
+        if (injectContent != null) {
+            evaluateJavascript(root, injectContent);
+        }
+    }
+
     private void sendToBridge(WebView root, String message) {
-        String script = "WebViewBridge.onMessage('" + message + "');";
+        String script = "(function(){ if (WebViewBridge && WebViewBridge.__push__) { WebViewBridge.__push__(\"" + message + "\"); } }());";
         WebViewBridgeManager.evaluateJavascript(root, script);
     }
 
@@ -65,6 +124,18 @@ static private void evaluateJavascript(WebView root, String javascript) {
             root.loadUrl("javascript:" + javascript);
         }
     }
+
+    @ReactProp(name = "requestFocus")
+    public void requestFocus(WebView root, boolean isRequestFocus) {
+        if(isRequestFocus) {
+            root.requestFocus();
+        }
+    }
+
+    @ReactProp(name = "injectedJavaScript")
+    public void setInjectedJavaScript(WebView root, @Nullable String injectedJavaScript) {
+        evaluateJavascript(root, injectedJavaScript);
+    }
 
     @ReactProp(name = "allowFileAccessFromFileURLs")
     public void setAllowFileAccessFromFileURLs(WebView root, boolean allows) {
@@ -75,4 +146,4 @@ public void setAllowFileAccessFromFileURLs(WebView root, boolean allows) {
     public void setAllowUniversalAccessFromFileURLs(WebView root, boolean allows) {
         root.getSettings().setAllowUniversalAccessFromFileURLs(allows);
     }
-}
+}

android/src/main/java/com/github/alinz/reactnativewebviewbridge/WebViewBridgePackage.java

@@ -19,7 +19,7 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactAppli
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactApplicationContext) {
         return Arrays.<ViewManager>asList(
-                new WebViewBridgeManager()
+                new WebViewBridgeManager(reactApplicationContext)
         );
     }
 

ios/RCTWebViewBridge.h

@@ -10,8 +10,12 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
+#if __has_include(<React/RCTView.h>)
 #import <React/RCTView.h>
-
+#else
+#import "RCTView.h"
+#endif
+
 @class RCTWebViewBridge;
 
 /**
@@ -44,5 +48,7 @@ shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
 - (void)goBack;
 - (void)reload;
 - (void)sendToBridge:(NSString *)message;
+- (NSString*) getElementHTML:(NSString*)elementId;
+- (NSString*) getSelectedHTML;
 
 @end

ios/RCTWebViewBridge.m

@@ -88,6 +88,18 @@ - (void)reload
   [_webView reload];
 }
 
+- (NSString*) getElementHTML:(NSString*)elementId
+{
+    NSString* JSString = [NSString stringWithFormat:@"document.getElementById(\"%@\").innerHTML",elementId];
+    return [_webView stringByEvaluatingJavaScriptFromString:JSString];
+}
+
+- (NSString*) getSelectedHTML {
+    NSString* JSString = [NSString stringWithFormat:@"document.getSelection()"];
+    NSLog(@"selectedHTML is: %@",JSString);
+    return [_webView stringByEvaluatingJavaScriptFromString:JSString];
+}
+
 - (void)sendToBridge:(NSString *)message
 {
   //we are warpping the send message in a function to make sure that if

ios/RCTWebViewBridgeManager.m

@@ -11,11 +11,25 @@
  */
 
 #import "RCTWebViewBridgeManager.h"
+#import "RCTWebViewBridge.h"
 
+#if __has_include(<React/RCTBridge.h>)
 #import <React/RCTBridge.h>
+#else
+#import "RCTBridge.h"
+#endif
+
+#if __has_include(<React/RCTUIManager.h>)
 #import <React/RCTUIManager.h>
-#import "RCTWebViewBridge.h"
+#else
+#import "RCTUIManager.h"
+#endif
+
+#if __has_include(<React/UIView+React.h>)
+#import <React/UIView+React.h>
+#else
 #import "UIView+React.h"
+#endif
 
 @interface RCTWebViewBridgeManager () <RCTWebViewBridgeDelegate>
 
@@ -49,8 +63,8 @@ - (UIView *)view
 RCT_EXPORT_VIEW_PROPERTY(onLoadingError, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onShouldStartLoadWithRequest, RCTDirectEventBlock)
 RCT_REMAP_VIEW_PROPERTY(allowsInlineMediaPlayback, _webView.allowsInlineMediaPlayback, BOOL)
-RCT_REMAP_VIEW_PROPERTY(mediaPlaybackRequiresUserAction, _webView.mediaPlaybackRequiresUserAction, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(onBridgeMessage, RCTDirectEventBlock)
+RCT_REMAP_VIEW_PROPERTY(keyboardDisplayRequiresUserAction, _webView.keyboardDisplayRequiresUserAction, BOOL)
 
 - (NSDictionary<NSString *, id> *)constantsToExport
 {
@@ -87,7 +101,7 @@ + (BOOL)requiresMainQueueSetup
 RCT_EXPORT_METHOD(goForward:(nonnull NSNumber *)reactTag)
 {
   [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWebViewBridge *> *viewRegistry) {
-    RCTWebViewBridge *view = viewRegistry[reactTag];
+    RCTWebViewBridge* view = viewRegistry[reactTag];
     if (![view isKindOfClass:[RCTWebViewBridge class]]) {
       RCTLogError(@"Invalid view returned from registry, expecting RCTWebViewBridge, got: %@", view);
     } else {
@@ -108,6 +122,34 @@ + (BOOL)requiresMainQueueSetup
   }];
 }
 
+RCT_EXPORT_METHOD(getElementHTML:(nonnull NSNumber *)reactTag :(NSString*)elementId :(RCTResponseSenderBlock)callback)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWebViewBridge *> *viewRegistry) {
+        RCTWebViewBridge *view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[RCTWebViewBridge class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting RCTWebViewBridge, got: %@", view);
+        } else {
+            NSString* html = [view getElementHTML:elementId];
+            NSLog(@"Editor HTML is %@", html);
+            callback(@[[NSNull null], html]);
+        }
+    }];
+}
+
+RCT_EXPORT_METHOD(getSelectedHTML:(nonnull NSNumber *)reactTag :(NSString*)elementId :(RCTResponseSenderBlock)callback)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWebViewBridge *> *viewRegistry) {
+        RCTWebViewBridge *view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[RCTWebViewBridge class]]) {
+            RCTLogError(@"Invalid view returned from registry, expecting RCTWebViewBridge, got: %@", view);
+        } else {
+            NSString* html = [view getSelectedHTML];
+            NSLog(@"Selected HTML is %@", html);
+            callback(@[[NSNull null], html]);
+        }
+    }];
+}
+
 RCT_EXPORT_METHOD(sendToBridge:(nonnull NSNumber *)reactTag
                   value:(NSString*)message)
 {
@@ -139,8 +181,8 @@ - (BOOL)webView:(__unused RCTWebViewBridge *)webView
     _shouldStartLoadLock = nil;
     return returnValue;
   } else {
-    RCTLogWarn(@"Did not receive response to shouldStartLoad in time, defaulting to YES");
-    return YES;
+    RCTLogWarn(@"Did not receive response to shouldStartLoad in time, defaulting to NO");
+    return NO;
   }
 }