@screeb/react-native 1.0.0-rc.2 → 2.0.1

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.0-rc.2"
-  implementation "org.jetbrains.kotlin:kotlin-stdlib:1.7.0"
+  implementation "app.screeb.sdk:survey:2.0.2"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22"
 }

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-all.zip

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

@@ -5,6 +5,10 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.WritableNativeMap
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.modules.core.DeviceEventManagerModule
 import java.util.HashMap
 import androidx.annotation.NonNull
 import android.content.Context
@@ -21,14 +25,31 @@ class ScreebModuleModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun initSdk(channelId: String, userId: String?, properties: ReadableMap?) {
+  fun initSdk(channelId: String, userId: String?, properties: ReadableMap?, hooks: ReadableMap?) {
     Log.d("ScreebModule", "Called initSdk : $userId")
     var map: HashMap<String, Any?>? = null
     if (properties != null) {
       map = properties.toHashMap()
     }
+    var mapHooks:HashMap<String, Any>? = null
+    if (hooks != null) {
+      mapHooks = hashMapOf<String, Any>()
+      val hooksKeys = hooks.keySetIterator()
+      while (hooksKeys.hasNextKey()) {
+        val key = hooksKeys.nextKey()
+        val value = hooks.getString(key)
+        if (key == "version"){
+          mapHooks[key] = value!!
+        } else {
+          mapHooks[key] = { payload:Any -> this.reactApplicationContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit("ScreebEvent",  Arguments.createMap().apply {
+            putString("hookId", value!!)
+            putString("payload", payload.toString())
+        }) }
+        }
+      }
+    }
     Handler(Looper.getMainLooper()).post {
-      Screeb.pluginInit(channelId, userId, map)
+      Screeb.pluginInit(channelId, userId, map, mapHooks)
     }
   }
 
@@ -104,14 +125,31 @@ class ScreebModuleModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun startSurvey(surveyId: String, allowMultipleResponses: Boolean? = true, hiddenFields: ReadableMap? = null, ignoreSurveyStatus: Boolean? = true) {
+  fun startSurvey(surveyId: String, allowMultipleResponses: Boolean? = true, hiddenFields: ReadableMap? = null, ignoreSurveyStatus: Boolean? = true, hooks: ReadableMap? = null) {
     Log.e("ScreebModule", "Called startSurvey : $surveyId")
     var map: HashMap<String, Any>? = null
     if (hiddenFields != null) {
       map = hiddenFields.toHashMap()
     }
+    var mapHooks:HashMap<String, Any>? = null
+    if (hooks != null) {
+      mapHooks = hashMapOf<String, Any>()
+      val hooksKeys = hooks.keySetIterator()
+      while (hooksKeys.hasNextKey()) {
+        val key = hooksKeys.nextKey()
+        val value = hooks.getString(key)
+        if (key == "version"){
+          mapHooks[key] = value!!
+        } else {
+          mapHooks[key] = { payload:Any -> this.reactApplicationContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit("ScreebEvent",  Arguments.createMap().apply {
+            putString("hookId", value!!)
+            putString("payload", payload.toString())
+        }) }
+        }
+      }
+    }
     Handler(Looper.getMainLooper()).post {
-      Screeb.startSurvey(surveyId, allowMultipleResponses ?: true, map, ignoreSurveyStatus ?: true)
+      Screeb.startSurvey(surveyId, allowMultipleResponses ?: true, map, ignoreSurveyStatus ?: true, mapHooks)
     }
   }
 

package/ios/ScreebModule.m

@@ -1,15 +1,16 @@
 #import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
 
-@interface RCT_EXTERN_MODULE(ScreebModule, NSObject)
+@interface RCT_EXTERN_MODULE(ScreebModule, RCTEventEmitter)
 
-RCT_EXTERN_METHOD(initSdk:(NSString *)channelId userId:(NSString *)userId_  properties:(NSDictionary<NSString *, id> *)properties_)
+RCT_EXTERN_METHOD(initSdk:(NSString *)channelId userId:(NSString *)userId_  properties:(NSDictionary<NSString *, id> *)properties_  hooks:(NSDictionary<NSString *, id> *)hooks_)
 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(startSurvey:(NSString *)surveyId allowMultipleResponses:(BOOL)allowMultipleResponses_ hiddenFields:(NSDictionary<NSString *, id> *)hiddenFields_ ignoreSurveyStatus:(BOOL)ignoreSurveyStatus_)
+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(debug)
 RCT_EXTERN_METHOD(debugTargeting)
 RCT_EXTERN_METHOD(closeSdk)
@@ -18,4 +19,4 @@ RCT_EXTERN_METHOD(resetIdentity)
 {
   return YES;
 }
-@end
+@end

package/ios/ScreebModule.swift

@@ -3,20 +3,32 @@ import UIKit
 import Foundation
 
 @objc(ScreebModule)
-class ScreebModule: NSObject {
+class ScreebModule: RCTEventEmitter {
 
-  @objc(initSdk:userId:properties:)
+    @objc(initSdk:userId:properties:hooks:)
   func initSdk(
       _ channelId: String,
       userId userId_: String?,
-      properties properties_: [String: Any]?) {
+      properties properties_: [String: Any]?,
+      hooks hooks_: [String: Any]?) {
     var map: [String: AnyEncodable?] = [:]
     if (properties_ != nil) {
         map = self.mapToAnyEncodable(map: properties_!)
     }
+    var mapHooks: [String: Any?]? = nil
+    if (hooks_ != nil) {
+      mapHooks = [:]
+      hooks_?.forEach{ hook in
+        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)]) }
+        }
+      }
+    }
     if let controller = UIApplication.shared.keyWindow?.rootViewController {
         DispatchQueue.main.async {
-          Screeb.initSdk(context: controller, channelId: channelId, identity: userId_, visitorProperty: map)
+          Screeb.initSdk(context: controller, channelId: channelId, identity: userId_, visitorProperty: map, hooks: mapHooks)
         }
     } else {
         print("Screeb : error init, could not find rootViewController")
@@ -61,13 +73,24 @@ class ScreebModule: NSObject {
     }
   }
 
