fix: allow reload iOS cmponents in DEBUG mode

Adyen · Jul 17, 2023 · b1288b1 · b1288b1
1 parent dabefd4
commit b1288b1
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 27 deletions.
diff --git a/ios/Components/AdyenDropIn.swift b/ios/Components/AdyenDropIn.swift
@@ -11,20 +11,16 @@ import React
 
 @objc(AdyenDropIn)
 final internal class AdyenDropIn: BaseModule {
-
-    private var dropInComponent: DropInComponent?
 
     override func supportedEvents() -> [String]! { super.supportedEvents() }
+
+    private var dropInComponent: DropInComponent? {
+        currentComponent as? DropInComponent
+    }
+
     @objc
     func hide(_ success: NSNumber, event: NSDictionary) {
-        DispatchQueue.main.async { [weak self] in
-            guard let self = self else { return }
-
-            self.dropInComponent?.finalizeIfNeeded(with: success.boolValue) {
-                self.cleanUp()
-                self.dropInComponent = nil
-            }
-        }
+        dismiss(success.boolValue)
     }
 
     @objc
@@ -55,8 +51,8 @@ final internal class AdyenDropIn: BaseModule {
         let component = DropInComponent(paymentMethods: paymentMethods,
                                         configuration: config,
                                         style: dropInComponentStyle)
-        dropInComponent = component
-        dropInComponent?.delegate = self
+        currentComponent = component
+        component.delegate = self
         present(component: component)
     }
 

diff --git a/ios/Components/ApplePayComponent.swift b/ios/Components/ApplePayComponent.swift
@@ -12,17 +12,12 @@ import React
 
 @objc(AdyenApplePay)
 final internal class ApplePayComponent: BaseModule {
-
+    
     override func supportedEvents() -> [String]! { super.supportedEvents() }
+
     @objc
     func hide(_ success: NSNumber, event: NSDictionary) {
-        DispatchQueue.main.async {[weak self] in
-            guard let self = self else { return }
-
-            self.currentComponent?.finalizeIfNeeded(with: success.boolValue) {
-                self.cleanUp()
-            }
-        }
+        dismiss(success.boolValue)
     }
 
     @objc

diff --git a/ios/Components/BaseModule.swift b/ios/Components/BaseModule.swift
@@ -10,6 +10,13 @@ import Adyen
 import Adyen3DS2
 
 internal class BaseModule: RCTEventEmitter {
+
+#if DEBUG
+    override func invalidate() {
+        super.invalidate()
+        dismiss(false)
+    }
+#endif
 
     @objc
     override static func requiresMainQueueSetup() -> Bool { true }
@@ -135,6 +142,16 @@ internal class BaseModule: RCTEventEmitter {
         currentPresenter = nil
     }
 
+    internal func dismiss(_ result: Bool) {
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+
+            self.currentComponent?.finalizeIfNeeded(with: result) {
+                self.cleanUp()
+            }
+        }
+    }
+
 }
 
 extension BaseModule {

diff --git a/ios/Components/InstantComponent.swift b/ios/Components/InstantComponent.swift
@@ -12,17 +12,12 @@ import React
 
 @objc(AdyenInstant)
 final internal class InstantComponent: BaseModule {
+
     override func supportedEvents() -> [String]! { super.supportedEvents() }
 
     @objc
     func hide(_ success: NSNumber, event: NSDictionary) {
-        DispatchQueue.main.async {[weak self] in
-            guard let self = self else { return }
-
-            self.currentComponent?.finalizeIfNeeded(with: success.boolValue) {
-                self.cleanUp()
-            }
-        }
+        dismiss(success.boolValue)
     }
 
     @objc