@screeb/react-native 2.1.3 → 2.1.5

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.1")
+    Screeb.setSecondarySDK("react-native", "2.1.5")
     var map: HashMap<String, Any?>? = null
     if (properties != null) {
       map = properties.toHashMap()

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.1")
+    Screeb.setSecondarySDK(name: "react-native", version: "2.1.5")
     var map: [String: AnyEncodable?] = [:]
     if (properties_ != nil) {
         map = self.mapToAnyEncodable(map: properties_!)
@@ -23,7 +23,14 @@ class ScreebModule: RCTEventEmitter {
         if (hook.key == "version") {
           mapHooks![hook.key] = hook.value as? String
         } else {
-          mapHooks![hook.key] = {(payload:Any) -> () in self.sendEvent(withName: "ScreebEvent", body: ["hookId":hook.value,"payload":String(describing: payload)]) }
+          mapHooks![hook.key] = {(payload:Any) -> () in DispatchQueue.main.async {
+            guard let data = try? JSONEncoder().encode(self.toAnyEncodable(payload)) else {
+              return
+            }
+
+            let encoded = String(data: data, encoding: .utf8)!
+            self.sendEvent(withName: "ScreebEvent", body: ["hookId": hook.value, "payload": encoded])
+          }}
         }
       }
     }
@@ -90,7 +97,14 @@ class ScreebModule: RCTEventEmitter {
         if(hook.key == "version"){
             mapHooks![hook.key] = hook.value as? String
         } else {
-            mapHooks![hook.key] = {(payload:Any) -> () in self.sendEvent(withName: "ScreebEvent", body: ["hookId":hook.value,"payload":String(describing: payload)]) }
+            mapHooks![hook.key] = {(payload:Any) -> () in DispatchQueue.main.async {
+            guard let data = try? JSONEncoder().encode(self.toAnyEncodable(payload)) else {
+              return
+            }
+
+            let encoded = String(data: data, encoding: .utf8)!
+            self.sendEvent(withName: "ScreebEvent", body: ["hookId": hook.value, "payload": encoded])
+          }}
         }
       }
     }
@@ -140,7 +154,7 @@ class ScreebModule: RCTEventEmitter {
   @objc func onHookResult(_ hookId: String, payload: [String: Any]?) {
     DispatchQueue.main.async {
       if payload != nil {
-        let encoded = self.toAnyEncodable(payload["result"]
+        let encoded = self.toAnyEncodable(payload!["result"])
         Screeb.onHookResult(hookId, encoded)
       }
     }

package/lib/commonjs/index.js

@@ -104,16 +104,27 @@ function closeSurvey() {
 }
 exports.closeSurvey = closeSurvey;
 function handleEvent(event) {
-    console.log(event);
     if (event?.hookId != null) {
         let hook = hooksRegistry.get(event.hookId);
         if (hook != null) {
             const result = hook(event.payload);
-            console.log("Hook result: ", result);
-            console.log(event.payload);
-            const originalHookId = event?.payload?.hook_id;
+            const parsedPayload = JSON.parse(event.payload);
+            const originalHookId = parsedPayload?.hook_id;
             if (originalHookId) {
-                ScreebModule.onHookResult(originalHookId, result);
+                // result must be a map to fit with react native allowed types
+                // Check if hook is a promise/async function
+                if (result instanceof Promise) {
+                    result
+                        .then((result) => {
+                        ScreebModule.onHookResult(originalHookId, { result });
+                    })
+                        .catch((error) => {
+                        console.error(error);
+                    });
+                }
+                else {
+                    ScreebModule.onHookResult(originalHookId, { result });
+                }
             }
         }
     }

package/lib/module/index.js

@@ -88,16 +88,27 @@ 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) {
             const result = hook(event.payload);
-            console.log("Hook result: ", result);
-            console.log(event.payload);
-            const originalHookId = event?.payload?.hook_id;
+            const parsedPayload = JSON.parse(event.payload);
+            const originalHookId = parsedPayload?.hook_id;
             if (originalHookId) {
-                ScreebModule.onHookResult(originalHookId, result);
+                // result must be a map to fit with react native allowed types
+                // Check if hook is a promise/async function
+                if (result instanceof Promise) {
+                    result
+                        .then((result) => {
+                        ScreebModule.onHookResult(originalHookId, { result });
+                    })
+                        .catch((error) => {
+                        console.error(error);
+                    });
+                }
+                else {
+                    ScreebModule.onHookResult(originalHookId, { result });
+                }
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@screeb/react-native",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "Continuous Product Discovery",
   "scripts": {
     "clean": "rm -rf lib/",

package/src/index.tsx

@@ -143,10 +143,22 @@ function handleEvent(event: any) {
     let hook = hooksRegistry.get(event.hookId);
     if (hook != null) {
       const result = hook(event.payload);
-      const originalHookId = event?.payload?.hook_id;
+      const parsedPayload = JSON.parse(event.payload);
+      const originalHookId = parsedPayload?.hook_id;
       if (originalHookId) {
         // result must be a map to fit with react native allowed types
-        ScreebModule.onHookResult(originalHookId, { result });
+        // Check if hook is a promise/async function
+        if (result instanceof Promise) {
+          result
+            .then((result) => {
+              ScreebModule.onHookResult(originalHookId, { result });
+            })
+            .catch((error) => {
+              console.error(error);
+            });
+        } else {
+          ScreebModule.onHookResult(originalHookId, { result });
+        }
       }
     }
   }