fix: TabLinkNavigator - Modified 'backOrNext' Method

Author: 97chos

Sources/LinkNavigator/Builder/TabNavigationBuilder.swift

@@ -63,10 +63,10 @@ extension TabNavigationBuilder {
   }
 
   public func lastPick(controller: UINavigationController?, item: LinkItem) -> RouteViewController? {
-    guard let controller, let first = item.pathList.first else { return .none }
+    guard let controller, let last = item.pathList.last else { return .none }
     return controller.viewControllers
       .compactMap { $0 as? RouteViewController }
-      .last(where: { $0.matchPath == first })
+      .last(where: { $0.matchPath == last })
   }
 
   public func exceptFilter(
@@ -78,4 +78,10 @@ extension TabNavigationBuilder {
       .filter { !item.pathList.contains($0.matchPath) }
   }
 
+  public func isContainSequence(item: LinkItem) -> Bool {
+    let currentPathJoin = routeBuilderList.map { $0.matchPath }.joined(separator: ",")
+    let itemPathJoin = item.pathList.joined(separator: ",")
+
+    return currentPathJoin.contains(itemPathJoin)
+  }
 }

Sources/LinkNavigator/Core/Core/TabLinkNavigator/TabLinkNavigator.swift

@@ -158,8 +158,6 @@ extension TabLinkNavigator {
     NotificationCenter.default
       .post(name: TabbarEventNotification.onSelectedTab, object: targetPath)
   }
-
-  public func reload(items _: LinkItem, isAnimated _: Bool) { }
 }
 
 extension UINavigationController {

Sources/LinkNavigator/Core/Core/TabLinkNavigator/TabPartialNavigator.swift

@@ -100,24 +100,24 @@ extension TabPartialNavigator: TabLinkNavigatorProtocol {
   }
 
   public func backOrNext(linkItem: LinkItem, isAnimated: Bool) {
-    guard
-      let pick = navigationBuilder.firstPick(
-        controller: currentController,
-        item: linkItem)
-    else { return }
-
+    guard navigationBuilder.isContainSequence(item: linkItem),
+          let pick = navigationBuilder.lastPick(
+            controller: currentController,
+            item: linkItem) else {
+      currentController?.merge(new: navigationBuilder.build(item: linkItem), isAnimated: isAnimated)
+      return
+    }
     currentController?.popToViewController(pick, animated: isAnimated)
   }
 
   public func rootBackOrNext(linkItem: LinkItem, isAnimated: Bool) {
-    guard
-      let pick = navigationBuilder.firstPick(
-        controller: currentController,
-        item: linkItem)
-    else {
+    guard navigationBuilder.isContainSequence(item: linkItem),
+          let pick = navigationBuilder.lastPick(
+            controller: rootController,
+            item: linkItem) else {
+      rootController.merge(new: navigationBuilder.build(item: linkItem), isAnimated: isAnimated)
       return
     }
-
     rootController.popToViewController(pick, animated: isAnimated)
   }