Make sure that compositionLocalContext is initialized before composition

compose/mpp/demo/src/commonMain/kotlin/androidx/compose/mpp/demo/components/dialog/DialogCompositionLocals.kt

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.compose.mpp.demo.components.dialog
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.Button
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
+
+private val LocalString = staticCompositionLocalOf<String> {
+    error("CompositionLocal LocalString not present")
+}
+
+@Composable
+fun DialogCompositionLocalExample() {
+    var dialogOpened: Boolean by remember { mutableStateOf(true) }
+    if (!dialogOpened) {
+        Button(onClick = { dialogOpened = true }) {
+            Text("OpenDialog")
+        }
+    }
+    var current by remember { mutableStateOf("test 0") }
+    LaunchedEffect(Unit) {
+        var i = 1
+        while (coroutineContext.isActive) {
+            delay(500)
+            current = "test $i"
+            i++
+        }
+    }
+    CompositionLocalProvider(LocalString provides current) {
+        if (dialogOpened) {
+            Dialog(
+                onDismissRequest = { dialogOpened = false },
+            ) {
+                Box(Modifier.size(200.dp).background(Color.Yellow), contentAlignment = Alignment.Center) {
+                    Text("LocalString: ${LocalString.current}")
+                }
+            }
+        }
+    }
+}

compose/mpp/demo/src/commonMain/kotlin/androidx/compose/mpp/demo/components/dialog/Dialogs.kt

@@ -21,6 +21,7 @@ import androidx.compose.mpp.demo.Screen
 val Dialogs = Screen.Selection(
     "Dialogs",
     DialogExample,
+    Screen.Example("CompositionLocal inside Dialog") { DialogCompositionLocalExample() },
     DialogWithTextField,
     FocusAndKeyInput,
 )

compose/mpp/demo/src/commonMain/kotlin/androidx/compose/mpp/demo/components/popup/PopupCompositionLocals.kt

@@ -24,20 +24,36 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Popup
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
 
-val LocalString = staticCompositionLocalOf<String> {
+private val LocalString = staticCompositionLocalOf<String> {
     error("CompositionLocal LocalString not present")
 }
 
 @Composable
 fun PopupCompositionLocalExample() {
-    CompositionLocalProvider(LocalString provides "test") {
+    var current by remember { mutableStateOf("test 0") }
+    LaunchedEffect(Unit) {
+        var i = 1
+        while (coroutineContext.isActive) {
+            delay(500)
+            current = "test $i"
+            i++
+        }
+    }
+    CompositionLocalProvider(LocalString provides current) {
         MaterialTheme {
             Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
                 Popup {

compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/scene/ComposeSceneLayer.skiko.kt

@@ -178,7 +178,9 @@ internal fun rememberComposeSceneLayer(
             layoutDirection = layoutDirection,
             focusable = focusable,
             compositionContext = parentComposition,
-        )
+        ).also {
+            it.compositionLocalContext = compositionLocalContext
+        }
     }
     layer.focusable = focusable
     DisposableEffect(Unit) {

compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/scene/UIViewComposeSceneLayer.uikit.kt

@@ -58,7 +58,6 @@ internal class UIViewComposeSceneLayer(
     focusStack: FocusStack<UIView>?,
     windowContext: PlatformWindowContext,
     compositionContext: CompositionContext,
-    compositionLocalContext: CompositionLocalContext?,
 ) : ComposeSceneLayer {
 
     override var focusable: Boolean = focusStack != null
@@ -117,9 +116,7 @@ internal class UIViewComposeSceneLayer(
             coroutineContext = compositionContext.effectCoroutineContext,
             renderingUIViewFactory = ::createSkikoUIView,
             composeSceneFactory = ::createComposeScene
-        ).also {
-            it.compositionLocalContext = compositionLocalContext
-        }
+        )
     }
 
     init {

compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/window/ComposeContainer.uikit.kt

@@ -362,7 +362,6 @@ internal class ComposeContainer(
                 focusStack = if (focusable) focusStack else null,
                 windowContext = windowContext,
                 compositionContext = compositionContext,
-                compositionLocalContext = mediator?.compositionLocalContext,
             )
     }