Make sure POSModalManager is always reset when it's no longer presented

woocommerce · Jan 30, 2025 · ac276c1 · ac276c1
1 parent b262860
commit ac276c1
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/WooCommerce/Classes/POS/Presentation/Reusable Views/POSModalManager.swift b/WooCommerce/Classes/POS/Presentation/Reusable Views/POSModalManager.swift
@@ -1,15 +1,26 @@
 import SwiftUI
+import Combine
 
 class POSModalManager: ObservableObject {
     @Published private(set) var isPresented: Bool = false
     @Published private(set) var allowsInteractiveDismissal: Bool = true
     private var contentBuilder: (() -> AnyView)?
     private var onDismiss: (() -> Void)?
+    private var subscriptions = Set<AnyCancellable>()
 
     func present<Content: View>(onDismiss: @escaping () -> Void, content: @escaping () -> Content) {
         contentBuilder = { AnyView(content()) }
         self.onDismiss = onDismiss
         isPresented = true
+
+        $isPresented
+            .sink { [weak self] _ in
+                guard let self else { return }
+                if !isPresented {
+                    reset()
+                }
+            }
+            .store(in: &subscriptions)
     }
 
     func dismiss() {
@@ -34,5 +45,6 @@ class POSModalManager: ObservableObject {
         onDismiss = nil
         allowsInteractiveDismissal = true
         contentBuilder = nil
+        subscriptions = Set()
     }
 }