@screeb/react-native 2.0.20 → 2.0.22

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.28"
+  implementation "app.screeb.sdk:survey:2.0.31"
   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.0.20")
+    Screeb.setSecondarySDK("react-native", "2.0.22")
     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.0.20")
+    Screeb.setSecondarySDK(name: "react-native", version: "2.0.22")
     var map: [String: AnyEncodable?] = [:]
     if (properties_ != nil) {
         map = self.mapToAnyEncodable(map: properties_!)
@@ -149,22 +149,30 @@ class ScreebModule: RCTEventEmitter {
     }
   }
 
-  private func mapToAnyEncodable(map: [String: Any]) -> [String: AnyEncodable?] {
-      return map.mapValues{
-          value in
-          switch value {
-          case is String:
-              return AnyEncodable(value as! String)
-          case is Bool:
-              return AnyEncodable(value as! Bool)
-          case is Float:
-              return AnyEncodable(value as! Float)
-          case is Int:
-              return AnyEncodable(value as! Int)
-          default: break
-          }
-          return nil
+  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))
+        } else {
+            anyEncodableMap[key] = nil
+        }
       }
+      return anyEncodableMap
   }
 
   override func supportedEvents() -> [String]! {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@screeb/react-native",
-  "version": "2.0.20",
+  "version": "2.0.22",
   "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.9'
+  s.dependency "Screeb", '~> 2.0.10'
 end