clevertap-react-native 1.0.2 → 1.1.0

package/ios/CleverTapReact/CleverTapReact.m

@@ -17,11 +17,14 @@
 #import "CleverTapInstanceConfig.h"
 #import "CTLocalInApp.h"
 #import "Clevertap+PushPermission.h"
+#import "CleverTap+CTVar.h"
+#import "CTVar.h"
 
 static NSDateFormatter *dateFormatter;
 
 @interface CleverTapReact()
 @property CleverTap *cleverTapInstance;
+@property(nonatomic, strong) NSMutableDictionary *allVariables;
 @end
 
 @implementation CleverTapReact
@@ -52,6 +55,10 @@ RCT_EXPORT_MODULE();
         kCleverTapPushNotificationClicked: kCleverTapPushNotificationClicked,
         kCleverTapPushPermissionResponseReceived: kCleverTapPushPermissionResponseReceived,
         kCleverTapInAppNotificationShowed: kCleverTapInAppNotificationShowed,
+        kCleverTapOnVariablesChanged:
+            kCleverTapOnVariablesChanged,
+        kCleverTapOnValueChanged:
+            kCleverTapOnValueChanged,
         kXPS: kXPS
     };
 }
@@ -63,6 +70,15 @@ RCT_EXPORT_MODULE();
 
 # pragma mark - Launch
 
