react-native-candle 0.1.31 → 0.1.32

package/ios/Sources/CandleLinkSheetWrapperView.swift

@@ -28,6 +28,11 @@ struct CandleLinkSheetWrapper: View {
           ) { newLinkedAccount in
             viewModel.linkedAccount = newLinkedAccount
           }
+          .onChange(of: viewModel.showSheet) { _, newValue in
+            Task { @MainActor in
+              viewModel.isPresented = newValue
+            }
+          }
           .environment(candleClient)
       } else {
         Spacer()

package/ios/Sources/HostingViewController.swift

@@ -15,6 +15,12 @@ extension UIViewController {
     child.view.pinEdges(to: view)
     child.didMove(toParent: self)
   }
+
+  func removeEmbedded(_ child: UIViewController) {
+    child.willMove(toParent: nil)
+    child.view.removeFromSuperview()
+    child.removeFromParent()
+  }
 }
 
 extension UIView {

package/ios/Sources/RNCandle.swift

@@ -39,14 +39,6 @@ final class HybridRNCandle: HybridRNCandleSpec {
       )
       let hostingVC = UIHostingController(rootView: wrapperView)
       self.rootVC = hostingVC
-      guard
-        let rootViewController = UIApplication.keyWindow?
-          .rootViewController
-      else {
-        throw RNClientError.badInitialization(
-          message: "Application root view was not initialized.")
-      }
-      rootViewController.embed(hostingVC)
     }
   }
 
@@ -68,7 +60,15 @@ final class HybridRNCandle: HybridRNCandleSpec {
       try viewModel.showDynamicLoading = showDynamicLoading
       try viewModel.presentationBackground = presentationBackground
       try viewModel.presentationStyle = presentationStyle
-      // FIXME: there's a glitch the first time it's presented unless you do this
+      guard
+        let rootViewController = UIApplication.keyWindow?
+          .rootViewController
+      else {
+        throw RNClientError.badInitialization(
+          message: "Application root view was not initialized.")
+      }
+
+      let parentVC = rootViewController.candleTopMost
       DispatchQueue.main.async { [weak self] in
         guard let self else {
           #if DEBUG
@@ -76,7 +76,11 @@ final class HybridRNCandle: HybridRNCandleSpec {
           #endif
           return
         }
+
         do {
+          if let rootVC = self.rootVC {
+            parentVC.embed(rootVC)
+          }
           try self.viewModel.showSheet = isPresented
         } catch {
           #if DEBUG
@@ -84,6 +88,15 @@ final class HybridRNCandle: HybridRNCandleSpec {
           #endif
         }
       }
+      try viewModel.$isPresented
+        .removeDuplicates()
+        .receive(on: RunLoop.main)
+        .sink(receiveValue: { [weak self] isPresented in
+          if let rootVC = self?.rootVC, !isPresented {
+            parentVC.removeEmbedded(rootVC)
+          }
+        })
+        .store(in: &cancellables)
       try viewModel.$linkedAccount
         .removeDuplicates()
         .compactMap(\.?.toLinkedAccount)
@@ -116,7 +129,8 @@ final class HybridRNCandle: HybridRNCandleSpec {
             "\(#function) \(#line): Candle client was not initialized."
         )
       }
-      rootHostingVC.embedOnTop(hostingVC)
+      let parentVC = rootHostingVC.candleTopMost
+      parentVC.embedOnTop(hostingVC)
       let tradeQuote = try tradeQuote.toCandleModel
       DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
         wrapperView.viewModel.tradeQuote = tradeQuote
@@ -1261,3 +1275,13 @@ extension Models.LinkedAccountStatusRef {
     )
   }
 }
+
+extension UIViewController {
+  fileprivate var candleTopMost: UIViewController {
+    var top = self
+    while let presented = top.presentedViewController {
+      top = presented
+    }
+    return top
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-candle",
-  "version": "0.1.31",
+  "version": "0.1.32",
   "description": "Candle SDK for React Native",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/module/index.js",