-  @objc func startSurvey(_ surveyId: String, allowMultipleResponses allowMultipleResponses_: Bool, hiddenFields hiddenFields_: [String: Any]?,ignoreSurveyStatus ignoreSurveyStatus_: Bool) {
+  @objc func startSurvey(_ surveyId: String, allowMultipleResponses allowMultipleResponses_: Bool, hiddenFields hiddenFields_: [String: Any]?,ignoreSurveyStatus ignoreSurveyStatus_: Bool, hooks hooks_: [String: Any]?) {
     var map: [String: AnyEncodable] = [:]
     if (hiddenFields_ != nil) {
         map = self.mapToAnyEncodable(map: hiddenFields_!).filter({ $0.value != nil }).mapValues({ $0! })
     }
+    var mapHooks: [String: Any?]? = nil
+    if (hooks_ != nil) {
+      mapHooks = [:]
+      hooks_?.forEach{ hook in
+        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)]) }
+        }
+      }
+    }
     DispatchQueue.main.async {
-      Screeb.startSurvey(surveyId: surveyId, allowMultipleResponses: allowMultipleResponses_, hiddenFields: map, ignoreSurveyStatus: ignoreSurveyStatus_)
+        Screeb.startSurvey(surveyId: surveyId, allowMultipleResponses: allowMultipleResponses_, hiddenFields: map, ignoreSurveyStatus: ignoreSurveyStatus_, hooks: mapHooks)
     }
   }
 
@@ -132,4 +155,8 @@ class ScreebModule: NSObject {
           return nil
       }
   }
