Merge pull request #23 from canopas/fix-uipilot-pop-issue

Fix - UIPilot multiple pop issue

Author: jimmy0251

README.md

@@ -38,7 +38,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: "1.2.0"))
+    .package(url: "https://github.com/canopas/UIPilot.git", .upToNextMajor(from: "1.2.1"))
 ]
 ```
 
@@ -47,7 +47,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', '~> 1.2.0'
+        pod 'UIPilot', '~> 1.2.1'
     end
 
 [CocoaPods]: https://cocoapods.org

Sources/UIPilot/UIPilot.swift

@@ -16,8 +16,11 @@ public class UIPilot<T: Equatable>: ObservableObject {
         logger = debug ? DebugLog() : EmptyLog()
         logger.log("UIPilot - Pilot Initialized.")
 
-        viewGenerator.onPop = { [weak self] in
-            self?.pop()
+        viewGenerator.onPop = { [weak self] path in
+            if let self = self, self.paths.count > 1
+                && path.id == self.paths[self.paths.count - 2].id {
+                    self.pop()
+            }
         }
 
         push(initial)
@@ -124,7 +127,7 @@ class PathViewState: ObservableObject {
 
 class PathViewGenerator<T: Equatable> {
 
-    var onPop: (() -> Void)?
+    var onPop: ((UIPilotPath<T>) -> Void)?
 
     func generate(_ paths: [UIPilotPath<T>], _ routeMap: RouteMap<T>, _ pathViews: [UIPilotPath<T>: PathView]) -> (PathView?, [UIPilotPath<T>: PathView]) {
         var pathViews = recycleViews(paths, pathViews: pathViews)
@@ -140,9 +143,8 @@ class PathViewGenerator<T: Equatable> {
 
             content?.state.next = current
             content?.state.onPop = current == nil ? {} : { [weak self] in
-                if let self = self, !paths.isEmpty,
-                   paths.last != path {
-                    self.onPop?()
+                if let self = self {
+                    self.onPop?(path)
                 }
             }
             current = content

UIPilot.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "UIPilot"
-  s.version          = "1.2.0"
+  s.version          = "1.2.1"
   s.summary          = "The missing type-safe, SwiftUI navigation library."
 
   s.description      = <<-DESC

docs/index.md

@@ -323,7 +323,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: "1.2.0"))
+    .package(url: "https://github.com/canopas/UIPilot.git", .upToNextMajor(from: "1.2.1"))
 ]
 ```
 
@@ -332,7 +332,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', '~> 1.2.0'
+        pod 'UIPilot', '~> 1.2.1'
     end
 
 [CocoaPods]: https://cocoapods.org