Fixed current page not displayed when swiped through with two fingers

arkivanov · Nov 4, 2023 · fd867c0 · fd867c0
1 parent f03d0b2
commit fd867c0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/decompose/src/commonMain/kotlin/com/arkivanov/decompose/Ref.kt b/decompose/src/commonMain/kotlin/com/arkivanov/decompose/Ref.kt
@@ -0,0 +1,4 @@
+package com.arkivanov.decompose
+
+@InternalDecomposeApi
+class Ref<T>(var value: T)
diff --git a/...src/commonMain/kotlin/com/arkivanov/decompose/extensions/compose/jetbrains/pages/Pages.kt b/...src/commonMain/kotlin/com/arkivanov/decompose/extensions/compose/jetbrains/pages/Pages.kt
@@ -14,6 +14,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import com.arkivanov.decompose.ExperimentalDecomposeApi
+import com.arkivanov.decompose.Ref
 import com.arkivanov.decompose.extensions.compose.jetbrains.subscribeAsState
 import com.arkivanov.decompose.hashString
 import com.arkivanov.decompose.router.pages.ChildPages
@@ -90,7 +91,13 @@ fun <T : Any> Pages(
  { childPages.items[it].configuration.hashString() },
  ) { pageIndex ->
  val item = childPages.items[pageIndex]
- val page = remember(item.configuration) { item.instance }
+
+ val pageRef = remember(item.configuration) { Ref(item.instance) }
+ if (item.instance != null) {
+ pageRef.value = item.instance
+ }
+
+ val page = pageRef.value
  if (page != null) {
  pageContent(pageIndex, page)
  }

diff --git a/...e-jetpack/src/main/java/com/arkivanov/decompose/extensions/compose/jetpack/pages/Pages.kt b/...e-jetpack/src/main/java/com/arkivanov/decompose/extensions/compose/jetpack/pages/Pages.kt
@@ -15,6 +15,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import com.arkivanov.decompose.ExperimentalDecomposeApi
 import com.arkivanov.decompose.InternalDecomposeApi
+import com.arkivanov.decompose.Ref
 import com.arkivanov.decompose.extensions.compose.jetpack.subscribeAsState
 import com.arkivanov.decompose.hashString
 import com.arkivanov.decompose.router.pages.ChildPages
@@ -92,7 +93,13 @@ fun <T : Any> Pages(
  { childPages.items[it].configuration.hashString() },
  ) { pageIndex ->
  val item = childPages.items[pageIndex]
- val page = remember(item.configuration) { item.instance }
+
+ val pageRef = remember(item.configuration) { Ref(item.instance) }
+ if (item.instance != null) {
+ pageRef.value = item.instance
+ }
+
+ val page = pageRef.value
  if (page != null) {
  pageContent(pageIndex, page)
  }