Skip to content

Commit 4337249

Browse files
committed
Uncomment LocalViewModelStoreOwner.current in NavHost on JS DOM and the issue in commit 0209d15 is resolved
1 parent 3d49fd5 commit 4337249

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

navigation/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ kotlin {
2020
//implementation("org.jetbrains.compose.annotation-internal:annotation:${DependencyVersions.composeMultiplatform}")
2121
api(cpnProject(project, ":common")) // for `Modifier` and `Alignment`
2222
//implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.8.0") // This depends on Compose target '[jscanvas]'.
23+
// https://github.com/JetBrains/compose-multiplatform-core/blob/f6d989a1ae9cd5895b4fba7821946ead389c4848/navigation/navigation-compose/build.gradle#L58
24+
api(cpnProject(project, ":lifecycle-viewmodel"))
2325
}
2426
}
2527
composeUiMain {

navigation/src/jsMain/kotlin/com/huanshankeji/androidx/navigation/compose/NavHost.js.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import androidx.compose.runtime.*
44
import androidx.lifecycle.ViewModelStore
55
import androidx.lifecycle.ViewModelStoreOwner
66
import androidx.navigation.*
7+
import com.huanshankeji.androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
78
import com.huanshankeji.compose.foundation.layout.Box
89
import com.huanshankeji.compose.foundation.layout.fillMaxSize
910
import com.huanshankeji.compose.ui.Alignment
@@ -56,7 +57,7 @@ actual fun NavHost(
5657
) {
5758

5859
//val lifecycleOwner = LocalLifecycleOwner.current
59-
val viewModelStoreOwner = /*LocalViewModelStoreOwner.current ?:*/ rememberViewModelStoreOwner()
60+
val viewModelStoreOwner = LocalViewModelStoreOwner.current ?: rememberViewModelStoreOwner()
6061

6162
navController.setViewModelStore(viewModelStoreOwner.viewModelStore)
6263

0 commit comments

Comments
 (0)