Merge pull request #1962 from InsertKoinIO/fix_navigation_arguments_cmp

Fix CMP NavBackStack argument unboxing
InsertKoinIO · Aug 30, 2024 · a74e470 · a74e470
2 parents 46ab29b + 5c09730
commit a74e470
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...ore-viewmodel-navigation/src/commonMain/kotlin/org/koin/viewmodel/CreationNavExtrasExt.kt b/...ore-viewmodel-navigation/src/commonMain/kotlin/org/koin/viewmodel/CreationNavExtrasExt.kt
@@ -8,7 +8,7 @@ import org.koin.core.annotation.KoinInternalApi
 
 @OptIn(KoinInternalApi::class)
 fun defaultNavExtras(viewModelStoreOwner: ViewModelStoreOwner): CreationExtras = when {
-    viewModelStoreOwner is NavBackStackEntry && viewModelStoreOwner.arguments != null -> viewModelStoreOwner.arguments?.toExtras(viewModelStoreOwner) ?: CreationExtras.Empty
+    viewModelStoreOwner is NavBackStackEntry -> viewModelStoreOwner.defaultViewModelCreationExtras
     viewModelStoreOwner is HasDefaultViewModelProviderFactory -> viewModelStoreOwner.defaultViewModelCreationExtras
     else -> CreationExtras.Empty
 }