From 26c75b82b78ab9e91812d14d39d9dcfd68bd83d8 Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Tue, 5 Mar 2019 09:01:19 +0200 Subject: [PATCH] Rename RTCWKWebview --- ios/RCTWKWebViewManager.h | 5 - .../project.pbxproj | 24 ++--- ios/{RCTWKWebView.h => StatusWKWebView.h} | 6 +- ios/{RCTWKWebView.m => StatusWKWebView.m} | 23 +++-- ios/StatusWKWebViewManager.h | 5 + ...ViewManager.m => StatusWKWebViewManager.m} | 50 +++++----- webview-bridge/index.ios.js | 98 +++++++++---------- 7 files changed, 105 insertions(+), 106 deletions(-) delete mode 100644 ios/RCTWKWebViewManager.h rename ios/{RCTWKWebView.h => StatusWKWebView.h} (91%) rename ios/{RCTWKWebView.m => StatusWKWebView.m} (98%) create mode 100644 ios/StatusWKWebViewManager.h rename ios/{RCTWKWebViewManager.m => StatusWKWebViewManager.m} (75%) diff --git a/ios/RCTWKWebViewManager.h b/ios/RCTWKWebViewManager.h deleted file mode 100644 index 1f87a578..00000000 --- a/ios/RCTWKWebViewManager.h +++ /dev/null @@ -1,5 +0,0 @@ -#import "React/RCTViewManager.h" - -@interface RCTWKWebViewManager : RCTViewManager - -@end diff --git a/ios/React-Native-Webview-Bridge.xcodeproj/project.pbxproj b/ios/React-Native-Webview-Bridge.xcodeproj/project.pbxproj index 346bcd79..adce6517 100644 --- a/ios/React-Native-Webview-Bridge.xcodeproj/project.pbxproj +++ b/ios/React-Native-Webview-Bridge.xcodeproj/project.pbxproj @@ -7,8 +7,8 @@ objects = { /* Begin PBXBuildFile section */ - 9EF4097B1E0929E900B7C524 /* RCTWKWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EF4097A1E0929E900B7C524 /* RCTWKWebView.m */; }; - 9EF4097E1E092A2500B7C524 /* RCTWKWebViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EF4097D1E092A2500B7C524 /* RCTWKWebViewManager.m */; }; + 9EF4097B1E0929E900B7C524 /* StatusWKWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EF4097A1E0929E900B7C524 /* StatusWKWebView.m */; }; + 9EF4097E1E092A2500B7C524 /* StatusWKWebViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EF4097D1E092A2500B7C524 /* StatusWKWebViewManager.m */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -26,10 +26,10 @@ /* Begin PBXFileReference section */ 4114DC4C1C187C3A003CD988 /* libReact-Native-Webview-Bridge.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libReact-Native-Webview-Bridge.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 4114DC5F1C187CE4003CD988 /* webviewbridge.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = webviewbridge.js; sourceTree = ""; }; - 9EF409791E0929C900B7C524 /* RCTWKWebView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTWKWebView.h; sourceTree = SOURCE_ROOT; }; - 9EF4097A1E0929E900B7C524 /* RCTWKWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTWKWebView.m; sourceTree = SOURCE_ROOT; }; - 9EF4097C1E092A1400B7C524 /* RCTWKWebViewManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTWKWebViewManager.h; sourceTree = SOURCE_ROOT; }; - 9EF4097D1E092A2500B7C524 /* RCTWKWebViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTWKWebViewManager.m; sourceTree = SOURCE_ROOT; }; + 9EF409791E0929C900B7C524 /* StatusWKWebView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StatusWKWebView.h; sourceTree = SOURCE_ROOT; }; + 9EF4097A1E0929E900B7C524 /* StatusWKWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StatusWKWebView.m; sourceTree = SOURCE_ROOT; }; + 9EF4097C1E092A1400B7C524 /* StatusWKWebViewManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StatusWKWebViewManager.h; sourceTree = SOURCE_ROOT; }; + 9EF4097D1E092A2500B7C524 /* StatusWKWebViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StatusWKWebViewManager.m; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -63,10 +63,10 @@ 4114DC4E1C187C3A003CD988 /* React-Native-Webview-Bridge */ = { isa = PBXGroup; children = ( - 9EF409791E0929C900B7C524 /* RCTWKWebView.h */, - 9EF4097A1E0929E900B7C524 /* RCTWKWebView.m */, - 9EF4097C1E092A1400B7C524 /* RCTWKWebViewManager.h */, - 9EF4097D1E092A2500B7C524 /* RCTWKWebViewManager.m */, + 9EF409791E0929C900B7C524 /* StatusWKWebView.h */, + 9EF4097A1E0929E900B7C524 /* StatusWKWebView.m */, + 9EF4097C1E092A1400B7C524 /* StatusWKWebViewManager.h */, + 9EF4097D1E092A2500B7C524 /* StatusWKWebViewManager.m */, ); path = "React-Native-Webview-Bridge"; sourceTree = ""; @@ -136,8 +136,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9EF4097B1E0929E900B7C524 /* RCTWKWebView.m in Sources */, - 9EF4097E1E092A2500B7C524 /* RCTWKWebViewManager.m in Sources */, + 9EF4097B1E0929E900B7C524 /* StatusWKWebView.m in Sources */, + 9EF4097E1E092A2500B7C524 /* StatusWKWebViewManager.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/RCTWKWebView.h b/ios/StatusWKWebView.h similarity index 91% rename from ios/RCTWKWebView.h rename to ios/StatusWKWebView.h index b35496fc..86dd2de2 100644 --- a/ios/RCTWKWebView.h +++ b/ios/StatusWKWebView.h @@ -1,6 +1,6 @@ #import "React/RCTView.h" -@class RCTWKWebView; +@class StatusWKWebView; /** * Special scheme used to pass messages to the injectedJavaScript @@ -12,13 +12,13 @@ extern NSString *const RCTJSNavigationScheme; @protocol RCTWKWebViewDelegate -- (BOOL)webView:(RCTWKWebView *)webView +- (BOOL)webView:(StatusWKWebView *)webView shouldStartLoadForRequest:(NSMutableDictionary *)request withCallback:(RCTDirectEventBlock)callback; @end -@interface RCTWKWebView : RCTView +@interface StatusWKWebView : RCTView @property (nonatomic, weak) id delegate; diff --git a/ios/RCTWKWebView.m b/ios/StatusWKWebView.m similarity index 98% rename from ios/RCTWKWebView.m rename to ios/StatusWKWebView.m index 19357181..53fe9bff 100644 --- a/ios/RCTWKWebView.m +++ b/ios/StatusWKWebView.m @@ -1,4 +1,4 @@ -#import "RCTWKWebView.h" +#import "StatusWKWebView.h" #import #import @@ -18,7 +18,7 @@ NSString *const RCTWebViewBridgeSchema = @"wvb"; -@interface RCTWKWebView () +@interface StatusWKWebView () @property (nonatomic, copy) RCTDirectEventBlock onLoadingStart; @property (nonatomic, copy) RCTDirectEventBlock onLoadingFinish; @@ -30,7 +30,7 @@ @interface RCTWKWebView () -@interface RCTWKWebViewManager () +@interface StatusWKWebViewManager () @end -@implementation RCTWKWebViewManager +@implementation StatusWKWebViewManager { NSConditionLock *_shouldStartLoadLock; BOOL _shouldStartLoad; @@ -22,7 +22,7 @@ @implementation RCTWKWebViewManager - (UIView *)view { - RCTWKWebView *webView = [RCTWKWebView new]; + StatusWKWebView *webView = [StatusWKWebView new]; webView.delegate = self; return webView; } @@ -45,10 +45,10 @@ - (UIView *)view RCT_EXPORT_METHOD(goBack:(nonnull NSNumber *)reactTag) { - [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary *viewRegistry) { - RCTWKWebView *view = viewRegistry[reactTag]; - if (![view isKindOfClass:[RCTWKWebView class]]) { - RCTLogError(@"Invalid view returned from registry, expecting RCTWKWebView, got: %@", view); + [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary *viewRegistry) { + StatusWKWebView *view = viewRegistry[reactTag]; + if (![view isKindOfClass:[StatusWKWebView class]]) { + RCTLogError(@"Invalid view returned from registry, expecting StatusWKWebView, got: %@", view); } else { [view goBack]; } @@ -57,10 +57,10 @@ - (UIView *)view RCT_EXPORT_METHOD(goForward:(nonnull NSNumber *)reactTag) { - [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary *viewRegistry) { - RCTWKWebView *view = viewRegistry[reactTag]; - if (![view isKindOfClass:[RCTWKWebView class]]) { - RCTLogError(@"Invalid view returned from registry, expecting RCTWKWebView, got: %@", view); + [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary *viewRegistry) { + StatusWKWebView *view = viewRegistry[reactTag]; + if (![view isKindOfClass:[StatusWKWebView class]]) { + RCTLogError(@"Invalid view returned from registry, expecting StatusWKWebView, got: %@", view); } else { [view goForward]; } @@ -69,10 +69,10 @@ - (UIView *)view RCT_EXPORT_METHOD(reload:(nonnull NSNumber *)reactTag) { - [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary *viewRegistry) { - RCTWKWebView *view = viewRegistry[reactTag]; - if (![view isKindOfClass:[RCTWKWebView class]]) { - RCTLogError(@"Invalid view returned from registry, expecting RCTWKWebView, got: %@", view); + [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary *viewRegistry) { + StatusWKWebView *view = viewRegistry[reactTag]; + if (![view isKindOfClass:[StatusWKWebView class]]) { + RCTLogError(@"Invalid view returned from registry, expecting StatusWKWebView, got: %@", view); } else { [view reload]; } @@ -84,10 +84,10 @@ - (UIView *)view resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) { - [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary *viewRegistry) { - RCTWKWebView *view = viewRegistry[reactTag]; - if (![view isKindOfClass:[RCTWKWebView class]]) { - RCTLogError(@"Invalid view returned from registry, expecting RCTWKWebView, got: %@", view); + [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary *viewRegistry) { + StatusWKWebView *view = viewRegistry[reactTag]; + if (![view isKindOfClass:[StatusWKWebView class]]) { + RCTLogError(@"Invalid view returned from registry, expecting StatusWKWebView, got: %@", view); } else { [view evaluateJavaScript:js completionHandler:^(id result, NSError *error) { if (error) { @@ -103,9 +103,9 @@ - (UIView *)view RCT_EXPORT_METHOD(sendToBridge:(nonnull NSNumber *)reactTag value:(NSString*)message) { - [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary *viewRegistry) { - RCTWKWebView *view = viewRegistry[reactTag]; - if (![view isKindOfClass:[RCTWKWebView class]]) { + [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary *viewRegistry) { + StatusWKWebView *view = viewRegistry[reactTag]; + if (![view isKindOfClass:[StatusWKWebView class]]) { RCTLogError(@"Invalid view returned from registry, expecting RCTWebViewBridge, got: %@", view); } else { [view sendToBridge: message]; @@ -115,7 +115,7 @@ - (UIView *)view #pragma mark - Exported synchronous methods -- (BOOL)webView:(__unused RCTWKWebView *)webView +- (BOOL)webView:(__unused StatusWKWebView *)webView shouldStartLoadForRequest:(NSMutableDictionary *)request withCallback:(RCTDirectEventBlock)callback { diff --git a/webview-bridge/index.ios.js b/webview-bridge/index.ios.js index b55425d0..cdfdb011 100644 --- a/webview-bridge/index.ios.js +++ b/webview-bridge/index.ios.js @@ -20,7 +20,7 @@ import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource' import deprecatedPropType from 'react-native/Libraries/Utilities/deprecatedPropType'; import invariant from 'fbjs/lib/invariant'; import keyMirror from 'fbjs/lib/keyMirror'; -var WKWebViewManager = NativeModules.WKWebViewManager; +var WKWebViewManager = NativeModules.StatusWKWebViewManager; var BGWASH = 'rgba(255,255,255,0.8)'; var RCT_WEBVIEW_REF = 'webview'; @@ -44,31 +44,31 @@ const JSNavigationScheme = 'react-js-navigation'; type ErrorEvent = { domain: any; - code: any; - description: any; +code: any; +description: any; } type Event = Object; var defaultRenderLoading = () => ( - + ); var defaultRenderError = (errorDomain, errorCode, errorDesc) => ( - - Error loading page - - - {'Domain: ' + errorDomain} - - - {'Error Code: ' + errorCode} - - - {'Description: ' + errorDesc} - + + Error loading page + + + {'Domain: ' + errorDomain} + + + {'Error Code: ' + errorCode} + + + {'Description: ' + errorDesc} + ); @@ -232,7 +232,7 @@ var WKWebView = createReactClass({ ); } else if (this.state.viewState !== WebViewState.IDLE) { console.error( - 'RCTWKWebView invalid state encountered: ' + this.state.loading + 'StatusWKWebView invalid state encountered: ' + this.state.loading ); } @@ -244,10 +244,10 @@ var WKWebView = createReactClass({ } var onShouldStartLoadWithRequest = this.props.onShouldStartLoadWithRequest && ((event: Event) => { - var shouldStart = this.props.onShouldStartLoadWithRequest && - this.props.onShouldStartLoadWithRequest(event.nativeEvent); - WKWebViewManager.startLoadWithResult(!!shouldStart, event.nativeEvent.lockIdentifier); - }); + var shouldStart = this.props.onShouldStartLoadWithRequest && + this.props.onShouldStartLoadWithRequest(event.nativeEvent); + WKWebViewManager.startLoadWithResult(!!shouldStart, event.nativeEvent.lockIdentifier); + }); var source = this.props.source || {}; if (this.props.html) { @@ -257,33 +257,33 @@ var WKWebView = createReactClass({ } var webView = - ; + ; return ( - {webView} - {otherView} - - ); + {webView} + {otherView} + + ); }, /** @@ -292,7 +292,7 @@ var WKWebView = createReactClass({ goForward: function() { UIManager.dispatchViewManagerCommand( this.getWebViewHandle(), - UIManager.RCTWKWebView.Commands.goForward, + UIManager.StatusWKWebView.Commands.goForward, null ); }, @@ -303,7 +303,7 @@ var WKWebView = createReactClass({ goBack: function() { UIManager.dispatchViewManagerCommand( this.getWebViewHandle(), - UIManager.RCTWKWebView.Commands.goBack, + UIManager.StatusWKWebView.Commands.goBack, null ); }, @@ -314,7 +314,7 @@ var WKWebView = createReactClass({ reload: function() { UIManager.dispatchViewManagerCommand( this.getWebViewHandle(), - UIManager.RCTWKWebView.Commands.reload, + UIManager.StatusWKWebView.Commands.reload, null ); }, @@ -394,7 +394,7 @@ var WKWebView = createReactClass({ }, }); -var RCTWKWebView = requireNativeComponent('RCTWKWebView', WKWebView, { +var StatusWKWebView = requireNativeComponent('StatusWKWebView', WKWebView, { nativeOnly: { onLoadingStart: true, onLoadingError: true,