@screeb/react-native 2.1.1 → 2.1.3

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

@@ -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)
     }
@@ -189,8 +186,11 @@ class ScreebModuleModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun onHookResult(hookId: String, result: Any?){
-    Screeb.onHookResult(hookId, result)
+  fun onHookResult(hookId: String, payload: ReadableMap?){
+    if (payload != null) {
+      val result = payload!!.toHashMap()["result"] as Any?
+      Screeb.onHookResult(hookId, result)
+    }
   }
 
   @ReactMethod

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

@@ -137,10 +137,12 @@ class ScreebModule: RCTEventEmitter {
     }
   }
 
-  @objc func onHookResult(_ hookId: String, result: Any?) {
+  @objc func onHookResult(_ hookId: String, payload: [String: Any]?) {
     DispatchQueue.main.async {
-      let encoded = self.toAnyEncodable(result)
-      Screeb.onHookResult(hookId, encoded)
+      if payload != nil {
+        let encoded = self.toAnyEncodable(payload["result"]
+        Screeb.onHookResult(hookId, encoded)
+      }
     }
   }
 

package/package.json

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

package/src/index.tsx

@@ -139,16 +139,14 @@ export function closeSurvey() {
 }
 
 function handleEvent(event: any) {
-  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;
       if (originalHookId) {
-        ScreebModule.onHookResult(originalHookId, result);
+        // result must be a map to fit with react native allowed types
+        ScreebModule.onHookResult(originalHookId, { result });
       }
     }
   }