fix setContent

JetBrains · Dec 8, 2023 · 73621ef · 73621ef
1 parent 9bfba2f
commit 73621ef
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/window/ComposeSceneMediator.uikit.kt b/compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/window/ComposeSceneMediator.uikit.kt
@@ -171,6 +171,16 @@ internal class ComposeSceneMediator(
     }
 
     private var onAttachedToWindow: (() -> Unit)? = null
+    private fun whenViewShown(action: () -> Unit) {
+        if (view.window == null) {
+            onAttachedToWindow = {
+                onAttachedToWindow = null
+                action()
+            }
+        } else {
+            action()
+        }
+    }
 
     init {
         view.onAttachedToWindow = {
@@ -183,8 +193,7 @@ internal class ComposeSceneMediator(
     }
 
     fun setContent(content: @Composable () -> Unit) {
-        onAttachedToWindow = {
-            onAttachedToWindow = null
+        whenViewShown {
             scene.setContent {
                 /**
                  * TODO isReadyToShowContent it is workaround we need to fix.