From df9a25f9440b15b5b14479a5b43d7c877c7c4201 Mon Sep 17 00:00:00 2001 From: Alejandro Osorio Date: Wed, 9 Nov 2016 11:33:07 -0200 Subject: [PATCH 1/3] Add support for stopLoading function in android --- webview-bridge/index.android.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/webview-bridge/index.android.js b/webview-bridge/index.android.js index bdfe8180..cfd9ed5e 100644 --- a/webview-bridge/index.android.js +++ b/webview-bridge/index.android.js @@ -168,6 +168,14 @@ var WebViewBridge = React.createClass({ ); }, + stopLoading: function() { + UIManager.dispatchViewManagerCommand( + this.getWebViewBridgeHandle(), + UIManager.RCTWebViewBridge.Commands.stopLoading, + null + ); + }, + sendToBridge: function (message: string) { UIManager.dispatchViewManagerCommand( this.getWebViewBridgeHandle(), From ba28379532ca0f59c33c665ef48fee2684bfe850 Mon Sep 17 00:00:00 2001 From: Guilherme Bruzzi Date: Tue, 31 Jan 2017 19:01:54 -0200 Subject: [PATCH 2/3] Fix iOS imports on RN 0.40+ --- ios/RCTWebViewBridge.h | 2 +- ios/RCTWebViewBridge.m | 13 +++++++------ ios/RCTWebViewBridgeManager.h | 2 +- ios/RCTWebViewBridgeManager.m | 7 ++++--- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ios/RCTWebViewBridge.h b/ios/RCTWebViewBridge.h index 09006303..c7d34222 100644 --- a/ios/RCTWebViewBridge.h +++ b/ios/RCTWebViewBridge.h @@ -10,7 +10,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTView.h" +#import @class RCTWebViewBridge; diff --git a/ios/RCTWebViewBridge.m b/ios/RCTWebViewBridge.m index ce7868c4..07ed2a0e 100644 --- a/ios/RCTWebViewBridge.m +++ b/ios/RCTWebViewBridge.m @@ -14,12 +14,13 @@ #import -#import "RCTAutoInsetsProtocol.h" -#import "RCTConvert.h" -#import "RCTEventDispatcher.h" -#import "RCTLog.h" -#import "RCTUtils.h" -#import "RCTView.h" + +#import +#import +#import +#import +#import + #import "UIView+React.h" #import diff --git a/ios/RCTWebViewBridgeManager.h b/ios/RCTWebViewBridgeManager.h index e0659a8d..00578f3f 100644 --- a/ios/RCTWebViewBridgeManager.h +++ b/ios/RCTWebViewBridgeManager.h @@ -10,7 +10,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTWebViewBridgeManager : RCTViewManager diff --git a/ios/RCTWebViewBridgeManager.m b/ios/RCTWebViewBridgeManager.m index ad15e14b..8156cbe5 100644 --- a/ios/RCTWebViewBridgeManager.m +++ b/ios/RCTWebViewBridgeManager.m @@ -11,10 +11,11 @@ */ #import "RCTWebViewBridgeManager.h" - -#import "RCTBridge.h" -#import "RCTUIManager.h" #import "RCTWebViewBridge.h" + +#import +#import + #import "UIView+React.h" @interface RCTWebViewBridgeManager () From 2220555a3a1e2a422127d6d34af88d9f924d6f69 Mon Sep 17 00:00:00 2001 From: Guilherme Bruzzi Date: Thu, 2 Feb 2017 11:21:35 -0200 Subject: [PATCH 3/3] Revert "Fix iOS imports on RN 0.40+" This reverts commit ba28379532ca0f59c33c665ef48fee2684bfe850. --- ios/RCTWebViewBridge.h | 2 +- ios/RCTWebViewBridge.m | 13 ++++++------- ios/RCTWebViewBridgeManager.h | 2 +- ios/RCTWebViewBridgeManager.m | 7 +++---- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ios/RCTWebViewBridge.h b/ios/RCTWebViewBridge.h index c7d34222..09006303 100644 --- a/ios/RCTWebViewBridge.h +++ b/ios/RCTWebViewBridge.h @@ -10,7 +10,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import +#import "RCTView.h" @class RCTWebViewBridge; diff --git a/ios/RCTWebViewBridge.m b/ios/RCTWebViewBridge.m index 07ed2a0e..ce7868c4 100644 --- a/ios/RCTWebViewBridge.m +++ b/ios/RCTWebViewBridge.m @@ -14,13 +14,12 @@ #import - -#import -#import -#import -#import -#import - +#import "RCTAutoInsetsProtocol.h" +#import "RCTConvert.h" +#import "RCTEventDispatcher.h" +#import "RCTLog.h" +#import "RCTUtils.h" +#import "RCTView.h" #import "UIView+React.h" #import diff --git a/ios/RCTWebViewBridgeManager.h b/ios/RCTWebViewBridgeManager.h index 00578f3f..e0659a8d 100644 --- a/ios/RCTWebViewBridgeManager.h +++ b/ios/RCTWebViewBridgeManager.h @@ -10,7 +10,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import +#import "RCTViewManager.h" @interface RCTWebViewBridgeManager : RCTViewManager diff --git a/ios/RCTWebViewBridgeManager.m b/ios/RCTWebViewBridgeManager.m index 8156cbe5..ad15e14b 100644 --- a/ios/RCTWebViewBridgeManager.m +++ b/ios/RCTWebViewBridgeManager.m @@ -11,11 +11,10 @@ */ #import "RCTWebViewBridgeManager.h" -#import "RCTWebViewBridge.h" - -#import -#import +#import "RCTBridge.h" +#import "RCTUIManager.h" +#import "RCTWebViewBridge.h" #import "UIView+React.h" @interface RCTWebViewBridgeManager ()