Update package

Author: vmanot

Sources/Intramodular/Presentation/CocoaPresentationCoordinator.swift

@@ -173,7 +173,12 @@ extension CocoaPresentationCoordinator: DynamicViewPresenter {
 
         #if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
         return .init { attemptToFulfill in
-            if viewController.presentedViewController != nil {
+            if let presentedViewController = viewController.presentedViewController {
+                // Don't call `UIViewController.dismiss` if the presented view controller is already being dismissed. Otherwise, it causes the _presenter_ to dismiss itself.
+                guard !presentedViewController.isBeingDismissed else {
+                    return attemptToFulfill(.success(false))
+                }
+
                 viewController.dismiss(animated: animation != nil) {
                     if let presentation = presentation {
                         presentation.onDismiss()

Sources/Intramodular/Presentation/PresentationManager.swift

@@ -51,38 +51,6 @@ public struct BooleanPresentationManager: PresentationManager  {
     }
 }
 
-// MARK: - Auxiliary Implementation -
-
-private struct _PresentationManagerEnvironmentKey: ViewInteractorEnvironmentKey {
-    typealias ViewInteractor = PresentationManager
-    
-    static var defaultValue: PresentationManager? {
-        get {
-            return nil
-        }
-    }
-}
-
-extension EnvironmentValues {
-    public var presentationManager: PresentationManager {
-        get {
-            #if os(iOS) || os(tvOS) || os(macOS) || targetEnvironment(macCatalyst)
-            if navigator == nil && presentationMode.isPresented {
-                return presentationMode
-            } else {
-                return self[_PresentationManagerEnvironmentKey.self]
-                ?? (_appKitOrUIKitViewControllerBox?.value?._cocoaPresentationCoordinator).flatMap({ CocoaPresentationMode(coordinator: $0) })
-                    ?? presentationMode
-            }
-            #else
-            return self[_PresentationManagerEnvironmentKey.self] ?? presentationMode
-            #endif
-        } set {
-            self[_PresentationManagerEnvironmentKey.self] = newValue
-        }
-    }
-}
-
 // MARK: - Conformances -
 
 public struct AnyPresentationManager: PresentationManager {
@@ -115,3 +83,43 @@ extension Binding: PresentationManager where Value == PresentationMode {
         wrappedValue.dismiss()
     }
 }
+
+// MARK: - Auxiliary Implementation -
+
+private struct _PresentationManagerEnvironmentKey: ViewInteractorEnvironmentKey {
+    typealias ViewInteractor = PresentationManager
+
+    static var defaultValue: PresentationManager? {
+        get {
+            return nil
+        }
+    }
+}
+
+extension EnvironmentValues {
+    public var presentationManager: PresentationManager {
+        get {
+            #if os(iOS) || os(tvOS) || os(macOS) || targetEnvironment(macCatalyst)
+            if navigator == nil && presentationMode.isPresented {
+                if let existingPresentationManager = self[_PresentationManagerEnvironmentKey.self], existingPresentationManager.isPresented {
+                    if #available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *) {
+                        return existingPresentationManager
+                    } else {
+                        return presentationMode
+                    }
+                } else {
+                    return presentationMode
+                }
+            } else {
+                return self[_PresentationManagerEnvironmentKey.self]
+                ?? (_appKitOrUIKitViewControllerBox?.value?._cocoaPresentationCoordinator).flatMap({ CocoaPresentationMode(coordinator: $0) })
+                ?? presentationMode
+            }
+            #else
+            return self[_PresentationManagerEnvironmentKey.self] ?? presentationMode
+            #endif
+        } set {
+            self[_PresentationManagerEnvironmentKey.self] = newValue
+        }
+    }
+}