Fix hide/drop actions + add "hideAll(animated: Bool)" method on Modal…

…Presenter
facile-it · Feb 9, 2018 · fe13a10 · fe13a10
1 parent 397c629
commit fe13a10
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 20 deletions.
diff --git a/NavigationHelperUIKit/NavigationController.swift b/NavigationHelperUIKit/NavigationController.swift
@@ -41,15 +41,18 @@ extension UINavigationController: StructuredPresenter {
 	}
 
 	public func dropLast(animated: Bool) -> Future<()> {
-		return Future<()>.unfold { done in
-			DispatchQueue.main.async {
-				guard
-					self.viewControllers.isEmpty.not,
-					self.popViewController(animated: animated).isNil.not,
-					animated else { done(()); return }
-				self.transitionCoordinator?.animate(alongsideTransition: nil) { _ in done(()) }
+		guard allStructuredPresented.isEmpty.not else { return .pure(()) }
+
+		return Future<()>
+			.unfold { done in
+				DispatchQueue.main.async {
+					guard
+						self.popViewController(animated: animated).isNil.not,
+						animated else { done(()); return }
+					self.transitionCoordinator?.animate(alongsideTransition: nil) { _ in done(()) }
+				}
 			}
-		}.start()
+			.start()
 	}
 }
 

diff --git a/NavigationHelperUIKit/TabBarController.swift b/NavigationHelperUIKit/TabBarController.swift
@@ -42,14 +42,18 @@ extension UITabBarController: StructuredPresenter {
 	}
 
 	public func dropLast(animated: Bool) -> Future<()> {
-		return Future<()>.unfold { done in
-			DispatchQueue.main.async {
-				guard let viewControllers = self.viewControllers, viewControllers.isEmpty.not else { done(()); return }
-				self.setViewControllers(viewControllers.dropLast() |> Array.init(_:), animated: animated)
-				guard animated else { done(()); return }
-				self.transitionCoordinator?.animate(alongsideTransition: nil) { _ in done(()) }
+		guard allStructuredPresented.isEmpty.not else { return .pure(()) }
+
+		return Future<()>
+			.unfold { done in
+				DispatchQueue.main.async {
+					guard let viewControllers = self.viewControllers, viewControllers.isEmpty.not else { done(()); return }
+					self.setViewControllers(viewControllers.dropLast() |> Array.init(_:), animated: animated)
+					guard animated else { done(()); return }
+					self.transitionCoordinator?.animate(alongsideTransition: nil) { _ in done(()) }
+				}
 			}
-		}.start()
+			.start()
 	}
 }
 

diff --git a/NavigationHelperUIKit/ViewController.swift b/NavigationHelperUIKit/ViewController.swift
@@ -32,17 +32,21 @@ extension UIViewController: ModalPresenter {
 	}
 
 	public func hide(animated: Bool) -> Future<()> {
-		if let lastModalPresented = self.lastModalPresented, let shownPresenter = lastModalPresented as? ModalPresenter, shownPresenter.isPresenting {
+		guard let lastModalPresented = self.lastModalPresented else { return .pure(()) }
+
+		if let shownPresenter = lastModalPresented as? ModalPresenter, shownPresenter.isPresenting {
 			return shownPresenter.hide(animated: animated).flatMap {
 				self.hide(animated: animated)
 			}
 		}
 
-		return Future<()>.unfold { done in
-			DispatchQueue.main.async {
-				self.dismiss(animated: animated, completion: done)
+		return Future<()>
+			.unfold { done in
+				DispatchQueue.main.async {
+					self.dismiss(animated: animated, completion: done)
+				}
 			}
-		}.start()
+			.start()
 	}
 
 	public var lastModalPresented: Presentable? {

diff --git a/Sources/NavigationHelper/Protocols.swift b/Sources/NavigationHelper/Protocols.swift
@@ -27,6 +27,13 @@ extension ModalPresenter {
 	public var isPresenting: Bool {
 		return lastModalPresented.isNil.not
 	}
+
+	public func hideAll(animated: Bool) -> Future<()> {
+		guard isPresenting else { return .pure(()) }
+		return hide(animated: animated).flatMap {
+			self.hideAll(animated: true)
+		}
+	}
 }
 
 public protocol StructuredPresenter {