Dismiss controller in NavManager.dismissSheet()

Open-Bytes · May 27, 2022 · 93304a2 · 93304a2
1 parent a6fc76a
commit 93304a2
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/SwiftUINavigator/Sources/SwiftUINavigator/NavManager.swift b/SwiftUINavigator/Sources/SwiftUINavigator/NavManager.swift
@@ -248,6 +248,7 @@ extension NavManager {
         root?.presentFullSheet = false
         root?.presentCustomSheet = false
         root?.sheet = nil
+        dismissController()
     }
 
     public func dismiss(
@@ -259,10 +260,7 @@ extension NavManager {
     }
 
     public func dismiss(to destination: DismissDestination) {
-        #if os(iOS)
-        // For dismissing the custom sheet which is displayed in a controller
-        UIApplication.shared.topController?.dismiss(animated: true)
-        #endif
+        dismissController()
 
         lastNavigationType = .pop
 
@@ -285,6 +283,12 @@ extension NavManager {
         }
     }
 
+    private func dismissController() {
+        #if os(iOS)
+        // For dismissing the custom sheet which is displayed in a controller
+        UIApplication.shared.topController?.dismiss(animated: true)
+        #endif
+    }
 }
 
 extension NavManager {