[Patch 1.0.2] Maintain viewController to prevent dismissing all modals on close (#69)

* Maintain viewController to prevent dismissing all modals on close

* Bump + add changelog entry

Author: markmur

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.2 - February 21, 2024
+
+- Improve "close" event logic by only dismissing the Checkout sheet.
+
 ## 1.0.1 - February 20, 2024
 
 - Adds support for view controllers other than the `rootViewController`. This

modules/@shopify/checkout-sheet-kit/ios/ShopifyCheckoutSheetKit.swift

@@ -28,13 +28,12 @@ import React
 
 @objc(RCTShopifyCheckoutSheetKit)
 class RCTShopifyCheckoutSheetKit: RCTEventEmitter, CheckoutDelegate {
-	private var rootViewController: UIViewController?
+	private var viewControlller: UIViewController?
 
 	private var hasListeners = false
 
 	override init() {
 		super.init()
-		self.rootViewController = UIApplication.shared.delegate?.window??.rootViewController
 	}
 
 	override var methodQueue: DispatchQueue! {
@@ -90,7 +89,8 @@ class RCTShopifyCheckoutSheetKit: RCTEventEmitter, CheckoutDelegate {
 			if self.hasListeners {
 				self.sendEvent(withName: "close", body: nil)
 			}
-			self.rootViewController?.dismiss(animated: true)
+			self.viewControlller?.dismiss(animated: true)
+			self.viewControlller = nil
 		}
 	}
 
@@ -128,6 +128,7 @@ class RCTShopifyCheckoutSheetKit: RCTEventEmitter, CheckoutDelegate {
 		DispatchQueue.main.async {
 			if let url = URL(string: checkoutURL), let viewController = self.getCurrentViewController() {
 				ShopifyCheckoutSheetKit.present(checkout: url, from: viewController, delegate: self)
+				self.viewControlller = viewController
 			}
 		}
 	}

modules/@shopify/checkout-sheet-kit/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shopify/checkout-sheet-kit",
   "license": "MIT",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "lib/commonjs/index.js",
   "types": "src/index.ts",
   "source": "src/index.ts",