react-native-webview-bootpay 13.13.4-4.alpha.1 → 13.13.4-6.alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/apple/BPCWebView.mm +18 -18
- package/apple/BPCWebViewModule.mm +1 -1
- package/package.json +1 -1
package/apple/BPCWebView.mm
CHANGED
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
|
|
13
13
|
using namespace facebook::react;
|
|
14
14
|
|
|
15
|
-
auto
|
|
15
|
+
auto BPCStringToOnShouldStartLoadWithRequestNavigationTypeEnum(std::string value) {
|
|
16
16
|
if (value == "click") return BPCWebViewEventEmitter::OnShouldStartLoadWithRequestNavigationType::Click;
|
|
17
17
|
if (value == "formsubmit") return BPCWebViewEventEmitter::OnShouldStartLoadWithRequestNavigationType::Formsubmit;
|
|
18
18
|
if (value == "backforward") return BPCWebViewEventEmitter::OnShouldStartLoadWithRequestNavigationType::Backforward;
|
|
@@ -21,7 +21,7 @@ auto stringToOnShouldStartLoadWithRequestNavigationTypeEnum(std::string value) {
|
|
|
21
21
|
return BPCWebViewEventEmitter::OnShouldStartLoadWithRequestNavigationType::Other;
|
|
22
22
|
}
|
|
23
23
|
|
|
24
|
-
auto
|
|
24
|
+
auto BPCStringToOnLoadingStartNavigationTypeEnum(std::string value) {
|
|
25
25
|
if (value == "click") return BPCWebViewEventEmitter::OnLoadingStartNavigationType::Click;
|
|
26
26
|
if (value == "formsubmit") return BPCWebViewEventEmitter::OnLoadingStartNavigationType::Formsubmit;
|
|
27
27
|
if (value == "backforward") return BPCWebViewEventEmitter::OnLoadingStartNavigationType::Backforward;
|
|
@@ -30,7 +30,7 @@ auto stringToOnLoadingStartNavigationTypeEnum(std::string value) {
|
|
|
30
30
|
return BPCWebViewEventEmitter::OnLoadingStartNavigationType::Other;
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
auto
|
|
33
|
+
auto BPCStringToOnLoadingFinishNavigationTypeEnum(std::string value) {
|
|
34
34
|
if (value == "click") return BPCWebViewEventEmitter::OnLoadingFinishNavigationType::Click;
|
|
35
35
|
if (value == "formsubmit") return BPCWebViewEventEmitter::OnLoadingFinishNavigationType::Formsubmit;
|
|
36
36
|
if (value == "backforward") return BPCWebViewEventEmitter::OnLoadingFinishNavigationType::Backforward;
|
|
@@ -77,11 +77,11 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
|
|
|
77
77
|
_view.onShouldStartLoadWithRequest = [self](NSDictionary* dictionary) {
|
|
78
78
|
if (_eventEmitter) {
|
|
79
79
|
auto webViewEventEmitter = std::static_pointer_cast<BPCWebViewEventEmitter const>(_eventEmitter);
|
|
80
|
-
facebook::react::
|
|
80
|
+
facebook::react::RNCWebViewEventEmitter::OnShouldStartLoadWithRequest data = {
|
|
81
81
|
.url = std::string([[dictionary valueForKey:@"url"] UTF8String]),
|
|
82
82
|
.lockIdentifier = [[dictionary valueForKey:@"lockIdentifier"] doubleValue],
|
|
83
83
|
.title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
|
|
84
|
-
.navigationType =
|
|
84
|
+
.navigationType = BPCStringToOnShouldStartLoadWithRequestNavigationTypeEnum(std::string([[dictionary valueForKey:@"navigationType"] UTF8String])),
|
|
85
85
|
.canGoBack = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
|
|
86
86
|
.canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoForward"] boolValue]),
|
|
87
87
|
.isTopFrame = static_cast<bool>([[dictionary valueForKey:@"isTopFrame"] boolValue]),
|
|
@@ -94,11 +94,11 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
|
|
|
94
94
|
_view.onLoadingStart = [self](NSDictionary* dictionary) {
|
|
95
95
|
if (_eventEmitter) {
|
|
96
96
|
auto webViewEventEmitter = std::static_pointer_cast<BPCWebViewEventEmitter const>(_eventEmitter);
|
|
97
|
-
facebook::react::
|
|
97
|
+
facebook::react::RNCWebViewEventEmitter::OnLoadingStart data = {
|
|
98
98
|
.url = std::string([[dictionary valueForKey:@"url"] UTF8String]),
|
|
99
99
|
.lockIdentifier = [[dictionary valueForKey:@"lockIdentifier"] doubleValue],
|
|
100
100
|
.title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
|
|
101
|
-
.navigationType =
|
|
101
|
+
.navigationType = BPCStringToOnLoadingStartNavigationTypeEnum(std::string([[dictionary valueForKey:@"navigationType"] UTF8String])),
|
|
102
102
|
.canGoBack = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
|
|
103
103
|
.canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoForward"] boolValue]),
|
|
104
104
|
.loading = static_cast<bool>([[dictionary valueForKey:@"loading"] boolValue]),
|
|
@@ -110,7 +110,7 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
|
|
|
110
110
|
_view.onLoadingError = [self](NSDictionary* dictionary) {
|
|
111
111
|
if (_eventEmitter) {
|
|
112
112
|
auto webViewEventEmitter = std::static_pointer_cast<BPCWebViewEventEmitter const>(_eventEmitter);
|
|
113
|
-
facebook::react::
|
|
113
|
+
facebook::react::RNCWebViewEventEmitter::OnLoadingError data = {
|
|
114
114
|
.url = std::string([[dictionary valueForKey:@"url"] UTF8String]),
|
|
115
115
|
.lockIdentifier = [[dictionary valueForKey:@"lockIdentifier"] doubleValue],
|
|
116
116
|
.title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
|
|
@@ -127,7 +127,7 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
|
|
|
127
127
|
_view.onMessage = [self](NSDictionary* dictionary) {
|
|
128
128
|
if (_eventEmitter) {
|
|
129
129
|
auto webViewEventEmitter = std::static_pointer_cast<BPCWebViewEventEmitter const>(_eventEmitter);
|
|
130
|
-
facebook::react::
|
|
130
|
+
facebook::react::RNCWebViewEventEmitter::OnMessage data = {
|
|
131
131
|
.url = std::string([[dictionary valueForKey:@"url"] UTF8String]),
|
|
132
132
|
.lockIdentifier = [[dictionary valueForKey:@"lockIdentifier"] doubleValue],
|
|
133
133
|
.title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
|
|
@@ -142,11 +142,11 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
|
|
|
142
142
|
_view.onLoadingFinish = [self](NSDictionary* dictionary) {
|
|
143
143
|
if (_eventEmitter) {
|
|
144
144
|
auto webViewEventEmitter = std::static_pointer_cast<BPCWebViewEventEmitter const>(_eventEmitter);
|
|
145
|
-
facebook::react::
|
|
145
|
+
facebook::react::RNCWebViewEventEmitter::OnLoadingFinish data = {
|
|
146
146
|
.url = std::string([[dictionary valueForKey:@"url"] UTF8String]),
|
|
147
147
|
.lockIdentifier = [[dictionary valueForKey:@"lockIdentifier"] doubleValue],
|
|
148
148
|
.title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
|
|
149
|
-
.navigationType =
|
|
149
|
+
.navigationType = BPCStringToOnLoadingFinishNavigationTypeEnum(std::string([[dictionary valueForKey:@"navigationType"] UTF8String], [[dictionary valueForKey:@"navigationType"] lengthOfBytesUsingEncoding:NSUTF8StringEncoding])),
|
|
150
150
|
.canGoBack = static_cast<bool>([[dictionary valueForKey:@"canGoBack"] boolValue]),
|
|
151
151
|
.canGoForward = static_cast<bool>([[dictionary valueForKey:@"canGoForward"] boolValue]),
|
|
152
152
|
.loading = static_cast<bool>([[dictionary valueForKey:@"loading"] boolValue]),
|
|
@@ -158,7 +158,7 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
|
|
|
158
158
|
_view.onLoadingProgress = [self](NSDictionary* dictionary) {
|
|
159
159
|
if (_eventEmitter) {
|
|
160
160
|
auto webViewEventEmitter = std::static_pointer_cast<BPCWebViewEventEmitter const>(_eventEmitter);
|
|
161
|
-
facebook::react::
|
|
161
|
+
facebook::react::RNCWebViewEventEmitter::OnLoadingProgress data = {
|
|
162
162
|
.url = std::string([[dictionary valueForKey:@"url"] UTF8String]),
|
|
163
163
|
.lockIdentifier = [[dictionary valueForKey:@"lockIdentifier"] doubleValue],
|
|
164
164
|
.title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
|
|
@@ -173,7 +173,7 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
|
|
|
173
173
|
_view.onContentProcessDidTerminate = [self](NSDictionary* dictionary) {
|
|
174
174
|
if (_eventEmitter) {
|
|
175
175
|
auto webViewEventEmitter = std::static_pointer_cast<BPCWebViewEventEmitter const>(_eventEmitter);
|
|
176
|
-
facebook::react::
|
|
176
|
+
facebook::react::RNCWebViewEventEmitter::OnContentProcessDidTerminate data = {
|
|
177
177
|
.url = std::string([[dictionary valueForKey:@"url"] UTF8String]),
|
|
178
178
|
.lockIdentifier = [[dictionary valueForKey:@"lockIdentifier"] doubleValue],
|
|
179
179
|
.title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
|
|
@@ -187,7 +187,7 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
|
|
|
187
187
|
_view.onCustomMenuSelection = [self](NSDictionary* dictionary) {
|
|
188
188
|
if (_eventEmitter) {
|
|
189
189
|
auto webViewEventEmitter = std::static_pointer_cast<BPCWebViewEventEmitter const>(_eventEmitter);
|
|
190
|
-
facebook::react::
|
|
190
|
+
facebook::react::RNCWebViewEventEmitter::OnCustomMenuSelection data = {
|
|
191
191
|
.selectedText = std::string([[dictionary valueForKey:@"selectedText"] UTF8String]),
|
|
192
192
|
.key = std::string([[dictionary valueForKey:@"key"] UTF8String]),
|
|
193
193
|
.label = std::string([[dictionary valueForKey:@"label"] UTF8String])
|
|
@@ -205,7 +205,7 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
|
|
|
205
205
|
double zoomScale = [[dictionary valueForKey:@"zoomScale"] doubleValue];
|
|
206
206
|
|
|
207
207
|
auto webViewEventEmitter = std::static_pointer_cast<BPCWebViewEventEmitter const>(_eventEmitter);
|
|
208
|
-
facebook::react::
|
|
208
|
+
facebook::react::RNCWebViewEventEmitter::OnScroll data = {
|
|
209
209
|
.contentOffset = {
|
|
210
210
|
.x = [[contentOffset valueForKey:@"x"] doubleValue],
|
|
211
211
|
.y = [[contentOffset valueForKey:@"y"] doubleValue]
|
|
@@ -231,7 +231,7 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
|
|
|
231
231
|
_view.onHttpError = [self](NSDictionary* dictionary) {
|
|
232
232
|
if (_eventEmitter) {
|
|
233
233
|
auto webViewEventEmitter = std::static_pointer_cast<BPCWebViewEventEmitter const>(_eventEmitter);
|
|
234
|
-
facebook::react::
|
|
234
|
+
facebook::react::RNCWebViewEventEmitter::OnHttpError data = {
|
|
235
235
|
.url = std::string([[dictionary valueForKey:@"url"] UTF8String]),
|
|
236
236
|
.lockIdentifier = [[dictionary valueForKey:@"lockIdentifier"] doubleValue],
|
|
237
237
|
.title = std::string([[dictionary valueForKey:@"title"] UTF8String]),
|
|
@@ -406,7 +406,7 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
|
|
|
406
406
|
_view.onFileDownload = [self](NSDictionary* dictionary) {
|
|
407
407
|
if (_eventEmitter) {
|
|
408
408
|
auto webViewEventEmitter = std::static_pointer_cast<BPCWebViewEventEmitter const>(_eventEmitter);
|
|
409
|
-
facebook::react::
|
|
409
|
+
facebook::react::RNCWebViewEventEmitter::OnFileDownload data = {
|
|
410
410
|
.downloadUrl = std::string([[dictionary valueForKey:@"downloadUrl"] UTF8String])
|
|
411
411
|
};
|
|
412
412
|
webViewEventEmitter->onFileDownload(data);
|
|
@@ -421,7 +421,7 @@ auto stringToOnLoadingFinishNavigationTypeEnum(std::string value) {
|
|
|
421
421
|
_view.onOpenWindow = [self](NSDictionary* dictionary) {
|
|
422
422
|
if (_eventEmitter) {
|
|
423
423
|
auto webViewEventEmitter = std::static_pointer_cast<BPCWebViewEventEmitter const>(_eventEmitter);
|
|
424
|
-
facebook::react::
|
|
424
|
+
facebook::react::RNCWebViewEventEmitter::OnOpenWindow data = {
|
|
425
425
|
.targetUrl = std::string([[dictionary valueForKey:@"targetUrl"] UTF8String])
|
|
426
426
|
};
|
|
427
427
|
webViewEventEmitter->onOpenWindow(data);
|
|
@@ -23,7 +23,7 @@ RCT_EXPORT_METHOD(shouldStartLoadWithLockIdentifier:(BOOL)shouldStart lockIdenti
|
|
|
23
23
|
|
|
24
24
|
#ifdef RCT_NEW_ARCH_ENABLED
|
|
25
25
|
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params {
|
|
26
|
-
return std::make_shared<facebook::react::
|
|
26
|
+
return std::make_shared<facebook::react::NativeRNCWebViewModuleSpecJSI>(params);
|
|
27
27
|
}
|
|
28
28
|
#endif /* RCT_NEW_ARCH_ENABLED */
|
|
29
29
|
|
package/package.json
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"Thibault Malbranche <malbranche.thibault@gmail.com>"
|
|
11
11
|
],
|
|
12
12
|
"license": "MIT",
|
|
13
|
-
"version": "13.13.
|
|
13
|
+
"version": "13.13.46.alpha.1",
|
|
14
14
|
"homepage": "https://github.com/react-native-webview/react-native-webview#readme",
|
|
15
15
|
"scripts": {
|
|
16
16
|
"android": "react-native run-android",
|