+    
+  override func supportedEvents() -> [String]! {
+    return ["ScreebEvent"]
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@screeb/react-native",
-  "version": "1.0.0-rc.2",
+  "version": "2.0.1",
   "description": "Continuous Product Discovery",
   "scripts": {
     "clean": "rm -rf lib/",

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.0.0-rc.3'
+  s.dependency "Screeb", '~> 2.0.0'
 end

package/src/index.tsx

@@ -1,31 +1,64 @@
-import { NativeModules, Platform } from 'react-native';
+import {
+  DeviceEventEmitter,
+  NativeEventEmitter,
+  NativeModules,
+  Platform,
+} from "react-native";
 
 const LINKING_ERROR =
   `The package '@screeb/react-native' doesn't seem to be linked. Make sure: \n\n` +
-  Platform.select({ ios: "- You have run 'pod install'\n", default: '' }) +
-  '- You rebuilt the app after installing the package\n' +
-  '- You are not using Expo managed workflow\n';
+  Platform.select({ ios: "- You have run 'pod install'\n", default: "" }) +
+  "- You rebuilt the app after installing the package\n" +
+  "- You are not using Expo managed workflow\n";
 
 const ScreebModule = NativeModules.ScreebModule
   ? NativeModules.ScreebModule
   : new Proxy(
-    {},
-    {
-      get() {
-        throw new Error(LINKING_ERROR);
-      },
-    }
-  );
+      {},
+      {
+        get() {
+          throw new Error(LINKING_ERROR);
+        },
+      }
+    );
+
+let hooksRegistry = new Map<string, any>();
 
 export function initSdk(
   androidChannelId: string,
   iosChannelId: string,
   userId?: string,
-  properties?: Map<string, any>) {
-  if (Platform.OS === 'ios') {
-    return ScreebModule.initSdk(iosChannelId, userId, properties);
+  properties?: Map<string, any>,
+  hooks?: any
+) {
+  const emitter =
+    Platform.OS === "ios"
+      ? new NativeEventEmitter(NativeModules.ScreebModule)
+      : DeviceEventEmitter;
+  emitter.addListener("ScreebEvent", handleEvent);
+  let mapHooksId: any = undefined;
+  if (hooks != null) {
+    mapHooksId = new Object();
+    Object.keys(hooks).map((key) => {
+      if (key == "version") {
+        mapHooksId = { ...mapHooksId, version: hooks[key] };
+      } else {
+        // Random id
+        let uuid = Date.now().toString() + Math.random().toString();
+        hooksRegistry.set(uuid, hooks[key]);
+        mapHooksId = { ...mapHooksId, [key]: uuid };
+      }
+    });
+  }
+  if (Platform.OS === "ios") {
+    return ScreebModule.initSdk(iosChannelId, userId, properties, mapHooksId);
   } else {
-    return ScreebModule.initSdk(androidChannelId, userId, properties);
+    return ScreebModule.initSdk(
+      androidChannelId,
+      userId,
+      properties,
+      mapHooksId
+    );
   }
 }
 export function setIdentity(userId: string, properties?: Map<string, any>) {
@@ -34,10 +67,18 @@ export function setIdentity(userId: string, properties?: Map<string, any>) {
 export function setProperties(properties?: Map<string, any>) {
   return ScreebModule.setProperties(properties);
 }
-export function assignGroup(type: string | null, name: string, properties?: Map<string, any>) {
+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>) {
+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>) {
@@ -46,18 +87,53 @@ export function trackEvent(name: string, properties?: Map<string, any>) {
 export function trackScreen(name: string, properties?: Map<string, any>) {
   return ScreebModule.trackScreen(name, properties);
 }
-export function startSurvey(surveyId: string, allowMultipleResponses?: boolean, hiddenFields?: Map<string, any>, ignoreSurveyStatus?: boolean) {
-  return ScreebModule.startSurvey(surveyId, allowMultipleResponses ?? true, hiddenFields, ignoreSurveyStatus ?? true);
+export function startSurvey(
+  surveyId: string,
+  allowMultipleResponses?: boolean,
+  hiddenFields?: Map<string, any>,
+  ignoreSurveyStatus?: boolean,
+  hooks?: any
+) {
+  let mapHooksId: any = undefined;
+  if (hooks != undefined) {
+    mapHooksId = new Object();
+    Object.keys(hooks).map((key) => {
+      if (key == "version") {
+        mapHooksId = { ...mapHooksId, version: hooks[key] };
+      } else {
+        // Random id
+        let uuid = Date.now().toString() + Math.random().toString();
+        hooksRegistry.set(uuid, hooks[key]);
+        mapHooksId = { ...mapHooksId, [key]: uuid };
+      }
+    });
+  }
+  return ScreebModule.startSurvey(
+    surveyId,
+    allowMultipleResponses ?? true,
+    hiddenFields,
+    ignoreSurveyStatus ?? true,
+    mapHooksId
+  );
 }
-export function debug(){
+export function debug() {
   return ScreebModule.debug();
 }
-export function debugTargeting(){
+export function debugTargeting() {
   return ScreebModule.debugTargeting();
 }
-export function resetIdentity(){
+export function resetIdentity() {
   return ScreebModule.resetIdentity();
 }
-export function closeSdk(){
+export function closeSdk() {
   return ScreebModule.closeSdk();
-}
+}
+
+function handleEvent(event: any) {
+  if (event?.hookId != null) {
+    let hook = hooksRegistry.get(event.hookId);
+    if (hook != null) {
+      hook(event.payload);
+    }
+  }
+}