Merge pull request #27 from superwall/develop

1.4.2

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 The changelog for `Superwall`. Also see the [releases](https://github.com/superwall/react-native-superwall/releases) on GitHub.
 
+## 1.4.2
+
+### Fixes
+
+- Fixes an issue where params that were passed with `getPresentationResult(event:params:)` were being dropped.
+
 ## 1.4.1
 
 ### Enhancements

android/src/main/java/com/superwallreactnative/SuperwallReactNativeModule.kt

@@ -29,7 +29,6 @@ import com.superwallreactnative.models.SuperwallOptions
 import com.superwallreactnative.models.convertMapToReadableMap
 import com.superwallreactnative.models.convertReadableMapToMap
 import com.superwallreactnative.models.asString
-import com.superwallreactnative.models.convertReadableMapToCompactMap
 import com.superwallreactnative.models.toJson
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -272,8 +271,7 @@ class SuperwallReactNativeModule(private val reactContext: ReactApplicationConte
     promise: Promise
   ) {
     CoroutineScope(Dispatchers.IO).launch {
-      val paramsMap = params?.let { convertReadableMapToCompactMap(it) }
-      val result = Superwall.instance.getPresentationResult(event, paramsMap)
+      val result = Superwall.instance.getPresentationResult(event, params?.toHashMap())
       launch(Dispatchers.Main) {
         promise.resolve(result.toJson())
       }

android/src/main/java/com/superwallreactnative/models/SuperwallEvent.kt

@@ -241,20 +241,3 @@ fun convertReadableMapToMap(readableMap: ReadableMap): Map<String, Any?> {
   }
   return map
 }
-
-fun convertReadableMapToCompactMap(readableMap: ReadableMap): Map<String, Any> {
-  val map: MutableMap<String, Any> = HashMap()
-  val iterator = readableMap.keySetIterator()
-  while (iterator.hasNextKey()) {
-    val key = iterator.nextKey()
-    when (val value = readableMap.getType(key)) {
-      ReadableType.String -> map[key] = readableMap.getString(key) ?: continue
-      ReadableType.Boolean -> map[key] = readableMap.getBoolean(key)
-      ReadableType.Number -> map[key] = readableMap.getDouble(key)
-      ReadableType.Map -> map[key] = convertReadableMapToMap(readableMap.getMap(key)!!)
-      ReadableType.Null -> continue
-      else -> {}
-    }
-  }
-  return map
-}

example/ios/Podfile.lock

@@ -1119,7 +1119,7 @@ PODS:
     - React-Core
   - SocketRocket (0.6.1)
   - Superscript (0.1.12)
-  - superwall-react-native (1.4.1):
+  - superwall-react-native (1.4.2):
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
@@ -1393,7 +1393,7 @@ SPEC CHECKSUMS:
   RNPurchases: 06957eb2f35bd7bb336d32fccf3534d45a3fda8a
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Superscript: 1ed1b4364f93bd16be05d085bba7357dbab95c83
-  superwall-react-native: 6c5401f69c3185053bff9f09bfc52a2b97313eab
+  superwall-react-native: 9505d6e29c25c9d53f0e053545bad52a3081fc53
   SuperwallKit: ff739c94ebc351ae210c8b0f0b3931e930d74053
   Yoga: 1b901a6d6eeba4e8a2e8f308f708691cdb5db312
 

ios/SuperwallReactNative.swift

@@ -241,7 +241,7 @@ class SuperwallReactNative: RCTEventEmitter {
   @objc(getPresentationResult:params:withResolver:withRejecter:)
   func getPresentationResult(
     event: String,
-    params: [String: Any],
+    params: [String: Any]?,
     resolve: @escaping RCTPromiseResolveBlock,
     reject: @escaping RCTPromiseRejectBlock
   ) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superwall/react-native-superwall",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "The React Native package for Superwall",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

src/index.tsx

@@ -336,7 +336,14 @@ export default class Superwall {
     params?: Map<String, any>
   ): Promise<PresentationResult> {
     await this.awaitConfig();
-    return await SuperwallReactNative.getPresentationResult(event, params);
+    let paramsObject = {};
+    if (params) {
+      paramsObject = Object.fromEntries(params);
+    }
+    return await SuperwallReactNative.getPresentationResult(
+      event,
+      paramsObject
+    );
   }
 
   async getConfigurationStatus(): Promise<ConfigurationStatus> {