@stripe/stripe-react-native 0.56.0 → 0.57.0

package/android/src/main/java/com/reactnativestripesdk/addresssheet/AddressLauncherManager.kt

@@ -0,0 +1,78 @@
+package com.reactnativestripesdk.addresssheet
+
+import android.annotation.SuppressLint
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.WritableMap
+import com.reactnativestripesdk.utils.ErrorType
+import com.reactnativestripesdk.utils.StripeUIManager
+import com.reactnativestripesdk.utils.createError
+import com.stripe.android.core.reactnative.ReactNativeSdkInternal
+import com.stripe.android.paymentsheet.PaymentSheet
+import com.stripe.android.paymentsheet.addresselement.AddressDetails
+import com.stripe.android.paymentsheet.addresselement.AddressLauncher
+import com.stripe.android.paymentsheet.addresselement.AddressLauncherResult
+
+@OptIn(ReactNativeSdkInternal::class)
+class AddressLauncherManager(
+  context: ReactApplicationContext,
+  appearance: PaymentSheet.Appearance,
+  defaultAddress: AddressDetails?,
+  allowedCountries: Set<String>,
+  buttonTitle: String?,
+  title: String?,
+  googlePlacesApiKey: String?,
+  autocompleteCountries: Set<String>,
+  additionalFields: AddressLauncher.AdditionalFieldsConfiguration?,
+  private var callback: ((error: WritableMap?, address: AddressDetails?) -> Unit),
+) : StripeUIManager(context) {
+  companion object {
+    internal var publishableKey: String? = null
+  }
+
+  private lateinit var addressLauncher: AddressLauncher
+  private var configuration =
+    AddressLauncher.Configuration(
+      appearance = appearance,
+      address = defaultAddress,
+      allowedCountries = allowedCountries,
+      buttonTitle = buttonTitle,
+      additionalFields = additionalFields,
+      title = title,
+      googlePlacesApiKey = googlePlacesApiKey,
+      autocompleteCountries = autocompleteCountries,
+    )
+
+  override fun onPresent() {
+    val activity = getCurrentActivityOrResolveWithError(promise) ?: return
+    publishableKey?.let { publishableKey ->
+      @SuppressLint("RestrictedApi")
+      addressLauncher =
+        AddressLauncher(activity, signal, ::onAddressLauncherResult).also {
+          it.present(publishableKey = publishableKey, configuration = configuration)
+        }
+    }
+      ?: run {
+        callback.invoke(
+          createError(
+            ErrorType.Failed.toString(),
+            "No publishable key set. Stripe has not been initialized. Initialize Stripe in your app with the StripeProvider component or the initStripe method.",
+          ),
+          null,
+        )
+      }
+  }
+
+  private fun onAddressLauncherResult(result: AddressLauncherResult) {
+    when (result) {
+      is AddressLauncherResult.Canceled -> {
+        callback.invoke(
+          createError(ErrorType.Canceled.toString(), "The flow has been canceled."),
+          null,
+        )
+      }
+      is AddressLauncherResult.Succeeded -> {
+        callback.invoke(null, result.address)
+      }
+    }
+  }
+}

package/android/src/main/java/com/reactnativestripesdk/addresssheet/AddressSheetView.kt

@@ -1,7 +1,6 @@
 package com.reactnativestripesdk.addresssheet
 
 import android.annotation.SuppressLint
-import android.os.Bundle
 import android.util.Log
 import android.widget.FrameLayout
 import com.facebook.react.bridge.ReadableMap
@@ -13,7 +12,7 @@ import com.reactnativestripesdk.buildPaymentSheetAppearance
 import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.PaymentSheetAppearanceException
 import com.reactnativestripesdk.utils.createError
-import com.reactnativestripesdk.utils.toBundleObject
+import com.reactnativestripesdk.utils.getBooleanOr
 import com.stripe.android.paymentsheet.PaymentSheet
 import com.stripe.android.paymentsheet.addresselement.AddressDetails
 import com.stripe.android.paymentsheet.addresselement.AddressLauncher
