fixed measuring issue

Author: zach-klippenstein

core-compose/src/main/java/com/squareup/workflow/ui/compose/internal/ParentComposition.kt

@@ -50,9 +50,11 @@ internal data class ParentComposition(
  * Creates a [ParentComposition] from the current point in the composition and adds it to this
  * [ViewEnvironment].
  */
-@Composable internal fun ViewEnvironment.withParentComposition(): ViewEnvironment {
+@Composable internal fun ViewEnvironment.withParentComposition(
+  reference: CompositionReference = compositionReference()
+): ViewEnvironment {
   val compositionReference = ParentComposition(
-      reference = compositionReference(),
+      reference = reference,
       recomposer = currentComposer.recomposer
   )
   return this + (ParentComposition to compositionReference)

core-compose/src/main/java/com/squareup/workflow/ui/compose/internal/ViewFactories.kt

@@ -16,13 +16,20 @@
 package com.squareup.workflow.ui.compose.internal
 
 import android.view.View
+import android.view.ViewGroup
 import androidx.compose.Composable
+import androidx.compose.compositionReference
 import androidx.compose.onPreCommit
 import androidx.compose.remember
+import androidx.ui.core.AndroidOwner
 import androidx.ui.core.ContextAmbient
 import androidx.ui.core.Modifier
+import androidx.ui.core.OwnerAmbient
 import androidx.ui.core.Ref
 import androidx.ui.foundation.Box
+import androidx.ui.foundation.drawBorder
+import androidx.ui.graphics.Color
+import androidx.ui.unit.dp
 import androidx.ui.viewinterop.AndroidView
 import com.squareup.workflow.ui.ViewEnvironment
 import com.squareup.workflow.ui.ViewFactory
@@ -51,7 +58,7 @@ import com.squareup.workflow.ui.showRendering
   modifier: Modifier = Modifier
 ) {
   val viewFactory = this
-  Box(modifier = modifier) {
+  Box(modifier = modifier.drawBorder(1.dp, Color.Red)) {
     // Fast path: If the child binding is also a Composable, we don't need to go through the legacy
     // view system and can just invoke the binding's composable function directly.
     if (viewFactory is ComposeViewFactory) {
@@ -73,16 +80,22 @@ import com.squareup.workflow.ui.showRendering
   viewEnvironment: ViewEnvironment
 ): Pair<View, ViewEnvironment> {
   val childView = remember { Ref<View>() }
+  val compRef = compositionReference()
   val newEnvironment = if (childView.value?.canShowRendering(rendering) != true) {
+    // If we don't pass the parent Android View, the child will have the wrong LayoutParams.
+    @Suppress("DEPRECATION")
+    val parentView = (OwnerAmbient.current as? AndroidOwner)?.view as? ViewGroup
+
     // Plumb the current composition "context" through the ViewEnvironment so any nested
     // composable factories get access to any ambients currently in effect.
     // See setOrContinueContent().
-    viewEnvironment.withParentComposition()
+    viewEnvironment.withParentComposition(compRef)
         .also { newEnvironment ->
           childView.value = viewFactory.buildView(
               initialRendering = rendering,
               initialViewEnvironment = newEnvironment,
-              contextForNewView = ContextAmbient.current
+              contextForNewView = ContextAmbient.current,
+              container = parentView
           )
         }
   } else viewEnvironment