+- (instancetype)init
+{
+    self = [super init];
+    if (self) {
+        self.allVariables = [NSMutableDictionary dictionary];
+    }
+    return self;
+}
+
 - (CleverTap *)cleverTapInstance {
     if (_cleverTapInstance != nil) {
         return _cleverTapInstance;
@@ -97,6 +113,11 @@ RCT_EXPORT_METHOD(getInitialUrl:(RCTResponseSenderBlock)callback) {
     }
 }
 
+RCT_EXPORT_METHOD(setLibrary:(NSString*)name andVersion:(int)version) {
+    RCTLogInfo(@"[CleverTap setLibrary:%@ andVersion:%d]", name, version);
+    [[self cleverTapInstance] setLibrary:name];
+    [[self cleverTapInstance] setCustomSdkVersion:name version:version];
+}
 
 #pragma mark - Push Notifications
 
@@ -479,6 +500,36 @@ RCT_EXPORT_METHOD(setDebugLevel:(int)level) {
     return _profile;
 }
 
+- (CTVar *)createVarForName:(NSString *)name andValue:(id)value {
+
+    if ([value isKindOfClass:[NSString class]]) {
+        return [[self cleverTapInstance]defineVar:name withString:value];
+    }
+    if ([value isKindOfClass:[NSDictionary class]]) {
+        return [[self cleverTapInstance]defineVar:name withDictionary:value];
+    }
+    if ([value isKindOfClass:[NSNumber class]]) {
+        if ([self isBoolNumber:value]) {
+            return [[self cleverTapInstance]defineVar:name withBool:value];
+        }
+        return [[self cleverTapInstance]defineVar:name withNumber:value];
+    }
+    return nil;
+}
+
+- (BOOL)isBoolNumber:(NSNumber *)number {
+    CFTypeID boolID = CFBooleanGetTypeID();
+    CFTypeID numID = CFGetTypeID(CFBridgingRetain(number));
+    return (numID == boolID);
+}
+
+- (NSMutableDictionary *)getVariableValues {
+    NSMutableDictionary *varValues = [NSMutableDictionary dictionary];
+    [self.allVariables enumerateKeysAndObjectsUsingBlock:^(id  _Nonnull key, CTVar*  _Nonnull var, BOOL * _Nonnull stop) {
+        varValues[key] = var.value;
+    }];
+    return varValues;
+}
 
 #pragma mark - App Inbox
 
@@ -543,15 +594,33 @@ RCT_EXPORT_METHOD(deleteInboxMessageForId:(NSString*)messageId) {
     [[self cleverTapInstance] deleteInboxMessageForID:messageId];
 }
 
+RCT_EXPORT_METHOD(markReadInboxMessagesForIDs:(NSArray*)messageIds) {
+    if (!messageIds) return;
+    RCTLogInfo(@"[CleverTap markReadInboxMessagesForIDs]");
+    [[self cleverTapInstance] markReadInboxMessagesForIDs:messageIds];
+}
+
+RCT_EXPORT_METHOD(deleteInboxMessagesForIDs:(NSArray*)messageIds) {
+    if (!messageIds) return;
+    RCTLogInfo(@"[CleverTap deleteInboxMessagesForIDs]");
+    [[self cleverTapInstance] deleteInboxMessagesForIDs:messageIds];
+}
+
+RCT_EXPORT_METHOD(dismissInbox) {
+    RCTLogInfo(@"[CleverTap dismissAppInbox]");
+    [[self cleverTapInstance] dismissAppInbox];
+}
+
 RCT_EXPORT_METHOD(initializeInbox) {
     RCTLogInfo(@"[CleverTap Inbox Initialize]");
     [[self cleverTapInstance] initializeInboxWithCallback:^(BOOL success) {
         if (success) {
             RCTLogInfo(@"[Inbox initialized]");
-            [[NSNotificationCenter defaultCenter] postNotificationName:kCleverTapInboxDidInitialize object:nil userInfo:nil];
+            NSMutableDictionary *body = [NSMutableDictionary new];
+            [[NSNotificationCenter defaultCenter] postNotificationName:kCleverTapInboxDidInitialize object:nil userInfo:body];
             [[self cleverTapInstance] registerInboxUpdatedBlock:^{
                 RCTLogInfo(@"[Inbox updated]");
-                [[NSNotificationCenter defaultCenter] postNotificationName:kCleverTapInboxMessagesDidUpdate object:nil userInfo:nil];
+                [[NSNotificationCenter defaultCenter] postNotificationName:kCleverTapInboxMessagesDidUpdate object:nil userInfo:body];
             }];
         }
     }];
@@ -644,13 +713,13 @@ RCT_EXPORT_METHOD(showInbox:(NSDictionary*)styleConfig) {
 - (void)messageDidSelect:(CleverTapInboxMessage *_Nonnull)message atIndex:(int)index withButtonIndex:(int)buttonIndex {
     NSMutableDictionary *body = [NSMutableDictionary new];
     if ([message json] != nil) {
-        NSError *error;
-        NSData *jsonData = [NSJSONSerialization dataWithJSONObject:[message json]
-                                                                   options:0
-                                                                   error:&error];
-        NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-        body[@"data"] = jsonString;
+        body[@"data"] = [NSMutableDictionary dictionaryWithDictionary:[message json]];
+    } else {
+        body[@"data"] = [NSMutableDictionary new];
     }
+    body[@"contentPageIndex"] = @(index);
+    body[@"buttonIndex"] = @(buttonIndex);
+
     [[NSNotificationCenter defaultCenter] postNotificationName:kCleverTapInboxMessageTapped object:nil userInfo:body];
 }
 
@@ -878,5 +947,70 @@ RCT_EXPORT_METHOD(isPushPermissionGranted:(RCTResponseSenderBlock)callback){
     }
 }
 
-@end
+#pragma mark - Product Experiences: Vars
+
+RCT_EXPORT_METHOD(syncVariables) {
+    RCTLogInfo(@"[CleverTap syncVariables]");
+    [[self cleverTapInstance]syncVariables];
+}
 
+RCT_EXPORT_METHOD(syncVariablesinProd:(BOOL)isProduction) {
+    RCTLogInfo(@"[CleverTap syncVariables:isProduction]");
+    [[self cleverTapInstance]syncVariables:isProduction];
+}
+
+RCT_EXPORT_METHOD(getVariable:(NSString * _Nonnull)name callback:(RCTResponseSenderBlock)callback) {
+    RCTLogInfo(@"[CleverTap getVariable:name]");
+    CTVar *var = self.allVariables[name];
+    [self returnResult:var.value withCallback:callback andError:nil];
+}
+
+RCT_EXPORT_METHOD(getVariables:(RCTResponseSenderBlock)callback) {
+    RCTLogInfo(@"[CleverTap getVariables]");
+
+    NSMutableDictionary *varValues = [self getVariableValues];
+    [self returnResult:varValues withCallback:callback andError:nil];
+}
+
+RCT_EXPORT_METHOD(fetchVariables:(RCTResponseSenderBlock)callback) {
+    RCTLogInfo(@"[CleverTap fetchVariables]");
+    [[self cleverTapInstance]fetchVariables:^(BOOL success) {
+        [self returnResult:@(success) withCallback:callback andError:nil];
+    }];
+}
+
+RCT_EXPORT_METHOD(defineVariables:(NSDictionary*)variables) {
+    RCTLogInfo(@"[CleverTap defineVariables]");
+
+    if (!variables) return;
+
+    [variables enumerateKeysAndObjectsUsingBlock:^(NSString*  _Nonnull key, id  _Nonnull value, BOOL * _Nonnull stop) {
+        CTVar *var = [self createVarForName:key andValue:value];
+
+        if (var) {
+            self.allVariables[key] = var;
+        }
+    }];
+}
+
+RCT_EXPORT_METHOD(onVariablesChanged) {
+    RCTLogInfo(@"[CleverTap onVariablesChanged]");
+    [[self cleverTapInstance]onVariablesChanged:^{
+        [[NSNotificationCenter defaultCenter] postNotificationName:kCleverTapOnVariablesChanged object:nil userInfo:[self getVariableValues]];
+    }];
+}
+
+RCT_EXPORT_METHOD(onValueChanged:(NSString*)name) {
+    RCTLogInfo(@"[CleverTap onValueChanged]");
+    CTVar *var = self.allVariables[name];
+    if (var) {
+        [var onValueChanged:^{
+            NSDictionary *varResult = @{
+                var.name: var.value
+            };
+            [[NSNotificationCenter defaultCenter] postNotificationName:kCleverTapOnValueChanged object:nil userInfo:varResult];
+        }];
+    }
+}
+
+@end

package/ios/CleverTapReact/CleverTapReactEventEmitter.m

@@ -8,11 +8,12 @@
 RCT_EXPORT_MODULE();
 
 - (NSArray<NSString *> *)supportedEvents {
-    return @[kCleverTapProfileDidInitialize, kCleverTapProfileSync, kCleverTapInAppNotificationDismissed, kCleverTapInboxDidInitialize, kCleverTapInboxMessagesDidUpdate, kCleverTapInAppNotificationButtonTapped, kCleverTapInboxMessageButtonTapped, kCleverTapInboxMessageTapped, kCleverTapDisplayUnitsLoaded,  kCleverTapFeatureFlagsDidUpdate, kCleverTapProductConfigDidFetch, kCleverTapProductConfigDidActivate, kCleverTapProductConfigDidInitialize, kCleverTapPushNotificationClicked, kCleverTapPushPermissionResponseReceived, kCleverTapInAppNotificationShowed];
+    return @[kCleverTapProfileDidInitialize, kCleverTapProfileSync, kCleverTapInAppNotificationDismissed, kCleverTapInboxDidInitialize, kCleverTapInboxMessagesDidUpdate, kCleverTapInAppNotificationButtonTapped, kCleverTapInboxMessageButtonTapped, kCleverTapInboxMessageTapped, kCleverTapDisplayUnitsLoaded,  kCleverTapFeatureFlagsDidUpdate, kCleverTapProductConfigDidFetch, kCleverTapProductConfigDidActivate, kCleverTapProductConfigDidInitialize, kCleverTapPushNotificationClicked, kCleverTapPushPermissionResponseReceived, kCleverTapInAppNotificationShowed, kCleverTapOnVariablesChanged, kCleverTapOnValueChanged];
 }
 
 
 - (void)startObserving {
+    
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(emitEventInternal:)
                                                  name:kCleverTapProfileDidInitialize
@@ -88,6 +89,14 @@ RCT_EXPORT_MODULE();
                                                  name:kCleverTapPushPermissionResponseReceived
                                                object:nil];
     
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(emitEventInternal:)
+                                                 name:kCleverTapOnVariablesChanged
+                                               object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(emitEventInternal:)
+                                                 name:kCleverTapOnValueChanged
+                                               object:nil];
 }
 
 - (void)stopObserving {
@@ -98,5 +107,4 @@ RCT_EXPORT_MODULE();
     [self sendEventWithName:notification.name body:notification.userInfo];
 }
 
