InsanusMokrassar/MicroUtils
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/MicroUtils.git synced 2025-09-06 16:49:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix of InfinityPagedComponent

Browse Source
This commit is contained in:
InsanusMokrassar
2025-03-03 08:57:40 +06:00
parent e70d34d91a
commit 3bf2ed5168
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pagination/compose/build.gradle
View File

@@ -14,6 +14,7 @@ kotlin {
dependencies { dependencies {
api project(":micro_utils.pagination.common") api project(":micro_utils.pagination.common")
api project(":micro_utils.common.compose") api project(":micro_utils.common.compose")
api libs.kt.coroutines
} }
} }
} }

13
pagination/compose/src/commonMain/kotlin/InfinityPagedComponent.kt
View File

@@ -17,7 +17,8 @@ class InfinityPagedComponentContext<T> internal constructor(
page: Int, page: Int,
size: Int size: Int
) { ) {
internal val iterationState: MutableState<Pair<Int, Pagination>> = mutableStateOf(0 to SimplePagination(page, size)) internal val startPage = SimplePagination(page, size)
internal val iterationState: MutableState<Pair<Int, Pagination?>> = mutableStateOf(0 to null)
internal val dataState: MutableState<List<T>?> = mutableStateOf(null) internal val dataState: MutableState<List<T>?> = mutableStateOf(null)
internal var lastPageLoaded = false internal var lastPageLoaded = false
@@ -26,10 +27,11 @@ class InfinityPagedComponentContext<T> internal constructor(
*/ */
fun loadNext() { fun loadNext() {
if (lastPageLoaded) return if (lastPageLoaded) return
if (iterationState.value.second is SimplePagination) return // Data loading has been inited but not loaded yet
iterationState.value = iterationState.value.let { iterationState.value = iterationState.value.let {
if ((dataState.value as? PaginationResult<*>) ?.isLastPage == true) return if ((it.second as? PaginationResult<*>) ?.isLastPage == true) return
(it.first + 1) to it.second.nextPage() (it.first + 1) to (it.second ?: startPage).nextPage()
} }
} }
@@ -40,7 +42,7 @@ class InfinityPagedComponentContext<T> internal constructor(
dataState.value = null dataState.value = null
lastPageLoaded = false lastPageLoaded = false
iterationState.value = iterationState.value.let { iterationState.value = iterationState.value.let {
(it.first + 1) to (it.second.firstPage()) (it.first + 1) to null
} }
} }
} }
@@ -64,10 +66,11 @@ internal fun <T> InfinityPagedComponent(
val context = remember { InfinityPagedComponentContext<T>(page, size) } val context = remember { InfinityPagedComponentContext<T>(page, size) }
LaunchedEffect(context.iterationState.value.first) { LaunchedEffect(context.iterationState.value.first) {
val paginationResult = loader(context, context.iterationState.value.second) val paginationResult = loader(context, context.iterationState.value.second ?: context.startPage)
if (paginationResult.isLastPage) { if (paginationResult.isLastPage) {
context.lastPageLoaded = true context.lastPageLoaded = true
} }
context.iterationState.value = context.iterationState.value.copy(second = paginationResult)
context.dataState.value = (context.dataState.value ?: emptyList()) + paginationResult.results context.dataState.value = (context.dataState.value ?: emptyList()) + paginationResult.results
} }