@screeb/react-native 2.1.0 → 2.1.2

package/android/build.gradle

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

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

@@ -28,7 +28,7 @@ class ScreebModuleModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   fun initSdk(channelId: String, userId: String?, properties: ReadableMap?, hooks: ReadableMap?, initOptions: ReadableMap?) {
     Log.d("ScreebModule", "Called initSdk : $userId")
-    Screeb.setSecondarySDK("react-native", "2.1.0")
+    Screeb.setSecondarySDK("react-native", "2.1.1")
     var map: HashMap<String, Any?>? = null
     if (properties != null) {
       map = properties.toHashMap()
@@ -51,9 +51,6 @@ class ScreebModuleModule(reactContext: ReactApplicationContext) :
       }
     }
 
-    // TODO: pass to pluginInit
-    var initOptions = InitOptions()
-
     Handler(Looper.getMainLooper()).post {
       Screeb.pluginInit(channelId, userId, map, mapHooks)
     }
@@ -164,20 +161,6 @@ class ScreebModuleModule(reactContext: ReactApplicationContext) :
     }
   }
 
-  @ReactMethod
-  fun debug(){
-    Log.d("ScreebModule","Called debug")
-    Screeb.debug()
-  }
-
-  @ReactMethod
-  fun debugTargeting(){
-    Log.d("ScreebModule","Called debugTargeting")
-    Handler(Looper.getMainLooper()).post {
-      Screeb.debugTargeting()
-    }
-  }
-
   @ReactMethod
   fun resetIdentity(){
     Log.d("ScreebModule","Called resetIdentity")
@@ -201,4 +184,24 @@ class ScreebModuleModule(reactContext: ReactApplicationContext) :
       Screeb.closeSurvey()
     }
   }
+
+  @ReactMethod
+  fun onHookResult(hookId: String, payload: ReadableMap?){
+    val result = payload?.toHashMap()["result"] as Any?
+    Screeb.onHookResult(hookId, result)
+  }
+
+  @ReactMethod
+  fun debug(){
+    Log.d("ScreebModule","Called debug")
+    Screeb.debug()
+  }
+
+  @ReactMethod
+  fun debugTargeting(){
+    Log.d("ScreebModule","Called debugTargeting")
+    Handler(Looper.getMainLooper()).post {
+      Screeb.debugTargeting()
+    }
+  }
 }

package/ios/ScreebModule.m

