fix: removing usage of the map for cardview reference (#436)

* fix: removing usage of the map for cardview reference * fix: move cardfield reference to StripeSdk class
stripe · Jul 21, 2021 · ec34e55 · ec34e55
1 parent cb0b58d
commit ec34e55
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 51 deletions.
diff --git a/ios/CardFieldDelegate.swift b/ios/CardFieldDelegate.swift
diff --git a/ios/CardFieldManager.swift b/ios/CardFieldManager.swift
@@ -1,27 +1,12 @@
 import Foundation
 
 @objc(CardFieldManager)
-class CardFieldManager: RCTViewManager, CardFieldDelegate {
-    public let cardFieldMap: NSMutableDictionary = [:]
-
-    func onDidCreateViewInstance(id: String, reference: Any?) -> Void {
-        cardFieldMap[id] = reference
-    }
-
-    func onDidDestroyViewInstance(id: String) {
-        cardFieldMap[id] = nil
-    }
-
-    public func getCardFieldReference(id: String) -> Any? {
-        return self.cardFieldMap[id]
-    }
-
+class CardFieldManager: RCTViewManager {
     override func view() -> UIView! {
-        // as it's reasonable we handle only one CardField component on the same screen
-        if (cardFieldMap[CARD_FIELD_INSTANCE_ID] != nil) {
-            // TODO: throw an exception
-        }
-        return CardFieldView(delegate: self)
+        let cardField = CardFieldView()
+        let stripeSdk = bridge.module(forName: "StripeSdk") as? StripeSdk
+        stripeSdk?.cardFieldView = cardField;
+        return cardField
     }
 
 

diff --git a/ios/CardFieldView.swift b/ios/CardFieldView.swift
@@ -13,8 +13,6 @@ class CardFieldView: UIView, STPPaymentCardTextFieldDelegate {
 
     public var cardParams: STPPaymentMethodCardParams? = nil
 
-    public var delegate: CardFieldDelegate?
-
     @objc var postalCodeEnabled: Bool = true {
         didSet {
             cardField.postalCodeEntryEnabled = postalCodeEnabled
@@ -95,13 +93,6 @@ class CardFieldView: UIView, STPPaymentCardTextFieldDelegate {
         self.addSubview(cardField)
     }
 
-    convenience init(delegate: CardFieldDelegate) {
-        self.init(frame: CGRect.zero)
-        self.delegate = delegate
-
-        self.delegate?.onDidCreateViewInstance(id: CARD_FIELD_INSTANCE_ID, reference: self)
-    }
-
     func focus() {
         cardField.becomeFirstResponder()
     }
@@ -114,10 +105,6 @@ class CardFieldView: UIView, STPPaymentCardTextFieldDelegate {
         cardField.clear()
     }
 
-    override func removeFromSuperview() {
-        self.delegate?.onDidDestroyViewInstance(id: CARD_FIELD_INSTANCE_ID)
-    }
-
     func paymentCardTextFieldDidEndEditing(_ textField: STPPaymentCardTextField) {
         onFocusChange?(["focusedField": NSNull()])
     }

diff --git a/ios/StripeSdk.swift b/ios/StripeSdk.swift
@@ -3,6 +3,7 @@ import Stripe
 
 @objc(StripeSdk)
 class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionViewControllerDelegate, UIAdaptivePresentationControllerDelegate {
+    public var cardFieldView: CardFieldView? = nil
     var merchantIdentifier: String? = nil
 
     private var paymentSheet: PaymentSheet?
@@ -213,9 +214,6 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi
             resolve(Errors.createError(ConfirmPaymentErrorType.Failed.rawValue, "You must provide paymentMethodType"))
             return
         }
-
-        let cardFieldUIManager = bridge.module(forName: "CardFieldManager") as? CardFieldManager
-        let cardFieldView = cardFieldUIManager?.getCardFieldReference(id: CARD_FIELD_INSTANCE_ID) as? CardFieldView
 
         var paymentMethodParams: STPPaymentMethodParams?
         let factory = PaymentMethodFactory.init(params: params, cardFieldView: cardFieldView)
@@ -453,9 +451,6 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi
             return
         }
 
-        let cardFieldUIManager = bridge.module(forName: "CardFieldManager") as? CardFieldManager
-        let cardFieldView = cardFieldUIManager?.getCardFieldReference(id: CARD_FIELD_INSTANCE_ID) as? CardFieldView
-
         var paymentMethodParams: STPPaymentMethodParams?
         let factory = PaymentMethodFactory.init(params: params, cardFieldView: cardFieldView)
 
@@ -498,9 +493,6 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi
             }
         }
 
-        let cardFieldUIManager = bridge.module(forName: "CardFieldManager") as? CardFieldManager
-        let cardFieldView = cardFieldUIManager?.getCardFieldReference(id: CARD_FIELD_INSTANCE_ID) as? CardFieldView
-
         guard let cardParams = cardFieldView?.cardParams else {
             resolve(Errors.createError(CreateTokenErrorType.Failed.rawValue, "Card details not complete"))
             return
@@ -564,9 +556,6 @@ class StripeSdk: RCTEventEmitter, STPApplePayContextDelegate, STPBankSelectionVi
     ) -> Void {
         self.confirmPaymentResolver = resolve
         self.confirmPaymentClientSecret = paymentIntentClientSecret
-
-        let cardFieldUIManager = bridge.module(forName: "CardFieldManager") as? CardFieldManager
-        let cardFieldView = cardFieldUIManager?.getCardFieldReference(id: CARD_FIELD_INSTANCE_ID) as? CardFieldView
 
         let paymentMethodId = params["paymentMethodId"] as? String
         let paymentIntentParams = STPPaymentIntentParams(clientSecret: paymentIntentClientSecret)