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

hotfix in InfinityPagedComponent and PagedComponent

Browse Source
This commit is contained in:
InsanusMokrassar
2025-03-03 21:16:34 +06:00
parent d4148d52e3
commit c216dba69d
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@ class InfinityPagedComponentContext<T> internal constructor(
size: Int size: Int
) { ) {
internal val startPage = SimplePagination(page, size) internal val startPage = SimplePagination(page, size)
internal val iterationState: MutableState<Pair<Int, Pagination?>> = mutableStateOf(0 to null) internal val iterationState: MutableState<Pagination?> = mutableStateOf(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
@@ -27,11 +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 if (iterationState.value is SimplePagination) return // Data loading has been inited but not loaded yet
iterationState.value = iterationState.value.let { iterationState.value = iterationState.value.let {
if ((it.second as? PaginationResult<*>) ?.isLastPage == true) return if ((it as? PaginationResult<*>) ?.isLastPage == true) return
(it.first + 1) to (it.second ?: startPage).nextPage() (it ?: startPage).nextPage()
} }
} }
@@ -42,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 null null
} }
} }
} }
@@ -66,12 +66,12 @@ 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 ?.page) {
val paginationResult = loader(context, context.iterationState.value.second ?: context.startPage) val paginationResult = loader(context, context.iterationState.value ?: context.startPage)
if (paginationResult.isLastPage) { if (paginationResult.isLastPage) {
context.lastPageLoaded = true context.lastPageLoaded = true
} }
context.iterationState.value = context.iterationState.value.copy(second = paginationResult) context.iterationState.value = paginationResult
context.dataState.value = (context.dataState.value ?: emptyList()) + paginationResult.results context.dataState.value = (context.dataState.value ?: emptyList()) + paginationResult.results
} }

18
pagination/compose/src/commonMain/kotlin/PagedComponent.kt
View File

@@ -23,7 +23,7 @@ class PagedComponentContext<T> internal constructor(
initialPage: Int, initialPage: Int,
size: Int size: Int
) { ) {
internal val iterationState: MutableState<Pair<Int, Pagination>> = mutableStateOf(0 to SimplePagination(preset?.page ?: initialPage, preset?.size ?: size)) internal val iterationState: MutableState<Pagination> = mutableStateOf(SimplePagination(preset?.page ?: initialPage, preset?.size ?: size))
internal var dataOptional: PaginationResult<T>? = preset internal var dataOptional: PaginationResult<T>? = preset
private set private set
@@ -35,7 +35,7 @@ class PagedComponentContext<T> internal constructor(
fun loadNext() { fun loadNext() {
iterationState.value = iterationState.value.let { iterationState.value = iterationState.value.let {
if (dataState.value ?.isLastPage == true) return if (dataState.value ?.isLastPage == true) return
(it.first + 1) to it.second.nextPage() it.nextPage()
} }
} }
@@ -44,10 +44,10 @@ class PagedComponentContext<T> internal constructor(
*/ */
fun loadPrevious() { fun loadPrevious() {
iterationState.value = iterationState.value.let { iterationState.value = iterationState.value.let {
if (it.second.isFirstPage) return if (it.isFirstPage) return
(it.first - 1) to SimplePagination( SimplePagination(
it.second.page - 1, it.page - 1,
it.second.size it.size
) )
} }
} }
@@ -57,7 +57,7 @@ class PagedComponentContext<T> internal constructor(
*/ */
fun reload() { fun reload() {
iterationState.value = iterationState.value.let { iterationState.value = iterationState.value.let {
it.copy(it.first + 1) SimplePagination(it.page, it.size)
} }
} }
} }
@@ -82,8 +82,8 @@ internal fun <T> PagedComponent(
) { ) {
val context = remember { PagedComponentContext(preload, initialPage, size) } val context = remember { PagedComponentContext(preload, initialPage, size) }
LaunchedEffect(context.iterationState.value) { LaunchedEffect(context.iterationState.value.page, context.iterationState.value.hashCode()) {
context.dataState.value = loader(context, context.iterationState.value.second) context.dataState.value = loader(context, context.iterationState.value)
} }
context.dataState.value ?.let { context.dataState.value ?.let {

4
pagination/compose/src/jvmTest/kotlin/InfinityPagedComponentTests.kt
View File

@@ -30,8 +30,8 @@ class InfinityPagedComponentTests {
} }
) { ) {
if (it == null) { if (it == null) {
if (this.iterationState.value.second != null) { if (this.iterationState.value != null) {
assertEquals(0, (this.iterationState.value.second as? SimplePagination) ?.page) assertEquals(0, (this.iterationState.value as? SimplePagination) ?.page)
} }
} else { } else {
assertEquals(expectedList, it) assertEquals(expectedList, it)