WIP RetainedStateHolder

build.gradle.kts

@@ -100,6 +100,8 @@ allprojects {
         "**/FilterList.kt",
         "**/Remove.kt",
         "**/Pets.kt",
+        "**/RetainedStateHolder*.kt",
+        "**/RetainedStateRestorationTester.kt",
         "**/SystemUiController.kt",
       )
     }

circuit-foundation/src/commonMain/kotlin/com/slack/circuit/foundation/CircuitContent.kt

@@ -42,32 +42,7 @@ public fun CircuitContent(
     circuit.onUnavailableContent,
   key: Any? = screen,
 ) {
-  val navigator =
-    remember(onNavEvent) {
-      object : Navigator {
-        override fun goTo(screen: Screen) {
-          onNavEvent(NavEvent.GoTo(screen))
-        }
-
-        override fun resetRoot(
-          newRoot: Screen,
-          saveState: Boolean,
-          restoreState: Boolean,
-        ): ImmutableList<Screen> {
-          onNavEvent(NavEvent.ResetRoot(newRoot, saveState, restoreState))
-          return persistentListOf()
-        }
-
-        override fun pop(result: PopResult?): Screen? {
-          onNavEvent(NavEvent.Pop(result))
-          return null
-        }
-
-        override fun peek(): Screen = screen
-
-        override fun peekBackStack(): ImmutableList<Screen> = persistentListOf(screen)
-      }
-    }
+  val navigator = remember(onNavEvent) { Navigator.navEventNavigator(screen, onNavEvent) }
   CircuitContent(screen, navigator, modifier, circuit, unavailableContent, key)
 }
 

circuit-foundation/src/commonMain/kotlin/com/slack/circuit/foundation/NavEvent.kt

@@ -20,6 +20,35 @@ public fun Navigator.onNavEvent(event: NavEvent) {
   }
 }
 
+public fun Navigator.Companion.navEventNavigator(
+  screen: Screen,
+  onNavEvent: (event: NavEvent) -> Unit,
+): Navigator {
+  return object : Navigator {
+    override fun goTo(screen: Screen) {
+      onNavEvent(NavEvent.GoTo(screen))
+    }
+
+    override fun resetRoot(
+      newRoot: Screen,
+      saveState: Boolean,
+      restoreState: Boolean,
+    ): List<Screen> {
+      onNavEvent(NavEvent.ResetRoot(newRoot, saveState, restoreState))
+      return emptyList()
+    }
+
+    override fun pop(): Screen? {
+      onNavEvent(NavEvent.Pop)
+      return null
+    }
+
+    override fun peek(): Screen = screen
+
+    override fun peekBackStack(): List<Screen> = listOf(screen)
+  }
+}
+
 /** A sealed navigation interface intended to be used when making a navigation callback. */
 public sealed interface NavEvent : CircuitUiEvent {
   /** Corresponds to [Navigator.pop]. */

circuit-retained/src/androidInstrumentedTest/AndroidManifest.xml

@@ -2,5 +2,6 @@
 
     <application>
         <activity android:name="androidx.activity.ComponentActivity"/>
+        <activity android:name="com.slack.circuit.retained.android.RetainedStateHolderTest$Activity"/>
     </application>
 </manifest>