diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt index 3d3dbe57a..952c73b1f 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt @@ -122,10 +122,11 @@ fun FavouritesScreen(navigator: DestinationsNavigator) { val data = rememberInVM(urlBuilder.favCat == FavListUrlBuilder.FAV_CAT_LOCAL) { if (urlBuilder.favCat == FavListUrlBuilder.FAV_CAT_LOCAL) { Pager(PagingConfig(20, jumpThreshold = 40)) { - if (keyword.isBlank()) { + val keywordNow = urlBuilder.keyword.orEmpty() + if (keywordNow.isBlank()) { EhDB.localFavLazyList } else { - EhDB.searchLocalFav(keyword) + EhDB.searchLocalFav(keywordNow) } } } else { diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/RememberGlobally.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/RememberGlobally.kt index e201c5384..36d844533 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/RememberGlobally.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/tools/RememberGlobally.kt @@ -1,6 +1,7 @@ package com.hippo.ehviewer.ui.tools import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisallowComposableCalls import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.State import androidx.compose.runtime.currentCompositeKeyHash @@ -15,9 +16,9 @@ class StateMapViewModel : ViewModel() { } @Composable -fun rememberInVM( +inline fun rememberInVM( vararg inputs: Any?, - init: ViewModel.() -> T, + crossinline init: @DisallowComposableCalls ViewModel.() -> T, ): T { val vm: StateMapViewModel = viewModel() val key = currentCompositeKeyHash