Fix #2034 ViewModel Navigation restoring SavedStateHandle from right …

…arguments
InsertKoinIO · Feb 7, 2025 · ea0ee4d · ea0ee4d
1 parent 1e30f2c
commit ea0ee4d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/...ndroid/koin-androidx-navigation/src/main/java/org/koin/androidx/navigation/NavGraphExt.kt b/...ndroid/koin-androidx-navigation/src/main/java/org/koin/androidx/navigation/NavGraphExt.kt
@@ -35,9 +35,15 @@ import org.koin.core.qualifier.Qualifier
 inline fun <reified VM : ViewModel> Fragment.koinNavGraphViewModel(
     @IdRes navGraphId: Int,
     qualifier: Qualifier? = null,
-    noinline ownerProducer: () -> ViewModelStoreOwner = { findNavController().getBackStackEntry(navGraphId) },
+    noinline ownerProducer: (() -> ViewModelStoreOwner)? = null,
     noinline extrasProducer: (() -> CreationExtras)? = null,
     noinline parameters: (() -> ParametersHolder)? = null,
 ): Lazy<VM> {
-    return viewModel(qualifier, ownerProducer, extrasProducer, parameters)
+    val backStackEntry by lazy { findNavController().getBackStackEntry(navGraphId) }
+    return viewModel(
+        qualifier,
+        ownerProducer ?: { backStackEntry },
+        extrasProducer ?: { backStackEntry.defaultViewModelCreationExtras },
+        parameters
+    )
 }