0.10.0

Author: zoyi-jin

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.10.0
+
+## Update
+* Migrated to TypeScript
+* support android channel-io 12.5.2
+* support iOS channel-io 12.4.1
+
 # 0.9.3
 
 ## Update

RNChannelIO.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "RNChannelIO"
-  s.version      = "0.3.0"
+  s.version      = "0.4.0"
   s.summary      = "RNChannelIO"
   s.description  = "channel plugin for react native"
   s.homepage     = "https://channel.io"
@@ -15,5 +15,5 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '12.0'
 
   s.dependency "React"
-  s.dependency "ChannelIOSDK", '~> 12'
+  s.dependency "ChannelIOSDK", '12.4.1'
 end

index.ts

@@ -66,12 +66,12 @@ export interface PopupData {
 }
 
 export interface UserData {
-  language: Language
+  language?: Language
   tags?: string[]
   profile?: Profile
   profileOnce?: Record<string, any>
-  unsubscribeEmail: boolean
-  unsubscribeTexting: boolean
+  unsubscribeEmail?: boolean
+  unsubscribeTexting?: boolean
 }
 
 export interface BootConfig {

ios/RCTConvert+ChannelIO.h

@@ -13,9 +13,9 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTConvert (ChannelIO)
-+ (BootConfig *)bootConfig:(id)json;
-+ (Profile *)profile:(id)json;
-+ (ChannelButtonOption *)channelButtonOption:(id)json;
++ (CHTBootConfig *)bootConfig:(id)json;
++ (CHTProfile *)profile:(id)json;
++ (CHTChannelButtonOption *)channelButtonOption:(id)json;
 @end
 
 // LanguageOption

ios/RCTConvert+ChannelIO.m

@@ -13,7 +13,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface RNChannelIO : RCTEventEmitter <RCTBridgeModule, ChannelPluginDelegate>
+@interface RNChannelIO : RCTEventEmitter <RCTBridgeModule, CHTChannelPluginDelegate>
 @end
 
 // event key

ios/RNChannelIO.h

@@ -57,59 +57,59 @@ -(void)stopObserving {
 - (NSDictionary *)constantsToExport {
   return @{
     EVENT: @{
-        KEY_EVENT_ON_BADGE_CHANGED: EVENT_ON_BADGE_CHANGED,
-        KEY_EVENT_ON_FOLLOW_UP_CHANGED: EVENT_ON_FOLLOW_UP_CHANGED,
-        KEY_EVENT_ON_POPUP_DATA_RECEIVED: EVENT_ON_POPUP_DATA_RECEIVED,
-        KEY_EVENT_ON_SHOW_MESSENGER: EVENT_ON_SHOW_MESSENGER,
-        KEY_EVENT_ON_HIDE_MESSENGER: EVENT_ON_HIDE_MESSENGER,
-        KEY_EVENT_ON_CHAT_CREATED: EVENT_ON_CHAT_CREATED,
-        KEY_EVENT_ON_PRE_URL_CLICKED: EVENT_ON_PRE_URL_CLICKED,
-        KEY_EVENT_ON_URL_CLICKED: EVENT_ON_URL_CLICKED
+      KEY_EVENT_ON_BADGE_CHANGED: EVENT_ON_BADGE_CHANGED,
+      KEY_EVENT_ON_FOLLOW_UP_CHANGED: EVENT_ON_FOLLOW_UP_CHANGED,
+      KEY_EVENT_ON_POPUP_DATA_RECEIVED: EVENT_ON_POPUP_DATA_RECEIVED,
+      KEY_EVENT_ON_SHOW_MESSENGER: EVENT_ON_SHOW_MESSENGER,
+      KEY_EVENT_ON_HIDE_MESSENGER: EVENT_ON_HIDE_MESSENGER,
+      KEY_EVENT_ON_CHAT_CREATED: EVENT_ON_CHAT_CREATED,
+      KEY_EVENT_ON_PRE_URL_CLICKED: EVENT_ON_PRE_URL_CLICKED,
+      KEY_EVENT_ON_URL_CLICKED: EVENT_ON_URL_CLICKED
     },
     LANGUAGE: @{
-        KEY_LANGUAGE_KOREAN: @(LanguageOptionKorean),
-        KEY_LANGUAGE_ENGLISH: @(LanguageOptionEnglish),
-        KEY_LANGUAGE_JAPANESE: @(LanguageOptionJapanese),
-        KEY_LANGUAGE_DEVICE: @(LanguageOptionDevice)
+      KEY_LANGUAGE_KOREAN: @(CHTLanguageOptionKorean),
+      KEY_LANGUAGE_ENGLISH: @(CHTLanguageOptionEnglish),
+      KEY_LANGUAGE_JAPANESE: @(CHTLanguageOptionJapanese),
+      KEY_LANGUAGE_DEVICE: @(CHTLanguageOptionDevice)
     },
     BOOT_STATUS: @{
-        KEY_BOOT_STATUS_SUCCESS: @(BootStatusSuccess),
-        KEY_BOOT_STATUS_NOT_INITIALIZED: @(BootStatusNotInitialized),
-        KEY_BOOT_STATUS_NETWORK_TIMEOUT: @(BootStatusNetworkTimeout),
-        KEY_BOOT_STATUS_NOT_AVAILABLE_VERSION: @(BootStatusNotAvailableVersion),
-        KEY_BOOT_STATUS_SERVICE_UNDER_CONSTRUCTION: @(BootStatusServiceUnderConstruction),
-        KEY_BOOT_STATUS_REQUIRE_PAYMENT: @(BootStatusRequirePayment),
-        KEY_BOOT_STATUS_ACCESS_DENIED: @(BootStatusAccessDenied),
-        KEY_BOOT_STATUS_UNKNOWN_ERROR: @(BootStatusUnknown)
+      KEY_BOOT_STATUS_SUCCESS: @(CHTBootStatusSuccess),
+      KEY_BOOT_STATUS_NOT_INITIALIZED: @(CHTBootStatusNotInitialized),
+      KEY_BOOT_STATUS_NETWORK_TIMEOUT: @(CHTBootStatusNetworkTimeout),
+      KEY_BOOT_STATUS_NOT_AVAILABLE_VERSION: @(CHTBootStatusNotAvailableVersion),
+      KEY_BOOT_STATUS_SERVICE_UNDER_CONSTRUCTION: @(CHTBootStatusServiceUnderConstruction),
+      KEY_BOOT_STATUS_REQUIRE_PAYMENT: @(CHTBootStatusRequirePayment),
+      KEY_BOOT_STATUS_ACCESS_DENIED: @(CHTBootStatusAccessDenied),
+      KEY_BOOT_STATUS_UNKNOWN_ERROR: @(CHTBootStatusUnknown)
     },
     CHANNEL_BUTTON_ICON: @{
-      KEY_CHANNEL_BUTTON_OPTION_ICON_CHANNEL: @(ChannelButtonIconChannel),
-      KEY_CHANNEL_BUTTON_OPTION_ICON_CHAT_BUBBLE_FILLED: @(ChannelButtonIconChatBubbleFilled),
-      KEY_CHANNEL_BUTTON_OPTION_ICON_CHAT_PROGRESS_FILLED: @(ChannelButtonIconChatProgressFilled),
-      KEY_CHANNEL_BUTTON_OPTION_ICON_CHAT_QUESTION_FILLED: @(ChannelButtonIconChatQuestionFilled),
-      KEY_CHANNEL_BUTTON_OPTION_ICON_CHAT_LIGHTNING_FILLED: @(ChannelButtonIconChatLightningFilled),
-      KEY_CHANNEL_BUTTON_OPTION_ICON_CHAT_BUBBLE_ALT_FILLED: @(ChannelButtonIconChatBubbleAltFilled),
-      KEY_CHANNEL_BUTTON_OPTION_ICON_SMS_FILLED: @(ChannelButtonIconSmsFilled),
-      KEY_CHANNEL_BUTTON_OPTION_ICON_COMMENT_FILLED: @(ChannelButtonIconCommentFilled),
-      KEY_CHANNEL_BUTTON_OPTION_ICON_SEND_FORWARD_FILLED: @(ChannelButtonIconSendForwardFilled),
-      KEY_CHANNEL_BUTTON_OPTION_ICON_HELP_FILLED: @(ChannelButtonIconHelpFilled),
-      KEY_CHANNEL_BUTTON_OPTION_ICON_CHAT_PROGRESS: @(ChannelButtonIconChatProgress),
-      KEY_CHANNEL_BUTTON_OPTION_ICON_CHAT_QUESTION: @(ChannelButtonIconChatQuestion),
-      KEY_CHANNEL_BUTTON_OPTION_ICON_CHAT_BUBBLE_ALT: @(ChannelButtonIconChatBubbleAlt),
-      KEY_CHANNEL_BUTTON_OPTION_ICON_SMS: @(ChannelButtonIconSms),
-      KEY_CHANNEL_BUTTON_OPTION_ICON_COMMENT: @(ChannelButtonIconComment),
-      KEY_CHANNEL_BUTTON_OPTION_ICON_SEND_FORWARD: @(ChannelButtonIconSendForward),
-      KEY_CHANNEL_BUTTON_OPTION_ICON_COMMUNICATION: @(ChannelButtonIconCommunication),
-      KEY_CHANNEL_BUTTON_OPTION_ICON_HEADSET: @(ChannelButtonIconHeadset)
+      KEY_CHANNEL_BUTTON_OPTION_ICON_CHANNEL: @(CHTChannelButtonIconChannel),
+      KEY_CHANNEL_BUTTON_OPTION_ICON_CHAT_BUBBLE_FILLED: @(CHTChannelButtonIconChatBubbleFilled),
+      KEY_CHANNEL_BUTTON_OPTION_ICON_CHAT_PROGRESS_FILLED: @(CHTChannelButtonIconChatProgressFilled),
+      KEY_CHANNEL_BUTTON_OPTION_ICON_CHAT_QUESTION_FILLED: @(CHTChannelButtonIconChatQuestionFilled),
+      KEY_CHANNEL_BUTTON_OPTION_ICON_CHAT_LIGHTNING_FILLED: @(CHTChannelButtonIconChatLightningFilled),
+      KEY_CHANNEL_BUTTON_OPTION_ICON_CHAT_BUBBLE_ALT_FILLED: @(CHTChannelButtonIconChatBubbleAltFilled),
+      KEY_CHANNEL_BUTTON_OPTION_ICON_SMS_FILLED: @(CHTChannelButtonIconSmsFilled),
+      KEY_CHANNEL_BUTTON_OPTION_ICON_COMMENT_FILLED: @(CHTChannelButtonIconCommentFilled),
+      KEY_CHANNEL_BUTTON_OPTION_ICON_SEND_FORWARD_FILLED: @(CHTChannelButtonIconSendForwardFilled),
+      KEY_CHANNEL_BUTTON_OPTION_ICON_HELP_FILLED: @(CHTChannelButtonIconHelpFilled),
+      KEY_CHANNEL_BUTTON_OPTION_ICON_CHAT_PROGRESS: @(CHTChannelButtonIconChatProgress),
+      KEY_CHANNEL_BUTTON_OPTION_ICON_CHAT_QUESTION: @(CHTChannelButtonIconChatQuestion),
+      KEY_CHANNEL_BUTTON_OPTION_ICON_CHAT_BUBBLE_ALT: @(CHTChannelButtonIconChatBubbleAlt),
+      KEY_CHANNEL_BUTTON_OPTION_ICON_SMS: @(CHTChannelButtonIconSms),
+      KEY_CHANNEL_BUTTON_OPTION_ICON_COMMENT: @(CHTChannelButtonIconComment),
+      KEY_CHANNEL_BUTTON_OPTION_ICON_SEND_FORWARD: @(CHTChannelButtonIconSendForward),
+      KEY_CHANNEL_BUTTON_OPTION_ICON_COMMUNICATION: @(CHTChannelButtonIconCommunication),
+      KEY_CHANNEL_BUTTON_OPTION_ICON_HEADSET: @(CHTChannelButtonIconHeadset)
     },
     CHANNEL_BUTTON_POSITION: @{
-        KEY_CHANNEL_BUTTON_OPTION_POSITION_RIGHT: @(ChannelButtonPositionRight),
-        KEY_CHANNEL_BUTTON_OPTION_POSITION_LEFT: @(ChannelButtonPositionLeft)
+      KEY_CHANNEL_BUTTON_OPTION_POSITION_RIGHT: @(CHTChannelButtonPositionRight),
+      KEY_CHANNEL_BUTTON_OPTION_POSITION_LEFT: @(CHTChannelButtonPositionLeft)
     },
     CHANNEL_APPEARANCE: @{
-      KEY_APPEARANCE_SYSTEM: @(AppearanceSystem),
-      KEY_APPEARANCE_DARK: @(AppearanceDark),
-      KEY_APPEARANCE_LIGHT: @(AppearanceLight)
+      KEY_APPEARANCE_SYSTEM: @(CHTAppearanceSystem),
+      KEY_APPEARANCE_DARK: @(CHTAppearanceDark),
+      KEY_APPEARANCE_LIGHT: @(CHTAppearanceLight)
     },
   };
 }
@@ -130,38 +130,38 @@ - (NSDictionary *)constantsToExport {
 RCT_EXPORT_METHOD(boot:(id)bootConfig
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
-  BootConfig * config = [RCTConvert bootConfig:bootConfig];
-
-  [ChannelIO bootWith:config completion:^(BootStatus status, User *user) {
+  CHTBootConfig * config = [RCTConvert bootConfig:bootConfig];
+  
+  [ChannelIO bootWith:config completion:^(CHTBootStatus status, CHTUser *user) {
     NSString * stringStatus = BOOT_STATUS_UNKNOWN_ERROR;
     switch (status) {
-      case BootStatusSuccess:
+      case CHTBootStatusSuccess:
         stringStatus = BOOT_STATUS_SUCCESS;
         break;
-      case BootStatusNotInitialized:
+      case CHTBootStatusNotInitialized:
         stringStatus = BOOT_STATUS_NOT_INITIALIZED;
         break;
-      case BootStatusNetworkTimeout:
+      case CHTBootStatusNetworkTimeout:
         stringStatus = BOOT_STATUS_NETWORK_TIMEOUT;
         break;
-      case BootStatusNotAvailableVersion:
+      case CHTBootStatusNotAvailableVersion:
         stringStatus = BOOT_STATUS_NOT_AVAILABLE_VERSION;
         break;
-      case BootStatusServiceUnderConstruction:
+      case CHTBootStatusServiceUnderConstruction:
         stringStatus = BOOT_STATUS_SERVICE_UNDER_CONSTRUCTION;
         break;
-      case BootStatusRequirePayment:
+      case CHTBootStatusRequirePayment:
         stringStatus = BOOT_STATUS_REQUIRE_PAYMENT;
         break;
-      case BootStatusAccessDenied:
+      case CHTBootStatusAccessDenied:
         stringStatus = BOOT_STATUS_ACCESS_DENIED;
         break;
       default:
         stringStatus = BOOT_STATUS_UNKNOWN_ERROR;
         break;
     }
 
-    if (status == BootStatusSuccess && user != nil) {
+    if (status == CHTBootStatusSuccess && user != nil) {
       resolve(@{KEY_STATUS: stringStatus, KEY_USER: user.toJson});
     } else {
       resolve(@{KEY_STATUS: stringStatus});
@@ -245,29 +245,29 @@ - (NSDictionary *)constantsToExport {
 RCT_EXPORT_METHOD(updateUser:(NSDictionary<NSString *, id> *)userData
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
-  UpdateUserParamObjcBuilder *builder = [[UpdateUserParamObjcBuilder alloc] init];
+  CHTUpdateUserParamObjcBuilder *builder = [[CHTUpdateUserParamObjcBuilder alloc] init];
 
   if ([[userData allKeys] containsObject:KEY_LANGUAGE]) {
     NSString *language = [RCTConvert NSString:userData[KEY_LANGUAGE]];
     if ([language isEqualToString:LANGUAGE_OPTION_KO]) {
-      [builder withLanguage:LanguageOptionKorean];
+      [builder withLanguage:CHTLanguageOptionKorean];
     } else if ([language isEqualToString:LANGUAGE_OPTION_JA]) {
-      [builder withLanguage:LanguageOptionJapanese];
+      [builder withLanguage:CHTLanguageOptionJapanese];
     } else if ([language isEqualToString:LANGUAGE_OPTION_EN]) {
-      [builder withLanguage:LanguageOptionEnglish];
+      [builder withLanguage:CHTLanguageOptionEnglish];
     } else {
-      [builder withLanguage:LanguageOptionDevice];
+      [builder withLanguage:CHTLanguageOptionDevice];
     }
   } else if ([[userData allKeys] containsObject:KEY_LOCALE]) {
     NSString *locale = [RCTConvert NSString:userData[KEY_LOCALE]];
     if ([locale isEqualToString:LANGUAGE_OPTION_KO]) {
-      [builder withLanguage:LanguageOptionKorean];
+      [builder withLanguage:CHTLanguageOptionKorean];
     } else if ([locale isEqualToString:LANGUAGE_OPTION_JA]) {
-      [builder withLanguage:LanguageOptionJapanese];
+      [builder withLanguage:CHTLanguageOptionJapanese];
     } else if ([locale isEqualToString:LANGUAGE_OPTION_EN]) {
-      [builder withLanguage:LanguageOptionEnglish];
+      [builder withLanguage:CHTLanguageOptionEnglish];
     } else {
-      [builder withLanguage:LanguageOptionDevice];
+      [builder withLanguage:CHTLanguageOptionDevice];
     }
   }
 
@@ -300,8 +300,8 @@ - (NSDictionary *)constantsToExport {
       [builder withTags:[RCTConvert NSArray:userData[KEY_TAGS]]];
     }
   }
-
-  [ChannelIO updateUserWithParam:[builder build] completion:^(NSError *error, User *user) {
+  
+  [ChannelIO updateUserWithParam:[builder build] completion:^(NSError *error, CHTUser *user) {
     NSMutableDictionary<NSString *, id> *result = [NSMutableDictionary dictionary];
 
     if (user != nil) {
@@ -323,7 +323,7 @@ - (NSDictionary *)constantsToExport {
 RCT_EXPORT_METHOD(addTags:(NSArray<NSString *> *)tags
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
-  [ChannelIO addTags:tags completion:^(NSError *error, User *user) {
+  [ChannelIO addTags:tags completion:^(NSError *error, CHTUser *user) {
     NSMutableDictionary<NSString *, id> *result = [NSMutableDictionary dictionary];
 
     if (user != nil) {
@@ -345,7 +345,7 @@ - (NSDictionary *)constantsToExport {
 RCT_EXPORT_METHOD(removeTags:(NSArray<NSString *> *)tags
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
-  [ChannelIO removeTags:tags completion:^(NSError *error, User *user) {
+  [ChannelIO removeTags:tags completion:^(NSError *error, CHTUser *user) {
     NSMutableDictionary<NSString *, id> *result = [NSMutableDictionary dictionary];
 
     if (user != nil) {
@@ -391,11 +391,11 @@ - (NSDictionary *)constantsToExport {
 RCT_EXPORT_METHOD(setAppearance:(NSString *)appearance) {
   if (appearance != nil) {
     if ([appearance isEqualToString:APPEARANCE_SYSTEM]) {
-      [ChannelIO setAppearance:AppearanceSystem];
+      [ChannelIO setAppearance:CHTAppearanceSystem];
     } else if ([appearance isEqualToString:APPEARANCE_LIGHT]) {
-      [ChannelIO setAppearance:AppearanceLight];
+      [ChannelIO setAppearance:CHTAppearanceLight];
     } else if ([appearance isEqualToString:APPEARANCE_DARK]) {
-      [ChannelIO setAppearance:AppearanceDark];
+      [ChannelIO setAppearance:CHTAppearanceDark];
     }
   }
 }
@@ -411,7 +411,7 @@ - (void)onBadgeChangedWithUnread:(NSInteger)unread alert:(NSInteger)alert {
   }
 }
 
-- (void)onPopupDataReceivedWithEvent:(PopupData *)event {
+- (void)onPopupDataReceivedWithEvent:(CHTPopupData *)event {
   if (hasListeners) {
     [self sendEventWithName:EVENT_ON_POPUP_DATA_RECEIVED body:@{KEY_POPUP: event.toJson}];
   }

ios/RNChannelIO.m

@@ -1,8 +1,8 @@
 {
   "name": "react-native-channel-plugin",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "description": "react native module for channel io",
-  "main": "index.js",
+  "main": "index.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },