API tweaks

slackhq · Apr 10, 2024 · d3e89bc · d3e89bc
1 parent eb1b654
commit d3e89bc
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/...-foundation/src/commonMain/kotlin/com/slack/circuit/foundation/NavigableCircuitContent.kt b/...-foundation/src/commonMain/kotlin/com/slack/circuit/foundation/NavigableCircuitContent.kt
@@ -128,7 +128,11 @@ public fun <R : Record> NavigableCircuitContent(
           LocalBackStack provides backStack,
           *providedLocals,
         ) {
-          provider.content(record, backStack)
+          provider.content(
+            record,
+            // presenterEnabled. We only enable the presenter for the top record
+            backStack.topRecord == record,
+          )
         }
       }
     }
@@ -139,7 +143,7 @@ public fun <R : Record> NavigableCircuitContent(
 @Immutable
 public class RecordContentProvider<R : Record>(
   public val record: R,
-  internal val content: @Composable (R, BackStack<R>) -> Unit,
+  internal val content: @Composable (R, Boolean) -> Unit,
 ) {
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
@@ -183,15 +187,15 @@ private fun <R : Record> BackStack<R>.buildCircuitContentProviders(
         RecordContentProvider(
           record = record,
           content =
-            movableContentOf { record, backStack ->
+            movableContentOf { record, presenterEnabled ->
               CircuitContent(
                 screen = record.screen,
                 modifier = Modifier,
                 navigator = lastNavigator,
                 circuit = lastCircuit,
                 unavailableContent = lastUnavailableRoute,
                 key = record.key,
-                presenterEnabled = backStack.topRecord == record,
+                presenterEnabled = presenterEnabled,
               )
             },
         )