Skip to content

Commit 42d5eb1

Browse files
authored
Merge pull request #93 from emkman/release/v0.4.1
Use same init wrapper on iOS as Android to handle optional param
2 parents 629979e + 41e4429 commit 42d5eb1

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

index.js

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
1-
import { NativeModules, Platform } from "react-native";
1+
import { NativeModules } from "react-native";
22

33
const RNZendeskChatModule = NativeModules.RNZendeskChatModule;
44

5-
Platform.select({
6-
default: () => {
7-
return;
8-
},
9-
android: () => {
10-
// react-native android doesn't support Java method overloading
11-
// So this code implements the init method but makes sure to call
12-
// the right Java Code making sure there's a value for each parameter
13-
// Reference: https://github.com/facebook/react-native/blob/07d090dbc6c46b8f3760dbd25dbe0540c18cb3f3/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java#L85-L86
14-
RNZendeskChatModule.init = (key, appId) => {
15-
return RNZendeskChatModule._initWith2Args(key, appId || null);
16-
};
17-
},
18-
})();
5+
// react-native doesn't support method overloading for Java or Objective-C
6+
// So this code implements the init method but makes sure to
7+
// always call it with two defined parameters, passing null for the second as needed
8+
// Reference: https://github.com/facebook/react-native/blob/07d090dbc6c46b8f3760dbd25dbe0540c18cb3f3/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaModuleWrapper.java#L85-L86
9+
10+
RNZendeskChatModule.init = (key, appId) => {
11+
return RNZendeskChatModule._initWith2Args(key, appId || null);
12+
};
1913

2014
/**
2115
* TypeScript Documentation for this Module describes the available methods & parameters

ios/RNZendeskChatModule.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ - (void) dismissChatUI {
187187
[RCTPresentedViewController() dismissViewControllerAnimated:YES completion:nil];
188188
}
189189

190-
RCT_EXPORT_METHOD(init:(NSString *)zenDeskKey appId:(NSString *)appId) {
190+
RCT_EXPORT_METHOD(_initWith2Args:(NSString *)zenDeskKey appId:(NSString *)appId) {
191191
if (appId) {
192192
[ZDKChat initializeWithAccountKey:zenDeskKey appId:appId queue:dispatch_get_main_queue()];
193193
} else {

0 commit comments

Comments
 (0)