@@ -11,6 +11,7 @@ RCT_EXTERN_METHOD(unassignGroup:(NSString *)type name:(NSString *)name_ properti
 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(startSurvey:(NSString *)surveyId allowMultipleResponses:(BOOL)allowMultipleResponses_ hiddenFields:(NSDictionary<NSString *, id> *)hiddenFields_ ignoreSurveyStatus:(BOOL)ignoreSurveyStatus_ hooks:(NSDictionary<NSString *, id> *)hooks_)
+RCT_EXTERN_METHOD(onHookResult:(NSString *)hookId payload:(NSDictionary<NSString *, id> *)payload_)
 RCT_EXTERN_METHOD(debug)
 RCT_EXTERN_METHOD(debugTargeting)
 RCT_EXTERN_METHOD(closeSdk)

package/ios/ScreebModule.swift

@@ -11,7 +11,7 @@ class ScreebModule: RCTEventEmitter {
       properties properties_: [String: Any]?,
       hooks hooks_: [String: Any]?,
       initOptions initOptions_: [String: Any]?) {
-    Screeb.setSecondarySDK(name: "react-native", version: "2.1.0")
+    Screeb.setSecondarySDK(name: "react-native", version: "2.1.1")
     var map: [String: AnyEncodable?] = [:]
     if (properties_ != nil) {
         map = self.mapToAnyEncodable(map: properties_!)
@@ -119,60 +119,73 @@ class ScreebModule: RCTEventEmitter {
     }
   }
 
-  @objc func debug(){
+  @objc func resetIdentity(){
     DispatchQueue.main.async {
-      Screeb.debug()
+      Screeb.resetIdentity()
     }
   }
 
-  @objc func debugTargeting(){
+  @objc func closeSdk(){
     DispatchQueue.main.async {
-      Screeb.debugTargeting()
+      Screeb.closeSdk()
     }
   }
 
-  @objc func resetIdentity(){
+  @objc func closeSurvey(){
     DispatchQueue.main.async {
-      Screeb.resetIdentity()
+      Screeb.closeSurvey()
     }
   }
 
-  @objc func closeSdk(){
+  @objc func onHookResult(_ hookId: String, payload: [String: Any]?) {
     DispatchQueue.main.async {
-      Screeb.closeSdk()
+      if payload != nil {
+        let encoded = self.toAnyEncodable(payload["result"]
+        Screeb.onHookResult(hookId, encoded)
+      }
     }
   }
 
-  @objc func closeSurvey(){
+  @objc func debug(){
     DispatchQueue.main.async {
-      Screeb.closeSurvey()
+      Screeb.debug()
     }
   }
 
-  private func mapToAnyEncodable(map: [String: Any?]?) -> [String: AnyEncodable?] {
-      var anyEncodableMap: [String: AnyEncodable?] = [:]
-      map?.forEach { key, value in
-        if let nsValue = value as? NSNumber {
-            if CFBooleanGetTypeID() == CFGetTypeID(nsValue) {
-                anyEncodableMap[key] = AnyEncodable(nsValue.boolValue)
-            } else if let value = value as? Int {
-                anyEncodableMap[key] = AnyEncodable(value)
-            } else if let value = value as? Double {
-                anyEncodableMap[key] = AnyEncodable(value)
-            } else if let value = value as? Float {
-                anyEncodableMap[key] = AnyEncodable(value)
-            } else {
-                anyEncodableMap[key] = nil
-            }
-        } else if let value = value as? String {
-            anyEncodableMap[key] = AnyEncodable(value)
-        } else if let value = value as? [String: Any?] {
-            anyEncodableMap[key] = AnyEncodable(self.mapToAnyEncodable(map: value))
+  @objc func debugTargeting(){
+    DispatchQueue.main.async {
+      Screeb.debugTargeting()
+    }
+  }
+
+  private func toAnyEncodable(_ value: Any?) -> AnyEncodable? {
+    if let nsValue = value as? NSNumber {
+        if CFBooleanGetTypeID() == CFGetTypeID(nsValue) {
+            return AnyEncodable(nsValue.boolValue)
+        } else if let value = value as? Int {
+            return AnyEncodable(value)
+        } else if let value = value as? Double {
+            return AnyEncodable(value)
+        } else if let value = value as? Float {
+            return AnyEncodable(value)
         } else {
-            anyEncodableMap[key] = nil
+            return nil
         }
-      }
-      return anyEncodableMap
+    } else if let value = value as? String {
+        return AnyEncodable(value)
+    } else if let value = value as? [String: Any?] {
+        return AnyEncodable(self.mapToAnyEncodable(map: value))
+    } else {
+        return nil
+    }
+  }
+
+  private func mapToAnyEncodable(map: [String: Any?]?) -> [String: AnyEncodable?] {
+    var anyEncodableMap: [String: AnyEncodable?] = [:]
+    map?.forEach { key, value in
+        anyEncodableMap[key] = self.toAnyEncodable(value)
+    }
+    return anyEncodableMap
   }
 
   override func supportedEvents() -> [String]! {

package/lib/commonjs/index.js

@@ -27,8 +27,7 @@ function initSdk(androidChannelId, iosChannelId, userId, properties, hooks, isDe
                 mapHooksId = { ...mapHooksId, version: hooks[key] };
             }
             else {
-                // Random id
-                let uuid = Date.now().toString() + Math.random().toString();
+                let uuid = Date.now().toString() + Math.random().toString() + key;
                 hooksRegistry.set(uuid, hooks[key]);
                 mapHooksId = { ...mapHooksId, [key]: uuid };
             }
@@ -75,8 +74,7 @@ function startSurvey(surveyId, allowMultipleResponses, hiddenFields, ignoreSurve
                 mapHooksId = { ...mapHooksId, version: hooks[key] };
             }
             else {
-                // Random id
-                let uuid = Date.now().toString() + Math.random().toString();
+                let uuid = Date.now().toString() + Math.random().toString() + key;
                 hooksRegistry.set(uuid, hooks[key]);
                 mapHooksId = { ...mapHooksId, [key]: uuid };
             }
@@ -106,10 +104,17 @@ function closeSurvey() {
 }
 exports.closeSurvey = closeSurvey;
 function handleEvent(event) {
+    console.log(event);
     if (event?.hookId != null) {
         let hook = hooksRegistry.get(event.hookId);
         if (hook != null) {
-            hook(event.payload);
+            const result = hook(event.payload);
+            console.log("Hook result: ", result);
+            console.log(event.payload);
+            const originalHookId = event?.payload?.hook_id;
+            if (originalHookId) {
+                ScreebModule.onHookResult(originalHookId, result);
+            }
         }
     }
 }

package/lib/module/index.js

@@ -24,8 +24,7 @@ export function initSdk(androidChannelId, iosChannelId, userId, properties, hook
                 mapHooksId = { ...mapHooksId, version: hooks[key] };
             }
             else {
-                // Random id
-                let uuid = Date.now().toString() + Math.random().toString();
+                let uuid = Date.now().toString() + Math.random().toString() + key;
                 hooksRegistry.set(uuid, hooks[key]);
                 mapHooksId = { ...mapHooksId, [key]: uuid };
             }
@@ -65,8 +64,7 @@ export function startSurvey(surveyId, allowMultipleResponses, hiddenFields, igno
                 mapHooksId = { ...mapHooksId, version: hooks[key] };
             }
             else {
-                // Random id
-                let uuid = Date.now().toString() + Math.random().toString();
+                let uuid = Date.now().toString() + Math.random().toString() + key;
                 hooksRegistry.set(uuid, hooks[key]);
                 mapHooksId = { ...mapHooksId, [key]: uuid };
             }
@@ -90,10 +88,17 @@ export function closeSurvey() {
     return ScreebModule.closeSurvey();
 }
 function handleEvent(event) {
+    console.log(event);
     if (event?.hookId != null) {
         let hook = hooksRegistry.get(event.hookId);
         if (hook != null) {
-            hook(event.payload);
+            const result = hook(event.payload);
+            console.log("Hook result: ", result);
+            console.log(event.payload);
+            const originalHookId = event?.payload?.hook_id;
+            if (originalHookId) {
+                ScreebModule.onHookResult(originalHookId, result);
+            }
         }
     }
 }

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@screeb/react-native",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Continuous Product Discovery",
   "scripts": {
     "clean": "rm -rf lib/",
     "lint": "eslint \"**/*.{js,ts,tsx}\"",
     "build": "npm run clean ; tsc -p tsconfig.build.json && tsc -p tsconfig.build.cjs.json"
   },
-  "react-native": "src/index",
+  "react-native": "src/index.tsx",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
-  "source": "src/index",
+  "source": "src/index.tsx",
   "keywords": [
     "react-native",
     "ios",

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", '~> 2.1.1'
+  s.dependency "Screeb", '~> 2.1.6'
 end

package/src/index.tsx

@@ -44,8 +44,7 @@ export function initSdk(
       if (key == "version") {
         mapHooksId = { ...mapHooksId, version: hooks[key] };
       } else {
-        // Random id
-        let uuid = Date.now().toString() + Math.random().toString();
+        let uuid = Date.now().toString() + Math.random().toString() + key;
         hooksRegistry.set(uuid, hooks[key]);
         mapHooksId = { ...mapHooksId, [key]: uuid };
       }
@@ -109,8 +108,7 @@ export function startSurvey(
       if (key == "version") {
         mapHooksId = { ...mapHooksId, version: hooks[key] };
       } else {
-        // Random id
-        let uuid = Date.now().toString() + Math.random().toString();
+        let uuid = Date.now().toString() + Math.random().toString() + key;
         hooksRegistry.set(uuid, hooks[key]);
         mapHooksId = { ...mapHooksId, [key]: uuid };
       }
@@ -144,7 +142,12 @@ function handleEvent(event: any) {
   if (event?.hookId != null) {
     let hook = hooksRegistry.get(event.hookId);
     if (hook != null) {
-      hook(event.payload);
+      const result = hook(event.payload);
+      const originalHookId = event?.payload?.hook_id;
+      if (originalHookId) {
+        // result must be a map to fit with react native allowed types
+        ScreebModule.onHookResult(originalHookId, { result });
+      }
     }
   }
 }