Fixed Pages not rendering the current page when switching to a curren…

…tly destroyed page
arkivanov · Oct 11, 2023 · 2892e7d · 2892e7d
1 parent c301491
commit 2892e7d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
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
@@ -11,6 +11,7 @@ import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.State
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import com.arkivanov.decompose.ExperimentalDecomposeApi
 import com.arkivanov.decompose.extensions.compose.jetbrains.subscribeAsState
@@ -88,7 +89,9 @@ fun <T : Any> Pages(
  state,
  { childPages.items[it].configuration.hashString() },
  ) { pageIndex ->
- childPages.items[pageIndex].instance?.also { page ->
+ val item = childPages.items[pageIndex]
+ val page = remember(item.configuration) { item.instance }
+ 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
@@ -11,6 +11,7 @@ import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.State
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import com.arkivanov.decompose.ExperimentalDecomposeApi
 import com.arkivanov.decompose.InternalDecomposeApi
@@ -90,7 +91,9 @@ fun <T : Any> Pages(
  state,
  { childPages.items[it].configuration.hashString() },
  ) { pageIndex ->
- childPages.items[pageIndex].instance?.also { page ->
+ val item = childPages.items[pageIndex]
+ val page = remember(item.configuration) { item.instance }
+ if (page != null) {
  pageContent(pageIndex, page)
  }
  }