@screeb/react-native 0.8.7 → 0.8.9

package/android/build.gradle

@@ -124,6 +124,6 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
   // noinspection GradleDynamicVersion
   api 'com.facebook.react:react-native:+'
-  implementation "app.screeb.sdk:survey:1.10.2"
+  implementation "app.screeb.sdk:survey:1.10.5"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:1.7.0"
 }

package/android/src/main/java/com/screebmodule/ScreebModuleModule.kt

@@ -22,13 +22,13 @@ class ScreebModuleModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun initSdk(channelId: String, userId: String?, properties: ReadableMap?) {
-    Log.d("ScreebModule", "Called setIdentity : $userId")
+    Log.d("ScreebModule", "Called initSdk : $userId")
     var map: HashMap<String, Any?>? = null
     if (properties != null) {
       map = properties.toHashMap()
     }
     Handler(Looper.getMainLooper()).post {
-      Screeb?.pluginInit(channelId, userId, map)
+      Screeb.pluginInit(channelId, userId, map)
     }
   }
 
@@ -40,66 +40,78 @@ class ScreebModuleModule(reactContext: ReactApplicationContext) :
       map = properties.toHashMap()
     }
     Handler(Looper.getMainLooper()).post {
-      Screeb?.setIdentity(userId, map)
+      Screeb.setIdentity(userId, map)
     }
   }
 
   @ReactMethod
