Extracted RouterState.Entry class to Child

decompose/src/commonMain/kotlin/com/arkivanov/decompose/Child.kt

@@ -0,0 +1,17 @@
+package com.arkivanov.decompose
+
+import com.arkivanov.decompose.statekeeper.Parcelable
+
+sealed class Child<out C : Parcelable, out T : Any> {
+
+    abstract val configuration: C
+
+    data class Created<out C : Parcelable, out T : Any>(
+        override val configuration: C,
+        val component: T
+    ) : Child<C, T>()
+
+    data class Destroyed<out C : Parcelable>(
+        override val configuration: C
+    ) : Child<C, Nothing>()
+}

decompose/src/commonMain/kotlin/com/arkivanov/decompose/RouterState.kt

@@ -3,20 +3,6 @@ package com.arkivanov.decompose
 import com.arkivanov.decompose.statekeeper.Parcelable
 
 data class RouterState<out C : Parcelable, out T : Any>(
-    val activeChild: Entry.Created<C, T>,
-    val backStack: List<Entry<C, T>>
-) {
-
-    sealed class Entry<out C : Parcelable, out T : Any> {
-        abstract val configuration: C
-
-        data class Created<out C : Parcelable, out T : Any>(
-            override val configuration: C,
-            val component: T
-        ) : Entry<C, T>()
-
-        data class Destroyed<out C : Parcelable>(
-            override val configuration: C
-        ) : Entry<C, Nothing>()
-    }
-}
+    val activeChild: Child.Created<C, T>,
+    val backStack: List<Child<C, T>>
+)

decompose/src/commonMain/kotlin/com/arkivanov/decompose/router/RouterImpl.kt

@@ -1,5 +1,6 @@
 package com.arkivanov.decompose.router
 
+import com.arkivanov.decompose.Child
 import com.arkivanov.decompose.Router
 import com.arkivanov.decompose.RouterState
 import com.arkivanov.decompose.backpressed.BackPressedRegistry
@@ -65,13 +66,13 @@ internal class RouterImpl<C : Parcelable, T : Any>(
 
     private fun RouterStack<C, T>.toState(): RouterState<C, T> =
         RouterState(
-            activeChild = RouterState.Entry.Created(configuration = active.configuration, component = active.component),
+            activeChild = Child.Created(configuration = active.configuration, component = active.component),
             backStack = backStack.map { it.toRouterStateEntry() }
         )
 
-    private fun RouterEntry<C, T>.toRouterStateEntry(): RouterState.Entry<C, T> =
+    private fun RouterEntry<C, T>.toRouterStateEntry(): Child<C, T> =
         when (this) {
-            is RouterEntry.Created -> RouterState.Entry.Created(configuration = configuration, component = component)
-            is RouterEntry.Destroyed -> RouterState.Entry.Destroyed(configuration = configuration)
+            is RouterEntry.Created -> Child.Created(configuration = configuration, component = component)
+            is RouterEntry.Destroyed -> Child.Destroyed(configuration = configuration)
         }
 }

extensions-compose-jetpack/src/main/java/com/arkivanov/decompose/extensions/compose/jetpack/RouterStateComposable.kt

@@ -7,18 +7,19 @@ import androidx.compose.runtime.key
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.SaveableStateHolder
 import androidx.compose.runtime.saveable.rememberSaveableStateHolder
+import com.arkivanov.decompose.Child
 import com.arkivanov.decompose.RouterState
 import com.arkivanov.decompose.statekeeper.Parcelable
 import com.arkivanov.decompose.value.Value
 
-typealias ChildContent<C, T> = @Composable (child: T, configuration: C) -> Unit
+typealias ChildContent<C, T> = @Composable (child: Child.Created<C, T>) -> Unit
 
-typealias ChildAnimation<C, T> = @Composable (child: T, configuration: C, ChildContent<C, T>) -> Unit
+typealias ChildAnimation<C, T> = @Composable (child: Child.Created<C, T>, ChildContent<C, T>) -> Unit
 
 @Composable
 fun <C : Parcelable, T : Any> Children(
     routerState: Value<RouterState<C, T>>,
-    animation: ChildAnimation<C, T> = { child, configuration, childContent -> childContent(child, configuration) },
+    animation: ChildAnimation<C, T> = { child, childContent -> childContent(child) },
     content: ChildContent<C, T>
 ) {
     val holder = key(routerState) { rememberSaveableStateHolder() }
@@ -27,9 +28,9 @@ fun <C : Parcelable, T : Any> Children(
 
     holder.retainStates(state.getConfigurations())
 
-    animation(activeChild.component, activeChild.configuration) { child, configuration ->
-        holder.SaveableStateProvider(configuration) {
-            content(child, configuration)
+    animation(activeChild) { child ->
+        holder.SaveableStateProvider(child.configuration) {
+            content(child)
         }
     }
 }

sample/counter/ios-app/ios-app/SimpleRouterState.swift

@@ -11,7 +11,7 @@ import Counter
 func simpleRouterState<T : AnyObject>(_ child: T) -> Value<RouterState<AnyObject, T>> {
     return mutableValue(
         RouterState(
-            activeChild: RouterStateEntryCreated(
+            activeChild: ChildCreated(
                 configuration: "config" as AnyObject,
                 component: child
             ),

sample/counter/shared/src/androidMain/kotlin/com/arkivanov/sample/counter/shared/ui/compose/CounterInnerContainerComposable.kt

@@ -33,14 +33,14 @@ operator fun CounterInnerContainer.Model.invoke() {
             Spacer(modifier = Modifier.height(16.dp))
 
             Row {
-                Children(leftChild) { child, _ ->
-                    child(onNext = ::onNextLeftChild, onPrev = ::onPrevLeftChild)
+                Children(leftChild) {
+                    it.component(onNext = ::onNextLeftChild, onPrev = ::onPrevLeftChild)
                 }
 
                 Spacer(modifier = Modifier.width(16.dp))
 
-                Children(rightChild) { child, _ ->
-                    child(onNext = ::onNextRightChild, onPrev = ::onPrevRightChild)
+                Children(rightChild) {
+                    it.component(onNext = ::onNextRightChild, onPrev = ::onPrevRightChild)
                 }
             }
         }

sample/counter/shared/src/androidMain/kotlin/com/arkivanov/sample/counter/shared/ui/compose/CounterRootCountainerComposable.kt

@@ -36,8 +36,8 @@ operator fun CounterRootContainer.Model.invoke() {
 
             Spacer(modifier = Modifier.height(16.dp))
 
-            Children(child) { child, _ ->
-                child.inner()
+            Children(child) {
+                it.component.inner()
             }
         }
     }