-
 @end

package/ios/CleverTapReact/CleverTapReactManager.h

@@ -10,5 +10,6 @@
 - (void)setDelegates:(CleverTap *)cleverTapInstance;
 
 @property NSString *launchDeepLink;
+@property(nonatomic, strong) NSDictionary *pendingPushNotificationExtras;
 
 @end

package/ios/CleverTapReact/CleverTapReactManager.m

@@ -3,6 +3,9 @@
 
 #import <UIKit/UIKit.h>
 #import <React/RCTLog.h>
+#import <React/RCTBridge.h>
+#import <React/RCTEventDispatcher.h>
+#import <React/RCTRootView.h>
 
 #import "CleverTap+Inbox.h"
 #import "CleverTapUTMDetail.h"
@@ -32,9 +35,15 @@
     return sharedInstance;
 }
 
+
 - (instancetype)init {
     self = [super init];
     if (self) {
+        
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(handleContentDidAppearNotification:)
+                                                     name:RCTContentDidAppearNotification
+                                                   object:nil];
         CleverTap *clevertap = [CleverTap sharedInstance];
         [self setDelegates:clevertap];
     }
@@ -49,14 +58,17 @@
     [[cleverTapInstance featureFlags] setDelegate:self];
     [[cleverTapInstance productConfig] setDelegate:self];
     [cleverTapInstance setPushPermissionDelegate:self];
-    [cleverTapInstance setLibrary:@"React-Native"];
 }
 
