Merge pull request #409 from arkivanov/fix-back-gesture-1

Wrap the child content slot in PredictiveBackAnimation with movableContentOf
arkivanov · Jun 8, 2023 · a94b71a · a94b71a
2 parents e5db98d + 2549ea2
commit a94b71a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/...kivanov/decompose/extensions/compose/jetbrains/stack/animation/PredictiveBackAnimation.kt b/...kivanov/decompose/extensions/compose/jetbrains/stack/animation/PredictiveBackAnimation.kt
@@ -9,6 +9,7 @@ import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.key
+import androidx.compose.runtime.movableContentOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -75,6 +76,15 @@ private class PredictiveBackAnimation<C : Any, T : Any>(
 
  @Composable
  override fun invoke(stack: ChildStack<C, T>, modifier: Modifier, content: @Composable (child: Child.Created<C, T>) -> Unit) {
+ val childContent =
+ remember(content) {
+ movableContentOf<Child.Created<C, T>> { child ->
+ key(child.configuration) {
+ content(child)
+ }
+ }
+ }
+
  val currentKey = remember { Holder(value = 0) }
 
  var items: List<Item<C, T>> by rememberMutableStateWithLatest(
@@ -89,7 +99,7 @@ private class PredictiveBackAnimation<C : Any, T : Any>(
  animation(
  stack = item.stack,
  modifier = Modifier.fillMaxSize().then(item.progressData?.toProgressModifier() ?: Modifier),
- content = content,
+ content = childContent,
  )
  }
  }

diff --git a/...arkivanov/decompose/extensions/compose/jetpack/stack/animation/PredictiveBackAnimation.kt b/...arkivanov/decompose/extensions/compose/jetpack/stack/animation/PredictiveBackAnimation.kt
@@ -10,6 +10,7 @@ import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.key
+import androidx.compose.runtime.movableContentOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -77,6 +78,15 @@ private class PredictiveBackAnimation<C : Any, T : Any>(
 
  @Composable
  override fun invoke(stack: ChildStack<C, T>, modifier: Modifier, content: @Composable (child: Child.Created<C, T>) -> Unit) {
+ val childContent =
+ remember(content) {
+ movableContentOf<Child.Created<C, T>> { child ->
+ key(child.configuration) {
+ content(child)
+ }
+ }
+ }
+
  val currentKey = remember { Holder(value = 0) }
 
  var items: List<Item<C, T>> by rememberMutableStateWithLatest(
@@ -91,7 +101,7 @@ private class PredictiveBackAnimation<C : Any, T : Any>(
  animation(
  stack = item.stack,
  modifier = Modifier.fillMaxSize().then(item.progressData?.toProgressModifier() ?: Modifier),
- content = content,
+ content = childContent,
  )
  }
  }