Merge pull request #36 from canopas/fix-multiple-pop-issue

Fix multiple pop issue and bump version to 2.0.2

Package.swift

@@ -5,10 +5,7 @@ import PackageDescription
 let package = Package(
     name: "UIPilot",
     platforms: [
-        .macOS(.v11),
         .iOS(.v14),
-        .tvOS(.v14),
-        .watchOS(.v7)
     ],
     products: [
         .library(

README.md

@@ -42,7 +42,7 @@ Once you have your Swift package set up, adding UIPilot as a dependency is as ea
 
 ```swift
 dependencies: [
-    .package(url: "https://github.com/canopas/UIPilot.git", .upToNextMajor(from: "2.0.1"))
+    .package(url: "https://github.com/canopas/UIPilot.git", .upToNextMajor(from: "2.0.2"))
 ]
 ```
 
@@ -51,7 +51,7 @@ dependencies: [
 [CocoaPods][] is a dependency manager for Cocoa projects. For usage and installation instructions, visit their website. To integrate UIPilot into your Xcode project using CocoaPods, specify it in your Podfile:
 
     target 'YourAppName' do
-        pod 'UIPilot', '~> 2.0.1'
+        pod 'UIPilot', '~> 2.0.2'
     end
 
 [CocoaPods]: https://cocoapods.org

Sources/UIPilot/UIPilot.swift

@@ -113,6 +113,9 @@ struct NavigationControllerHost<T: Equatable, Screen: View>: UIViewControllerRep
         navigation.popHandler = {
             uipilot.onSystemPop()
         }
+        navigation.stackSizeProvider = {
+            uipilot.routes.count
+        }
 
         for path in uipilot.routes {
             navigation.pushViewController(
@@ -154,6 +157,7 @@ struct NavigationControllerHost<T: Equatable, Screen: View>: UIViewControllerRep
 class PopAwareUINavigationController: UINavigationController, UINavigationControllerDelegate
 {
     var popHandler: (() -> Void)?
+    var stackSizeProvider: (() -> Int)?
 
     var popGestureBeganController: UIViewController?
 
@@ -163,16 +167,13 @@ class PopAwareUINavigationController: UINavigationController, UINavigationContro
     }
 
     func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool) {
-        if let coordinator = viewController.transitionCoordinator {
-            if let dismissedViewController = coordinator.viewController(forKey: .from),
-                      !navigationController.viewControllers.contains(dismissedViewController) {
-                self.popHandler?()
-            }
+
+        if let stackSizeProvider = stackSizeProvider, stackSizeProvider() > navigationController.viewControllers.count {
+            self.popHandler?()
         }
     }
 }
 
-
 extension View {
     public func uipNavigationBarHidden(_ hidden: Bool) -> some View {
         return modifier(NavHiddenModifier(isHidden: hidden))

UIPilot.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "UIPilot"
-  s.version          = "2.0.1"
+  s.version          = "2.0.2"
   s.summary          = "The missing type-safe, SwiftUI navigation library."
 
   s.description      = <<-DESC
@@ -21,7 +21,4 @@ Pod::Spec.new do |s|
   s.preserve_paths   = 'README.md'
 
   s.ios.deployment_target     = '14.0'
-  s.tvos.deployment_target    = '14.0'
-  s.osx.deployment_target     = '11.0'
-  s.watchos.deployment_target = '7.0'
 end

docs/index.md

@@ -322,7 +322,7 @@ Once you have your Swift package set up, adding UIPilot as a dependency is as ea
 
 ```swift
 dependencies: [
-    .package(url: "https://github.com/canopas/UIPilot.git", .upToNextMajor(from: "2.0.1"))
+    .package(url: "https://github.com/canopas/UIPilot.git", .upToNextMajor(from: "2.0.2"))
 ]
 ```
 
@@ -331,7 +331,7 @@ dependencies: [
 [CocoaPods][] is a dependency manager for Cocoa projects. For usage and installation instructions, visit their website. To integrate UIPilot into your Xcode project using CocoaPods, specify it in your Podfile:
 
     target 'YourAppName' do
-        pod 'UIPilot', '~> 2.0.1'
+        pod 'UIPilot', '~> 2.0.2'
     end
 
 [CocoaPods]: https://cocoapods.org