@stripe/stripe-react-native 0.41.0 → 0.43.0

package/android/src/main/java/com/reactnativestripesdk/StripeSdkPackage.kt

@@ -8,19 +8,17 @@ import com.reactnativestripesdk.addresssheet.AddressSheetViewManager
 import com.reactnativestripesdk.pushprovisioning.AddToWalletButtonManager
 
 class StripeSdkPackage : ReactPackage {
-    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-        return listOf<NativeModule>(StripeSdkModule(reactContext))
-    }
+  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> =
+    listOf<NativeModule>(StripeSdkModule(reactContext))
 
-    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-      return listOf<ViewManager<*, *>>(
-        CardFieldViewManager(),
-        AuBECSDebitFormViewManager(),
-        StripeContainerManager(),
-        CardFormViewManager(),
-        GooglePayButtonManager(),
-        AddToWalletButtonManager(reactContext),
-        AddressSheetViewManager()
-      )
-    }
+  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> =
+    listOf<ViewManager<*, *>>(
+      CardFieldViewManager(),
+      AuBECSDebitFormViewManager(),
+      StripeContainerManager(),
+      CardFormViewManager(),
+      GooglePayButtonManager(),
+      AddToWalletButtonManager(reactContext),
+      AddressSheetViewManager(),
+    )
 }

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

