@expo/ui 58.0.8 → 58.0.10

package/CHANGELOG.md

@@ -1,14 +1,23 @@
 # Changelog
 
-## Unpublished
+## 58.0.10
 
-### 🛠 Breaking changes
+### Patch Changes
 
-### 🎉 New features
+- [android] Fix `community/picker` `Picker` not updating its displayed label after a selection or a `selectedValue` change. ([#50801](https://github.com/expo/expo/pull/50801) by [@RaddishIoW](https://github.com/RaddishIoW))
+- [web] Fix `ListItem` always showing a pointer cursor, even without an `onPress`, because React Native Web's `Pressable` applies one unconditionally. A `ListItem` with no `onPress` now shows the default cursor instead of misleadingly looking clickable. ([#49986](https://github.com/expo/expo/pull/49986) by [@timheilman](https://github.com/timheilman))
+- [iOS][Android] `RNHostView` `matchContents` accepts `{ horizontal, vertical }`, so hosted content can take its width from the parent and its height from the content. ([#50674](https://github.com/expo/expo/pull/50674) by [@intergalacticspacehighway](https://github.com/intergalacticspacehighway))
+- [iOS] Stop linking WidgetKit into apps that use `@expo/ui` without widgets. The `widgetURL`, `activityBackgroundTint`, `widgetAccentedRenderingMode`, and `containerBackground` (`widget` placement) modifiers and the `AccessoryWidgetBackground` view now take effect only inside `expo-widgets` widgets and Live Activities. ([#50786](https://github.com/expo/expo/pull/50786) by [@intergalacticspacehighway](https://github.com/intergalacticspacehighway))
+- [iOS] Added the `preferredColorScheme` modifier, which sets the color scheme of a presentation such as `BottomSheet`, including its background. ([#50851](https://github.com/expo/expo/pull/50851) by [@intergalacticspacehighway](https://github.com/intergalacticspacehighway))
 
-### 🐛 Bug fixes
+## 58.0.9
 
-### 💡 Others
+### Patch Changes
+
+- Force-bump all packages, due to migration to changesets. ([#50762](https://github.com/expo/expo/pull/50762) by [@kitten](https://github.com/kitten))
+- [iOS] Added `LazyVStack.ForEach` and `LazyHStack.ForEach`, which render rows from `data` and `keyExtractor` with a `children` function: `{({ item, index }) => <Row item={item} />}`. Rows are recycled from a small pool around the visible range, so large stacks only render the rows near the viewport. Set `recycling={false}` to render every row. ([#50579](https://github.com/expo/expo/pull/50579) by [@intergalacticspacehighway](https://github.com/intergalacticspacehighway))
+- [android] Fix `Switch` label rendering one letter per line inside a `Host` with `matchContents`. ([#50693](https://github.com/expo/expo/pull/50693) by [@janicduplessis](https://github.com/janicduplessis))
+- [android] Added `IntrinsicSize` support to the `width` modifier. ([#50693](https://github.com/expo/expo/pull/50693) by [@janicduplessis](https://github.com/janicduplessis))
 
 ## 58.0.8 — 2026-09-28
 

package/android/build.gradle

@@ -12,13 +12,13 @@ apply plugin: 'expo-module-gradle-plugin'
 apply plugin: 'org.jetbrains.kotlin.plugin.compose'
 
 group = 'expo.modules.ui'
-version = '58.0.8'
+version = '58.0.10'
 
 android {
   namespace "expo.modules.ui"
   defaultConfig {
     versionCode 1
-    versionName "58.0.8"
+    versionName "58.0.10"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   buildFeatures {

package/android/src/main/java/expo/modules/ui/AnimatedVisibilityView.kt

@@ -73,32 +73,64 @@ data class ExitTransitionRecord(
 // TODO(@ubax): expose animationSpec parameter (tween, spring, duration) for all transitions
 private fun EnterTransitionRecord.toComposeTransition(): EnterTransition = when (type) {
   EnterTransitionType.FADE_IN ->
-    if (initialAlpha != null) fadeIn(initialAlpha = initialAlpha) else fadeIn()
+    if (initialAlpha != null) {
+      fadeIn(initialAlpha = initialAlpha)
+    } else {
+      fadeIn()
+    }
   EnterTransitionType.SLIDE_IN_HORIZONTALLY ->
-    if (initialOffsetX != null) slideInHorizontally { (it * initialOffsetX).toInt() } else slideInHorizontally()
+    if (initialOffsetX != null) {
+      slideInHorizontally { (it * initialOffsetX).toInt() }
+    } else {
+      slideInHorizontally()
+    }
   EnterTransitionType.SLIDE_IN_VERTICALLY ->
-    if (initialOffsetY != null) slideInVertically { (it * initialOffsetY).toInt() } else slideInVertically()
+    if (initialOffsetY != null) {
+      slideInVertically { (it * initialOffsetY).toInt() }
+    } else {
+      slideInVertically()
+    }
   // TODO(@ubax): expose expandFrom (Alignment) and initialSize parameters for expand transitions
   EnterTransitionType.EXPAND_IN -> expandIn()
   EnterTransitionType.EXPAND_HORIZONTALLY -> expandHorizontally()
   EnterTransitionType.EXPAND_VERTICALLY -> expandVertically()
   EnterTransitionType.SCALE_IN ->
-    if (initialScale != null) scaleIn(initialScale = initialScale) else scaleIn()
+    if (initialScale != null) {
+      scaleIn(initialScale = initialScale)
+    } else {
+      scaleIn()
+    }
 }
 
 private fun ExitTransitionRecord.toComposeTransition(): ExitTransition = when (type) {
   ExitTransitionType.FADE_OUT ->
-    if (targetAlpha != null) fadeOut(targetAlpha = targetAlpha) else fadeOut()
+    if (targetAlpha != null) {
+      fadeOut(targetAlpha = targetAlpha)
+    } else {
+      fadeOut()
+    }
   ExitTransitionType.SLIDE_OUT_HORIZONTALLY ->
-    if (targetOffsetX != null) slideOutHorizontally { (it * targetOffsetX).toInt() } else slideOutHorizontally()
+    if (targetOffsetX != null) {
+      slideOutHorizontally { (it * targetOffsetX).toInt() }
+    } else {
+      slideOutHorizontally()
+    }
   ExitTransitionType.SLIDE_OUT_VERTICALLY ->
-    if (targetOffsetY != null) slideOutVertically { (it * targetOffsetY).toInt() } else slideOutVertically()
+    if (targetOffsetY != null) {
+      slideOutVertically { (it * targetOffsetY).toInt() }
+    } else {
+      slideOutVertically()
+    }
   // TODO(@ubax): expose shrinkTowards (Alignment) and targetSize parameters for shrink transitions
   ExitTransitionType.SHRINK_OUT -> shrinkOut()
   ExitTransitionType.SHRINK_HORIZONTALLY -> shrinkHorizontally()
   ExitTransitionType.SHRINK_VERTICALLY -> shrinkVertically()
   ExitTransitionType.SCALE_OUT ->
-    if (targetScale != null) scaleOut(targetScale = targetScale) else scaleOut()
+    if (targetScale != null) {
+      scaleOut(targetScale = targetScale)
+    } else {
+      scaleOut()
+    }
 }
 
 private fun List<EnterTransitionRecord>.toComposedEnterTransition(): EnterTransition? =

package/android/src/main/java/expo/modules/ui/ComposeViews.kt

@@ -65,7 +65,13 @@ internal fun FunctionalComposableScope.RowContent(props: LayoutProps) {
     verticalAlignment = props.verticalAlignment?.toComposeAlignment() ?: Alignment.Top,
     modifier = ModifierRegistry
       .applyModifiers(props.modifiers, appContext, composableScope, globalEventDispatcher)
-      .then(if (scrollBehavior != null) Modifier.nestedScroll(scrollBehavior) else Modifier)
+      .then(
+        if (scrollBehavior != null) {
+          Modifier.nestedScroll(scrollBehavior)
+        } else {
+          Modifier
+        }
+      )
   ) {
     Children(UIComposableScope(rowScope = this@Row, nestedScrollConnection = scrollBehavior))
   }
@@ -95,7 +101,13 @@ internal fun FunctionalComposableScope.ColumnContent(props: LayoutProps) {
     horizontalAlignment = props.horizontalAlignment?.toComposeAlignment() ?: Alignment.Start,
     modifier = ModifierRegistry
       .applyModifiers(props.modifiers, appContext, composableScope, globalEventDispatcher)
-      .then(if (scrollBehavior != null) Modifier.nestedScroll(scrollBehavior) else Modifier)
+      .then(
+        if (scrollBehavior != null) {
+          Modifier.nestedScroll(scrollBehavior)
+        } else {
+          Modifier
+        }
+      )
   ) {
     Children(UIComposableScope(columnScope = this@Column, nestedScrollConnection = scrollBehavior))
   }
@@ -112,7 +124,13 @@ fun FunctionalComposableScope.BoxContent(props: LayoutProps) {
     contentAlignment = props.contentAlignment?.toComposeAlignment() ?: Alignment.TopStart,
     modifier = ModifierRegistry
       .applyModifiers(props.modifiers, appContext, composableScope, globalEventDispatcher)
-      .then(if (scrollBehavior != null) Modifier.nestedScroll(scrollBehavior) else Modifier)
+      .then(
+        if (scrollBehavior != null) {
+          Modifier.nestedScroll(scrollBehavior)
+        } else {
+          Modifier
+        }
+      )
   ) {
     Children(UIComposableScope(boxScope = this@Box, nestedScrollConnection = scrollBehavior))
   }

package/android/src/main/java/expo/modules/ui/DatePickerView.kt

@@ -219,14 +219,22 @@ fun rememberSelectableDates(selectableDatesRecord: SelectableDatesRecord?): Sele
 
       object : SelectableDates {
         override fun isSelectableDate(utcTimeMillis: Long): Boolean {
-          if (startUtcDayMillis != null && utcTimeMillis < startUtcDayMillis) return false
-          if (endUtcDayMillis != null && utcTimeMillis > endUtcDayMillis) return false
+          if (startUtcDayMillis != null && utcTimeMillis < startUtcDayMillis) {
+            return false
+          }
+          if (endUtcDayMillis != null && utcTimeMillis > endUtcDayMillis) {
+            return false
+          }
           return true
         }
 
         override fun isSelectableYear(year: Int): Boolean {
-          if (startYear != null && year < startYear) return false
-          if (endYear != null && year > endYear) return false
+          if (startYear != null && year < startYear) {
+            return false
+          }
+          if (endYear != null && year > endYear) {
+            return false
+          }
           return true
         }
       }

package/android/src/main/java/expo/modules/ui/ExpoUIModule.kt

@@ -167,7 +167,11 @@ class ExpoUIModule : Module() {
         ?: appContext.reactContext
         ?: throw Exceptions.ReactContextLost()
       val resolvedScheme = options?.scheme
-        ?: if (context.isSystemInDarkTheme()) ExpoColorScheme.DARK else ExpoColorScheme.LIGHT
+        ?: if (context.isSystemInDarkTheme()) {
+          ExpoColorScheme.DARK
+        } else {
+          ExpoColorScheme.LIGHT
+        }
       val isDark = resolvedScheme == ExpoColorScheme.DARK
       val seedArgb = options?.seedColor?.composeOrNull?.toArgb()
       val colorScheme = if (seedArgb != null) {

package/android/src/main/java/expo/modules/ui/HorizontalPagerView.kt

@@ -125,7 +125,9 @@ fun FunctionalComposableScope.HorizontalPagerContent(
   }
 
   val pageCount = pageCountState.intValue
-  if (pageCount == 0) return
+  if (pageCount == 0) {
+    return
+  }
 
   // Mirror Compose's PagerState observable fields to JS callbacks. Each
   // state-backed snapshotFlow drops its first emission so we don't echo the

package/android/src/main/java/expo/modules/ui/HostView.kt

@@ -81,17 +81,33 @@ internal enum class ExpoColorScheme(val value: String) : Enumerable {
 
   fun toColorScheme(context: Context): ColorScheme {
     return when (this) {
-      LIGHT -> if (isDynamicColorSupported) dynamicLightColorScheme(context) else lightColorScheme()
-      DARK -> if (isDynamicColorSupported) dynamicDarkColorScheme(context) else darkColorScheme()
+      LIGHT -> if (isDynamicColorSupported) {
+        dynamicLightColorScheme(context)
+      } else {
+        lightColorScheme()
+      }
+      DARK -> if (isDynamicColorSupported) {
+        dynamicDarkColorScheme(context)
+      } else {
+        darkColorScheme()
+      }
     }
   }
 
   companion object {
     fun defaultColorScheme(context: Context, isSystemInDarkTheme: Boolean): ColorScheme {
       return if (isDynamicColorSupported) {
-        if (isSystemInDarkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+        if (isSystemInDarkTheme) {
+          dynamicDarkColorScheme(context)
+        } else {
+          dynamicLightColorScheme(context)
+        }
       } else {
-        if (isSystemInDarkTheme) darkColorScheme() else lightColorScheme()
+        if (isSystemInDarkTheme) {
+          darkColorScheme()
+        } else {
+          lightColorScheme()
+        }
       }
     }
   }
@@ -159,8 +175,20 @@ internal class HostView(context: Context, appContext: AppContext) :
 
     Layout(
       modifier = Modifier
-        .then(if (props.matchContentsHorizontal.value == true) Modifier.wrapContentWidth() else Modifier)
-        .then(if (props.matchContentsVertical.value == true) Modifier.wrapContentHeight() else Modifier)
+        .then(
+          if (props.matchContentsHorizontal.value == true) {
+            Modifier.wrapContentWidth()
+          } else {
+            Modifier
+          }
+        )
+        .then(
+          if (props.matchContentsVertical.value == true) {
+            Modifier.wrapContentHeight()
+          } else {
+            Modifier
+          }
+        )
         .onSizeChanged { size -> dispatchOnLayoutContent(size, density) },
       content = content
     ) { measurables, constraints ->
@@ -199,8 +227,16 @@ internal class HostView(context: Context, appContext: AppContext) :
           val heightDp = contentHeightPx.toDp().value.toDouble()
 
           shadowNodeProxy.setViewSize(
-            if (constraints.maxWidth == 0) widthDp else Double.NaN,
-            if (constraints.maxHeight == 0) heightDp else Double.NaN
+            if (constraints.maxWidth == 0) {
+              widthDp
+            } else {
+              Double.NaN
+            },
+            if (constraints.maxHeight == 0) {
+              heightDp
+            } else {
+              Double.NaN
+            }
           )
         }
       }
@@ -227,8 +263,16 @@ internal class HostView(context: Context, appContext: AppContext) :
       val height = size.height.toDp().value
 
       if (matchContentsHorizontal == true || matchContentsVertical == true) {
-        val styleWidth = if (matchContentsHorizontal == true && width > 0) width else null
-        val styleHeight = if (matchContentsVertical == true && height > 0) height else null
+        val styleWidth = if (matchContentsHorizontal == true && width > 0) {
+          width
+        } else {
+          null
+        }
+        val styleHeight = if (matchContentsVertical == true && height > 0) {
+          height
+        } else {
+          null
+        }
         shadowNodeProxy.setStyleSize(styleWidth?.toDouble(), styleHeight?.toDouble())
       }
 
@@ -263,8 +307,16 @@ internal class HostView(context: Context, appContext: AppContext) :
     val matchContentsVertical = props.matchContentsVertical.value
     val composeView = findComposeView()
     composeView.layoutParams = LayoutParams(
-      if (matchContentsHorizontal == true) LayoutParams.WRAP_CONTENT else LayoutParams.MATCH_PARENT,
-      if (matchContentsVertical == true) LayoutParams.WRAP_CONTENT else LayoutParams.MATCH_PARENT
+      if (matchContentsHorizontal == true) {
+        LayoutParams.WRAP_CONTENT
+      } else {
+        LayoutParams.MATCH_PARENT
+      },
+      if (matchContentsVertical == true) {
+        LayoutParams.WRAP_CONTENT
+      } else {
+        LayoutParams.MATCH_PARENT
+      }
     )
   }
 

package/android/src/main/java/expo/modules/ui/LazyItemsView.kt

@@ -176,7 +176,15 @@ internal fun LazyListScope.lazyRecycledItems(
     Box(
       modifier = Modifier.onSizeChanged { size ->
         if (content != null) {
-          window.measure(itemKey, if (isVertical) size.height else size.width, revision)
+          window.measure(
+            itemKey,
+            if (isVertical) {
+              size.height
+            } else {
+              size.width
+            },
+            revision
+          )
         }
       }
     ) {
@@ -205,7 +213,11 @@ internal fun LazyListScope.lazyRecycledItems(
  */
 internal fun Modifier.lazyRecycledItemsCrossAxis(list: ViewGroup, isVertical: Boolean): Modifier =
   layout { measurable, constraints ->
-    val crossAxisSize = if (isVertical) constraints.maxWidth else constraints.maxHeight
+    val crossAxisSize = if (isVertical) {
+      constraints.maxWidth
+    } else {
+      constraints.maxHeight
+    }
     for (index in 0..<list.childCount) {
       (list.getChildAt(index) as? LazyItemsView)?.window?.updateCrossAxisSize(crossAxisSize)
     }

package/android/src/main/java/expo/modules/ui/ModalBottomSheetView.kt

@@ -145,7 +145,11 @@ fun FunctionalComposableScope.ModalBottomSheetContent(
   // then asked for light system bars, which turned the navigation bar white.
   val resolvedContentColor = props.contentColor.composeOrNull
     ?: MaterialTheme.colorScheme.contentColorFor(resolvedContainerColor).takeOrElse {
-      if (resolvedContainerColor.luminance() > 0.5f) ComposeColor.Black else ComposeColor.White
+      if (resolvedContainerColor.luminance() > 0.5f) {
+        ComposeColor.Black
+      } else {
+        ComposeColor.White
+      }
     }
   val resolvedScrimColor = props.scrimColor.composeOrNull ?: BottomSheetDefaults.ScrimColor
   val dragHandleSlotView = findChildSlotView(view, "dragHandle")

package/android/src/main/java/expo/modules/ui/ModifierRegistry.kt

@@ -21,6 +21,7 @@ import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
@@ -79,6 +80,7 @@ import expo.modules.kotlin.records.Field
 import expo.modules.kotlin.records.Record
 import expo.modules.kotlin.records.recordFromMap
 import expo.modules.kotlin.types.ConverterContext
+import expo.modules.kotlin.types.Either
 import expo.modules.kotlin.types.Enumerable
 import expo.modules.kotlin.types.OptimizedRecord
 import expo.modules.kotlin.views.ComposableScope
@@ -133,6 +135,21 @@ data class WidthParams(
   @Field val width: Int = 0
 ) : Record
 
+internal enum class IntrinsicSizeType(val value: String) : Enumerable {
+  MIN("min"),
+  MAX("max");
+
+  fun toComposeIntrinsicSize(): IntrinsicSize = when (this) {
+    MIN -> IntrinsicSize.Min
+    MAX -> IntrinsicSize.Max
+  }
+}
+
+@OptimizedRecord
+internal data class ComposeWidthParams(
+  @Field val width: Either<Int, IntrinsicSizeType>? = null
+) : Record
+
 @OptimizedRecord
 data class HeightParams(
   @Field val height: Int = 0
@@ -168,7 +185,9 @@ data class BackgroundParams(
 // Color animation specs reuse the JS `$type` shape from `@expo/ui/jetpack-compose/modifiers/animation` (spring / tween / snap).
 // Keyframes are float-only and aren't supported for colors.
 private fun parseColorAnimationSpec(raw: Any?): AnimationSpec<androidx.compose.ui.graphics.Color>? {
-  if (raw !is Map<*, *>) return null
+  if (raw !is Map<*, *>) {
+    return null
+  }
   return when (raw["\$type"]) {
     "spring" -> spring(
       dampingRatio = (raw["dampingRatio"] as? Number)?.toFloat() ?: Spring.DampingRatioNoBouncy,
@@ -409,7 +428,9 @@ object ModifierRegistry {
     scope: ComposableScope,
     eventDispatcher: ModifierEventDispatcher
   ): Modifier {
-    if (modifiers.isNullOrEmpty()) return Modifier
+    if (modifiers.isNullOrEmpty()) {
+      return Modifier
+    }
     return modifiers.fold(Modifier as Modifier) { acc, config ->
       val type = config["\$type"]?.asString() ?: return@fold acc
       val modifier = modifierFactories[type]?.invoke(config, scope, appContext, eventDispatcher)
@@ -471,8 +492,12 @@ object ModifierRegistry {
     }
 
     register("width") { map, _, appContext, _ ->
-      val params = recordFromMap<WidthParams>(map, appContext)
-      Modifier.width(params.width.dp)
+      val width = recordFromMap<ComposeWidthParams>(map, appContext).width
+      if (width?.`is`(IntrinsicSizeType::class) == true) {
+        Modifier.width(width.second().toComposeIntrinsicSize())
+      } else {
+        Modifier.width((width?.first() ?: 0).dp)
+      }
     }
 
     register("height") { map, _, appContext, _ ->

package/android/src/main/java/expo/modules/ui/RNHostView.kt

@@ -8,9 +8,15 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewParent
 import android.widget.FrameLayout
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.requiredHeight
 import androidx.compose.foundation.layout.requiredSize
+import androidx.compose.foundation.layout.requiredWidth
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
@@ -42,7 +48,8 @@ import expo.modules.kotlin.views.OptimizedComposeProps
 
 @OptimizedComposeProps
 internal data class RNHostViewProps(
-  val matchContents: MutableState<Boolean?> = mutableStateOf(null),
+  val matchContentsHorizontal: MutableState<Boolean?> = mutableStateOf(null),
+  val matchContentsVertical: MutableState<Boolean?> = mutableStateOf(null),
   //  Adds LeafNode and MeasurableYogaNode trait in Shadow node
   val expoInternalSizeFromChildren: MutableState<Boolean?> = mutableStateOf(null),
   val modifiers: MutableState<ModifierList> = mutableStateOf(emptyList())
@@ -146,22 +153,33 @@ internal class RNHostView(context: Context, appContext: AppContext) :
 
   @Composable
   override fun ComposableScope.Content() {
-    val matchContents = props.matchContents.value ?: false
+    val matchContentsHorizontal = props.matchContentsHorizontal.value ?: false
+    val matchContentsVertical = props.matchContentsVertical.value ?: false
     val scope: ComposableScope = this
 
     wrapperState.value?.let { wrapper ->
       childViewState.value ?: return@let
-      val sizingModifier = if (matchContents) {
-        applySizeFromYogaNodeModifier()
-      } else {
-        Modifier
-          .fillMaxSize()
-          .then(reportSizeToYogaNodeModifier())
+      val sizingModifier = when {
+        matchContentsHorizontal && matchContentsVertical -> applySizeFromYogaNodeModifier()
+        matchContentsVertical ->
+          Modifier
+            .fillMaxWidth()
+            .then(reportSizeToYogaNodeModifier(reportHeight = false))
+            .then(applyHeightFromYogaNodeModifier())
+        matchContentsHorizontal ->
+          Modifier
+            .fillMaxHeight()
+            .then(reportSizeToYogaNodeModifier(reportWidth = false))
+            .then(applyWidthFromYogaNodeModifier())
+        else ->
+          Modifier
+            .fillMaxSize()
+            .then(reportSizeToYogaNodeModifier())
       }
-      // Origin last: a chain applies outside-in, so a caller `padding` or `offset` has to shift the
-      // content before it is read.
-      val modifiers = sizingModifier
-        .then(ModifierRegistry.applyModifiers(props.modifiers.value, appContext, scope, globalEventDispatcher))
+      // A chain applies outside-in. Caller modifiers go first so a `padding` or `border` shrinks the
+      // box before its size is reported and its origin is read.
+      val modifiers = ModifierRegistry.applyModifiers(props.modifiers.value, appContext, scope, globalEventDispatcher)
+        .then(sizingModifier)
         .then(publishContentOriginModifier())
 
       AndroidView(
@@ -204,6 +222,28 @@ internal class RNHostView(context: Context, appContext: AppContext) :
     }
   }
 
+  @Composable
+  private fun applyHeightFromYogaNodeModifier(): Modifier {
+    val height = childSizeState.value.height
+    if (height <= 0) {
+      return Modifier
+    }
+    return Modifier
+      .wrapContentHeight(Alignment.Top, unbounded = true)
+      .requiredHeight(with(LocalDensity.current) { height.toDp() })
+  }
+
+  @Composable
+  private fun applyWidthFromYogaNodeModifier(): Modifier {
+    val width = childSizeState.value.width
+    if (width <= 0) {
+      return Modifier
+    }
+    return Modifier
+      .wrapContentWidth(Alignment.CenterHorizontally, unbounded = true)
+      .requiredWidth(with(LocalDensity.current) { width.toDp() })
+  }
+
   /**
    * Publishes where Compose placed this view inside its `Host`, which Yoga has no way to know:
    * Yoga puts the box at the `Host`'s origin while Compose may draw it anywhere inside. Without
@@ -233,13 +273,21 @@ internal class RNHostView(context: Context, appContext: AppContext) :
   // Sets Yoga node size from Compose view size
   // Listens to Compose view size changes and updates the Yoga node size
   @Composable
-  private fun reportSizeToYogaNodeModifier(): Modifier {
+  private fun reportSizeToYogaNodeModifier(reportWidth: Boolean = true, reportHeight: Boolean = true): Modifier {
     val density = LocalDensity.current
     return Modifier.onSizeChanged { size ->
       with(density) {
         shadowNodeProxy.setViewSize(
-          size.width.toDp().value.toDouble(),
-          size.height.toDp().value.toDouble()
+          if (reportWidth) {
+            size.width.toDp().value.toDouble()
+          } else {
+            Double.NaN
+          },
+          if (reportHeight) {
+            size.height.toDp().value.toDouble()
+          } else {
+            Double.NaN
+          }
         )
       }
     }
@@ -318,7 +366,8 @@ private class TouchDispatchingRootViewGroup(
 
   override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
     // Always gets called with EXACTLY mode
-    // because parent has either fillMaxSize (matchContents = false) or requiredSize (matchContents = true) modifiers
+    // because parent has fillMaxSize (matchContents = false), requiredSize (matchContents = true), or a
+    // fillMax* + required* pair (one matched axis) modifiers
     setMeasuredDimension(
       MeasureSpec.getSize(widthMeasureSpec),
       MeasureSpec.getSize(heightMeasureSpec)
@@ -498,7 +547,9 @@ private class TouchDispatchingRootViewGroup(
     // Use the (…, type, consumed) variant so we can read how much the sheet ate (consumed[1]).
     val consumed = IntArray(2)
     dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, null, ViewCompat.TYPE_TOUCH, consumed)
-    if (consumed[1] != 0) sheetMovingOnLastDragFrame = true
+    if (consumed[1] != 0) {
+      sheetMovingOnLastDragFrame = true
+    }
   }
 
   override fun onNestedPreFling(target: View, velocityX: Float, velocityY: Float): Boolean {

package/android/src/main/java/expo/modules/ui/ShapeView.kt

@@ -179,7 +179,9 @@ fun pathFromShapeRecord(record: ShapeRecord, size: Size, density: Density): Path
 }
 
 fun shapeFromShapeRecord(shapeRecord: ShapeRecord?): Shape? {
-  if (shapeRecord == null) return null
+  if (shapeRecord == null) {
+    return null
+  }
   return object : Shape {
     override fun createOutline(size: Size, layoutDirection: LayoutDirection, density: Density): Outline {
       val path = pathFromShapeRecord(shapeRecord, size, density)

package/android/src/main/java/expo/modules/ui/SlotView.kt

@@ -65,7 +65,9 @@ fun findChildSlotView(viewGroup: ViewGroup, slotName: String): SlotView? {
 inline fun <reified T> findChildOfType(viewGroup: ViewGroup): T? {
   for (index in 0..<viewGroup.size) {
     val child = viewGroup.getChildAt(index)
-    if (child is T) return child
+    if (child is T) {
+      return child
+    }
   }
   return null
 }

package/android/src/main/java/expo/modules/ui/SnackbarView.kt

@@ -83,7 +83,11 @@ fun FunctionalComposableScope.SnackbarHostContent(
       "long" -> SnackbarDuration.Long
       "indefinite" -> SnackbarDuration.Indefinite
       // M3 default: indefinite when there's an action label, else short.
-      else -> if (options.actionLabel == null) SnackbarDuration.Short else SnackbarDuration.Indefinite
+      else -> if (options.actionLabel == null) {
+        SnackbarDuration.Short
+      } else {
+        SnackbarDuration.Indefinite
+      }
     }
     val result = try {
       withContext(scope.coroutineContext) {

package/android/src/main/java/expo/modules/ui/TextView.kt

@@ -134,7 +134,9 @@ enum class TextLineBreakType(val value: String) : Enumerable {
 }
 
 fun resolveFontFamily(name: String?, context: Context): FontFamily? {
-  if (name == null) return null
+  if (name == null) {
+    return null
+  }
   return when (name) {
     "default" -> FontFamily.Default
     "sansSerif" -> FontFamily.SansSerif

package/android/src/main/java/expo/modules/ui/Utils.kt

@@ -32,7 +32,9 @@ val Color?.composeOrNull: androidx.compose.ui.graphics.Color?
  * Gets the ImageVector for a given icon name using reflection.
  */
 fun getImageVector(icon: String?): ImageVector? {
-  if (icon.isNullOrEmpty()) return null
+  if (icon.isNullOrEmpty()) {
+    return null
+  }
   return try {
     val (theme, name) = icon.split(".")
     val clazz = Class.forName("androidx.compose.material.icons.$theme.${name}Kt")