-  fun trackEvent(eventId: String, properties: ReadableMap?) {
-    Log.d("ScreebModule", "Called trackEvent : $eventId")
+  fun setProperties(properties: ReadableMap) {
+    Log.d(
+      "ScreebModule",
+      "Called setVisitorProperties with " + properties.toHashMap().size + " properties"
+    )
+    Handler(Looper.getMainLooper()).post {
+      Screeb.setVisitorProperties(properties.toHashMap())
+    }
+  }
+
+  @ReactMethod
+  fun assignGroup(type: String? = null, name: String, properties: ReadableMap? = null) {
+    Log.d("ScreebModule", "Called assignGroup : $name")
     var map: HashMap<String, Any?>? = null
     if (properties != null) {
       map = properties.toHashMap()
     }
     Handler(Looper.getMainLooper()).post {
-      Screeb?.trackEvent(eventId, map)
+      Screeb.assignGroup(type, name, map)
     }
   }
 
   @ReactMethod
-  fun trackScreen(screen: String, properties: ReadableMap?) {
-    Log.d("ScreebModule", "Called trackScreen : $screen")
+  fun unassignGroup(type: String? = null, name: String, properties: ReadableMap? = null) {
+    Log.d("ScreebModule", "Called unassignGroup : $name")
     var map: HashMap<String, Any?>? = null
     if (properties != null) {
       map = properties.toHashMap()
     }
     Handler(Looper.getMainLooper()).post {
-      Screeb?.trackScreen(screen, map)
+      Screeb.unassignGroup(type, name, map)
     }
   }
 
   @ReactMethod
-  fun setProperties(properties: ReadableMap) {
-    Log.d(
-      "ScreebModule",
-      "Called setVisitorProperties with " + properties.toHashMap().size + " properties"
-    )
+  fun trackEvent(eventId: String, properties: ReadableMap?) {
+    Log.d("ScreebModule", "Called trackEvent : $eventId")
+    var map: HashMap<String, Any?>? = null
+    if (properties != null) {
+      map = properties.toHashMap()
+    }
     Handler(Looper.getMainLooper()).post {
-      Screeb?.setVisitorProperties(properties.toHashMap())
+      Screeb.trackEvent(eventId, map)
     }
   }
 
   @ReactMethod
-  fun startSurvey(surveyId: String, allowMultipleResponses: Boolean, hiddenFields: ReadableMap? = null) {
-    Log.e("ScreebModule", "Called startSurvey : $surveyId")
-    var map: HashMap<String, Any>? = null
-    if (hiddenFields != null) {
-      map = hiddenFields.toHashMap()
+  fun trackScreen(screen: String, properties: ReadableMap?) {
+    Log.d("ScreebModule", "Called trackScreen : $screen")
+    var map: HashMap<String, Any?>? = null
+    if (properties != null) {
+      map = properties.toHashMap()
     }
     Handler(Looper.getMainLooper()).post {
-      Screeb?.startSurvey(surveyId, allowMultipleResponses, map)
+      Screeb.trackScreen(screen, map)
     }
   }
 
   @ReactMethod
-  fun assignGroup(type: String? = null, name: String, properties: ReadableMap? = null) {
-    Log.d("ScreebModule", "Called assignGroup : $name")
+  fun startSurvey(surveyId: String, allowMultipleResponses: Boolean? = true, hiddenFields: ReadableMap? = null) {
+    Log.e("ScreebModule", "Called startSurvey : $surveyId")
     var map: HashMap<String, Any>? = null
-    if (properties != null) {
-      map = properties.toHashMap()
+    if (hiddenFields != null) {
+      map = hiddenFields.toHashMap()
     }
     Handler(Looper.getMainLooper()).post {
-      Screeb?.assignGroup(type, name, map)
+      Screeb.startSurvey(surveyId, allowMultipleResponses, map)
     }
   }
 
@@ -107,9 +119,7 @@ class ScreebModuleModule(reactContext: ReactApplicationContext) :
 
     @JvmStatic
     fun setAppContext(context: Context){
-      Screeb.initSdkWithContextOnly(
-        context
-      )
+      Screeb.initSdkWithContextOnly(context)
     }
 
   }

package/ios/ScreebModule.m

@@ -4,11 +4,12 @@
 
 RCT_EXTERN_METHOD(initSdk:(NSString *)channelId userId:(NSString *)userId_  properties:(NSDictionary<NSString *, id> *)properties_)
 RCT_EXTERN_METHOD(setIdentity:(NSString *)userId properties:(NSDictionary<NSString *, id> *)properties_)
+RCT_EXTERN_METHOD(setProperties:(NSDictionary<NSString *, id> *)properties)
+RCT_EXTERN_METHOD(assignGroup:(NSString *)type name:(NSString *)name_ properties:(NSDictionary<NSString *, id> *)properties_)
+RCT_EXTERN_METHOD(unassignGroup:(NSString *)type name:(NSString *)name_ properties:(NSDictionary<NSString *, id> *)properties_)
 RCT_EXTERN_METHOD(trackEvent:(NSString *)eventId properties:(NSDictionary<NSString *, id> *)properties_)
 RCT_EXTERN_METHOD(trackScreen:(NSString *)screen properties:(NSDictionary<NSString *, id> *)properties_)
-RCT_EXTERN_METHOD(setProperties:(NSDictionary<NSString *, id> *)properties)
 RCT_EXTERN_METHOD(startSurvey:(NSString *)surveyId allowMultipleResponses:(BOOL)allowMultipleResponses_ hiddenFields:(NSDictionary<NSString *, id> *)hiddenFields_)
-RCT_EXTERN_METHOD(assignGroup:(NSString *)type name:(NSString *)name_ properties:(NSDictionary<NSString *, id> *)properties_)
 + (BOOL)requiresMainQueueSetup
 {
   return YES;

package/ios/ScreebModule.swift

@@ -23,7 +23,7 @@ class ScreebModule: NSObject {
     }
   }
 
-  @objc func setIdentity(_ userId: String, properties properties_: [String: Any]?) {
+  @objc func setIdentity(_ userId: String, properties properties_: [String: Any?]?) {
     var map: [String: AnyEncodable?] = [:]
     if (properties_ != nil) {
         map = self.mapToAnyEncodable(map: properties_!)
@@ -33,7 +33,7 @@ class ScreebModule: NSObject {
     }
   }
 
-  @objc func trackEvent(_ eventId: String, properties properties_: [String: Any]?) {
+  @objc func trackEvent(_ eventId: String, properties properties_: [String: Any?]?) {
     var map: [String: AnyEncodable?] = [:]
     if (properties_ != nil) {
         map = self.mapToAnyEncodable(map: properties_!)
@@ -43,7 +43,7 @@ class ScreebModule: NSObject {
     }
   }
 
-  @objc func trackScreen(_ screen: String, properties properties_: [String: Any]?) {
+  @objc func trackScreen(_ screen: String, properties properties_: [String: Any?]?) {
     var map: [String: AnyEncodable?] = [:]
     if (properties_ != nil) {
         map = self.mapToAnyEncodable(map: properties_!)
@@ -54,7 +54,7 @@ class ScreebModule: NSObject {
   }
 
   @objc(setProperties:)
-  func setVisitorPropertiesImpl(_ properties: [String: Any]) {
+  func setVisitorPropertiesImpl(_ properties: [String: Any?]) {
     let map = self.mapToAnyEncodable(map: properties)
     DispatchQueue.main.async {
       Screeb.visitorProperty(visitorProperty: map)
@@ -71,7 +71,17 @@ class ScreebModule: NSObject {
     }
   }
 
-  @objc func assignGroup(_ type: String?, name name_: String, properties properties_: [String: Any]?) {
+  @objc func assignGroup(_ type: String?, name name_: String, properties properties_: [String: Any?]?) {
+    var map: [String: AnyEncodable] = [:]
+    if (properties_ != nil) {
+        map = self.mapToAnyEncodable(map: properties_!).filter({ $0.value != nil }).mapValues({ $0! })
+    }
+    DispatchQueue.main.async {
+      Screeb.assignGroup(type: type, name: name_, properties: map)
+    }
+  }
+
+  @objc func unassignGroup(_ type: String?, name name_: String, properties properties_: [String: Any?]?) {
     var map: [String: AnyEncodable] = [:]
     if (properties_ != nil) {
         map = self.mapToAnyEncodable(map: properties_!).filter({ $0.value != nil }).mapValues({ $0! })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@screeb/react-native",
-  "version": "0.8.7",
+  "version": "0.8.9",
   "description": "A react-native module to integrate Screeb mobile sdk for Android and/or iOS.",
   "scripts": {
     "lint": "eslint \"**/*.{js,ts,tsx}\"",
@@ -51,4 +51,4 @@
     "react": "*",
     "react-native": "*"
   }
-}
+}

package/screeb-module.podspec

@@ -16,5 +16,5 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.dependency "React-Core"
-  s.dependency "Screeb", '~> 1.10.1'
+  s.dependency "Screeb", '~> 1.10.3'
 end

package/src/index.tsx

@@ -31,18 +31,21 @@ export function initSdk(
 export function setIdentity(userId: string, properties?: Map<string, any>) {
   return ScreebModule.setIdentity(userId, properties);
 }
+export function setProperties(properties?: Map<string, any>) {
+  return ScreebModule.setProperties(properties);
+}
+export function assignGroup(type: string | null, name: string, properties?: Map<string, any>) {
+  return ScreebModule.assignGroup(type, name, properties);
+}
+export function unassignGroup(type: string | null, name: string, properties?: Map<string, any>) {
+  return ScreebModule.unassignGroup(type, name, properties);
+}
 export function trackEvent(name: string, properties?: Map<string, any>) {
   return ScreebModule.trackEvent(name, properties);
 }
 export function trackScreen(name: string, properties?: Map<string, any>) {
   return ScreebModule.trackScreen(name, properties);
 }
-export function setProperties(properties?: Map<string, any>) {
-  return ScreebModule.setProperties(properties);
-}
 export function startSurvey(surveyId: string, allowMultipleResponses?: boolean, hiddenFields?: Map<string, any>) {
   return ScreebModule.startSurvey(surveyId, allowMultipleResponses ?? true, hiddenFields);
 }
-export function assignGroup(type: string | null, name: string, properties?: Map<string, any>) {
-  return ScreebModule.assignGroup(name, type, properties);
-}