Reshuffling
This commit is contained in:
Jamon Holmgren
parent
ee3d296d33
commit
af0057a321
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#import <React/RCTView.h>
|
||||
|
||||
@class RCTWebView;
|
||||
@class IRWebView;
|
||||
|
||||
/**
|
||||
* Special scheme used to pass messages to the injectedJavaScript
|
||||
|
|
@ -17,17 +17,17 @@
|
|||
*/
|
||||
extern NSString *const RCTJSNavigationScheme;
|
||||
|
||||
@protocol RCTWebViewDelegate <NSObject>
|
||||
@protocol IRWebViewDelegate <NSObject>
|
||||
|
||||
- (BOOL)webView:(RCTWebView *)webView
|
||||
- (BOOL)webView:(IRWebView *)webView
|
||||
shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
|
||||
withCallback:(RCTDirectEventBlock)callback;
|
||||
|
||||
@end
|
||||
|
||||
@interface RCTWebView : RCTView
|
||||
@interface IRWebView : RCTView
|
||||
|
||||
@property (nonatomic, weak) id<RCTWebViewDelegate> delegate;
|
||||
@property (nonatomic, weak) id<IRWebViewDelegate> delegate;
|
||||
|
||||
@property (nonatomic, copy) NSDictionary *source;
|
||||
@property (nonatomic, assign) UIEdgeInsets contentInset;
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
#import "RCTWebView.h"
|
||||
#import "IRWebView.h"
|
||||
|
||||
#import <UIKit/UIKit.h>
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ NSString *const RCTJSNavigationScheme = @"react-js-navigation";
|
|||
|
||||
static NSString *const kPostMessageHost = @"postMessage";
|
||||
|
||||
@interface RCTWebView () <UIWebViewDelegate, RCTAutoInsetsProtocol>
|
||||
@interface IRWebView () <UIWebViewDelegate, RCTAutoInsetsProtocol>
|
||||
|
||||
@property (nonatomic, copy) RCTDirectEventBlock onLoadingStart;
|
||||
@property (nonatomic, copy) RCTDirectEventBlock onLoadingFinish;
|
||||
|
|
@ -31,7 +31,7 @@ static NSString *const kPostMessageHost = @"postMessage";
|
|||
|
||||
@end
|
||||
|
||||
@implementation RCTWebView
|
||||
@implementation IRWebView
|
||||
{
|
||||
UIWebView *_webView;
|
||||
NSString *_injectedJavaScript;
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "IRWebView"
|
||||
s.version = "1.0.0"
|
||||
s.summary = "IRWebView"
|
||||
s.description = <<-DESC
|
||||
IRWebView
|
||||
DESC
|
||||
s.homepage = ""
|
||||
s.license = "MIT"
|
||||
# s.license = { :type => "MIT", :file => "FILE_LICENSE" }
|
||||
s.author = { "author" => "author@domain.cn" }
|
||||
s.platform = :ios, "7.0"
|
||||
s.source = { :git => "https://github.com/author/IRWebView.git", :tag => "master" }
|
||||
s.source_files = "IRWebView/**/*.{h,m}"
|
||||
s.requires_arc = true
|
||||
|
||||
|
||||
s.dependency "React"
|
||||
#s.dependency "others"
|
||||
|
||||
end
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,259 @@
|
|||
// !$*UTF8*$!
|
||||
{
|
||||
archiveVersion = 1;
|
||||
classes = {
|
||||
};
|
||||
objectVersion = 46;
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
B3E7B58A1CC2AC0600A0062D /* IRWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* IRWebView.m */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXCopyFilesBuildPhase section */
|
||||
58B511D91A9E6C8500147676 /* CopyFiles */ = {
|
||||
isa = PBXCopyFilesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
dstPath = "include/$(PRODUCT_NAME)";
|
||||
dstSubfolderSpec = 16;
|
||||
files = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXCopyFilesBuildPhase section */
|
||||
|
||||
/* Begin PBXFileReference section */
|
||||
134814201AA4EA6300B7C361 /* libIRWebView.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libIRWebView.a; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
B3E7B5881CC2AC0600A0062D /* IRWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IRWebView.h; sourceTree = "<group>"; };
|
||||
B3E7B5891CC2AC0600A0062D /* IRWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IRWebView.m; sourceTree = "<group>"; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFrameworksBuildPhase section */
|
||||
58B511D81A9E6C8500147676 /* Frameworks */ = {
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXFrameworksBuildPhase section */
|
||||
|
||||
/* Begin PBXGroup section */
|
||||
134814211AA4EA7D00B7C361 /* Products */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
134814201AA4EA6300B7C361 /* libIRWebView.a */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
58B511D21A9E6C8500147676 = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
B3E7B5881CC2AC0600A0062D /* IRWebView.h */,
|
||||
B3E7B5891CC2AC0600A0062D /* IRWebView.m */,
|
||||
134814211AA4EA7D00B7C361 /* Products */,
|
||||
);
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
/* End PBXGroup section */
|
||||
|
||||
/* Begin PBXNativeTarget section */
|
||||
58B511DA1A9E6C8500147676 /* IRWebView */ = {
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "IRWebView" */;
|
||||
buildPhases = (
|
||||
58B511D71A9E6C8500147676 /* Sources */,
|
||||
58B511D81A9E6C8500147676 /* Frameworks */,
|
||||
58B511D91A9E6C8500147676 /* CopyFiles */,
|
||||
);
|
||||
buildRules = (
|
||||
);
|
||||
dependencies = (
|
||||
);
|
||||
name = IRWebView;
|
||||
productName = RCTDataManager;
|
||||
productReference = 134814201AA4EA6300B7C361 /* libIRWebView.a */;
|
||||
productType = "com.apple.product-type.library.static";
|
||||
};
|
||||
/* End PBXNativeTarget section */
|
||||
|
||||
/* Begin PBXProject section */
|
||||
58B511D31A9E6C8500147676 /* Project object */ = {
|
||||
isa = PBXProject;
|
||||
attributes = {
|
||||
LastUpgradeCheck = 0830;
|
||||
ORGANIZATIONNAME = Facebook;
|
||||
TargetAttributes = {
|
||||
58B511DA1A9E6C8500147676 = {
|
||||
CreatedOnToolsVersion = 6.1.1;
|
||||
};
|
||||
};
|
||||
};
|
||||
buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "IRWebView" */;
|
||||
compatibilityVersion = "Xcode 3.2";
|
||||
developmentRegion = English;
|
||||
hasScannedForEncodings = 0;
|
||||
knownRegions = (
|
||||
en,
|
||||
);
|
||||
mainGroup = 58B511D21A9E6C8500147676;
|
||||
productRefGroup = 58B511D21A9E6C8500147676;
|
||||
projectDirPath = "";
|
||||
projectRoot = "";
|
||||
targets = (
|
||||
58B511DA1A9E6C8500147676 /* IRWebView */,
|
||||
);
|
||||
};
|
||||
/* End PBXProject section */
|
||||
|
||||
/* Begin PBXSourcesBuildPhase section */
|
||||
58B511D71A9E6C8500147676 /* Sources */ = {
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
B3E7B58A1CC2AC0600A0062D /* IRWebView.m in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
/* End PBXSourcesBuildPhase section */
|
||||
|
||||
/* Begin XCBuildConfiguration section */
|
||||
58B511ED1A9E6C8500147676 /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
||||
CLANG_CXX_LIBRARY = "libc++";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CLANG_WARN_BOOL_CONVERSION = YES;
|
||||
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
||||
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_ENUM_CONVERSION = YES;
|
||||
CLANG_WARN_INFINITE_RECURSION = YES;
|
||||
CLANG_WARN_INT_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
COPY_PHASE_STRIP = NO;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
ENABLE_TESTABILITY = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu99;
|
||||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
GCC_NO_COMMON_BLOCKS = YES;
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"DEBUG=1",
|
||||
"$(inherited)",
|
||||
);
|
||||
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
|
||||
MTL_ENABLE_DEBUG_INFO = YES;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
SDKROOT = iphoneos;
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
58B511EE1A9E6C8500147676 /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
|
||||
CLANG_CXX_LIBRARY = "libc++";
|
||||
CLANG_ENABLE_MODULES = YES;
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CLANG_WARN_BOOL_CONVERSION = YES;
|
||||
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
||||
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
||||
CLANG_WARN_EMPTY_BODY = YES;
|
||||
CLANG_WARN_ENUM_CONVERSION = YES;
|
||||
CLANG_WARN_INFINITE_RECURSION = YES;
|
||||
CLANG_WARN_INT_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||
CLANG_WARN_UNREACHABLE_CODE = YES;
|
||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||
COPY_PHASE_STRIP = YES;
|
||||
ENABLE_NS_ASSERTIONS = NO;
|
||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||
GCC_C_LANGUAGE_STANDARD = gnu99;
|
||||
GCC_NO_COMMON_BLOCKS = YES;
|
||||
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
|
||||
GCC_WARN_UNDECLARED_SELECTOR = YES;
|
||||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
SDKROOT = iphoneos;
|
||||
VALIDATE_PRODUCT = YES;
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
58B511F01A9E6C8500147676 /* Debug */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
HEADER_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
|
||||
"$(SRCROOT)/../../../React/**",
|
||||
"$(SRCROOT)/../../react-native/React/**",
|
||||
);
|
||||
LIBRARY_SEARCH_PATHS = "$(inherited)";
|
||||
OTHER_LDFLAGS = "-ObjC";
|
||||
PRODUCT_NAME = IRWebView;
|
||||
SKIP_INSTALL = YES;
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
58B511F11A9E6C8500147676 /* Release */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
HEADER_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
|
||||
"$(SRCROOT)/../../../React/**",
|
||||
"$(SRCROOT)/../../react-native/React/**",
|
||||
);
|
||||
LIBRARY_SEARCH_PATHS = "$(inherited)";
|
||||
OTHER_LDFLAGS = "-ObjC";
|
||||
PRODUCT_NAME = IRWebView;
|
||||
SKIP_INSTALL = YES;
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
/* End XCBuildConfiguration section */
|
||||
|
||||
/* Begin XCConfigurationList section */
|
||||
58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "IRWebView" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
58B511ED1A9E6C8500147676 /* Debug */,
|
||||
58B511EE1A9E6C8500147676 /* Release */,
|
||||
);
|
||||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "IRWebView" */ = {
|
||||
isa = XCConfigurationList;
|
||||
buildConfigurations = (
|
||||
58B511F01A9E6C8500147676 /* Debug */,
|
||||
58B511F11A9E6C8500147676 /* Release */,
|
||||
);
|
||||
defaultConfigurationIsVisible = 0;
|
||||
defaultConfigurationName = Release;
|
||||
};
|
||||
/* End XCConfigurationList section */
|
||||
};
|
||||
rootObject = 58B511D31A9E6C8500147676 /* Project object */;
|
||||
}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
// !$*UTF8*$!
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Workspace
|
||||
version = "1.0">
|
||||
<FileRef
|
||||
location = "group:IRWebView.xcodeproj">
|
||||
</FileRef>
|
||||
</Workspace>
|
||||
|
||||
|
|
@ -5,8 +5,8 @@
|
|||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
#import <React/RCTViewManager.h>
|
||||
#import <React/IRViewManager.h>
|
||||
|
||||
@interface RCTWebViewManager : RCTViewManager
|
||||
@interface IRWebViewManager : IRViewManager
|
||||
|
||||
@end
|
||||
|
|
@ -5,18 +5,18 @@
|
|||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
#import "RCTWebViewManager.h"
|
||||
#import "IRWebViewManager.h"
|
||||
|
||||
#import "RCTBridge.h"
|
||||
#import "RCTUIManager.h"
|
||||
#import "RCTWebView.h"
|
||||
#import "IRWebView.h"
|
||||
#import "UIView+React.h"
|
||||
|
||||
@interface RCTWebViewManager () <RCTWebViewDelegate>
|
||||
@interface IRWebViewManager () <IRWebViewDelegate>
|
||||
|
||||
@end
|
||||
|
||||
@implementation RCTWebViewManager
|
||||
@implementation IRWebViewManager
|
||||
{
|
||||
NSConditionLock *_shouldStartLoadLock;
|
||||
BOOL _shouldStartLoad;
|
||||
|
|
@ -26,7 +26,7 @@ RCT_EXPORT_MODULE()
|
|||
|
||||
- (UIView *)view
|
||||
{
|
||||
RCTWebView *webView = [RCTWebView new];
|
||||
IRWebView *webView = [IRWebView new];
|
||||
webView.delegate = self;
|
||||
return webView;
|
||||
}
|
||||
|
|
@ -51,10 +51,10 @@ RCT_REMAP_VIEW_PROPERTY(dataDetectorTypes, _webView.dataDetectorTypes, UIDataDet
|
|||
|
||||
RCT_EXPORT_METHOD(goBack:(nonnull NSNumber *)reactTag)
|
||||
{
|
||||
[self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWebView *> *viewRegistry) {
|
||||
RCTWebView *view = viewRegistry[reactTag];
|
||||
if (![view isKindOfClass:[RCTWebView class]]) {
|
||||
RCTLogError(@"Invalid view returned from registry, expecting RCTWebView, got: %@", view);
|
||||
[self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, IRWebView *> *viewRegistry) {
|
||||
IRWebView *view = viewRegistry[reactTag];
|
||||
if (![view isKindOfClass:[IRWebView class]]) {
|
||||
RCTLogError(@"Invalid view returned from registry, expecting IRWebView, got: %@", view);
|
||||
} else {
|
||||
[view goBack];
|
||||
}
|
||||
|
|
@ -65,8 +65,8 @@ RCT_EXPORT_METHOD(goForward:(nonnull NSNumber *)reactTag)
|
|||
{
|
||||
[self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
|
||||
id view = viewRegistry[reactTag];
|
||||
if (![view isKindOfClass:[RCTWebView class]]) {
|
||||
RCTLogError(@"Invalid view returned from registry, expecting RCTWebView, got: %@", view);
|
||||
if (![view isKindOfClass:[IRWebView class]]) {
|
||||
RCTLogError(@"Invalid view returned from registry, expecting IRWebView, got: %@", view);
|
||||
} else {
|
||||
[view goForward];
|
||||
}
|
||||
|
|
@ -75,10 +75,10 @@ RCT_EXPORT_METHOD(goForward:(nonnull NSNumber *)reactTag)
|
|||
|
||||
RCT_EXPORT_METHOD(reload:(nonnull NSNumber *)reactTag)
|
||||
{
|
||||
[self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWebView *> *viewRegistry) {
|
||||
RCTWebView *view = viewRegistry[reactTag];
|
||||
if (![view isKindOfClass:[RCTWebView class]]) {
|
||||
RCTLogError(@"Invalid view returned from registry, expecting RCTWebView, got: %@", view);
|
||||
[self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, IRWebView *> *viewRegistry) {
|
||||
IRWebView *view = viewRegistry[reactTag];
|
||||
if (![view isKindOfClass:[IRWebView class]]) {
|
||||
RCTLogError(@"Invalid view returned from registry, expecting IRWebView, got: %@", view);
|
||||
} else {
|
||||
[view reload];
|
||||
}
|
||||
|
|
@ -87,10 +87,10 @@ RCT_EXPORT_METHOD(reload:(nonnull NSNumber *)reactTag)
|
|||
|
||||
RCT_EXPORT_METHOD(stopLoading:(nonnull NSNumber *)reactTag)
|
||||
{
|
||||
[self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWebView *> *viewRegistry) {
|
||||
RCTWebView *view = viewRegistry[reactTag];
|
||||
if (![view isKindOfClass:[RCTWebView class]]) {
|
||||
RCTLogError(@"Invalid view returned from registry, expecting RCTWebView, got: %@", view);
|
||||
[self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, IRWebView *> *viewRegistry) {
|
||||
IRWebView *view = viewRegistry[reactTag];
|
||||
if (![view isKindOfClass:[IRWebView class]]) {
|
||||
RCTLogError(@"Invalid view returned from registry, expecting IRWebView, got: %@", view);
|
||||
} else {
|
||||
[view stopLoading];
|
||||
}
|
||||
|
|
@ -99,10 +99,10 @@ RCT_EXPORT_METHOD(stopLoading:(nonnull NSNumber *)reactTag)
|
|||
|
||||
RCT_EXPORT_METHOD(postMessage:(nonnull NSNumber *)reactTag message:(NSString *)message)
|
||||
{
|
||||
[self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWebView *> *viewRegistry) {
|
||||
RCTWebView *view = viewRegistry[reactTag];
|
||||
if (![view isKindOfClass:[RCTWebView class]]) {
|
||||
RCTLogError(@"Invalid view returned from registry, expecting RCTWebView, got: %@", view);
|
||||
[self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, IRWebView *> *viewRegistry) {
|
||||
IRWebView *view = viewRegistry[reactTag];
|
||||
if (![view isKindOfClass:[IRWebView class]]) {
|
||||
RCTLogError(@"Invalid view returned from registry, expecting IRWebView, got: %@", view);
|
||||
} else {
|
||||
[view postMessage:message];
|
||||
}
|
||||
|
|
@ -111,10 +111,10 @@ RCT_EXPORT_METHOD(postMessage:(nonnull NSNumber *)reactTag message:(NSString *)m
|
|||
|
||||
RCT_EXPORT_METHOD(injectJavaScript:(nonnull NSNumber *)reactTag script:(NSString *)script)
|
||||
{
|
||||
[self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RCTWebView *> *viewRegistry) {
|
||||
RCTWebView *view = viewRegistry[reactTag];
|
||||
if (![view isKindOfClass:[RCTWebView class]]) {
|
||||
RCTLogError(@"Invalid view returned from registry, expecting RCTWebView, got: %@", view);
|
||||
[self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, IRWebView *> *viewRegistry) {
|
||||
IRWebView *view = viewRegistry[reactTag];
|
||||
if (![view isKindOfClass:[IRWebView class]]) {
|
||||
RCTLogError(@"Invalid view returned from registry, expecting IRWebView, got: %@", view);
|
||||
} else {
|
||||
[view injectJavaScript:script];
|
||||
}
|
||||
|
|
@ -123,7 +123,7 @@ RCT_EXPORT_METHOD(injectJavaScript:(nonnull NSNumber *)reactTag script:(NSString
|
|||
|
||||
#pragma mark - Exported synchronous methods
|
||||
|
||||
- (BOOL)webView:(__unused RCTWebView *)webView
|
||||
- (BOOL)webView:(__unused IRWebView *)webView
|
||||
shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
|
||||
withCallback:(RCTDirectEventBlock)callback
|
||||
{
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
// /**
|
||||
// * Copyright (c) 2015-present, Facebook, Inc.
|
||||
// *
|
||||
// * This source code is licensed under the MIT license found in the
|
||||
// * LICENSE file in the root directory of this source tree.
|
||||
// */
|
||||
|
||||
// #import <React/RCTView.h>
|
||||
|
||||
// @class IRWebView;
|
||||
|
||||
// /**
|
||||
// * Special scheme used to pass messages to the injectedJavaScript
|
||||
// * code without triggering a page load. Usage:
|
||||
// *
|
||||
// * window.location.href = RCTJSNavigationScheme + '://hello'
|
||||
// */
|
||||
// extern NSString *const RCTJSNavigationScheme;
|
||||
|
||||
// @protocol IRWebViewDelegate <NSObject>
|
||||
|
||||
// - (BOOL)webView:(IRWebView *)webView
|
||||
// shouldStartLoadForRequest:(NSMutableDictionary<NSString *, id> *)request
|
||||
// withCallback:(RCTDirectEventBlock)callback;
|
||||
|
||||
// @end
|
||||
|
||||
// @interface IRWebView : RCTView
|
||||
|
||||
// @property (nonatomic, weak) id<IRWebViewDelegate> delegate;
|
||||
|
||||
// @property (nonatomic, copy) NSDictionary *source;
|
||||
// @property (nonatomic, assign) UIEdgeInsets contentInset;
|
||||
// @property (nonatomic, assign) BOOL automaticallyAdjustContentInsets;
|
||||
// @property (nonatomic, assign) BOOL messagingEnabled;
|
||||
// @property (nonatomic, copy) NSString *injectedJavaScript;
|
||||
// @property (nonatomic, assign) BOOL scalesPageToFit;
|
||||
|
||||
// - (void)goForward;
|
||||
// - (void)goBack;
|
||||
// - (void)reload;
|
||||
// - (void)stopLoading;
|
||||
// - (void)postMessage:(NSString *)message;
|
||||
// - (void)injectJavaScript:(NSString *)script;
|
||||
|
||||
// @end
|
||||
|
|
@ -0,0 +1,351 @@
|
|||
// /**
|
||||
// * Copyright (c) 2015-present, Facebook, Inc.
|
||||
// *
|
||||
// * This source code is licensed under the MIT license found in the
|
||||
// * LICENSE file in the root directory of this source tree.
|
||||
// */
|
||||
|
||||
// #import "IRWebView.h"
|
||||
|
||||
// #import <UIKit/UIKit.h>
|
||||
|
||||
// #import "RCTAutoInsetsProtocol.h"
|
||||
// #import "RCTConvert.h"
|
||||
// #import "RCTEventDispatcher.h"
|
||||
// #import "RCTLog.h"
|
||||
// #import "RCTUtils.h"
|
||||
// #import "RCTView.h"
|
||||
// #import "UIView+React.h"
|
||||
|
||||
// NSString *const RCTJSNavigationScheme = @"react-js-navigation";
|
||||
|
||||
// static NSString *const kPostMessageHost = @"postMessage";
|
||||
|
||||
// @interface IRWebView () <UIWebViewDelegate, RCTAutoInsetsProtocol>
|
||||
|
||||
// @property (nonatomic, copy) RCTDirectEventBlock onLoadingStart;
|
||||
// @property (nonatomic, copy) RCTDirectEventBlock onLoadingFinish;
|
||||
// @property (nonatomic, copy) RCTDirectEventBlock onLoadingError;
|
||||
// @property (nonatomic, copy) RCTDirectEventBlock onShouldStartLoadWithRequest;
|
||||
// @property (nonatomic, copy) RCTDirectEventBlock onMessage;
|
||||
|
||||
// @end
|
||||
|
||||
// @implementation IRWebView
|
||||
// {
|
||||
// UIWebView *_webView;
|
||||
// NSString *_injectedJavaScript;
|
||||
// }
|
||||
|
||||
// - (void)dealloc
|
||||
// {
|
||||
// _webView.delegate = nil;
|
||||
// }
|
||||
|
||||
// - (instancetype)initWithFrame:(CGRect)frame
|
||||
// {
|
||||
// if ((self = [super initWithFrame:frame])) {
|
||||
// super.backgroundColor = [UIColor clearColor];
|
||||
// _automaticallyAdjustContentInsets = YES;
|
||||
// _contentInset = UIEdgeInsetsZero;
|
||||
// _webView = [[UIWebView alloc] initWithFrame:self.bounds];
|
||||
// _webView.delegate = self;
|
||||
// #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
|
||||
// if ([_webView.scrollView respondsToSelector:@selector(setContentInsetAdjustmentBehavior:)]) {
|
||||
// _webView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
|
||||
// }
|
||||
// #endif
|
||||
// [self addSubview:_webView];
|
||||
// }
|
||||
// return self;
|
||||
// }
|
||||
|
||||
// RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)aDecoder)
|
||||
|
||||
// - (void)goForward
|
||||
// {
|
||||
// [_webView goForward];
|
||||
// }
|
||||
|
||||
// - (void)goBack
|
||||
// {
|
||||
// [_webView goBack];
|
||||
// }
|
||||
|
||||
// - (void)reload
|
||||
// {
|
||||
// NSURLRequest *request = [RCTConvert NSURLRequest:self.source];
|
||||
// if (request.URL && !_webView.request.URL.absoluteString.length) {
|
||||
// [_webView loadRequest:request];
|
||||
// }
|
||||
// else {
|
||||
// [_webView reload];
|
||||
// }
|
||||
// }
|
||||
|
||||
// - (void)stopLoading
|
||||
// {
|
||||
// [_webView stopLoading];
|
||||
// }
|
||||
|
||||
// - (void)postMessage:(NSString *)message
|
||||
// {
|
||||
// NSDictionary *eventInitDict = @{
|
||||
// @"data": message,
|
||||
// };
|
||||
// NSString *source = [NSString
|
||||
// stringWithFormat:@"document.dispatchEvent(new MessageEvent('message', %@));",
|
||||
// RCTJSONStringify(eventInitDict, NULL)
|
||||
// ];
|
||||
// [_webView stringByEvaluatingJavaScriptFromString:source];
|
||||
// }
|
||||
|
||||
// - (void)injectJavaScript:(NSString *)script
|
||||
// {
|
||||
// [_webView stringByEvaluatingJavaScriptFromString:script];
|
||||
// }
|
||||
|
||||
// - (void)setSource:(NSDictionary *)source
|
||||
// {
|
||||
// if (![_source isEqualToDictionary:source]) {
|
||||
// _source = [source copy];
|
||||
|
||||
// // Check for a static html source first
|
||||
// NSString *html = [RCTConvert NSString:source[@"html"]];
|
||||
// if (html) {
|
||||
// NSURL *baseURL = [RCTConvert NSURL:source[@"baseUrl"]];
|
||||
// if (!baseURL) {
|
||||
// baseURL = [NSURL URLWithString:@"about:blank"];
|
||||
// }
|
||||
// [_webView loadHTMLString:html baseURL:baseURL];
|
||||
// return;
|
||||
// }
|
||||
|
||||
// NSURLRequest *request = [RCTConvert NSURLRequest:source];
|
||||
// // Because of the way React works, as pages redirect, we actually end up
|
||||
// // passing the redirect urls back here, so we ignore them if trying to load
|
||||
// // the same url. We'll expose a call to 'reload' to allow a user to load
|
||||
// // the existing page.
|
||||
// if ([request.URL isEqual:_webView.request.URL]) {
|
||||
// return;
|
||||
// }
|
||||
// if (!request.URL) {
|
||||
// // Clear the webview
|
||||
// [_webView loadHTMLString:@"" baseURL:nil];
|
||||
// return;
|
||||
// }
|
||||
// [_webView loadRequest:request];
|
||||
// }
|
||||
// }
|
||||
|
||||
// - (void)layoutSubviews
|
||||
// {
|
||||
// [super layoutSubviews];
|
||||
// _webView.frame = self.bounds;
|
||||
// }
|
||||
|
||||
// - (void)setContentInset:(UIEdgeInsets)contentInset
|
||||
// {
|
||||
// _contentInset = contentInset;
|
||||
// [RCTView autoAdjustInsetsForView:self
|
||||
// withScrollView:_webView.scrollView
|
||||
// updateOffset:NO];
|
||||
// }
|
||||
|
||||
// - (void)setScalesPageToFit:(BOOL)scalesPageToFit
|
||||
// {
|
||||
// if (_webView.scalesPageToFit != scalesPageToFit) {
|
||||
// _webView.scalesPageToFit = scalesPageToFit;
|
||||
// [_webView reload];
|
||||
// }
|
||||
// }
|
||||
|
||||
// - (BOOL)scalesPageToFit
|
||||
// {
|
||||
// return _webView.scalesPageToFit;
|
||||
// }
|
||||
|
||||
// - (void)setBackgroundColor:(UIColor *)backgroundColor
|
||||
// {
|
||||
// CGFloat alpha = CGColorGetAlpha(backgroundColor.CGColor);
|
||||
// self.opaque = _webView.opaque = (alpha == 1.0);
|
||||
// _webView.backgroundColor = backgroundColor;
|
||||
// }
|
||||
|
||||
// - (UIColor *)backgroundColor
|
||||
// {
|
||||
// return _webView.backgroundColor;
|
||||
// }
|
||||
|
||||
// - (NSMutableDictionary<NSString *, id> *)baseEvent
|
||||
// {
|
||||
// NSMutableDictionary<NSString *, id> *event = [[NSMutableDictionary alloc] initWithDictionary:@{
|
||||
// @"url": _webView.request.URL.absoluteString ?: @"",
|
||||
// @"loading" : @(_webView.loading),
|
||||
// @"title": [_webView stringByEvaluatingJavaScriptFromString:@"document.title"],
|
||||
// @"canGoBack": @(_webView.canGoBack),
|
||||
// @"canGoForward" : @(_webView.canGoForward),
|
||||
// }];
|
||||
|
||||
// return event;
|
||||
// }
|
||||
|
||||
// - (void)refreshContentInset
|
||||
// {
|
||||
// [RCTView autoAdjustInsetsForView:self
|
||||
// withScrollView:_webView.scrollView
|
||||
// updateOffset:YES];
|
||||
// }
|
||||
|
||||
// #pragma mark - UIWebViewDelegate methods
|
||||
|
||||
// - (BOOL)webView:(__unused UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request
|
||||
// navigationType:(UIWebViewNavigationType)navigationType
|
||||
// {
|
||||
// BOOL isJSNavigation = [request.URL.scheme isEqualToString:RCTJSNavigationScheme];
|
||||
|
||||
// static NSDictionary<NSNumber *, NSString *> *navigationTypes;
|
||||
// static dispatch_once_t onceToken;
|
||||
// dispatch_once(&onceToken, ^{
|
||||
// navigationTypes = @{
|
||||
// @(UIWebViewNavigationTypeLinkClicked): @"click",
|
||||
// @(UIWebViewNavigationTypeFormSubmitted): @"formsubmit",
|
||||
// @(UIWebViewNavigationTypeBackForward): @"backforward",
|
||||
// @(UIWebViewNavigationTypeReload): @"reload",
|
||||
// @(UIWebViewNavigationTypeFormResubmitted): @"formresubmit",
|
||||
// @(UIWebViewNavigationTypeOther): @"other",
|
||||
// };
|
||||
// });
|
||||
|
||||
// // skip this for the JS Navigation handler
|
||||
// if (!isJSNavigation && _onShouldStartLoadWithRequest) {
|
||||
// NSMutableDictionary<NSString *, id> *event = [self baseEvent];
|
||||
// [event addEntriesFromDictionary: @{
|
||||
// @"url": (request.URL).absoluteString,
|
||||
// @"navigationType": navigationTypes[@(navigationType)]
|
||||
// }];
|
||||
// if (![self.delegate webView:self
|
||||
// shouldStartLoadForRequest:event
|
||||
// withCallback:_onShouldStartLoadWithRequest]) {
|
||||
// return NO;
|
||||
// }
|
||||
// }
|
||||
|
||||
// if (_onLoadingStart) {
|
||||
// // We have this check to filter out iframe requests and whatnot
|
||||
// BOOL isTopFrame = [request.URL isEqual:request.mainDocumentURL];
|
||||
// if (isTopFrame) {
|
||||
// NSMutableDictionary<NSString *, id> *event = [self baseEvent];
|
||||
// [event addEntriesFromDictionary: @{
|
||||
// @"url": (request.URL).absoluteString,
|
||||
// @"navigationType": navigationTypes[@(navigationType)]
|
||||
// }];
|
||||
// _onLoadingStart(event);
|
||||
// }
|
||||
// }
|
||||
|
||||
// if (isJSNavigation && [request.URL.host isEqualToString:kPostMessageHost]) {
|
||||
// NSString *data = request.URL.query;
|
||||
// data = [data stringByReplacingOccurrencesOfString:@"+" withString:@" "];
|
||||
// data = [data stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
|
||||
|
||||
// NSMutableDictionary<NSString *, id> *event = [self baseEvent];
|
||||
// [event addEntriesFromDictionary: @{
|
||||
// @"data": data,
|
||||
// }];
|
||||
|
||||
// NSString *source = @"document.dispatchEvent(new MessageEvent('message:received'));";
|
||||
|
||||
// [_webView stringByEvaluatingJavaScriptFromString:source];
|
||||
|
||||
// _onMessage(event);
|
||||
// }
|
||||
|
||||
// // JS Navigation handler
|
||||
// return !isJSNavigation;
|
||||
// }
|
||||
|
||||
// - (void)webView:(__unused UIWebView *)webView didFailLoadWithError:(NSError *)error
|
||||
// {
|
||||
// if (_onLoadingError) {
|
||||
// if ([error.domain isEqualToString:NSURLErrorDomain] && error.code == NSURLErrorCancelled) {
|
||||
// // NSURLErrorCancelled is reported when a page has a redirect OR if you load
|
||||
// // a new URL in the WebView before the previous one came back. We can just
|
||||
// // ignore these since they aren't real errors.
|
||||
// // http://stackoverflow.com/questions/1024748/how-do-i-fix-nsurlerrordomain-error-999-in-iphone-3-0-os
|
||||
// return;
|
||||
// }
|
||||
|
||||
// if ([error.domain isEqualToString:@"WebKitErrorDomain"] && error.code == 102) {
|
||||
// // Error code 102 "Frame load interrupted" is raised by the UIWebView if
|
||||
// // its delegate returns FALSE from webView:shouldStartLoadWithRequest:navigationType
|
||||
// // when the URL is from an http redirect. This is a common pattern when
|
||||
// // implementing OAuth with a WebView.
|
||||
// return;
|
||||
// }
|
||||
|
||||
// NSMutableDictionary<NSString *, id> *event = [self baseEvent];
|
||||
// [event addEntriesFromDictionary:@{
|
||||
// @"domain": error.domain,
|
||||
// @"code": @(error.code),
|
||||
// @"description": error.localizedDescription,
|
||||
// }];
|
||||
// _onLoadingError(event);
|
||||
// }
|
||||
// }
|
||||
|
||||
// - (void)webViewDidFinishLoad:(UIWebView *)webView
|
||||
// {
|
||||
// if (_messagingEnabled) {
|
||||
// #if RCT_DEV
|
||||
// // See isNative in lodash
|
||||
// NSString *testPostMessageNative = @"String(window.postMessage) === String(Object.hasOwnProperty).replace('hasOwnProperty', 'postMessage')";
|
||||
// BOOL postMessageIsNative = [
|
||||
// [webView stringByEvaluatingJavaScriptFromString:testPostMessageNative]
|
||||
// isEqualToString:@"true"
|
||||
// ];
|
||||
// if (!postMessageIsNative) {
|
||||
// RCTLogError(@"Setting onMessage on a WebView overrides existing values of window.postMessage, but a previous value was defined");
|
||||
// }
|
||||
// #endif
|
||||
// NSString *source = [NSString stringWithFormat:
|
||||
// @"(function() {"
|
||||
// "window.originalPostMessage = window.postMessage;"
|
||||
|
||||
// "var messageQueue = [];"
|
||||
// "var messagePending = false;"
|
||||
|
||||
// "function processQueue() {"
|
||||
// "if (!messageQueue.length || messagePending) return;"
|
||||
// "messagePending = true;"
|
||||
// "window.location = '%@://%@?' + encodeURIComponent(messageQueue.shift());"
|
||||
// "}"
|
||||
|
||||
// "window.postMessage = function(data) {"
|
||||
// "messageQueue.push(String(data));"
|
||||
// "processQueue();"
|
||||
// "};"
|
||||
|
||||
// "document.addEventListener('message:received', function(e) {"
|
||||
// "messagePending = false;"
|
||||
// "processQueue();"
|
||||
// "});"
|
||||
// "})();", RCTJSNavigationScheme, kPostMessageHost
|
||||
// ];
|
||||
// [webView stringByEvaluatingJavaScriptFromString:source];
|
||||
// }
|
||||
// if (_injectedJavaScript != nil) {
|
||||
// NSString *jsEvaluationValue = [webView stringByEvaluatingJavaScriptFromString:_injectedJavaScript];
|
||||
|
||||
// NSMutableDictionary<NSString *, id> *event = [self baseEvent];
|
||||
// event[@"jsEvaluationValue"] = jsEvaluationValue;
|
||||
|
||||
// _onLoadingFinish(event);
|
||||
// }
|
||||
// // we only need the final 'finishLoad' call so only fire the event when we're actually done loading.
|
||||
// else if (_onLoadingFinish && !webView.loading && ![webView.request.URL.absoluteString isEqualToString:@"about:blank"]) {
|
||||
// _onLoadingFinish([self baseEvent]);
|
||||
// }
|
||||
// }
|
||||
|
||||
// @end
|
||||
Loading…
Reference in New Issue