one 2.0.0-beta.159.1 → 2.0.0-beta.161.1

package/android/src/main/java/dev/onejs/one/OneKotlinHostView.kt

@@ -5,8 +5,11 @@ import android.view.ViewGroup
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.unit.constrainHeight
+import androidx.compose.ui.unit.constrainWidth
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.views.view.ReactViewGroup
 
@@ -35,6 +38,9 @@ class OneKotlinHostView(context: Context) : ReactViewGroup(context) {
 
     private var reportedWidth = -1.0
     private var reportedHeight = -1.0
+    private var observedWidth = -1
+    private var observedHeight = -1
+    private var measuringContent = false
 
     init {
         clipChildren = false
@@ -52,13 +58,38 @@ class OneKotlinHostView(context: Context) : ReactViewGroup(context) {
                         "native view $source.$view changed (contract hash mismatch: expected $hash, got ${dispatch.contractHash}); rebuild the app"
                     )
                 }
-                dispatch.Content(
-                    view = view,
-                    propsJson = props,
-                    emit = { eventName, eventArgs ->
-                        onHostEvent(source, view, eventName, eventArgs)
+                Layout(
+                    content = {
+                        dispatch.Content(
+                            view = view,
+                            propsJson = props,
+                            emit = { eventName, eventArgs ->
+                                onHostEvent(source, view, eventName, eventArgs)
+                            },
+                        )
                     },
-                )
+                ) { measurables, constraints ->
+                    // yoga owns the outer minimums; content keeps its natural size.
+                    val contentConstraints = constraints.copy(minWidth = 0, minHeight = 0)
+                    val placeables = measurables.map { it.measure(contentConstraints) }
+                    val contentWidth = placeables.maxOfOrNull { it.width } ?: 0
+                    val contentHeight = placeables.maxOfOrNull { it.height } ?: 0
+                    if (source == committedSource && view == committedView) {
+                        val changed = contentWidth != observedWidth || contentHeight != observedHeight
+                        observedWidth = contentWidth
+                        observedHeight = contentHeight
+                        if (changed && !measuringContent && isAttachedToWindow) {
+                            removeCallbacks(contentLayout)
+                            post(contentLayout)
+                        }
+                    }
+                    layout(
+                        constraints.constrainWidth(contentWidth),
+                        constraints.constrainHeight(contentHeight),
+                    ) {
+                        placeables.forEach { it.placeRelativeWithLayer(0, 0) }
+                    }
+                }
             }
         }
     }
@@ -89,6 +120,8 @@ class OneKotlinHostView(context: Context) : ReactViewGroup(context) {
         if (sourceOrViewChanged) {
             reportedWidth = -1.0
             reportedHeight = -1.0
+            observedWidth = -1
+            observedHeight = -1
         }
 
         if (sourceOrViewChanged || nextHash != committedContractHash || nextProps != committedProps) {
@@ -161,31 +194,45 @@ class OneKotlinHostView(context: Context) : ReactViewGroup(context) {
 
     private fun layoutComposeContent() {
         if (!composeView.isAttachedToWindow || committedSource.isEmpty() || committedView.isEmpty()) return
-        // measure content before letting yoga apply the outer constraints.
-        composeView.measure(
-            MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
-            MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
-        )
-        val naturalWidth = composeView.measuredWidth
-        var naturalHeight = composeView.measuredHeight
-        if (width > 0 && width != naturalWidth) {
-            composeView.measure(
-                MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+        measuringContent = true
+        try {
+            // measure content before letting yoga apply the outer constraints.
+            measureComposeContent(
                 MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
+                MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
+            )
+            val naturalWidth = composeView.measuredWidth
+            var naturalHeight = composeView.measuredHeight
+            if (width > 0 && width != naturalWidth) {
+                measureComposeContent(
+                    MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+                    MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
+                )
+                naturalHeight = composeView.measuredHeight
+            }
+            onContentSizeChanged(
+                committedSource,
+                committedView,
+                naturalWidth,
+                naturalHeight,
             )
-            naturalHeight = composeView.measuredHeight
+            measureComposeContent(
+                MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY),
+            )
+            composeView.layout(0, 0, width, height)
+        } finally {
+            measuringContent = false
         }
-        onContentSizeChanged(
-            committedSource,
-            committedView,
-            naturalWidth,
-            naturalHeight,
-        )
-        composeView.measure(
-            MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-            MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY),
-        )
-        composeView.layout(0, 0, width, height)
+    }
+
+    private fun measureComposeContent(widthSpec: Int, heightSpec: Int) {
+        // each explicit pass must update compose constraints rather than reuse android's cache.
+        composeView.forceLayout()
+        for (index in 0 until composeView.childCount) {
+            composeView.getChildAt(index).forceLayout()
+        }
+        composeView.measure(widthSpec, heightSpec)
     }
 
     override fun onDetachedFromWindow() {
@@ -198,6 +245,8 @@ class OneKotlinHostView(context: Context) : ReactViewGroup(context) {
         removeCallbacks(contentLayout)
         reportedWidth = -1.0
         reportedHeight = -1.0
+        observedWidth = -1
+        observedHeight = -1
         committedSource = ""
         committedView = ""
         committedContractHash = ""

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "2.0.0-beta.159.1",
+  "version": "2.0.0-beta.161.1",
   "description": "One is a React framework for web, iOS, and Android apps.",
   "license": "BSD-3-Clause",
   "sideEffects": [
@@ -218,18 +218,18 @@
     "@react-navigation/native-stack": "8.0.0-alpha.52",
     "@react-navigation/routers": "8.0.0-alpha.17",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/color-scheme": "2.0.0-beta.159.1",
-    "@vxrn/compiler": "2.0.0-beta.159.1",
-    "@vxrn/resolve": "2.0.0-beta.159.1",
-    "@vxrn/tslib-lite": "2.0.0-beta.159.1",
-    "@vxrn/use-isomorphic-layout-effect": "2.0.0-beta.159.1",
-    "@vxrn/utils": "2.0.0-beta.159.1",
-    "@vxrn/vite-plugin-metro": "2.0.0-beta.159.1",
+    "@vxrn/color-scheme": "2.0.0-beta.161.1",
+    "@vxrn/compiler": "2.0.0-beta.161.1",
+    "@vxrn/resolve": "2.0.0-beta.161.1",
+    "@vxrn/tslib-lite": "2.0.0-beta.161.1",
+    "@vxrn/use-isomorphic-layout-effect": "2.0.0-beta.161.1",
+    "@vxrn/utils": "2.0.0-beta.161.1",
+    "@vxrn/vite-plugin-metro": "2.0.0-beta.161.1",
     "babel-dead-code-elimination": "1.0.10",
     "babel-plugin-module-resolver": "^5.0.2",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "2.0.0-beta.159.1",
+    "create-vxrn": "2.0.0-beta.161.1",
     "escape-string-regexp": "^5.0.0",
     "fast-deep-equal": "^3.1.3",
     "fast-glob": "^3.3.3",
@@ -251,7 +251,7 @@
     "tsconfig-paths": "^4",
     "use-latest-callback": "^0.2.3",
     "vite": "^8.2.2",
-    "vxrn": "2.0.0-beta.159.1",
+    "vxrn": "2.0.0-beta.161.1",
     "web-streams-polyfill": "^4.3.0",
     "ws": "^8.21.0",
     "xxhashjs": "^0.2.2"