@@ -31,6 +30,14 @@ class AddressSheetView(
   private var googlePlacesApiKey: String? = null
   private var autocompleteCountries: Set<String> = emptySet()
   private var additionalFields: AddressLauncher.AdditionalFieldsConfiguration? = null
+  private var addressSheetManager: AddressLauncherManager? = null
+
+  override fun onDetachedFromWindow() {
+    super.onDetachedFromWindow()
+
+    addressSheetManager?.destroy()
+    addressSheetManager = null
+  }
 
   private fun onSubmit(params: WritableMap) {
     UIManagerHelper.getEventDispatcherForReactTag(context, id)?.dispatchEvent(
@@ -59,29 +66,37 @@ class AddressSheetView(
   private fun launchAddressSheet() {
     val appearance =
       try {
-        buildPaymentSheetAppearance(toBundleObject(appearanceParams), context)
+        buildPaymentSheetAppearance(appearanceParams, context)
       } catch (error: PaymentSheetAppearanceException) {
         onError(createError(ErrorType.Failed.toString(), error))
         return
       }
-    AddressLauncherFragment().presentAddressSheet(
-      context,
-      appearance,
-      defaultAddress,
-      allowedCountries,
-      buttonTitle,
-      sheetTitle,
-      googlePlacesApiKey,
-      autocompleteCountries,
-      additionalFields,
-    ) { error, address ->
-      if (address != null) {
-        onSubmit(buildResult(address))
-      } else {
-        onError(error)
+    addressSheetManager?.destroy()
+    addressSheetManager =
+      AddressLauncherManager(
+        context.reactApplicationContext,
+        appearance,
+        defaultAddress,
+        allowedCountries,
+        buttonTitle,
+        sheetTitle,
+        googlePlacesApiKey,
+        autocompleteCountries,
+        additionalFields,
+      ) { error, address ->
+        addressSheetManager?.destroy()
+        addressSheetManager = null
+
+        if (address != null) {
+          onSubmit(buildResult(address))
+        } else {
+          onError(error)
+        }
+        isVisible = false
+      }.also {
+        it.create()
+        it.present()
       }
-      isVisible = false
-    }
   }
 
   fun setAppearance(appearanceParams: ReadableMap?) {
@@ -117,27 +132,25 @@ class AddressSheetView(
   }
 
   companion object {
-    internal fun buildAddressDetails(bundle: Bundle): AddressDetails =
+    internal fun buildAddressDetails(map: ReadableMap): AddressDetails =
       AddressDetails(
-        name = bundle.getString("name"),
-        address = buildAddress(bundle.getBundle("address")),
-        phoneNumber = bundle.getString("phone"),
-        isCheckboxSelected = bundle.getBoolean("isCheckboxSelected"),
+        name = map.getString("name"),
+        address = buildAddress(map.getMap("address")),
+        phoneNumber = map.getString("phone"),
+        isCheckboxSelected = map.getBooleanOr("isCheckboxSelected", false),
       )
 
-    internal fun buildAddressDetails(map: ReadableMap): AddressDetails = buildAddressDetails(toBundleObject(map))
-
-    internal fun buildAddress(bundle: Bundle?): PaymentSheet.Address? {
-      if (bundle == null) {
+    internal fun buildAddress(map: ReadableMap?): PaymentSheet.Address? {
+      if (map == null) {
         return null
       }
       return PaymentSheet.Address(
-        city = bundle.getString("city"),
-        country = bundle.getString("country"),
-        line1 = bundle.getString("line1"),
-        line2 = bundle.getString("line2"),
-        state = bundle.getString("state"),
-        postalCode = bundle.getString("postalCode"),
+        city = map.getString("city"),
+        country = map.getString("country"),
+        line1 = map.getString("line1"),
+        line2 = map.getString("line2"),
+        state = map.getString("state"),
+        postalCode = map.getString("postalCode"),
       )
     }
 

package/android/src/main/java/com/reactnativestripesdk/customersheet/{CustomerSheetFragment.kt → CustomerSheetManager.kt}

@@ -10,6 +10,7 @@ import android.util.Log
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.reactnativestripesdk.ReactNativeCustomerAdapter
@@ -17,6 +18,8 @@ import com.reactnativestripesdk.ReactNativeCustomerSessionProvider
 import com.reactnativestripesdk.buildPaymentSheetAppearance
 import com.reactnativestripesdk.getBase64FromBitmap
 import com.reactnativestripesdk.getBitmapFromDrawable
+import com.reactnativestripesdk.getIntegerArrayList
+import com.reactnativestripesdk.getStringArrayList
 import com.reactnativestripesdk.mapToAddressCollectionMode
 import com.reactnativestripesdk.mapToCardBrandAcceptance
 import com.reactnativestripesdk.mapToCollectionMode
@@ -24,65 +27,50 @@ import com.reactnativestripesdk.utils.CreateTokenErrorType
 import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.KeepJsAwakeTask
 import com.reactnativestripesdk.utils.PaymentSheetAppearanceException
-import com.reactnativestripesdk.utils.StripeFragment
+import com.reactnativestripesdk.utils.StripeUIManager
 import com.reactnativestripesdk.utils.createError
+import com.reactnativestripesdk.utils.getBooleanOr
 import com.reactnativestripesdk.utils.mapFromPaymentMethod
 import com.reactnativestripesdk.utils.mapToPreferredNetworks
 import com.stripe.android.ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi
+import com.stripe.android.core.reactnative.ReactNativeSdkInternal
 import com.stripe.android.customersheet.CustomerAdapter
 import com.stripe.android.customersheet.CustomerEphemeralKey
 import com.stripe.android.customersheet.CustomerSheet
 import com.stripe.android.customersheet.CustomerSheetResult
 import com.stripe.android.customersheet.PaymentOptionSelection
 import com.stripe.android.model.PaymentMethod
-import com.stripe.android.paymentsheet.ExperimentalCustomerSessionApi
 import com.stripe.android.paymentsheet.PaymentSheet
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-@OptIn(ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi::class, ExperimentalCustomerSessionApi::class)
-class CustomerSheetFragment : StripeFragment() {
+@OptIn(ReactNativeSdkInternal::class, ExperimentalAllowsRemovalOfLastSavedPaymentMethodApi::class)
+class CustomerSheetManager(
+  context: ReactApplicationContext,
+  private var arguments: ReadableMap,
+  private var customerAdapterOverrides: ReadableMap,
+  private var initPromise: Promise,
+) : StripeUIManager(context) {
   private var customerSheet: CustomerSheet? = null
   internal var customerAdapter: ReactNativeCustomerAdapter? = null
   internal var customerSessionProvider: ReactNativeCustomerSessionProvider? = null
-  internal var context: ReactApplicationContext? = null
-  internal var initPromise: Promise? = null
   private var presentPromise: Promise? = null
   private var keepJsAwake: KeepJsAwakeTask? = null
 
-  override fun prepare() {
-    val context =
-      context
-        ?: run {
-          Log.e(
-            "StripeReactNative",
-            "No context found during CustomerSheet.initialize. Please file an issue: https://github.com/stripe/stripe-react-native/issues",
-          )
-          return
-        }
-    val initPromise =
-      initPromise
-        ?: run {
-          Log.e(
-            "StripeReactNative",
-            "No promise found for CustomerSheet.initialize. Please file an issue: https://github.com/stripe/stripe-react-native/issues",
-          )
-          return
-        }
-
-    val headerTextForSelectionScreen = arguments?.getString("headerTextForSelectionScreen")
-    val merchantDisplayName = arguments?.getString("merchantDisplayName")
-    val googlePayEnabled = arguments?.getBoolean("googlePayEnabled") ?: false
-    val billingDetailsBundle = arguments?.getBundle("defaultBillingDetails")
-    val billingConfigParams = arguments?.getBundle("billingDetailsCollectionConfiguration")
+  override fun onCreate() {
+    val headerTextForSelectionScreen = arguments.getString("headerTextForSelectionScreen")
+    val merchantDisplayName = arguments.getString("merchantDisplayName")
+    val googlePayEnabled = arguments.getBooleanOr("googlePayEnabled", false)
+    val billingDetailsMap = arguments.getMap("defaultBillingDetails")
+    val billingConfigParams = arguments.getMap("billingDetailsCollectionConfiguration")
     val allowsRemovalOfLastSavedPaymentMethod =
-      arguments?.getBoolean("allowsRemovalOfLastSavedPaymentMethod", true) ?: true
-    val paymentMethodOrder = arguments?.getStringArrayList("paymentMethodOrder")
+      arguments.getBooleanOr("allowsRemovalOfLastSavedPaymentMethod", true)
+    val paymentMethodOrder = arguments.getStringArrayList("paymentMethodOrder")
 
     val appearance =
       try {
-        buildPaymentSheetAppearance(arguments?.getBundle("appearance"), context)
+        buildPaymentSheetAppearance(arguments.getMap("appearance"), context)
       } catch (error: PaymentSheetAppearanceException) {
         initPromise.resolve(createError(ErrorType.Failed.toString(), error))
         return
@@ -95,13 +83,13 @@ class CustomerSheetFragment : StripeFragment() {
         .googlePayEnabled(googlePayEnabled)
         .headerTextForSelectionScreen(headerTextForSelectionScreen)
         .preferredNetworks(
-          mapToPreferredNetworks(arguments?.getIntegerArrayList("preferredNetworks")),
+          mapToPreferredNetworks(arguments.getIntegerArrayList("preferredNetworks")),
         ).allowsRemovalOfLastSavedPaymentMethod(allowsRemovalOfLastSavedPaymentMethod)
         .cardBrandAcceptance(mapToCardBrandAcceptance(arguments))
 
     paymentMethodOrder?.let { configuration.paymentMethodOrder(it) }
-    billingDetailsBundle?.let {
-      configuration.defaultBillingDetails(createDefaultBillingDetails(billingDetailsBundle))
+    billingDetailsMap?.let {
+      configuration.defaultBillingDetails(createDefaultBillingDetails(billingDetailsMap))
     }
     billingConfigParams?.let {
       configuration.billingDetailsCollectionConfiguration(
@@ -109,8 +97,10 @@ class CustomerSheetFragment : StripeFragment() {
       )
     }
 
-    val customerEphemeralKeySecret = arguments?.getString("customerEphemeralKeySecret")
-    val intentConfiguration = createIntentConfiguration(arguments?.getBundle("intentConfiguration"))
+    val activity = getCurrentActivityOrResolveWithError(initPromise) ?: return
+
+    val customerEphemeralKeySecret = arguments.getString("customerEphemeralKeySecret")
+    val intentConfiguration = createIntentConfiguration(arguments.getMap("intentConfiguration"))
     if (customerEphemeralKeySecret == null && intentConfiguration == null) {
       initPromise.resolve(
         createError(
@@ -128,32 +118,31 @@ class CustomerSheetFragment : StripeFragment() {
 
       customerSheet =
         CustomerSheet.create(
-          fragment = this,
+          activity = activity,
           customerSessionProvider = customerSessionProvider,
           callback = ::handleResult,
         )
     } else if (intentConfiguration == null) {
-      val customerId = arguments?.getString("customerId")
+      val customerId = arguments.getString("customerId")
       if (customerId == null) {
         initPromise.resolve(
           createError(ErrorType.Failed.toString(), "When using `customerEphemeralKeySecret` you must provide a value for `customerId`"),
         )
         return
       }
-      val setupIntentClientSecret = arguments?.getString("setupIntentClientSecret")
-      val customerAdapterOverrideParams = arguments?.getBundle("customerAdapter")
+      val setupIntentClientSecret = arguments.getString("setupIntentClientSecret")
       val customerAdapter =
         createCustomerAdapter(
           context,
-          customerId!!,
+          customerId,
           customerEphemeralKeySecret,
           setupIntentClientSecret,
-          customerAdapterOverrideParams,
+          customerAdapterOverrides,
         ).also { this.customerAdapter = it }
 
       customerSheet =
         CustomerSheet.create(
-          fragment = this,
+          activity = activity,
           customerAdapter = customerAdapter,
           callback = ::handleResult,
         )
@@ -193,16 +182,15 @@ class CustomerSheetFragment : StripeFragment() {
     resolvePresentPromise(promiseResult)
   }
 
-  fun present(
-    timeout: Long?,
-    promise: Promise,
-  ) {
-    keepJsAwake = context?.let { KeepJsAwakeTask(it).apply { start() } }
+  override fun onPresent() {
+    keepJsAwake = context.let { KeepJsAwakeTask(it).apply { start() } }
     presentPromise = promise
+    val timeout = timeout
     if (timeout != null) {
       presentWithTimeout(timeout)
+    } else {
+      customerSheet?.present() ?: run { resolvePresentPromise(createMissingInitError()) }
     }
-    customerSheet?.present() ?: run { resolvePresentPromise(createMissingInitError()) }
   }
 
   private fun presentWithTimeout(timeout: Long) {
@@ -232,7 +220,7 @@ class CustomerSheetFragment : StripeFragment() {
 
         override fun onActivityDestroyed(activity: Activity) {
           activities = mutableListOf()
-          context?.currentActivity?.application?.unregisterActivityLifecycleCallbacks(this)
+          context.currentActivity?.application?.unregisterActivityLifecycleCallbacks(this)
         }
       }
 
@@ -248,7 +236,7 @@ class CustomerSheetFragment : StripeFragment() {
       )
 
     context
-      ?.currentActivity
+      .currentActivity
       ?.application
       ?.registerActivityLifecycleCallbacks(activityLifecycleCallbacks)
 
@@ -304,37 +292,35 @@ class CustomerSheetFragment : StripeFragment() {
   }
 
   companion object {
-    internal const val TAG = "customer_sheet_launch_fragment"
-
     internal fun createMissingInitError(): WritableMap =
       createError(ErrorType.Failed.toString(), "No customer sheet has been initialized yet.")
 
-    internal fun createDefaultBillingDetails(bundle: Bundle): PaymentSheet.BillingDetails {
-      val addressBundle = bundle.getBundle("address")
+    internal fun createDefaultBillingDetails(map: ReadableMap): PaymentSheet.BillingDetails {
+      val addressMap = map.getMap("address")
       val address =
         PaymentSheet.Address(
-          addressBundle?.getString("city"),
-          addressBundle?.getString("country"),
-          addressBundle?.getString("line1"),
-          addressBundle?.getString("line2"),
-          addressBundle?.getString("postalCode"),
-          addressBundle?.getString("state"),
+          addressMap?.getString("city"),
+          addressMap?.getString("country"),
+          addressMap?.getString("line1"),
+          addressMap?.getString("line2"),
+          addressMap?.getString("postalCode"),
+          addressMap?.getString("state"),
         )
       return PaymentSheet.BillingDetails(
         address,
-        bundle.getString("email"),
-        bundle.getString("name"),
-        bundle.getString("phone"),
+        map.getString("email"),
+        map.getString("name"),
+        map.getString("phone"),
       )
     }
 
-    internal fun createBillingDetailsCollectionConfiguration(bundle: Bundle): PaymentSheet.BillingDetailsCollectionConfiguration =
+    internal fun createBillingDetailsCollectionConfiguration(map: ReadableMap): PaymentSheet.BillingDetailsCollectionConfiguration =
       PaymentSheet.BillingDetailsCollectionConfiguration(
-        name = mapToCollectionMode(bundle.getString("name")),
-        phone = mapToCollectionMode(bundle.getString("phone")),
-        email = mapToCollectionMode(bundle.getString("email")),
-        address = mapToAddressCollectionMode(bundle.getString("address")),
-        attachDefaultsToPaymentMethod = bundle.getBoolean("attachDefaultsToPaymentMethod", false),
+        name = mapToCollectionMode(map.getString("name")),
+        phone = mapToCollectionMode(map.getString("phone")),
+        email = mapToCollectionMode(map.getString("email")),
+        address = mapToAddressCollectionMode(map.getString("address")),
+        attachDefaultsToPaymentMethod = map.getBooleanOr("attachDefaultsToPaymentMethod", false),
       )
 
     internal fun createCustomerAdapter(
@@ -342,7 +328,7 @@ class CustomerSheetFragment : StripeFragment() {
       customerId: String,
       customerEphemeralKeySecret: String,
       setupIntentClientSecret: String?,
-      customerAdapterOverrideParams: Bundle?,
+      customerAdapterOverrideParams: ReadableMap?,
     ): ReactNativeCustomerAdapter {
       val ephemeralKeyProvider = {
         CustomerAdapter.Result.success(
@@ -375,18 +361,17 @@ class CustomerSheetFragment : StripeFragment() {
         context = context,
         adapter = customerAdapter,
         overridesFetchPaymentMethods =
-          customerAdapterOverrideParams?.getBoolean("fetchPaymentMethods") ?: false,
+          customerAdapterOverrideParams.getBooleanOr("fetchPaymentMethods", false),
         overridesAttachPaymentMethod =
-          customerAdapterOverrideParams?.getBoolean("attachPaymentMethod") ?: false,
+          customerAdapterOverrideParams.getBooleanOr("attachPaymentMethod", false),
         overridesDetachPaymentMethod =
-          customerAdapterOverrideParams?.getBoolean("detachPaymentMethod") ?: false,
+          customerAdapterOverrideParams.getBooleanOr("detachPaymentMethod", false),
         overridesSetSelectedPaymentOption =
-          customerAdapterOverrideParams?.getBoolean("setSelectedPaymentOption") ?: false,
+          customerAdapterOverrideParams.getBooleanOr("setSelectedPaymentOption", false),
         overridesFetchSelectedPaymentOption =
-          customerAdapterOverrideParams?.getBoolean("fetchSelectedPaymentOption") ?: false,
+          customerAdapterOverrideParams.getBooleanOr("fetchSelectedPaymentOption", false),
         overridesSetupIntentClientSecretForCustomerAttach =
-          customerAdapterOverrideParams?.getBoolean("setupIntentClientSecretForCustomerAttach")
-            ?: false,
+          customerAdapterOverrideParams.getBooleanOr("setupIntentClientSecretForCustomerAttach", false),
       )
     }
 
@@ -414,15 +399,15 @@ class CustomerSheetFragment : StripeFragment() {
       return paymentOptionResult
     }
 
-    internal fun createIntentConfiguration(intentConfigurationBundle: Bundle?): CustomerSheet.IntentConfiguration? =
+    internal fun createIntentConfiguration(intentConfigurationBundle: ReadableMap?): CustomerSheet.IntentConfiguration? =
       intentConfigurationBundle?.let { bundle ->
-        val onBehalfOf = bundle?.getString("onBehalfOf")
+        val onBehalfOf = bundle.getString("onBehalfOf")
         CustomerSheet.IntentConfiguration
           .Builder()
-          .paymentMethodTypes(bundle?.getStringArrayList("paymentMethodTypes") ?: emptyList())
+          .paymentMethodTypes(bundle.getStringArrayList("paymentMethodTypes") ?: emptyList())
           .apply {
             if (onBehalfOf != null) {
-              this.onBehalfOf(onBehalfOf!!)
+              this.onBehalfOf(onBehalfOf)
             }
           }.build()
       }

package/android/src/main/java/com/reactnativestripesdk/customersheet/ReactNativeCustomerSessionProvider.kt

@@ -2,10 +2,8 @@ package com.reactnativestripesdk
 
 import com.facebook.react.bridge.ReactApplicationContext
 import com.stripe.android.customersheet.CustomerSheet
-import com.stripe.android.paymentsheet.ExperimentalCustomerSessionApi
 import kotlinx.coroutines.CompletableDeferred
 
-@OptIn(ExperimentalCustomerSessionApi::class)
 class ReactNativeCustomerSessionProvider(
   val context: ReactApplicationContext,
   val intentConfiguration: CustomerSheet.IntentConfiguration,

package/android/src/main/java/com/reactnativestripesdk/utils/Extensions.kt

@@ -3,10 +3,8 @@ package com.reactnativestripesdk.utils
 import android.content.Context
 import android.view.View
 import android.view.inputmethod.InputMethodManager
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
 import com.facebook.react.bridge.Dynamic
-import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
 
@@ -26,17 +24,54 @@ fun View.hideSoftKeyboard() {
   }
 }
 
-fun Fragment.removeFragment(context: ReactApplicationContext) {
-  (context.currentActivity as? FragmentActivity)?.supportFragmentManager?.let {
-    if (it.findFragmentByTag(this.tag) != null) {
-      it.beginTransaction().remove(this).commitAllowingStateLoss()
-    }
+fun ReadableMap?.getBooleanOr(
+  key: String,
+  default: Boolean,
+): Boolean = if (this?.hasKey(key) == true && this.getType(key) == ReadableType.Boolean) this.getBoolean(key) else default
+
+fun ReadableMap?.getIntOrNull(key: String): Int? =
+  if (this?.hasKey(key) == true && this.getType(key) == ReadableType.Number) this.getInt(key) else null
+
+fun ReadableMap?.getIntOr(
+  key: String,
+  default: Int,
+): Int = getIntOrNull(key) ?: default
+
+fun ReadableMap?.getDoubleOrNull(key: String): Double? =
+  if (this?.hasKey(key) == true && this.getType(key) == ReadableType.Number) this.getDouble(key) else null
+
+fun ReadableMap?.getDoubleOr(
+  key: String,
+  default: Double,
+): Double = getDoubleOrNull(key) ?: default
+
+fun ReadableMap?.getFloatOrNull(key: String): Float? =
+  if (this?.hasKey(key) == true && this.getType(key) == ReadableType.Number) this.getDouble(key).toFloat() else null
+
+fun ReadableMap?.getBooleanOrNull(key: String): Boolean? =
+  if (this?.hasKey(key) == true && this.getType(key) == ReadableType.Boolean) this.getBoolean(key) else null
+
+fun ReadableMap?.getFloatOr(
+  key: String,
+  default: Float,
+): Float = getFloatOrNull(key) ?: default
+
+fun ReadableMap.isEmpty() = !this.keySetIterator().hasNextKey()
+
+fun ReadableMap.forEachKey(callback: (key: String) -> Unit) {
+  val iterator = this.keySetIterator()
+  while (iterator.hasNextKey()) {
+    val key = iterator.nextKey()
+    callback(key)
   }
 }
 
-fun ReadableMap.getBooleanOr(
-  key: String,
-  default: Boolean,
-): Boolean = if (this.hasKey(key)) this.getBoolean(key) else default
+fun ReadableArray.forEachMap(callback: (map: ReadableMap) -> Unit) {
+  for (i in 0 until this.size()) {
+    if (this.getType(i) == ReadableType.Map) {
+      this.getMap(i)?.let(callback)
+    }
+  }
+}
 
 fun Dynamic.asMapOrNull(): ReadableMap? = if (this.type == ReadableType.Map) this.asMap() else null