@@ -26,28 +26,31 @@ class AddressLauncherFragment : Fragment() {
   private var configuration = AddressLauncher.Configuration()
   private var callback: ((error: WritableMap?, address: AddressDetails?) -> Unit)? = null
 
-  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                            savedInstanceState: Bundle?): View {
-    return FrameLayout(requireActivity()).also {
-      it.visibility = View.GONE
-    }
-  }
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup?,
+    savedInstanceState: Bundle?,
+  ): View = FrameLayout(requireActivity()).also { it.visibility = View.GONE }
 
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+  override fun onViewCreated(
+    view: View,
+    savedInstanceState: Bundle?,
+  ) {
     publishableKey?.let { publishableKey ->
-      addressLauncher = AddressLauncher(this,
-                                        ::onAddressLauncherResult).also {
-        it.present(
-          publishableKey = publishableKey,
-          configuration = configuration
+      addressLauncher =
+        AddressLauncher(this, ::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,
         )
       }
-    } ?: 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) {
@@ -55,14 +58,11 @@ class AddressLauncherFragment : Fragment() {
       is AddressLauncherResult.Canceled -> {
         callback?.invoke(
           createError(ErrorType.Canceled.toString(), "The flow has been canceled."),
-          null
+          null,
         )
       }
       is AddressLauncherResult.Succeeded -> {
-        callback?.invoke(
-          null,
-          result.address
-        )
+        callback?.invoke(null, result.address)
       }
     }
   }
@@ -77,17 +77,19 @@ class AddressLauncherFragment : Fragment() {
     googlePlacesApiKey: String?,
     autocompleteCountries: Set<String>,
     additionalFields: AddressLauncher.AdditionalFieldsConfiguration?,
-    callback: ((error: WritableMap?, address: AddressDetails?) -> Unit)) {
-    configuration = AddressLauncher.Configuration(
-      appearance = appearance,
-      address = defaultAddress,
-      allowedCountries = allowedCountries,
-      buttonTitle = buttonTitle,
-      additionalFields = additionalFields,
-      title = title,
-      googlePlacesApiKey = googlePlacesApiKey,
-      autocompleteCountries = autocompleteCountries,
-    )
+    callback: ((error: WritableMap?, address: AddressDetails?) -> Unit),
+  ) {
+    configuration =
+      AddressLauncher.Configuration(
+        appearance = appearance,
+        address = defaultAddress,
+        allowedCountries = allowedCountries,
+        buttonTitle = buttonTitle,
+        additionalFields = additionalFields,
+        title = title,
+        googlePlacesApiKey = googlePlacesApiKey,
+        autocompleteCountries = autocompleteCountries,
+      )
     this.callback = callback
     (context.currentActivity as? FragmentActivity)?.let {
       attemptToCleanupPreviousFragment(it)
@@ -96,16 +98,19 @@ class AddressLauncherFragment : Fragment() {
   }
 
   private fun attemptToCleanupPreviousFragment(currentActivity: FragmentActivity) {
-    currentActivity.supportFragmentManager.beginTransaction()
+    currentActivity.supportFragmentManager
+      .beginTransaction()
       .remove(this)
       .commitAllowingStateLoss()
   }
 
   private fun commitFragmentAndStartFlow(currentActivity: FragmentActivity) {
     try {
-      currentActivity.supportFragmentManager.beginTransaction()
+      currentActivity.supportFragmentManager
+        .beginTransaction()
         .add(this, TAG)
         .commit()
-    } catch (_: IllegalStateException) {}
+    } catch (_: IllegalStateException) {
+    }
   }
 }

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

@@ -2,27 +2,28 @@ package com.reactnativestripesdk.addresssheet
 
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
-import com.facebook.react.uimanager.events.RCTEventEmitter
 
-internal class AddressSheetEvent constructor(viewTag: Int, private val eventType: EventType, private val eventMap: WritableMap?) : Event<AddressSheetEvent>(viewTag) {
+internal class AddressSheetEvent(
+  surfaceId: Int,
+  viewTag: Int,
+  private val eventType: EventType,
+  private val eventMap: WritableMap?,
+) : Event<AddressSheetEvent>(surfaceId, viewTag) {
   enum class EventType {
     OnSubmit,
-    OnError
+    OnError,
   }
 
-  override fun dispatch(rctEventEmitter: RCTEventEmitter) {
-    rctEventEmitter.receiveEvent(viewTag, eventName, eventMap)
-  }
+  override fun getEventData() = eventMap
 
   companion object {
-    const val ON_SUBMIT = "onSubmitAction"
-    const val ON_ERROR = "onErrorAction"
+    const val ON_SUBMIT = "topSubmitAction"
+    const val ON_ERROR = "topErrorAction"
   }
 
-  override fun getEventName(): String {
-    return when (eventType) {
+  override fun getEventName(): String =
+    when (eventType) {
       EventType.OnSubmit -> ON_SUBMIT
       EventType.OnError -> ON_ERROR
     }
-  }
 }

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

@@ -1,15 +1,14 @@
 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.Arguments
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.UIManagerModule
-import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.uimanager.UIManagerHelper
 import com.reactnativestripesdk.buildPaymentSheetAppearance
 import com.reactnativestripesdk.utils.ErrorType
 import com.reactnativestripesdk.utils.PaymentSheetAppearanceException
@@ -18,10 +17,11 @@ import com.reactnativestripesdk.utils.toBundleObject
 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
 
-class AddressSheetView(private val context: ThemedReactContext) : FrameLayout(context) {
-  private var eventDispatcher: EventDispatcher? = context.getNativeModule(UIManagerModule::class.java)?.eventDispatcher
+@SuppressLint("ViewConstructor")
+class AddressSheetView(
+  private val context: ThemedReactContext,
+) : FrameLayout(context) {
   private var isVisible = false
   private var appearanceParams: ReadableMap? = null
   private var defaultAddress: AddressDetails? = null
@@ -33,14 +33,14 @@ class AddressSheetView(private val context: ThemedReactContext) : FrameLayout(co
   private var additionalFields: AddressLauncher.AdditionalFieldsConfiguration? = null
 
   private fun onSubmit(params: WritableMap) {
-    eventDispatcher?.dispatchEvent(
-      AddressSheetEvent(id, AddressSheetEvent.EventType.OnSubmit, params)
+    UIManagerHelper.getEventDispatcherForReactTag(context, id)?.dispatchEvent(
+      AddressSheetEvent(context.surfaceId, id, AddressSheetEvent.EventType.OnSubmit, params),
     )
   }
 
   private fun onError(params: WritableMap?) {
-    eventDispatcher?.dispatchEvent(
-      AddressSheetEvent(id, AddressSheetEvent.EventType.OnError, params)
+    UIManagerHelper.getEventDispatcherForReactTag(context, id)?.dispatchEvent(
+      AddressSheetEvent(context.surfaceId, id, AddressSheetEvent.EventType.OnError, params),
     )
   }
 
@@ -48,18 +48,22 @@ class AddressSheetView(private val context: ThemedReactContext) : FrameLayout(co
     if (newVisibility && !isVisible) {
       launchAddressSheet()
     } else if (!newVisibility && isVisible) {
-      Log.w("StripeReactNative", "Programmatically dismissing the Address Sheet is not supported on Android.")
+      Log.w(
+        "StripeReactNative",
+        "Programmatically dismissing the Address Sheet is not supported on Android.",
+      )
     }
     isVisible = newVisibility
   }
 
   private fun launchAddressSheet() {
-    val appearance = try {
-      buildPaymentSheetAppearance(toBundleObject(appearanceParams), context)
-    } catch (error: PaymentSheetAppearanceException) {
-      onError(createError(ErrorType.Failed.toString(), error))
-      return
-    }
+    val appearance =
+      try {
+        buildPaymentSheetAppearance(toBundleObject(appearanceParams), context)
+      } catch (error: PaymentSheetAppearanceException) {
+        onError(createError(ErrorType.Failed.toString(), error))
+        return
+      }
     AddressLauncherFragment().presentAddressSheet(
       context,
       appearance,
@@ -69,7 +73,7 @@ class AddressSheetView(private val context: ThemedReactContext) : FrameLayout(co
       sheetTitle,
       googlePlacesApiKey,
       autocompleteCountries,
-      additionalFields
+      additionalFields,
     ) { error, address ->
       if (address != null) {
         onSubmit(buildResult(address))
@@ -113,18 +117,15 @@ class AddressSheetView(private val context: ThemedReactContext) : FrameLayout(co
   }
 
   companion object {
-    internal fun buildAddressDetails(bundle: Bundle): AddressDetails {
-      return AddressDetails(
+    internal fun buildAddressDetails(bundle: Bundle): AddressDetails =
+      AddressDetails(
         name = bundle.getString("name"),
         address = buildAddress(bundle.getBundle("address")),
         phoneNumber = bundle.getString("phone"),
         isCheckboxSelected = bundle.getBoolean("isCheckboxSelected"),
       )
-    }
 
-    internal fun buildAddressDetails(map: ReadableMap): AddressDetails {
-      return buildAddressDetails(toBundleObject(map))
-    }
+    internal fun buildAddressDetails(map: ReadableMap): AddressDetails = buildAddressDetails(toBundleObject(map))
 
     internal fun buildAddress(bundle: Bundle?): PaymentSheet.Address? {
       if (bundle == null) {
@@ -136,25 +137,24 @@ class AddressSheetView(private val context: ThemedReactContext) : FrameLayout(co
         line1 = bundle.getString("line1"),
         line2 = bundle.getString("line2"),
         state = bundle.getString("state"),
-        postalCode = bundle.getString("postalCode")
+        postalCode = bundle.getString("postalCode"),
       )
     }
 
-    internal fun getFieldConfiguration(key: String?): AddressLauncher.AdditionalFieldsConfiguration.FieldConfiguration {
-      return when (key) {
+    internal fun getFieldConfiguration(key: String?): AddressLauncher.AdditionalFieldsConfiguration.FieldConfiguration =
+      when (key) {
         "hidden" -> AddressLauncher.AdditionalFieldsConfiguration.FieldConfiguration.HIDDEN
         "optional" -> AddressLauncher.AdditionalFieldsConfiguration.FieldConfiguration.OPTIONAL
         "required" -> AddressLauncher.AdditionalFieldsConfiguration.FieldConfiguration.REQUIRED
         else -> AddressLauncher.AdditionalFieldsConfiguration.FieldConfiguration.HIDDEN
       }
-    }
 
     internal fun buildAdditionalFieldsConfiguration(params: ReadableMap): AddressLauncher.AdditionalFieldsConfiguration {
       val phoneConfiguration = getFieldConfiguration(params.getString("phoneNumber"))
 
       return AddressLauncher.AdditionalFieldsConfiguration(
         phone = phoneConfiguration,
-        checkboxLabel = params.getString("checkboxLabel")
+        checkboxLabel = params.getString("checkboxLabel"),
       )
     }
 

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

@@ -2,66 +2,98 @@ package com.reactnativestripesdk.addresssheet
 
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
-import com.facebook.react.common.MapBuilder
+import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 
+@ReactModule(name = AddressSheetViewManager.REACT_CLASS)
 class AddressSheetViewManager : SimpleViewManager<AddressSheetView>() {
-  override fun getName() = "AddressSheetView"
+  override fun getName() = REACT_CLASS
 
-  override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> {
-    return MapBuilder.of(
-      AddressSheetEvent.ON_SUBMIT, MapBuilder.of("registrationName", "onSubmitAction"),
-      AddressSheetEvent.ON_ERROR, MapBuilder.of("registrationName", "onErrorAction"))
-  }
+  override fun getExportedCustomDirectEventTypeConstants() =
+    mutableMapOf(
+      AddressSheetEvent.ON_SUBMIT to
+        mutableMapOf("registrationName" to "onSubmitAction"),
+      AddressSheetEvent.ON_ERROR to
+        mutableMapOf("registrationName" to "onErrorAction"),
+    )
 
   @ReactProp(name = "visible")
-  fun setVisible(view: AddressSheetView, visibility: Boolean) {
+  fun setVisible(
+    view: AddressSheetView,
+    visibility: Boolean,
+  ) {
     view.setVisible(visibility)
   }
 
   @ReactProp(name = "appearance")
-  fun setAppearance(view: AddressSheetView, appearance: ReadableMap) {
+  fun setAppearance(
+    view: AddressSheetView,
+    appearance: ReadableMap,
+  ) {
     view.setAppearance(appearance)
   }
 
   @ReactProp(name = "defaultValues")
-  fun setDefaultValues(view: AddressSheetView, defaults: ReadableMap) {
+  fun setDefaultValues(
+    view: AddressSheetView,
+    defaults: ReadableMap,
+  ) {
     view.setDefaultValues(defaults)
   }
 
   @ReactProp(name = "additionalFields")
-  fun setAdditionalFields(view: AddressSheetView, fields: ReadableMap) {
+  fun setAdditionalFields(
+    view: AddressSheetView,
+    fields: ReadableMap,
+  ) {
     view.setAdditionalFields(fields)
   }
 
   @ReactProp(name = "allowedCountries")
-  fun setAllowedCountries(view: AddressSheetView, countries: ReadableArray) {
+  fun setAllowedCountries(
+    view: AddressSheetView,
+    countries: ReadableArray,
+  ) {
     view.setAllowedCountries(countries.toArrayList().filterIsInstance<String>())
   }
 
   @ReactProp(name = "autocompleteCountries")
-  fun setAutocompleteCountries(view: AddressSheetView, countries: ReadableArray) {
+  fun setAutocompleteCountries(
+    view: AddressSheetView,
+    countries: ReadableArray,
+  ) {
     view.setAutocompleteCountries(countries.toArrayList().filterIsInstance<String>())
   }
 
   @ReactProp(name = "primaryButtonTitle")
-  fun setPrimaryButtonTitle(view: AddressSheetView, title: String) {
+  fun setPrimaryButtonTitle(
+    view: AddressSheetView,
+    title: String,
+  ) {
     view.setPrimaryButtonTitle(title)
   }
 
   @ReactProp(name = "sheetTitle")
-  fun setSheetTitle(view: AddressSheetView, title: String) {
+  fun setSheetTitle(
+    view: AddressSheetView,
+    title: String,
+  ) {
     view.setSheetTitle(title)
   }
 
   @ReactProp(name = "googlePlacesApiKey")
-  fun setGooglePlacesApiKey(view: AddressSheetView, key: String) {
+  fun setGooglePlacesApiKey(
+    view: AddressSheetView,
+    key: String,
+  ) {
     view.setGooglePlacesApiKey(key)
   }
 
-  override fun createViewInstance(reactContext: ThemedReactContext): AddressSheetView {
-    return AddressSheetView(reactContext)
+  override fun createViewInstance(reactContext: ThemedReactContext): AddressSheetView = AddressSheetView(reactContext)
+
+  companion object {
+    const val REACT_CLASS = "AddressSheetView"
   }
 }