Rename existing webview components

Intellicode · Jun 22, 2015 · 0f5d906 · 0f5d906
1 parent 5eed445
commit 0f5d906
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 31 deletions.
diff --git a/WebView.ios.js → BridgeableWebView.ios.js b/WebView.ios.js → BridgeableWebView.ios.js
@@ -23,8 +23,7 @@ var keyMirror = require('keyMirror');
 var requireNativeComponent = require('requireNativeComponent');
 
 var PropTypes = React.PropTypes;
-var RCTWebViewManager = require('NativeModules').WebViewManager;
-
+var RCTWebViewManager = require('NativeModules').RNBridgeableWebViewManager;
 var BGWASH = 'rgba(255,255,255,0.8)';
 var RCT_WEBVIEW_REF = 'webview';
 
@@ -130,7 +129,7 @@ var WebView = React.createClass({
       );
     } else if (this.state.viewState !== WebViewState.IDLE) {
       console.error(
-        'RCTWebView invalid state encountered: ' + this.state.loading
+        'RNBridgeableWebView invalid state encountered: ' + this.state.loading
       );
     }
 
@@ -142,7 +141,7 @@ var WebView = React.createClass({
     }
 
     var webView =
-      <RCTWebView
+      <RNBridgeableWebView
         ref={RCT_WEBVIEW_REF}
         key="webViewKey"
         style={webViewStyles}
@@ -221,7 +220,7 @@ var WebView = React.createClass({
   }
 });
 
