File tree Expand file tree Collapse file tree 1 file changed +13
-2
lines changed
packages/core/android/src/main/kotlin/com/datadog/reactnative Expand file tree Collapse file tree 1 file changed +13
-2
lines changed Original file line number Diff line number Diff line change 77package com.datadog.reactnative
88
99import android.util.Log
10+ import com.facebook.react.bridge.Arguments
1011import com.facebook.react.bridge.ReadableArray
1112import com.facebook.react.bridge.ReadableMap
1213import com.facebook.react.bridge.ReadableType
@@ -186,8 +187,18 @@ internal fun ReadableArray.toList(): List<*> {
186187 ReadableType .Boolean -> list.add(getBoolean(i))
187188 ReadableType .Number -> list.add(getDouble(i))
188189 ReadableType .String -> list.add(getString(i))
189- ReadableType .Map -> list.add(getMap(i).toMap())
190- ReadableType .Array -> list.add(getArray(i).toList())
190+ ReadableType .Map -> {
191+ // getMap() return type is nullable in previous RN versions
192+ @Suppress(" USELESS_ELVIS" )
193+ val readableMap = getMap(i) ? : Arguments .createMap()
194+ list.add(readableMap.toMap())
195+ }
196+ ReadableType .Array -> {
197+ // getArray() return type is nullable in previous RN versions
198+ @Suppress(" USELESS_ELVIS" )
199+ val readableArray = getArray(i) ? : Arguments .createArray()
200+ list.add(readableArray.toList())
201+ }
191202 else -> Log .e(
192203 javaClass.simpleName,
193204 " toList(): Unhandled ReadableType: ${type.name} ."
You can’t perform that action at this time.
0 commit comments