Fixes in using of 'rootChain' in 'restoreHierarchy'

InsanusMokrassar · Jan 8, 2023 · dd42bb8 · dd42bb8
1 parent d9c3dcd
commit dd42bb8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 * `Versions`:
   * `MicroUtils`: `0.16.5`
+* Fixes in using of `rootChain` in `restoreHierarchy`
 * `JS`:
   * Add more logs in `initNavigation`
 

diff --git a/core/src/commonMain/kotlin/repo/HierarchyHandler.kt b/core/src/commonMain/kotlin/repo/HierarchyHandler.kt
@@ -1,9 +1,6 @@
 package dev.inmo.navigation.core.repo
 
 import dev.inmo.navigation.core.*
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.takeWhile
 
 suspend fun <Base> ConfigHolder.Chain<Base>.restoreHierarchy(
     node: NavigationNode<out Base, Base>
@@ -16,13 +13,12 @@ suspend fun <Base> ConfigHolder.Chain<Base>.restoreHierarchy(
 }
 
 suspend fun <Base> ConfigHolder.Chain<Base>.restoreHierarchy(
-    factory: NavigationNodeFactory<Base>
+    factory: NavigationNodeFactory<Base>,
+    chainToRestore: NavigationChain<Base> = NavigationChain(null, factory)
 ): NavigationChain<Base> {
-    val subchain = NavigationChain(null, factory)
+    firstNodeConfig.restoreHierarchy(chainToRestore)
 
-    firstNodeConfig.restoreHierarchy(subchain)
-
-    return subchain
+    return chainToRestore
 }
 
 suspend fun <Base> ConfigHolder.Node<Base>.restoreHierarchy(
@@ -57,17 +53,19 @@ suspend fun <Base> NavigationNode<out Base, Base>.restoreHierarchy(
 
 suspend fun <T> restoreHierarchy(
     holder: ConfigHolder<T>,
-    factory: NavigationNodeFactory<T>
+    factory: NavigationNodeFactory<T>,
+    rootChain: NavigationChain<T> = NavigationChain(null, factory)
 ): NavigationChain<T>? {
     return when (holder) {
         is ConfigHolder.Chain -> {
             holder.restoreHierarchy(
-                factory
+                factory,
+                rootChain
             )
         }
         is ConfigHolder.Node -> {
             holder.restoreHierarchy(
-                NavigationChain(null, factory)
+                rootChain
             ) ?.chain
         }
     }

diff --git a/core/src/jsMain/kotlin/InitNavigation.kt b/core/src/jsMain/kotlin/InitNavigation.kt
@@ -60,7 +60,8 @@ inline fun <reified T : Base, reified Base : NavigationNodeDefaultConfig> initNa
 
         restoreHierarchy<Base>(
             existsChain ?: startChain,
-            factory = resultNodesFactory
+            factory = resultNodesFactory,
+            rootChain = rootChain
         ) ?.start(subscope)
     }
 }