feat: popTo

GoodRequest · Nov 15, 2024 · 3b5fc8c · 3b5fc8c
1 parent c20cc50
commit 3b5fc8c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/Sources/GoodCoordinator/Router.swift b/Sources/GoodCoordinator/Router.swift
@@ -65,11 +65,18 @@ private extension AnyReactor {
         navigationPath.cleanup()
     }
 
-//    public func popTo<R: Reactor>(_ reactor: R.Type) {
-//        let lastReactorIndex = navigationPath.count - 1
-//        let poppingToReactorAtIndex = navigationPath.keys.lastIndex(where: { $0 is R }) ?? lastReactorIndex
-//        navigationPath.removeLast(lastReactorIndex - poppingToReactorAtIndex)
-//    }
+    public func popTo<R: Reactor>(_ reactor: R.Type) {
+        var currentNode = navigationPath.lastActiveNode
+        while var parent = currentNode.parent, !parent.value.isTabs {
+            let parentReactor = parent.value.reactor
+            if parentReactor?.is(ofType: reactor) ?? false {
+                parent.value.mutator?(nil)
+                return
+            } else {
+                currentNode = parent
+            }
+        }
+    }
 
 }
 

diff --git a/Sources/GoodCoordinator/Structures/Tree.swift b/Sources/GoodCoordinator/Structures/Tree.swift
@@ -9,6 +9,8 @@ import Collections
 
 public typealias Tree<T> = TreeNode<T>
 
+// MARK: - Class
+
 public class TreeNode<T> {
     public var value: T
 
@@ -29,6 +31,8 @@ public class TreeNode<T> {
     }
 }
 
+// MARK: - Depth
+
 extension TreeNode {
 
     var depth: Int {
@@ -43,6 +47,8 @@ extension TreeNode {
 
 }
 
+// MARK: - String description
+
 extension TreeNode: CustomStringConvertible {
 
     public var description: String {
@@ -55,6 +61,8 @@ extension TreeNode: CustomStringConvertible {
 
 }
 
+// MARK: - Search
+
 extension TreeNode {
 
     public func depthFirstSearch(_ value: T, predicate: (T, T) -> Bool) -> TreeNode? {