kylefang/react-native-safari-view
1
0
Fork 0
mirror of https://github.com/tappollo/react-native-safari-view.git synced 2026-04-29 04:15:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #73 from naoufal/updates

Browse Source 
Native promises and updated android stub
This commit is contained in:
Koen Punt
2017-10-01 17:48:03 +02:00
committed by GitHub
parent 1b451f0edc aea0324ea6
commit 1e328aeb40
3 changed files with 20 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
SafariViewManager.android.js
View File

@@ -5,21 +5,8 @@
*/
'use strict';
const {NativeModules} = require('react-native');
const NativeSafariViewManager = NativeModules.SafariViewManager;
var SafariViewManager = {
isAvailable: function() {
return new Promise(function(resolve, reject) {
NativeSafariViewManager.isAvailable(function(error) {
if (error) {
return reject(error);
}
resolve(false);
});
});
export default {
isAvailable() {
return Promise.reject(new Error('SafariView is unavailable on Android'));
}
};
module.exports = SafariViewManager;

20
SafariViewManager.ios.js
View File

@@ -20,15 +20,7 @@ export default {
options.barTintColor = processColor(options.barTintColor);
}
return new Promise((resolve, reject) => {
NativeSafariViewManager.show(options, (error) => {
if (error) {
return reject(error);
}
resolve(true);
});
});
return NativeSafariViewManager.show(options);
},
dismiss() {
@@ -36,15 +28,7 @@ export default {
},
isAvailable() {
return new Promise((resolve, reject) => {
NativeSafariViewManager.isAvailable((error) => {
if (error) {
return reject(error);
}
resolve(true);
});
});
return NativeSafariViewManager.isAvailable();
},
addEventListener(event, listener) {

26
SafariViewManager.m
View File

@@ -31,20 +31,22 @@ RCT_EXPORT_MODULE()
return @[@"SafariViewOnShow", @"SafariViewOnDismiss"];
}
RCT_EXPORT_METHOD(show:(NSDictionary *)args callback:(RCTResponseSenderBlock)callback)
RCT_EXPORT_METHOD(show:(NSDictionary *)args resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
{
// Error if no url is passed
if (!args[@"url"]) {
reject(@"E_SAFARI_VIEW_NO_URL", @"You must specify a url.", nil);
return;
}
NSURL *url = [NSURL URLWithString:args[@"url"]];
BOOL readerMode = [args[@"readerMode"] boolValue];
UIColor *tintColorString = args[@"tintColor"];
UIColor *barTintColorString = args[@"barTintColor"];
BOOL fromBottom = [args[@"fromBottom"] boolValue];
// Error if no url is passed
if (!args[@"url"]) {
RCTLogError(@"[SafariView] You must specify a url.");
return;
}
// Initialize the Safari View
self.safariView = [[SFSafariViewController alloc] initWithURL:[NSURL URLWithString:args[@"url"]] entersReaderIfAvailable:[args[@"readerMode"] boolValue]];
self.safariView = [[SFSafariViewController alloc] initWithURL:url entersReaderIfAvailable:readerMode];
self.safariView.delegate = self;
// Set tintColor if available
@@ -83,15 +85,17 @@ RCT_EXPORT_METHOD(show:(NSDictionary *)args callback:(RCTResponseSenderBlock)cal
if (hasListeners) {
[self sendEventWithName:@"SafariViewOnShow" body:nil];
}
resolve(@YES);
}
RCT_EXPORT_METHOD(isAvailable:(RCTResponseSenderBlock)callback)
RCT_EXPORT_METHOD(isAvailable:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
{
if ([SFSafariViewController class]) {
// SafariView is available
callback(@[[NSNull null], @true]);
resolve(@YES);
} else {
callback(@[RCTMakeError(@"[SafariView] SafariView is unavailable.", nil, nil)]);
reject(@"E_SAFARI_VIEW_UNAVAILABLE", @"SafariView is unavailable", nil);
}
}