Skip to content

Commit 3671b08

Browse files
committed
fix: working implementation for ios
1 parent 04abd2b commit 3671b08

File tree

3 files changed

+24
-18
lines changed

3 files changed

+24
-18
lines changed

example/App.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,37 @@
11
import * as React from 'react';
22

3-
import { StyleSheet, View, Text, Button } from 'react-native';
3+
import {StyleSheet, View, Text, Button} from 'react-native';
44
import {
55
openBrowserAsync,
66
openAuthSessionAsync,
7+
dismissAuthSession,
8+
dismissBrowser,
79
} from 'react-native-web-browser';
810

911
export default function App() {
1012
return (
1113
<View style={styles.container}>
1214
<Button
1315
title="Open browser window to Google.com"
14-
onPress={() => openBrowserAsync('https://google.com')}
15-
>
16+
onPress={() => openBrowserAsync('https://google.com')}>
1617
Open browser window to Google.com
1718
</Button>
1819
<Button
1920
title="Open auth browser window to Google.com"
2021
onPress={() =>
2122
openAuthSessionAsync(
2223
'https://google.com',
23-
'https://account.google.com'
24+
'https://account.google.com',
2425
)
25-
}
26-
>
26+
}>
2727
Open auth browser window to Google.com
2828
</Button>
29+
<Button title="Dismiss Auth Session" onPress={() => dismissAuthSession()}>
30+
Dismiss Auth Session
31+
</Button>
32+
<Button title="Dismiss Browser" onPress={() => dismissBrowser()}>
33+
Dismiss Browser
34+
</Button>
2935
</View>
3036
);
3137
}

ios/WebBrowser.m

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ @interface RCT_EXTERN_MODULE(NativeWebBrowser, NSObject)
99
withResolver:(RCTPromiseResolveBlock)resolve
1010
withRejector:(RCTPromiseRejectBlock)reject)
1111

12+
1213
RCT_EXTERN_METHOD(dismissBrowser:(RCTPromiseResolveBlock)resolve
13-
withRejecter:(RCTPromiseRejectBlock)reject)
14+
withRejector:(RCTPromiseRejectBlock)reject)
1415

1516

1617
RCT_EXTERN_METHOD(openAuthSessionAsync:(NSString*)authUrlStr
@@ -21,23 +22,22 @@ @interface RCT_EXTERN_MODULE(NativeWebBrowser, NSObject)
2122

2223

2324
RCT_EXTERN_METHOD(dismissAuthSession:(RCTPromiseResolveBlock)resolve
24-
withRejecter:(RCTPromiseRejectBlock)reject)
25+
withRejector:(RCTPromiseRejectBlock)reject)
2526

2627

2728
RCT_EXTERN_METHOD(warmUpAsync:(RCTPromiseResolveBlock)resolve
28-
withRejecter:(RCTPromiseRejectBlock)reject)
29+
withRejecter:(RCTPromiseRejectBlock)reject)
2930

3031

3132
RCT_EXTERN_METHOD(coolDownAsync:(RCTPromiseResolveBlock)resolve
32-
withRejecter:(RCTPromiseRejectBlock)reject)
33-
33+
withRejecter:(RCTPromiseRejectBlock)reject)
3434

3535
RCT_EXTERN_METHOD(mayInitWithUrlAsync:(RCTPromiseResolveBlock)resolve
36-
withRejecter:(RCTPromiseRejectBlock)reject)
36+
withRejecter:(RCTPromiseRejectBlock)reject)
3737

3838

3939
RCT_EXTERN_METHOD(getCustomTabsSupportingBrowsers:(RCTPromiseResolveBlock)resolve
40-
withRejecter:(RCTPromiseRejectBlock)reject)
40+
withRejecter:(RCTPromiseRejectBlock)reject)
4141

4242

4343
@end

ios/WebBrowser.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class NativeWebBrowser: NSObject {
2727
}
2828

2929
@objc(dismissBrowser:withRejector:)
30-
func dismissBrowser(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
30+
func dismissBrowser(_ resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
3131
self.currentWebBrowserSession?.dismiss()
3232
self.currentWebBrowserSession = nil
3333
resolve(nil)
@@ -62,22 +62,22 @@ class NativeWebBrowser: NSObject {
6262
}
6363

6464
@objc(warmUpAsync:withRejector:)
65-
func warmUpAsync(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
65+
func warmUpAsync(_ resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
6666
resolve(nil)
6767
}
6868

6969
@objc(coolDownAsync:withRejector:)
70-
func coolDownAsync(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
70+
func coolDownAsync(_ resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
7171
resolve(nil)
7272
}
7373

7474
@objc(mayInitWithUrlAsync:withRejector:)
75-
func mayInitWithUrlAsync(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
75+
func mayInitWithUrlAsync(_ resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
7676
resolve(nil)
7777
}
7878

7979
@objc(getCustomTabsSupportingBrowsers:withRejector:)
80-
func getCustomTabsSupportingBrowsers(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
80+
func getCustomTabsSupportingBrowsers(_ resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
8181
resolve([])
8282
}
8383

0 commit comments

Comments
 (0)