From f2e090a6ceae6ff20870e5fad72ae0c48b09ce3e Mon Sep 17 00:00:00 2001
From: Jake Wharton <jw@squareup.com>
Date: Tue, 24 Oct 2023 10:09:50 -0400
Subject: [PATCH] Dispose old compositions when hosting within Compose UI
 (#1626)

Also other remember correctness changes.
---
 .../app/cash/redwood/composeui/RedwoodContent.kt  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/redwood-composeui/src/commonMain/kotlin/app/cash/redwood/composeui/RedwoodContent.kt b/redwood-composeui/src/commonMain/kotlin/app/cash/redwood/composeui/RedwoodContent.kt
index 9e3a388cb6..fcfde6f9be 100644
--- a/redwood-composeui/src/commonMain/kotlin/app/cash/redwood/composeui/RedwoodContent.kt
+++ b/redwood-composeui/src/commonMain/kotlin/app/cash/redwood/composeui/RedwoodContent.kt
@@ -18,6 +18,7 @@ package app.cash.redwood.composeui
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -44,7 +45,9 @@ public fun RedwoodContent(
   provider: Widget.Provider<@Composable () -> Unit>,
   content: @Composable () -> Unit,
 ) {
-  var viewportSize by remember { mutableStateOf(Size.Zero) }
+  // If the provider or content change, reset any assumption about the rendered size.
+  var viewportSize by remember(provider, content) { mutableStateOf(Size.Zero) }
+
   val density = LocalDensity.current
   val uiConfiguration = UiConfiguration(
     darkMode = isSystemInDarkTheme(),
@@ -60,8 +63,10 @@ public fun RedwoodContent(
   val scope = rememberCoroutineScope()
   val onBackPressedDispatcher = platformOnBackPressedDispatcher()
   val saveableStateRegistry = LocalSaveableStateRegistry.current
-  val children = remember(content) { ComposeWidgetChildren() }
-  LaunchedEffect(provider, content) {
+
+  // For simplicity, a new provider or content lambda gets an entirely new composition and children.
+  val children = remember(provider, content) { ComposeWidgetChildren() }
+  DisposableEffect(provider, content) {
     val composition = RedwoodComposition(
       scope = scope,
       provider = provider,
@@ -71,6 +76,10 @@ public fun RedwoodContent(
       uiConfigurations = uiConfigurations,
     )
     composition.setContent(content)
+
+    onDispose {
+      composition.cancel()
+    }
   }
 
   Box(