+
 - (void)applicationDidLaunchWithOptions:(NSDictionary *)options {
     NSDictionary *notification = [options valueForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
-    if (notification && notification[@"wzrk_dl"]) {
-        self.launchDeepLink = notification[@"wzrk_dl"];
-        RCTLogInfo(@"CleverTapReact: setting launch deeplink: %@", self.launchDeepLink);
+    if (notification){
+        self.pendingPushNotificationExtras = notification;
+        if (notification[@"wzrk_dl"]) {
+            self.launchDeepLink = notification[@"wzrk_dl"];
+            RCTLogInfo(@"CleverTapReact: setting launch deeplink: %@", self.launchDeepLink);
+        }
     }
 }
 
@@ -90,7 +102,7 @@
 - (void)pushNotificationTappedWithCustomExtras:(NSDictionary *)customExtras {
     NSMutableDictionary *pushNotificationExtras = [NSMutableDictionary new];
     if (customExtras != nil) {
-        pushNotificationExtras[@"customExtras"] = customExtras;
+        pushNotificationExtras = [NSMutableDictionary dictionaryWithDictionary:customExtras];
     }
     [self postNotificationWithName:kCleverTapPushNotificationClicked andBody:pushNotificationExtras];
 }
@@ -100,19 +112,15 @@
 
 - (void)inAppNotificationDismissedWithExtras:(NSDictionary *)extras andActionExtras:(NSDictionary *)actionExtras {
     NSMutableDictionary *body = [NSMutableDictionary new];
-    if (extras != nil) {
-        body[@"extras"] = extras;
-    }
-    if (actionExtras != nil) {
-        body[@"actionExtras"] = actionExtras;
-    }
+    body[@"extras"] = (extras != nil) ? extras : [NSMutableDictionary new];
+    body[@"actionExtras"] = (actionExtras != nil) ? actionExtras : [NSMutableDictionary new];
     [self postNotificationWithName:kCleverTapInAppNotificationDismissed andBody:body];
 }
 
 - (void)inAppNotificationButtonTappedWithCustomExtras:(NSDictionary *)customExtras {
     NSMutableDictionary *body = [NSMutableDictionary new];
     if (customExtras != nil) {
-        body[@"customExtras"] = customExtras;
+        body = [NSMutableDictionary dictionaryWithDictionary:customExtras];
     }
     [self postNotificationWithName:kCleverTapInAppNotificationButtonTapped andBody:body];
 }
@@ -134,30 +142,45 @@
 #pragma mark - CleverTapFeatureFlagsDelegate
 
 - (void)ctFeatureFlagsUpdated {
-    [self postNotificationWithName:kCleverTapFeatureFlagsDidUpdate andBody:nil];
+    NSMutableDictionary *body = [NSMutableDictionary new];
+    [self postNotificationWithName:kCleverTapFeatureFlagsDidUpdate andBody:body];
 }
 
 
 #pragma mark - CleverTapProductConfigDelegate
 
 - (void)ctProductConfigFetched {
-    [self postNotificationWithName:kCleverTapProductConfigDidFetch andBody:nil];
+    NSMutableDictionary *body = [NSMutableDictionary new];
+    [self postNotificationWithName:kCleverTapProductConfigDidFetch andBody:body];
 }
 
 - (void)ctProductConfigActivated {
-    [self postNotificationWithName:kCleverTapProductConfigDidActivate andBody:nil];
+    NSMutableDictionary *body = [NSMutableDictionary new];
+    [self postNotificationWithName:kCleverTapProductConfigDidActivate andBody:body];
 }
 
 - (void)ctProductConfigInitialized {
-    [self postNotificationWithName:kCleverTapProductConfigDidInitialize andBody:nil];
+    NSMutableDictionary *body = [NSMutableDictionary new];
+    [self postNotificationWithName:kCleverTapProductConfigDidInitialize andBody:body];
 }
 
 #pragma mark - CleverTapPushPermissionDelegate
 
 - (void)onPushPermissionResponse:(BOOL)accepted {
     NSMutableDictionary *body = [NSMutableDictionary new];
-    body[@"isPermissionGranted"] = [NSNumber numberWithBool:accepted];
+    body[@"accepted"] = [NSNumber numberWithBool:accepted];
     [self postNotificationWithName:kCleverTapPushPermissionResponseReceived andBody:body];
 }
 
+- (void)handleContentDidAppearNotification:(NSNotification *)notification {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    
+    NSMutableDictionary *pushNotificationExtras = [NSMutableDictionary new];
+    NSDictionary *customExtras = self.pendingPushNotificationExtras;
+    if (customExtras != nil) {
+        pushNotificationExtras = [NSMutableDictionary dictionaryWithDictionary:customExtras];
+        [self  postNotificationWithName:kCleverTapPushNotificationClicked andBody:pushNotificationExtras];
+    }
+}
+
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clevertap-react-native",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "CleverTap React Native SDK.",
   "main": "index.js",
   "types": "index.d.ts",

package/ios/CleverTapReact.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>

package/ios/CleverTapReact.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

package/ios/CleverTapReact.xcodeproj/xcuserdata/kushagra.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>CleverTapReact.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>