-var RCTWebView = requireNativeComponent('RCTWebView', WebView);
+var RNBridgeableWebView = requireNativeComponent('RNBridgeableWebView', WebView);
 
 var styles = StyleSheet.create({
   container: {

diff --git a/RCTWebView.h → RNBridgeableWebView.h b/RCTWebView.h → RNBridgeableWebView.h
@@ -11,7 +11,7 @@
 
 @class RCTEventDispatcher;
 
-@interface RCTWebView : RCTView
+@interface RNBridgeableWebView : RCTView
 
 @property (nonatomic, strong) NSURL *URL;
 @property (nonatomic, assign) UIEdgeInsets contentInset;

diff --git a/RCTWebView.m → RNBridgeableWebView.m b/RCTWebView.m → RNBridgeableWebView.m
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "RCTWebView.h"
+#import "RNBridgeableWebView.h"
 
 #import <UIKit/UIKit.h>
 
@@ -18,11 +18,11 @@
 #import "RCTView.h"
 #import "UIView+React.h"
 
-@interface RCTWebView () <UIWebViewDelegate, RCTAutoInsetsProtocol>
+@interface RNBridgeableWebView () <UIWebViewDelegate, RCTAutoInsetsProtocol>
 
 @end
 
-@implementation RCTWebView
+@implementation RNBridgeableWebView
 {
   RCTEventDispatcher *_eventDispatcher;
   UIWebView *_webView;

diff --git a/RCTWebViewManager.h → RNBridgeableWebViewManager.h b/RCTWebViewManager.h → RNBridgeableWebViewManager.h
@@ -9,6 +9,6 @@
 
 #import "RCTViewManager.h"
 
-@interface RCTWebViewManager : RCTViewManager
+@interface RNBridgeableWebViewManager : RCTViewManager
 
 @end
diff --git a/RCTWebViewManager.m → RNBridgeableWebViewManager.m b/RCTWebViewManager.m → RNBridgeableWebViewManager.m
@@ -7,20 +7,20 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "RCTWebViewManager.h"
+#import "RNBridgeableWebViewManager.h"
 
 #import "RCTBridge.h"
 #import "RCTSparseArray.h"
 #import "RCTUIManager.h"
-#import "RCTWebView.h"
+#import "RNBridgeableWebView.h"
 
-@implementation RCTWebViewManager
+@implementation RNBridgeableWebViewManager
 
 RCT_EXPORT_MODULE()
 
 - (UIView *)view
 {
-  return [[RCTWebView alloc] initWithEventDispatcher:self.bridge.eventDispatcher];
+  return [[RNBridgeableWebView alloc] initWithEventDispatcher:self.bridge.eventDispatcher];
 }
 
 RCT_REMAP_VIEW_PROPERTY(url, URL, NSURL);
@@ -48,8 +48,8 @@ - (NSDictionary *)constantsToExport
 RCT_EXPORT_METHOD(goBack:(NSNumber *)reactTag)
 {
   [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, RCTSparseArray *viewRegistry) {
-    RCTWebView *view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RCTWebView class]]) {
+    RNBridgeableWebView *view = viewRegistry[reactTag];
+    if (![view isKindOfClass:[RNBridgeableWebView class]]) {
       RCTLogError(@"Invalid view returned from registry, expecting RKWebView, got: %@", view);
     }
     [view goBack];
@@ -60,7 +60,7 @@ - (NSDictionary *)constantsToExport
 {
   [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, RCTSparseArray *viewRegistry) {
     id view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RCTWebView class]]) {
+    if (![view isKindOfClass:[RNBridgeableWebView class]]) {
       RCTLogError(@"Invalid view returned from registry, expecting RKWebView, got: %@", view);
     }
     [view goForward];
@@ -71,8 +71,8 @@ - (NSDictionary *)constantsToExport
 RCT_EXPORT_METHOD(reload:(NSNumber *)reactTag)
 {
   [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, RCTSparseArray *viewRegistry) {
-    RCTWebView *view = viewRegistry[reactTag];
-    if (![view isKindOfClass:[RCTWebView class]]) {
+    RNBridgeableWebView *view = viewRegistry[reactTag];
+    if (![view isKindOfClass:[RNBridgeableWebView class]]) {
       RCTLogMustFix(@"Invalid view returned from registry, expecting RKWebView, got: %@", view);
     }
     [view reload];

diff --git a/RNBridgeableWebview.xcodeproj/project.pbxproj b/RNBridgeableWebview.xcodeproj/project.pbxproj
@@ -7,8 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		E29EA2601B374B2000EE4B2B /* RCTWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = E29EA25D1B374B2000EE4B2B /* RCTWebView.m */; };
-		E29EA2611B374B2000EE4B2B /* RCTWebViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E29EA25F1B374B2000EE4B2B /* RCTWebViewManager.m */; };
+		E29EA2601B374B2000EE4B2B /* RNBridgeableWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = E29EA25D1B374B2000EE4B2B /* RNBridgeableWebView.m */; };
+		E29EA2611B374B2000EE4B2B /* RNBridgeableWebViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E29EA25F1B374B2000EE4B2B /* RNBridgeableWebViewManager.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -25,10 +25,10 @@
 
 /* Begin PBXFileReference section */
 		E29EA2361B33517A00EE4B2B /* libRNBridgeableWebview.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNBridgeableWebview.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		E29EA25C1B374B2000EE4B2B /* RCTWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTWebView.h; sourceTree = "<group>"; };
-		E29EA25D1B374B2000EE4B2B /* RCTWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTWebView.m; sourceTree = "<group>"; };
-		E29EA25E1B374B2000EE4B2B /* RCTWebViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTWebViewManager.h; sourceTree = "<group>"; };
-		E29EA25F1B374B2000EE4B2B /* RCTWebViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTWebViewManager.m; sourceTree = "<group>"; };
+		E29EA25C1B374B2000EE4B2B /* RNBridgeableWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNBridgeableWebView.h; sourceTree = "<group>"; };
+		E29EA25D1B374B2000EE4B2B /* RNBridgeableWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNBridgeableWebView.m; sourceTree = "<group>"; };
+		E29EA25E1B374B2000EE4B2B /* RNBridgeableWebViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNBridgeableWebViewManager.h; sourceTree = "<group>"; };
+		E29EA25F1B374B2000EE4B2B /* RNBridgeableWebViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNBridgeableWebViewManager.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -45,10 +45,10 @@
 		E29EA22D1B33517A00EE4B2B = {
 			isa = PBXGroup;
 			children = (
-				E29EA25C1B374B2000EE4B2B /* RCTWebView.h */,
-				E29EA25D1B374B2000EE4B2B /* RCTWebView.m */,
-				E29EA25E1B374B2000EE4B2B /* RCTWebViewManager.h */,
-				E29EA25F1B374B2000EE4B2B /* RCTWebViewManager.m */,
+				E29EA25C1B374B2000EE4B2B /* RNBridgeableWebView.h */,
+				E29EA25D1B374B2000EE4B2B /* RNBridgeableWebView.m */,
+				E29EA25E1B374B2000EE4B2B /* RNBridgeableWebViewManager.h */,
+				E29EA25F1B374B2000EE4B2B /* RNBridgeableWebViewManager.m */,
 				E29EA2371B33517A00EE4B2B /* Products */,
 			);
 			sourceTree = "<group>";
@@ -117,8 +117,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E29EA2601B374B2000EE4B2B /* RCTWebView.m in Sources */,
-				E29EA2611B374B2000EE4B2B /* RCTWebViewManager.m in Sources */,
+				E29EA2601B374B2000EE4B2B /* RNBridgeableWebView.m in Sources */,
+				E29EA2611B374B2000EE4B2B /* RNBridgeableWebViewManager.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};