@expo/ui 58.0.16 → 58.0.18

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 58.0.18
+
+### Patch Changes
+
+- [iOS] Speed up app launch by naming the SwiftUI views without protocol conformance lookups. ([#51459](https://github.com/expo/expo/pull/51459) by [@Kudo](https://github.com/Kudo))
+- Fix Android universal TextInput placeholders ignoring textStyle. ([#51563](https://github.com/expo/expo/pull/51563) by [@sync](https://github.com/sync))
+- [iOS] Fix `Form` and `List` sections in a `Host` starting 20pt inside the large title beside the iPhone Duo's rail, where iOS drops its content margin. This works around a SwiftUI bug and applies only on an edge where the inset comes from a bar beside the content. ([#51606](https://github.com/expo/expo/pull/51606) by [@huntie](https://github.com/huntie))
+
+## 58.0.17
+
+### Patch Changes
+
+- [Android] Fix the universal `ListItem` ignoring `testID`. The prop was never passed to Compose, so end-to-end tools such as Maestro could not find list rows on Android. It is now applied as the `testID` modifier, like the universal `Button` and `Checkbox` do. ([#51480](https://github.com/expo/expo/pull/51480) by [@devonik](https://github.com/devonik))
+- [Android] Bump Jetpack Compose UI and Foundation to 1.12.1 and Material3 to 1.5.0-beta01. Add `preferredItemWidth` to `HorizontalCenteredHeroCarousel` and deprecate `maxItemWidth`, matching the Material3 rename. Add `TimePickerElementColors` props without the `Unselected` infix (for example `clockDialContentColor`) and deprecate the old names. ([#51426](https://github.com/expo/expo/pull/51426) by [@intergalacticspacehighway](https://github.com/intergalacticspacehighway))
+
 ## 58.0.16
 
 ### Patch Changes

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.16'
+version = '58.0.18'
 
 android {
   namespace "expo.modules.ui"
   defaultConfig {
     versionCode 1
-    versionName "58.0.16"
+    versionName "58.0.18"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   buildFeatures {
@@ -38,10 +38,10 @@ android {
 dependencies {
   implementation 'com.facebook.react:react-android'
 
-  implementation 'androidx.compose.foundation:foundation-android:1.10.6'
-  implementation 'androidx.compose.ui:ui-android:1.10.6'
-  implementation "androidx.compose.material3:material3:1.5.0-alpha17"
-  implementation 'androidx.compose.material3:material3-android:1.5.0-alpha17'
+  implementation 'androidx.compose.foundation:foundation-android:1.12.1'
+  implementation 'androidx.compose.ui:ui-android:1.12.1'
+  implementation "androidx.compose.material3:material3:1.5.0-beta01"
+  implementation 'androidx.compose.material3:material3-android:1.5.0-beta01'
   implementation 'androidx.lifecycle:lifecycle-runtime:2.10.0'
   implementation 'androidx.fragment:fragment-ktx:1.8.9'
   implementation "androidx.graphics:graphics-shapes:1.1.0"

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

@@ -24,6 +24,7 @@ enum class FlingBehaviorType(val value: String) : Enumerable {
 
 @OptimizedComposeProps
 data class HorizontalCenteredHeroCarouselProps(
+  val preferredItemWidth: Float? = null,
   val maxItemWidth: Float? = null,
   val itemSpacing: Float? = null,
   val contentPadding: Either<Float, PaddingValuesRecord>? = null,
@@ -50,7 +51,7 @@ fun FunctionalComposableScope.HorizontalCenteredHeroCarouselContent(props: Horiz
   HorizontalCenteredHeroCarousel(
     state = carouselState,
     modifier = ModifierRegistry.applyModifiers(props.modifiers, appContext, composableScope, globalEventDispatcher),
-    maxItemWidth = props.maxItemWidth?.dp ?: Dp.Unspecified,
+    preferredItemWidth = (props.preferredItemWidth ?: props.maxItemWidth)?.dp ?: Dp.Unspecified,
     itemSpacing = (props.itemSpacing ?: 0f).dp,
     flingBehavior = flingBehavior,
     userScrollEnabled = props.userScrollEnabled ?: true,

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

@@ -123,6 +123,8 @@ class DateTimePickerColorOverrides : Record {
 
   @Field val clockDialSelectedContentColor: AndroidColor? = null
 
+  @Field val clockDialContentColor: AndroidColor? = null
+
   @Field val clockDialUnselectedContentColor: AndroidColor? = null
 
   @Field val selectorColor: AndroidColor? = null
@@ -131,18 +133,26 @@ class DateTimePickerColorOverrides : Record {
 
   @Field val periodSelectorSelectedContainerColor: AndroidColor? = null
 
+  @Field val periodSelectorContainerColor: AndroidColor? = null
+
   @Field val periodSelectorUnselectedContainerColor: AndroidColor? = null
 
   @Field val periodSelectorSelectedContentColor: AndroidColor? = null
 
+  @Field val periodSelectorContentColor: AndroidColor? = null
+
   @Field val periodSelectorUnselectedContentColor: AndroidColor? = null
 
   @Field val timeSelectorSelectedContainerColor: AndroidColor? = null
 
+  @Field val timeSelectorContainerColor: AndroidColor? = null
+
   @Field val timeSelectorUnselectedContainerColor: AndroidColor? = null
 
   @Field val timeSelectorSelectedContentColor: AndroidColor? = null
 
+  @Field val timeSelectorContentColor: AndroidColor? = null
+
   @Field val timeSelectorUnselectedContentColor: AndroidColor? = null
 }
 
@@ -323,17 +333,17 @@ fun buildTimePickerColors(
     containerColor = elementColors.containerColor.composeOrNull ?: defaults.containerColor,
     clockDialColor = elementColors.clockDialColor.composeOrNull ?: colorProp?.copy(alpha = 0.3f) ?: defaults.clockDialColor,
     clockDialSelectedContentColor = elementColors.clockDialSelectedContentColor.composeOrNull ?: defaults.clockDialSelectedContentColor,
-    clockDialUnselectedContentColor = elementColors.clockDialUnselectedContentColor.composeOrNull ?: defaults.clockDialUnselectedContentColor,
+    clockDialContentColor = (elementColors.clockDialContentColor ?: elementColors.clockDialUnselectedContentColor).composeOrNull ?: defaults.clockDialContentColor,
     selectorColor = elementColors.selectorColor.composeOrNull ?: colorProp ?: defaults.selectorColor,
     periodSelectorBorderColor = elementColors.periodSelectorBorderColor.composeOrNull ?: defaults.periodSelectorBorderColor,
     periodSelectorSelectedContainerColor = elementColors.periodSelectorSelectedContainerColor.composeOrNull ?: defaults.periodSelectorSelectedContainerColor,
-    periodSelectorUnselectedContainerColor = elementColors.periodSelectorUnselectedContainerColor.composeOrNull ?: defaults.periodSelectorUnselectedContainerColor,
+    periodSelectorContainerColor = (elementColors.periodSelectorContainerColor ?: elementColors.periodSelectorUnselectedContainerColor).composeOrNull ?: defaults.periodSelectorContainerColor,
     periodSelectorSelectedContentColor = elementColors.periodSelectorSelectedContentColor.composeOrNull ?: defaults.periodSelectorSelectedContentColor,
-    periodSelectorUnselectedContentColor = elementColors.periodSelectorUnselectedContentColor.composeOrNull ?: defaults.periodSelectorUnselectedContentColor,
+    periodSelectorContentColor = (elementColors.periodSelectorContentColor ?: elementColors.periodSelectorUnselectedContentColor).composeOrNull ?: defaults.periodSelectorContentColor,
     timeSelectorSelectedContainerColor = elementColors.timeSelectorSelectedContainerColor.composeOrNull ?: colorProp ?: defaults.timeSelectorSelectedContainerColor,
-    timeSelectorUnselectedContainerColor = elementColors.timeSelectorUnselectedContainerColor.composeOrNull ?: defaults.timeSelectorUnselectedContainerColor,
+    timeSelectorContainerColor = (elementColors.timeSelectorContainerColor ?: elementColors.timeSelectorUnselectedContainerColor).composeOrNull ?: defaults.timeSelectorContainerColor,
     timeSelectorSelectedContentColor = elementColors.timeSelectorSelectedContentColor.composeOrNull ?: defaults.timeSelectorSelectedContentColor,
-    timeSelectorUnselectedContentColor = elementColors.timeSelectorUnselectedContentColor.composeOrNull ?: defaults.timeSelectorUnselectedContentColor
+    timeSelectorContentColor = (elementColors.timeSelectorContentColor ?: elementColors.timeSelectorUnselectedContentColor).composeOrNull ?: defaults.timeSelectorContentColor
   )
 }
 

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

@@ -5,10 +5,11 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Slider
 import androidx.compose.material3.SliderDefaults
+import androidx.compose.material3.SliderState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import expo.modules.kotlin.records.Field
@@ -66,13 +67,20 @@ fun FunctionalComposableScope.SliderContent(props: SliderProps) {
   val effectiveUpper = minOf(props.max, props.upperLimit ?: Float.POSITIVE_INFINITY)
 
   var localValue by remember { mutableFloatStateOf(props.value.coerceIn(effectiveLower, effectiveUpper)) }
-  var isDragging by remember { mutableStateOf(false) }
   val clampedPropsValue = props.value.coerceIn(effectiveLower, effectiveUpper)
   var prevPropsValue by remember { mutableFloatStateOf(clampedPropsValue) }
 
+  val sliderState = remember(props.min, props.max, props.steps) {
+    SliderState(
+      value = localValue.coerceIn(effectiveLower, effectiveUpper),
+      steps = props.steps,
+      trackRange = props.min..props.max
+    )
+  }
+
   if (clampedPropsValue != prevPropsValue) {
     prevPropsValue = clampedPropsValue
-    if (!isDragging) {
+    if (!sliderState.isDragging) {
       localValue = clampedPropsValue
     }
   }
@@ -88,24 +96,28 @@ fun FunctionalComposableScope.SliderContent(props: SliderProps) {
     inactiveTickColor = props.colors.inactiveTickColor.compose
   )
 
+  SideEffect {
+    val target = localValue.coerceIn(effectiveLower, effectiveUpper)
+    if (sliderState.value != target) {
+      sliderState.value = target
+    }
+  }
+
   Slider(
-    value = localValue,
-    valueRange = props.min..props.max,
-    steps = props.steps,
+    state = sliderState,
     enabled = props.enabled,
     interactionSource = interactionSource,
     onValueChange = {
       val clamped = it.coerceIn(effectiveLower, effectiveUpper)
-      isDragging = true
       localValue = clamped
+      sliderState.value = clamped
       onValueChange(SliderValueChangedEvent(clamped))
     },
     onValueChangeFinished = {
-      isDragging = false
       onValueChangeFinished(Unit)
     },
     colors = sliderColors,
-    thumb = { sliderState ->
+    thumb = {
       if (thumbSlotView != null) {
         with(UIComposableScope()) { with(thumbSlotView) { Content() } }
       } else {

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

@@ -52,7 +52,7 @@ fun FunctionalComposableScope.ToggleButtonContent(
     onCheckedChange = { onCheckedChange(ToggleButtonValueChangeEvent(it)) },
     enabled = props.enabled,
     modifier = modifier,
-    colors = ToggleButtonDefaults.toggleButtonColors(
+    colors = ToggleButtonDefaults.colors(
       checkedContainerColor = props.colors.checkedContainerColor.compose,
       checkedContentColor = props.colors.checkedContentColor.compose,
       containerColor = props.colors.containerColor.compose,

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

@@ -49,7 +49,7 @@ fun FunctionalComposableScope.VerticalSliderContent(props: VerticalSliderProps)
     SliderState(
       value = localValue.coerceIn(effectiveLower, effectiveUpper),
       steps = props.steps,
-      valueRange = props.min..props.max
+      trackRange = props.min..props.max
     )
   }
 
@@ -77,16 +77,17 @@ fun FunctionalComposableScope.VerticalSliderContent(props: VerticalSliderProps)
     globalEventDispatcher
   )
 
+  val handleValueChange: (Float) -> Unit = {
+    val clamped = it.coerceIn(effectiveLower, effectiveUpper)
+    localValue = clamped
+    sliderState.value = clamped
+    onValueChange(SliderValueChangedEvent(clamped))
+  }
+  val handleValueChangeFinished: () -> Unit = {
+    onValueChangeFinished(Unit)
+  }
+
   SideEffect {
-    sliderState.onValueChange = {
-      val clamped = it.coerceIn(effectiveLower, effectiveUpper)
-      localValue = clamped
-      sliderState.value = clamped
-      onValueChange(SliderValueChangedEvent(clamped))
-    }
-    sliderState.onValueChangeFinished = {
-      onValueChangeFinished(Unit)
-    }
     val target = localValue.coerceIn(effectiveLower, effectiveUpper)
     if (sliderState.value != target) {
       sliderState.value = target
@@ -97,7 +98,9 @@ fun FunctionalComposableScope.VerticalSliderContent(props: VerticalSliderProps)
     thumbSlotView != null && trackSlotView != null -> VerticalSlider(
       state = sliderState,
       enabled = props.enabled,
-      reverseDirection = props.reverseDirection,
+      onValueChange = handleValueChange,
+      onValueChangeFinished = handleValueChangeFinished,
+      topToBottom = !props.reverseDirection,
       colors = sliderColors,
       interactionSource = interactionSource,
       thumb = {
@@ -112,7 +115,9 @@ fun FunctionalComposableScope.VerticalSliderContent(props: VerticalSliderProps)
     thumbSlotView != null -> VerticalSlider(
       state = sliderState,
       enabled = props.enabled,
-      reverseDirection = props.reverseDirection,
+      onValueChange = handleValueChange,
+      onValueChangeFinished = handleValueChangeFinished,
+      topToBottom = !props.reverseDirection,
       colors = sliderColors,
       interactionSource = interactionSource,
       thumb = {
@@ -124,7 +129,9 @@ fun FunctionalComposableScope.VerticalSliderContent(props: VerticalSliderProps)
     trackSlotView != null -> VerticalSlider(
       state = sliderState,
       enabled = props.enabled,
-      reverseDirection = props.reverseDirection,
+      onValueChange = handleValueChange,
+      onValueChangeFinished = handleValueChangeFinished,
+      topToBottom = !props.reverseDirection,
       colors = sliderColors,
       interactionSource = interactionSource,
       track = {
@@ -136,7 +143,9 @@ fun FunctionalComposableScope.VerticalSliderContent(props: VerticalSliderProps)
     else -> VerticalSlider(
       state = sliderState,
       enabled = props.enabled,
-      reverseDirection = props.reverseDirection,
+      onValueChange = handleValueChange,
+      onValueChangeFinished = handleValueChangeFinished,
+      topToBottom = !props.reverseDirection,
       colors = sliderColors,
       interactionSource = interactionSource,
       modifier = modifier

package/android/src/main/java/expo/modules/ui/menu/ExposedDropdownMenuView.kt

@@ -2,6 +2,7 @@ package expo.modules.ui.menu
 
 import android.graphics.Color
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExposedDropdownMenu
 import androidx.compose.material3.MenuDefaults
 import androidx.compose.runtime.Composable
 import expo.modules.kotlin.views.ComposeProps

package/build/jetpack-compose/Carousel/index.d.ts

@@ -46,8 +46,13 @@ export type CarouselCommonConfig = {
 };
 export interface HorizontalCenteredHeroCarouselProps extends CarouselCommonConfig {
     /**
-     * Maximum width of the hero item in dp.
-     * When unspecified, the hero item will be as wide as possible.
+     * The width that the large item aims for in dp. The carousel picks the arrangement whose large
+     * item width is closest to this value, so the final width can differ.
+     * When unspecified, one large item fills the viewport beside two small items.
+     */
+    preferredItemWidth?: number;
+    /**
+     * @deprecated Use `preferredItemWidth` instead. The value is now a preferred width, not a maximum.
      */
     maxItemWidth?: number;
     /**

package/build/jetpack-compose/Carousel/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["jetpack-compose/Carousel/index.tsx"],"sourcesContent":[null],"names":["requireNativeView","createViewModifierEventListener","transformProps","props","modifiers","restProps","undefined","createCarouselComponent","viewName","NativeView","CarouselComponent","HorizontalCenteredHeroCarousel","HorizontalMultiBrowseCarousel","HorizontalUncontainedCarousel"],"mappings":";AAAA,SAASA,iBAAiB,QAAQ,OAAO;AAGzC,SAASC,+BAA+B,QAAQ,qBAAqB;AAkDrE,SAASC,eAA2DC,KAAQ;IAC1E,MAAM,EAAEC,SAAS,EAAE,GAAGC,WAAW,GAAGF;IACpC,OAAO;QACLC;QACA,GAAIA,YAAYH,gCAAgCG,aAAaE,SAAS;QACtE,GAAGD,SAAS;IACd;AACF;AAEA,SAASE,wBACPC,QAAgB;IAEhB,MAAMC,aAAqCT,kBAAkB,UAAUQ;IACvE,OAAO,SAASE,kBAAkBP,KAAQ;QACxC,qBAAO,KAACM;YAAY,GAAGP,eAAeC,MAAM;;IAC9C;AACF;AAsBA;;;CAGC,GACD,OAAO,MAAMQ,iCACXJ,wBACE,sCACA;AAuBJ;;;CAGC,GACD,OAAO,MAAMK,gCACXL,wBAA4D,qCAAqC;AAanG;;;CAGC,GACD,OAAO,MAAMM,gCACXN,wBAA4D,qCAAqC,CAEnG,YAAY"}
+{"version":3,"sources":["jetpack-compose/Carousel/index.tsx"],"sourcesContent":[null],"names":["requireNativeView","createViewModifierEventListener","transformProps","props","modifiers","restProps","undefined","createCarouselComponent","viewName","NativeView","CarouselComponent","HorizontalCenteredHeroCarousel","HorizontalMultiBrowseCarousel","HorizontalUncontainedCarousel"],"mappings":";AAAA,SAASA,iBAAiB,QAAQ,OAAO;AAGzC,SAASC,+BAA+B,QAAQ,qBAAqB;AAkDrE,SAASC,eAA2DC,KAAQ;IAC1E,MAAM,EAAEC,SAAS,EAAE,GAAGC,WAAW,GAAGF;IACpC,OAAO;QACLC;QACA,GAAIA,YAAYH,gCAAgCG,aAAaE,SAAS;QACtE,GAAGD,SAAS;IACd;AACF;AAEA,SAASE,wBACPC,QAAgB;IAEhB,MAAMC,aAAqCT,kBAAkB,UAAUQ;IACvE,OAAO,SAASE,kBAAkBP,KAAQ;QACxC,qBAAO,KAACM;YAAY,GAAGP,eAAeC,MAAM;;IAC9C;AACF;AA2BA;;;CAGC,GACD,OAAO,MAAMQ,iCACXJ,wBACE,sCACA;AAuBJ;;;CAGC,GACD,OAAO,MAAMK,gCACXL,wBAA4D,qCAAqC;AAanG;;;CAGC,GACD,OAAO,MAAMM,gCACXN,wBAA4D,qCAAqC,CAEnG,YAAY"}

package/build/jetpack-compose/DatePicker/index.d.ts

@@ -81,6 +81,10 @@ export type TimePickerElementColors = {
     /** The color of clock dial numbers when selected or overlapping the selector. */
     clockDialSelectedContentColor?: ColorValue;
     /** The color of clock dial numbers when unselected. */
+    clockDialContentColor?: ColorValue;
+    /**
+     * @deprecated Use `clockDialContentColor` instead.
+     */
     clockDialUnselectedContentColor?: ColorValue;
     /** The color of the clock dial selector (hand). */
     selectorColor?: ColorValue;
@@ -89,18 +93,34 @@ export type TimePickerElementColors = {
     /** The background color of the selected AM/PM period. */
     periodSelectorSelectedContainerColor?: ColorValue;
     /** The background color of the unselected AM/PM period. */
+    periodSelectorContainerColor?: ColorValue;
+    /**
+     * @deprecated Use `periodSelectorContainerColor` instead.
+     */
     periodSelectorUnselectedContainerColor?: ColorValue;
     /** The text color of the selected AM/PM period. */
     periodSelectorSelectedContentColor?: ColorValue;
     /** The text color of the unselected AM/PM period. */
+    periodSelectorContentColor?: ColorValue;
+    /**
+     * @deprecated Use `periodSelectorContentColor` instead.
+     */
     periodSelectorUnselectedContentColor?: ColorValue;
     /** The background color of the selected hour/minute segment. */
     timeSelectorSelectedContainerColor?: ColorValue;
     /** The background color of the unselected hour/minute segment. */
+    timeSelectorContainerColor?: ColorValue;
+    /**
+     * @deprecated Use `timeSelectorContainerColor` instead.
+     */
     timeSelectorUnselectedContainerColor?: ColorValue;
     /** The text color of the selected hour/minute segment. */
     timeSelectorSelectedContentColor?: ColorValue;
     /** The text color of the unselected hour/minute segment. */
+    timeSelectorContentColor?: ColorValue;
+    /**
+     * @deprecated Use `timeSelectorContentColor` instead.
+     */
     timeSelectorUnselectedContentColor?: ColorValue;
 };
 export interface DateTimePickerProps {

package/build/jetpack-compose/DatePicker/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["jetpack-compose/DatePicker/index.tsx"],"sourcesContent":[null],"names":["requireNativeView","createViewModifierEventListener","convertSelectableDates","selectableDates","start","getTime","end","convertTimestampToDate","timestamp","Date","transformDateTimePickerProps","props","modifiers","variant","initialDate","elementColors","color","rest","initialDateTimestamp","undefined","onDateSelected","nativeEvent","date","DatePickerNativeView","DateTimePicker","transformDateRangePickerProps","initialStartDate","initialEndDate","onDateRangeSelected","DateRangePickerNativeView","DateRangePicker","nativeProps","DatePickerDialogNativeView","DatePickerDialog","onDismissRequest","DateRangePickerDialogNativeView","DateRangePickerDialog","confirmButtonLabel","dismissButtonLabel","TimePickerDialogNativeView","TimePickerDialog"],"mappings":"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"}
+{"version":3,"sources":["jetpack-compose/DatePicker/index.tsx"],"sourcesContent":[null],"names":["requireNativeView","createViewModifierEventListener","convertSelectableDates","selectableDates","start","getTime","end","convertTimestampToDate","timestamp","Date","transformDateTimePickerProps","props","modifiers","variant","initialDate","elementColors","color","rest","initialDateTimestamp","undefined","onDateSelected","nativeEvent","date","DatePickerNativeView","DateTimePicker","transformDateRangePickerProps","initialStartDate","initialEndDate","onDateRangeSelected","DateRangePickerNativeView","DateRangePicker","nativeProps","DatePickerDialogNativeView","DatePickerDialog","onDismissRequest","DateRangePickerDialogNativeView","DateRangePickerDialog","confirmButtonLabel","dismissButtonLabel","TimePickerDialogNativeView","TimePickerDialog"],"mappings":"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"}

package/build/universal/ListItem/ListItem.android.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { ListItem as ComposeListItem, Text } from '@expo/ui/jetpack-compose';
-import { clickable } from '@expo/ui/jetpack-compose/modifiers';
+import { clickable, testID as testIDModifier } from '@expo/ui/jetpack-compose/modifiers';
 import { Children } from 'react';
 import { extractListItemSlots } from './ListItemSlots';
 // Compose hosts can't render raw strings — they need a `Text` composable.
@@ -17,7 +17,7 @@ function wrapStrings(node) {
  * Android implementation of `ListItem`.
  * Delegates to Material 3 `ListItem` and applies `clickable` for tap handling.
  */ export function ListItem(props) {
-    const { children, onPress, leading: leadingProp, trailing: trailingProp, supportingText, modifiers, colors } = props;
+    const { children, onPress, leading: leadingProp, trailing: trailingProp, supportingText, testID, modifiers, colors } = props;
     const slots = extractListItemSlots(children);
     const leading = slots.leading ?? leadingProp;
     const trailing = slots.trailing ?? trailingProp;
@@ -26,6 +26,9 @@ function wrapStrings(node) {
         ...onPress ? [
             clickable(onPress)
         ] : [],
+        ...testID ? [
+            testIDModifier(testID)
+        ] : [],
         ...modifiers ?? []
     ];
     return /*#__PURE__*/ _jsxs(ComposeListItem, {

package/build/universal/ListItem/ListItem.android.js.map

@@ -1 +1 @@
-{"version":3,"sources":["universal/ListItem/ListItem.android.tsx"],"sourcesContent":[null],"names":["ListItem","ComposeListItem","Text","clickable","Children","extractListItemSlots","wrapStrings","node","Array","isArray","map","props","children","onPress","leading","leadingProp","trailing","trailingProp","supportingText","modifiers","colors","slots","supporting","itemModifiers","length","undefined","HeadlineContent","headline","SupportingContent","LeadingContent","TrailingContent"],"mappings":";AAAA,SAASA,YAAYC,eAAe,EAAEC,IAAI,QAAQ,2BAA2B;AAC7E,SAASC,SAAS,QAAQ,qCAAqC;AAC/D,SAASC,QAAQ,QAAwB,QAAQ;AAEjD,SAASC,oBAAoB,QAAQ,kBAAkB;AAGvD,0EAA0E;AAC1E,4GAA4G;AAC5G,SAASC,YAAYC,IAAe;IAClC,IAAIA,QAAQ,QAAQ,OAAOA,SAAS,WAAW,OAAOA;IACtD,IAAI,OAAOA,SAAS,YAAY,OAAOA,SAAS,UAAU,qBAAO,KAACL;kBAAMK;;IACxE,IAAIC,MAAMC,OAAO,CAACF,OAAO,OAAOH,SAASM,GAAG,CAACH,MAAMD;IACnD,OAAOC;AACT;AAEA;;;CAGC,GACD,OAAO,SAASP,SAASW,KAAoB;IAC3C,MAAM,EACJC,QAAQ,EACRC,OAAO,EACPC,SAASC,WAAW,EACpBC,UAAUC,YAAY,EACtBC,cAAc,EACdC,SAAS,EACTC,MAAM,EACP,GAAGT;IACJ,MAAMU,QAAQhB,qBAAqBO;IACnC,MAAME,UAAUO,MAAMP,OAAO,IAAIC;IACjC,MAAMC,WAAWK,MAAML,QAAQ,IAAIC;IACnC,MAAMK,aAAaD,MAAMC,UAAU,IAAIJ;IACvC,MAAMK,gBAAgB;WAAKV,UAAU;YAACV,UAAUU;SAAS,GAAG,EAAE;WAAOM,aAAa,EAAE;KAAE;IAEtF,qBACE,MAAClB;QAAgBmB,QAAQA;QAAQD,WAAWI,cAAcC,MAAM,GAAGD,gBAAgBE;;0BACjF,KAACxB,gBAAgByB,eAAe;0BAC9B,cAAA;8BAAGpB,YAAYe,MAAMM,QAAQ;;;YAE9BL,cAAc,qBACb,KAACrB,gBAAgB2B,iBAAiB;0BAC/B,OAAON,eAAe,YAAY,OAAOA,eAAe,yBACvD,KAACpB;8BAAMoB;qBAEPA;iBAGF;YACHR,WAAW,qBACV,KAACb,gBAAgB4B,cAAc;0BAAEvB,YAAYQ;iBAC3C;YACHE,YAAY,qBACX,KAACf,gBAAgB6B,eAAe;0BAAExB,YAAYU;iBAC5C;;;AAGV;AAEA,cAAc,UAAU"}
+{"version":3,"sources":["universal/ListItem/ListItem.android.tsx"],"sourcesContent":[null],"names":["ListItem","ComposeListItem","Text","clickable","testID","testIDModifier","Children","extractListItemSlots","wrapStrings","node","Array","isArray","map","props","children","onPress","leading","leadingProp","trailing","trailingProp","supportingText","modifiers","colors","slots","supporting","itemModifiers","length","undefined","HeadlineContent","headline","SupportingContent","LeadingContent","TrailingContent"],"mappings":";AAAA,SAASA,YAAYC,eAAe,EAAEC,IAAI,QAAQ,2BAA2B;AAC7E,SAASC,SAAS,EAAEC,UAAUC,cAAc,QAAQ,qCAAqC;AACzF,SAASC,QAAQ,QAAwB,QAAQ;AAEjD,SAASC,oBAAoB,QAAQ,kBAAkB;AAGvD,0EAA0E;AAC1E,4GAA4G;AAC5G,SAASC,YAAYC,IAAe;IAClC,IAAIA,QAAQ,QAAQ,OAAOA,SAAS,WAAW,OAAOA;IACtD,IAAI,OAAOA,SAAS,YAAY,OAAOA,SAAS,UAAU,qBAAO,KAACP;kBAAMO;;IACxE,IAAIC,MAAMC,OAAO,CAACF,OAAO,OAAOH,SAASM,GAAG,CAACH,MAAMD;IACnD,OAAOC;AACT;AAEA;;;CAGC,GACD,OAAO,SAAST,SAASa,KAAoB;IAC3C,MAAM,EACJC,QAAQ,EACRC,OAAO,EACPC,SAASC,WAAW,EACpBC,UAAUC,YAAY,EACtBC,cAAc,EACdhB,MAAM,EACNiB,SAAS,EACTC,MAAM,EACP,GAAGT;IACJ,MAAMU,QAAQhB,qBAAqBO;IACnC,MAAME,UAAUO,MAAMP,OAAO,IAAIC;IACjC,MAAMC,WAAWK,MAAML,QAAQ,IAAIC;IACnC,MAAMK,aAAaD,MAAMC,UAAU,IAAIJ;IACvC,MAAMK,gBAAgB;WAChBV,UAAU;YAACZ,UAAUY;SAAS,GAAG,EAAE;WACnCX,SAAS;YAACC,eAAeD;SAAQ,GAAG,EAAE;WACtCiB,aAAa,EAAE;KACpB;IAED,qBACE,MAACpB;QAAgBqB,QAAQA;QAAQD,WAAWI,cAAcC,MAAM,GAAGD,gBAAgBE;;0BACjF,KAAC1B,gBAAgB2B,eAAe;0BAC9B,cAAA;8BAAGpB,YAAYe,MAAMM,QAAQ;;;YAE9BL,cAAc,qBACb,KAACvB,gBAAgB6B,iBAAiB;0BAC/B,OAAON,eAAe,YAAY,OAAOA,eAAe,yBACvD,KAACtB;8BAAMsB;qBAEPA;iBAGF;YACHR,WAAW,qBACV,KAACf,gBAAgB8B,cAAc;0BAAEvB,YAAYQ;iBAC3C;YACHE,YAAY,qBACX,KAACjB,gBAAgB+B,eAAe;0BAAExB,YAAYU;iBAC5C;;;AAGV;AAEA,cAAc,UAAU"}

package/build/universal/TextInput/index.android.js

@@ -144,8 +144,11 @@ export function TextInput({ ref, value, onChangeText, placeholder, autoFocus, ed
                             modifiers: [
                                 fillMaxWidth()
                             ],
-                            style: textAlign && textAlign !== 'auto' ? {
-                                textAlign
+                            style: textStyle || textAlign && textAlign !== 'auto' ? {
+                                ...textStyle,
+                                ...textAlign && textAlign !== 'auto' ? {
+                                    textAlign
+                                } : null
                             } : undefined,
                             children: placeholder
                         })

package/build/universal/TextInput/index.android.js.map

@@ -1 +1 @@
-{"version":3,"sources":["universal/TextInput/index.android.tsx"],"sourcesContent":[null],"names":["BasicTextField","Box","Text","useNativeState","fillMaxWidth","onSizeChanged","semantics","testID","testIDModifier","useImperativeHandle","useRef","transformToModifiers","enterKeyHintToReturnKeyType","inputModeToKeyboardType","resolveEditable","mapReturnKeyType","value","mapKeyboardType","TextInput","ref","onChangeText","placeholder","autoFocus","editable","editableProp","multiline","keyboardType","keyboardTypeProp","autoCapitalize","autoCorrect","returnKeyType","returnKeyTypeProp","onSubmitEditing","onFocus","onBlur","cursorColor","textAlign","readOnly","inputMode","enterKeyHint","defaultValue","numberOfLines","numberOfLinesProp","rows","underlineColorAndroid","placeholderTextColor","textStyle","style","secureTextEntry","autoComplete","onContentSizeChange","maxLength","caretHidden","selectionColor","selectionHandleColor","selection","onSelectionChange","selectTextOnFocus","modifiers","userModifiers","initialFallbackRef","fallback","current","state","innerRef","isFocusedRef","focus","blur","clear","isFocused","setSelection","start","end","Promise","resolve","handleFocusChanged","focused","length","keyboardOptions","undefined","capitalization","autoCorrectEnabled","imeAction","keyboardActions","onDone","onGo","onNext","onSearch","onSend","onPrevious","contentType","singleLine","maxLines","minLines","visualTransformation","textSelectionColors","handleColor","backgroundColor","onValueChange","onFocusChanged","DecorationBox","contentAlignment","Placeholder","color","InnerTextField"],"mappings":";AAAA,SACEA,cAAc,EACdC,GAAG,EACHC,IAAI,EAIJC,cAAc,QACT,2BAA2B;AAClC,SACEC,YAAY,EACZC,aAAa,EACbC,SAAS,EACTC,UAAUC,cAAc,QACnB,qCAAqC;AAC5C,SAASC,mBAAmB,EAAEC,MAAM,QAAQ,QAAQ;AAGpD,SAASC,oBAAoB,QAAQ,oBAAoB;AAEzD,SAASC,2BAA2B,EAAEC,uBAAuB,EAAEC,eAAe,QAAQ,UAAU;AAEhG,SAASC,iBAAiBC,KAA2B;IACnD,IAAIA,UAAU,YAAYA,UAAU,SAAS,OAAO;IACpD,IAAIA,UAAU,UAAUA,UAAU,WAAWA,UAAU,kBAAkB,OAAO;IAChF,OAAOA;AACT;AAEA,SAASC,gBAAgBD,KAA0B;IACjD,OAAQA;QACN,KAAK;YACH,OAAO;QACT,KAAK;YACH,OAAO;QACT,KAAK;YACH,OAAO;QACT,KAAK;YACH,OAAO;QACT,KAAK;YACH,OAAO;QACT,KAAK;YACH,OAAO;QACT,KAAK;YACH,OAAO;QACT,KAAK;QACL,KAAK;QACL,KAAK;QACL,KAAK;QACL,KAAK;QACL,KAAK;YACH,OAAO;QACT;YACE,OAAO;IACX;AACF;AAEA,OAAO,SAASE,UAAU,EACxBC,GAAG,EACHH,KAAK,EACLI,YAAY,EACZC,WAAW,EACXC,SAAS,EACTC,UAAUC,YAAY,EACtBC,SAAS,EACTC,cAAcC,gBAAgB,EAC9BC,cAAc,EACdC,WAAW,EACXC,eAAeC,iBAAiB,EAChCC,eAAe,EACfC,OAAO,EACPC,MAAM,EACNC,WAAW,EACXC,SAAS,EACTC,QAAQ,EACRC,SAAS,EACTC,YAAY,EACZC,YAAY,EACZC,eAAeC,iBAAiB,EAChCC,IAAI,EACJC,qBAAqB,EACrBrC,MAAM,EACNsC,oBAAoB,EACpBC,SAAS,EACTC,KAAK,EACLC,eAAe,EACfC,YAAY,EACZC,mBAAmB,EACnBC,SAAS,EACTC,WAAW,EACXC,cAAc,EACdC,oBAAoB,EACpBC,SAAS,EACTC,iBAAiB,EACjBC,iBAAiB,EACjBC,WAAWC,aAAa,EACT;IACf,MAAMpC,WAAWT,gBAAgBU,cAAca;IAC/C,MAAMI,gBAAgBC,qBAAqBC;IAC3C,MAAMjB,eAAeC,oBAAoBd,wBAAwByB;IACjE,MAAMR,gBAAgBC,qBAAqBnB,4BAA4B2B;IAEvE,MAAMqB,qBAAqBlD,OAAO8B,gBAAgB;IAClD,MAAMqB,WAAW1D,eAAuByD,mBAAmBE,OAAO;IAClE,MAAMC,QAAS/C,SAAS6C;IAExB,MAAMG,WAAWtD,OAAqB;IACtC,MAAMuD,eAAevD,OAAO;IAC5BD,oBACEU,KACA,IAAO,CAAA;YACL+C,OAAO;gBACLF,SAASF,OAAO,EAAEI;YACpB;YACAC,MAAM;gBACJH,SAASF,OAAO,EAAEK;YACpB;YACAC,OAAO;gBACLJ,SAASF,OAAO,EAAEM;YACpB;YACAC,WAAW,IAAMJ,aAAaH,OAAO;YACrCQ,cAAc,CAACC,OAAeC,MAC5BR,SAASF,OAAO,EAAEQ,aAAaC,OAAOC,QAAQC,QAAQC,OAAO;QACjE,CAAA,GACA,EAAE;IAGJ,MAAMC,qBAAqB,CAACC;QAC1BX,aAAaH,OAAO,GAAGc;QACvB,IAAIA,WAAWnB,mBAAmB;YAChCO,SAASF,OAAO,EAAEQ,aAAa,GAAGP,MAAM/C,KAAK,CAAC6D,MAAM;QACtD;QACA,IAAID,SAAS3C;aACRC;IACP;IAEA,MAAM4C,kBACJpD,gBAAgBE,kBAAkBC,gBAAgBkD,aAAajD,gBAC3D;QACE,GAAIJ,eAAe;YAAEA,cAAcT,gBAAgBS;QAAc,IAAI,IAAI;QACzE,GAAIE,iBAAiB;YAAEoD,gBAAgBpD;QAAe,IAAI,IAAI;QAC9D,GAAIC,gBAAgBkD,YAAY;YAAEE,oBAAoBpD;QAAY,IAAI,IAAI;QAC1E,GAAIC,gBAAgB;YAAEoD,WAAWnE,iBAAiBe;QAAe,IAAI,IAAI;IAC3E,IACAiD;IAEN,MAAMI,kBAAkBnD,kBACpB;QACEoD,QAAQpD;QACRqD,MAAMrD;QACNsD,QAAQtD;QACRuD,UAAUvD;QACVwD,QAAQxD;QACRyD,YAAYzD;IACd,IACA+C;IAEJ,qBACE,KAAC/E;QACCmB,KAAK6C;QACLN,WAAW;eACLC,iBAAiB,EAAE;eACpBhD,qBAAqBoC,OAAO,CAAC;eAC5BxC,SAAS;gBAACC,eAAeD;aAAQ,GAAG,EAAE;eACtC0C,eAAe;gBAAC3C,UAAU;oBAAEoF,aAAazC;gBAAa;aAAG,GAAG,EAAE;eAC9DC,sBAAsB;gBAAC7C,cAAc6C;aAAqB,GAAG,EAAE;SACpE;QACDlC,OAAO+C;QACPzC,WAAWA;QACXe,UAAUd,aAAa;QACvBoE,YAAY,CAAClE;QACbmE,UAAUnE,aAAagB,iBAAiBA,gBAAgB,IAAIA,gBAAgBsC;QAC5Ec,UAAUpE,aAAagB,iBAAiBA,gBAAgB,IAAIA,gBAAgBsC;QAC5E5C,aAAaiB,cAAc,gBAAiBjB,eAAekB;QAC3DP,WACEA,aAAcV,aAAaA,cAAc,SACrC;YACE,GAAGU,SAAS;YACZ,GAAIV,aAAaA,cAAc,SAAS;gBAAEA;YAAU,IAAI,IAAI;QAC9D,IACA2C;QAENe,sBAAsB9C,kBAAkB,aAAa+B;QACrDgB,qBACE1C,kBAAkBC,uBACd;YACE0C,aAAa1C,wBAAwBD;YACrC4C,iBAAiB5C;QACnB,IACA0B;QAEND,iBAAiBA;QACjBK,iBAAiBA;QACjBe,eAAe9E;QACf+B,WAAWA;QACXgD,gBAAgBxB;QAChBpB,WAAWA;QACXC,mBAAmBA;kBACnB,cAAA,KAACxD,eAAeoG,aAAa;sBAC3B,cAAA,MAACnG;gBACCyD,WAAW;oBAACtD;iBAAe;gBAC3BiG,kBACEjE,cAAc,WAAW,cAAcA,cAAc,UAAU,WAAW2C;;oBAE3E1D,eAAe,qBACd,KAACrB,eAAesG,WAAW;kCACzB,cAAA,KAACpG;4BACCqG,OAAO1D;4BACPa,WAAW;gCAACtD;6BAAe;4BAC3B2C,OAAOX,aAAaA,cAAc,SAAS;gCAAEA;4BAAU,IAAI2C;sCAC1D1D;;yBAGH;kCACJ,KAACrB,eAAewG,cAAc;;;;;AAKxC;AAEA,cAAc,UAAU"}
+{"version":3,"sources":["universal/TextInput/index.android.tsx"],"sourcesContent":[null],"names":["BasicTextField","Box","Text","useNativeState","fillMaxWidth","onSizeChanged","semantics","testID","testIDModifier","useImperativeHandle","useRef","transformToModifiers","enterKeyHintToReturnKeyType","inputModeToKeyboardType","resolveEditable","mapReturnKeyType","value","mapKeyboardType","TextInput","ref","onChangeText","placeholder","autoFocus","editable","editableProp","multiline","keyboardType","keyboardTypeProp","autoCapitalize","autoCorrect","returnKeyType","returnKeyTypeProp","onSubmitEditing","onFocus","onBlur","cursorColor","textAlign","readOnly","inputMode","enterKeyHint","defaultValue","numberOfLines","numberOfLinesProp","rows","underlineColorAndroid","placeholderTextColor","textStyle","style","secureTextEntry","autoComplete","onContentSizeChange","maxLength","caretHidden","selectionColor","selectionHandleColor","selection","onSelectionChange","selectTextOnFocus","modifiers","userModifiers","initialFallbackRef","fallback","current","state","innerRef","isFocusedRef","focus","blur","clear","isFocused","setSelection","start","end","Promise","resolve","handleFocusChanged","focused","length","keyboardOptions","undefined","capitalization","autoCorrectEnabled","imeAction","keyboardActions","onDone","onGo","onNext","onSearch","onSend","onPrevious","contentType","singleLine","maxLines","minLines","visualTransformation","textSelectionColors","handleColor","backgroundColor","onValueChange","onFocusChanged","DecorationBox","contentAlignment","Placeholder","color","InnerTextField"],"mappings":"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"}

package/ios/HostView.swift

@@ -90,6 +90,7 @@ struct HostView: ExpoSwiftUI.View, ExpoSwiftUI.WithHostingView {
         Children()
       }
       .environment(\.expoHostingView, props.hostingViewReference)
+      .modifier(HostViewContentMarginsMitigation(layoutDirection: layoutDirection, hostingView: props.hostingView))
       .fixedSize(horizontal: props.matchContentsHorizontal, vertical: props.matchContentsVertical)
       .modifier(LayoutDirectionModifier(layoutDirection: layoutDirection))
       .modifier(ColorSchemeModifier(colorScheme: props.colorScheme?.toColorScheme()))

package/ios/Modifiers/HostViewContentMarginsMitigation.swift

@@ -0,0 +1,98 @@
+// Copyright 2015-present 650 Industries. All rights reserved.
+
+import SwiftUI
+import ExpoModulesCore
+
+/// Works around a SwiftUI bug on iPhone Duo: delete this file and its one use in `HostView` once iOS
+/// fixes it.
+///
+/// When the app is in a split view, positioned left, the tab bar becomes a rail beside the content and
+/// iOS drops its content margin on that edge, so the large title starts on the safe-area edge. A `Form`
+/// or `List` hosted under a UIKit navigation bar, as every `Host` is, keeps its 20pt section margin there
+/// and starts 20pt inside the title:
+///
+/// ```
+/// RNSNavigationController        navigation bar: large title at 84, the safe-area edge
+/// └─ RNSScreen                   the pushed controller: safe area 84, layout margins 84
+///    └─ UIHostingController      the Host, a child controller: 84 + 20pt margin = 104  ❌ BUG
+///       └─ Form                  sections at 104, 20pt inside the title
+/// ```
+///
+/// SwiftUI drops that 20pt only when the hosting controller is itself the pushed controller, which a
+/// `Host` can never be.
+///
+/// This sets the scroll content margin on such an edge to the hosted view's safe-area inset, measured
+/// from the view's edge, so sections start with the title. It applies only where the inset exceeds the
+/// window's own on that edge, so it comes from a bar beside the content, and the screen's layout margin
+/// equals its safe area, so iOS has dropped the margin there.
+///
+/// See ENG-27830.
+internal struct HostViewContentMarginsMitigation: ViewModifier {
+  let layoutDirection: LayoutDirection
+  weak var hostingView: UIView?
+
+  /// The leading and trailing content margins to apply, or `nil` to keep the system's.
+  @State private var margins = Margins()
+
+  private struct Margins: Equatable {
+    var leading: CGFloat?
+    var trailing: CGFloat?
+  }
+
+  func body(content: Content) -> some View {
+#if os(iOS)
+    if #available(iOS 17.0, *) {
+      content
+        .contentMargins(.leading, margins.leading, for: .scrollContent)
+        .contentMargins(.trailing, margins.trailing, for: .scrollContent)
+        .onGeometryChange(for: CGRect.self, of: { proxy in proxy.frame(in: .global) }) { _ in
+          updateMargins()
+        }
+        .onGeometryChange(for: EdgeInsets.self, of: { proxy in proxy.safeAreaInsets }) { _ in
+          updateMargins()
+        }
+    } else {
+      content
+    }
+#else
+    content
+#endif
+  }
+
+#if os(iOS)
+  /// UIKit can update the screen's layout margins after SwiftUI reports the geometry change, as
+  /// when the window moves into a split view, so the margins are checked again once that settles.
+  private func updateMargins() {
+    margins = affectedMargins()
+    DispatchQueue.main.async {
+      margins = affectedMargins()
+    }
+  }
+
+  private func affectedMargins() -> Margins {
+    guard let hostingView, let window = hostingView.window, let screen = screenView(of: hostingView) else {
+      return Margins()
+    }
+    let host = hostingView.safeAreaInsets
+    let left: CGFloat? = host.left > window.safeAreaInsets.left
+      && abs(screen.layoutMargins.left - screen.safeAreaInsets.left) < 0.5 ? host.left : nil
+    let right: CGFloat? = host.right > window.safeAreaInsets.right
+      && abs(screen.layoutMargins.right - screen.safeAreaInsets.right) < 0.5 ? host.right : nil
+    return layoutDirection == .rightToLeft
+      ? Margins(leading: right, trailing: left)
+      : Margins(leading: left, trailing: right)
+  }
+
+  /// The view of the nearest view controller above the `Host`, which is the screen it is hosted in.
+  private func screenView(of view: UIView) -> UIView? {
+    var responder = view.next
+    while let current = responder {
+      if let controller = current as? UIViewController {
+        return controller.view
+      }
+      responder = current.next
+    }
+    return nil
+  }
+#endif
+}

package/ios/UIBaseView.swift

@@ -73,7 +73,7 @@ public func ExpoUIView<Content: ExpoSwiftUI.View>(
   _ contentType: Content.Type
 ) -> ExpoSwiftUI.ViewDefinition<Content.Props, UIBaseView<Content.Props, Content>> where Content.Props: UIBaseViewProps {
   let wrappedType = UIBaseView<Content.Props, Content>.self
-  let contentName = String(describing: contentType)
+  let contentName = unqualifiedTypeName(contentType)
 
   return View(wrappedType) {
     ViewName(contentName)
@@ -89,7 +89,18 @@ public func ExpoUIView<Content: ExpoSwiftUI.View>(
   @ExpoSwiftUI.ViewDefinitionBuilder<Content> _ elements: @escaping () -> [AnyViewDefinitionElement]
 ) -> ExpoSwiftUI.ViewDefinition<Content.Props, UIBaseView<Content.Props, Content>> where Content.Props: UIBaseViewProps {
   let wrappedType = UIBaseView<Content.Props, Content>.self
-  let contentName = String(describing: contentType)
+  let contentName = unqualifiedTypeName(contentType)
 
   return ExpoSwiftUI.ViewDefinition(wrappedType, name: contentName, elements: elements())
 }
+
+/**
+ The name `String(describing: type)` gives for a metatype, without its three protocol conformance probes and the `Mirror`.
+ It takes an opaque `Any.Type` and is never inlined on purpose.
+ With a statically known metatype the optimizer folds `_typeName` into a constant that keeps the file discriminator
+ of a `private` type, e.g. `(Foo in _ABC123…)`, where `String(describing:)` yields `Foo`.
+ */
+@inline(never)
+private func unqualifiedTypeName(_ type: Any.Type) -> String {
+  return _typeName(type, qualified: false)
+}

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.18/expo.modules.ui-58.0.18-sources.jar.md5

@@ -0,0 +1 @@
+83ac1d8d00a142a3ffa834c4a6c1db65

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.18/expo.modules.ui-58.0.18-sources.jar.sha1

@@ -0,0 +1 @@
+5d7c4fd251da7578f23af5102d539533aefb3e64

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.18/expo.modules.ui-58.0.18-sources.jar.sha256

@@ -0,0 +1 @@
+f9a24faad34f9f66bebcdde7d05a6cf72a8b4b9030819b80049de5084a694ef0

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.18/expo.modules.ui-58.0.18-sources.jar.sha512

@@ -0,0 +1 @@
+10ed672c04082cf5f06e6ca6dca0f28229f11f3d503d46e5b61dbc7d3ad50bfdc1399838dd38dc5b8c1643ec375c4bf1672c95606ce28f7ed36384f66b829b68

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.18/expo.modules.ui-58.0.18.aar.md5

@@ -0,0 +1 @@
+b51953e6905c7a42506ea0d23c859703

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.18/expo.modules.ui-58.0.18.aar.sha1

@@ -0,0 +1 @@
+93a6d734857d79049d179014133d651be167840a

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.18/expo.modules.ui-58.0.18.aar.sha256

@@ -0,0 +1 @@
+6cbb10f1e4cd5618c6997d87c2021e97c7bab1b8fc4ecc7be48f563e9c0e284a

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.18/expo.modules.ui-58.0.18.aar.sha512

@@ -0,0 +1 @@
+ba561fa50c9fde30184d2c36051e644fd87db59555b7b38f8e2e5b7096b03bf0d2aec3e53fff1831d2705d85b174ec1a7fc2e9cadc69c41237aac262bbea9365

package/local-maven-repo/expo/modules/ui/expo.modules.ui/{58.0.16/expo.modules.ui-58.0.16.module → 58.0.18/expo.modules.ui-58.0.18.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "expo.modules.ui",
     "module": "expo.modules.ui",
-    "version": "58.0.16",
+    "version": "58.0.18",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,13 +24,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.ui-58.0.16.aar",
-          "url": "expo.modules.ui-58.0.16.aar",
-          "size": 1858313,
-          "sha512": "9e42c8a718971e6d77015353c6747570385fe0c1d901cf388a50509e00c9ee8581a81ba88d0e83a611b7ec5a6d1dff4280ecf81ed92776d2cf7c26f48c0048c5",
-          "sha256": "b8e480f4d8449359c2f5686c3614c9aa82ef98af9b7ce0edd4d839d14de7696f",
-          "sha1": "64369f3b1f16363a28412ac36309b53dc2a29752",
-          "md5": "812db5879217f7bbe3b44b5ffcb0725a"
+          "name": "expo.modules.ui-58.0.18.aar",
+          "url": "expo.modules.ui-58.0.18.aar",
+          "size": 1859361,
+          "sha512": "ba561fa50c9fde30184d2c36051e644fd87db59555b7b38f8e2e5b7096b03bf0d2aec3e53fff1831d2705d85b174ec1a7fc2e9cadc69c41237aac262bbea9365",
+          "sha256": "6cbb10f1e4cd5618c6997d87c2021e97c7bab1b8fc4ecc7be48f563e9c0e284a",
+          "sha1": "93a6d734857d79049d179014133d651be167840a",
+          "md5": "b51953e6905c7a42506ea0d23c859703"
         }
       ]
     },
@@ -65,28 +65,28 @@
           "group": "androidx.compose.foundation",
           "module": "foundation-android",
           "version": {
-            "requires": "1.10.6"
+            "requires": "1.12.1"
           }
         },
         {
           "group": "androidx.compose.ui",
           "module": "ui-android",
           "version": {
-            "requires": "1.10.6"
+            "requires": "1.12.1"
           }
         },
         {
           "group": "androidx.compose.material3",
           "module": "material3",
           "version": {
-            "requires": "1.5.0-alpha17"
+            "requires": "1.5.0-beta01"
           }
         },
         {
           "group": "androidx.compose.material3",
           "module": "material3-android",
           "version": {
-            "requires": "1.5.0-alpha17"
+            "requires": "1.5.0-beta01"
           }
         },
         {
@@ -141,13 +141,13 @@
       ],
       "files": [
         {
-          "name": "expo.modules.ui-58.0.16.aar",
-          "url": "expo.modules.ui-58.0.16.aar",
-          "size": 1858313,
-          "sha512": "9e42c8a718971e6d77015353c6747570385fe0c1d901cf388a50509e00c9ee8581a81ba88d0e83a611b7ec5a6d1dff4280ecf81ed92776d2cf7c26f48c0048c5",
-          "sha256": "b8e480f4d8449359c2f5686c3614c9aa82ef98af9b7ce0edd4d839d14de7696f",
-          "sha1": "64369f3b1f16363a28412ac36309b53dc2a29752",
-          "md5": "812db5879217f7bbe3b44b5ffcb0725a"
+          "name": "expo.modules.ui-58.0.18.aar",
+          "url": "expo.modules.ui-58.0.18.aar",
+          "size": 1859361,
+          "sha512": "ba561fa50c9fde30184d2c36051e644fd87db59555b7b38f8e2e5b7096b03bf0d2aec3e53fff1831d2705d85b174ec1a7fc2e9cadc69c41237aac262bbea9365",
+          "sha256": "6cbb10f1e4cd5618c6997d87c2021e97c7bab1b8fc4ecc7be48f563e9c0e284a",
+          "sha1": "93a6d734857d79049d179014133d651be167840a",
+          "md5": "b51953e6905c7a42506ea0d23c859703"
         }
       ]
     },
@@ -161,13 +161,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.ui-58.0.16-sources.jar",
-          "url": "expo.modules.ui-58.0.16-sources.jar",
-          "size": 112962,
-          "sha512": "79141ef63c1b975a30858d8c1ca7bccde8d14a64d337883063b3c1cbe44f977cc40e0fda89d3076fd84b5e47308e86b3659c71744a4fc3cac2b858a0686f38c6",
-          "sha256": "101a40d45fc8e73887c9518fbc88c31e2a700ca6e62d2cc96dd65f72459a9d69",
-          "sha1": "aef15fcbe60dff9cbb6491595df9269d819f7065",
-          "md5": "6b0b0d2a72178b6d25a038ee47271abb"
+          "name": "expo.modules.ui-58.0.18-sources.jar",
+          "url": "expo.modules.ui-58.0.18-sources.jar",
+          "size": 113113,
+          "sha512": "10ed672c04082cf5f06e6ca6dca0f28229f11f3d503d46e5b61dbc7d3ad50bfdc1399838dd38dc5b8c1643ec375c4bf1672c95606ce28f7ed36384f66b829b68",
+          "sha256": "f9a24faad34f9f66bebcdde7d05a6cf72a8b4b9030819b80049de5084a694ef0",
+          "sha1": "5d7c4fd251da7578f23af5102d539533aefb3e64",
+          "md5": "83ac1d8d00a142a3ffa834c4a6c1db65"
         }
       ]
     }

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.18/expo.modules.ui-58.0.18.module.md5

@@ -0,0 +1 @@
+c93ae24122a8c0fdf6031662c20d7ab1

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.18/expo.modules.ui-58.0.18.module.sha1

@@ -0,0 +1 @@
+0280a28f44e2219abbc8ce054003200350f1dcc7

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.18/expo.modules.ui-58.0.18.module.sha256

@@ -0,0 +1 @@
+ea72887593516448266e9bc6baf03968872b368955a35eb088ea2ff6704a1554

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.18/expo.modules.ui-58.0.18.module.sha512

@@ -0,0 +1 @@
+a6322f157112637387e22d8a67960dd950773126129ee71be541575898307ddec6c5f16bb581ed0706a2f3694b40ba69bbec78060759038aaddca1f93084bf8b

package/local-maven-repo/expo/modules/ui/expo.modules.ui/{58.0.16/expo.modules.ui-58.0.16.pom → 58.0.18/expo.modules.ui-58.0.18.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>expo.modules.ui</groupId>
   <artifactId>expo.modules.ui</artifactId>
-  <version>58.0.16</version>
+  <version>58.0.18</version>
   <packaging>aar</packaging>
   <name>expo.modules.ui</name>
   <url>https://github.com/expo/expo</url>
@@ -57,25 +57,25 @@
     <dependency>
       <groupId>androidx.compose.foundation</groupId>
       <artifactId>foundation-android</artifactId>
-      <version>1.10.6</version>
+      <version>1.12.1</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>androidx.compose.ui</groupId>
       <artifactId>ui-android</artifactId>
-      <version>1.10.6</version>
+      <version>1.12.1</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>androidx.compose.material3</groupId>
       <artifactId>material3</artifactId>
-      <version>1.5.0-alpha17</version>
+      <version>1.5.0-beta01</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>androidx.compose.material3</groupId>
       <artifactId>material3-android</artifactId>
-      <version>1.5.0-alpha17</version>
+      <version>1.5.0-beta01</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.18/expo.modules.ui-58.0.18.pom.md5

@@ -0,0 +1 @@
+28a30050a820f67ff0fb27470cb4f591

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.18/expo.modules.ui-58.0.18.pom.sha1

@@ -0,0 +1 @@
+d556d91a38a29be6a7ba659601e3a6b6aa33de81

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.18/expo.modules.ui-58.0.18.pom.sha256

@@ -0,0 +1 @@
+41cc6e28b0897992415819e13a13dc98d98755c22d717cfb456dfb169d6f620f

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.18/expo.modules.ui-58.0.18.pom.sha512

@@ -0,0 +1 @@
+5c5379544047a4326c296a599c1120e912f99ff4a427def0cfb7455ee1e9b4c99c51d36294ea4c023019a7ef565e85ffc1a3db6b1c812ae5a071d163d51ce385

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/ui",
-  "version": "58.0.16",
+  "version": "58.0.18",
   "description": "A collection of UI components",
   "keywords": [
     "Jetpack Compose",
@@ -141,7 +141,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.26.0",
-    "@expo/internal-scripts": "58.0.1",
+    "@expo/internal-scripts": "58.0.3",
     "@playwright/test": "^1.59.0",
     "@testing-library/react": "^16.3.0",
     "@testing-library/react-native": "^14.0.1",

package/src/jetpack-compose/Carousel/index.tsx

@@ -73,8 +73,13 @@ function createCarouselComponent<P extends { modifiers?: ModifierConfig[] }>(
 
 export interface HorizontalCenteredHeroCarouselProps extends CarouselCommonConfig {
   /**
-   * Maximum width of the hero item in dp.
-   * When unspecified, the hero item will be as wide as possible.
+   * The width that the large item aims for in dp. The carousel picks the arrangement whose large
+   * item width is closest to this value, so the final width can differ.
+   * When unspecified, one large item fills the viewport beside two small items.
+   */
+  preferredItemWidth?: number;
+  /**
+   * @deprecated Use `preferredItemWidth` instead. The value is now a preferred width, not a maximum.
    */
   maxItemWidth?: number;
   /**

package/src/jetpack-compose/DatePicker/index.tsx

@@ -89,6 +89,10 @@ export type TimePickerElementColors = {
   /** The color of clock dial numbers when selected or overlapping the selector. */
   clockDialSelectedContentColor?: ColorValue;
   /** The color of clock dial numbers when unselected. */
+  clockDialContentColor?: ColorValue;
+  /**
+   * @deprecated Use `clockDialContentColor` instead.
+   */
   clockDialUnselectedContentColor?: ColorValue;
   /** The color of the clock dial selector (hand). */
   selectorColor?: ColorValue;
@@ -97,18 +101,34 @@ export type TimePickerElementColors = {
   /** The background color of the selected AM/PM period. */
   periodSelectorSelectedContainerColor?: ColorValue;
   /** The background color of the unselected AM/PM period. */
+  periodSelectorContainerColor?: ColorValue;
+  /**
+   * @deprecated Use `periodSelectorContainerColor` instead.
+   */
   periodSelectorUnselectedContainerColor?: ColorValue;
   /** The text color of the selected AM/PM period. */
   periodSelectorSelectedContentColor?: ColorValue;
   /** The text color of the unselected AM/PM period. */
+  periodSelectorContentColor?: ColorValue;
+  /**
+   * @deprecated Use `periodSelectorContentColor` instead.
+   */
   periodSelectorUnselectedContentColor?: ColorValue;
   /** The background color of the selected hour/minute segment. */
   timeSelectorSelectedContainerColor?: ColorValue;
   /** The background color of the unselected hour/minute segment. */
+  timeSelectorContainerColor?: ColorValue;
+  /**
+   * @deprecated Use `timeSelectorContainerColor` instead.
+   */
   timeSelectorUnselectedContainerColor?: ColorValue;
   /** The text color of the selected hour/minute segment. */
   timeSelectorSelectedContentColor?: ColorValue;
   /** The text color of the unselected hour/minute segment. */
+  timeSelectorContentColor?: ColorValue;
+  /**
+   * @deprecated Use `timeSelectorContentColor` instead.
+   */
   timeSelectorUnselectedContentColor?: ColorValue;
 };
 

package/src/universal/ListItem/ListItem.android.tsx

@@ -1,5 +1,5 @@
 import { ListItem as ComposeListItem, Text } from '@expo/ui/jetpack-compose';
-import { clickable } from '@expo/ui/jetpack-compose/modifiers';
+import { clickable, testID as testIDModifier } from '@expo/ui/jetpack-compose/modifiers';
 import { Children, type ReactNode } from 'react';
 
 import { extractListItemSlots } from './ListItemSlots';
@@ -25,6 +25,7 @@ export function ListItem(props: ListItemProps) {
     leading: leadingProp,
     trailing: trailingProp,
     supportingText,
+    testID,
     modifiers,
     colors,
   } = props;
@@ -32,7 +33,11 @@ export function ListItem(props: ListItemProps) {
   const leading = slots.leading ?? leadingProp;
   const trailing = slots.trailing ?? trailingProp;
   const supporting = slots.supporting ?? supportingText;
-  const itemModifiers = [...(onPress ? [clickable(onPress)] : []), ...(modifiers ?? [])];
+  const itemModifiers = [
+    ...(onPress ? [clickable(onPress)] : []),
+    ...(testID ? [testIDModifier(testID)] : []),
+    ...(modifiers ?? []),
+  ];
 
   return (
     <ComposeListItem colors={colors} modifiers={itemModifiers.length ? itemModifiers : undefined}>

package/src/universal/TextInput/index.android.tsx

@@ -206,7 +206,14 @@ export function TextInput({
               <Text
                 color={placeholderTextColor as string | undefined}
                 modifiers={[fillMaxWidth()]}
-                style={textAlign && textAlign !== 'auto' ? { textAlign } : undefined}>
+                style={
+                  textStyle || (textAlign && textAlign !== 'auto')
+                    ? {
+                        ...textStyle,
+                        ...(textAlign && textAlign !== 'auto' ? { textAlign } : null),
+                      }
+                    : undefined
+                }>
                 {placeholder}
               </Text>
             </BasicTextField.Placeholder>

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.16/expo.modules.ui-58.0.16-sources.jar.md5

@@ -1 +0,0 @@
-6b0b0d2a72178b6d25a038ee47271abb

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.16/expo.modules.ui-58.0.16-sources.jar.sha1

@@ -1 +0,0 @@
-aef15fcbe60dff9cbb6491595df9269d819f7065

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.16/expo.modules.ui-58.0.16-sources.jar.sha256

@@ -1 +0,0 @@
-101a40d45fc8e73887c9518fbc88c31e2a700ca6e62d2cc96dd65f72459a9d69

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.16/expo.modules.ui-58.0.16-sources.jar.sha512

@@ -1 +0,0 @@
-79141ef63c1b975a30858d8c1ca7bccde8d14a64d337883063b3c1cbe44f977cc40e0fda89d3076fd84b5e47308e86b3659c71744a4fc3cac2b858a0686f38c6

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.16/expo.modules.ui-58.0.16.aar.md5

@@ -1 +0,0 @@
-812db5879217f7bbe3b44b5ffcb0725a

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.16/expo.modules.ui-58.0.16.aar.sha1

@@ -1 +0,0 @@
-64369f3b1f16363a28412ac36309b53dc2a29752

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.16/expo.modules.ui-58.0.16.aar.sha256

@@ -1 +0,0 @@
-b8e480f4d8449359c2f5686c3614c9aa82ef98af9b7ce0edd4d839d14de7696f

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.16/expo.modules.ui-58.0.16.aar.sha512

@@ -1 +0,0 @@
-9e42c8a718971e6d77015353c6747570385fe0c1d901cf388a50509e00c9ee8581a81ba88d0e83a611b7ec5a6d1dff4280ecf81ed92776d2cf7c26f48c0048c5

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.16/expo.modules.ui-58.0.16.module.md5

@@ -1 +0,0 @@
-d130a88c3e9ea609bae6f4e886ab244d

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.16/expo.modules.ui-58.0.16.module.sha1

@@ -1 +0,0 @@
-81f23fddc089c0a466c08356e6c33881fd08d65c

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.16/expo.modules.ui-58.0.16.module.sha256

@@ -1 +0,0 @@
-d57d5ce3086debe5c6c7760679de69409aa264c6871d034bac2140af6245f9f4

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.16/expo.modules.ui-58.0.16.module.sha512

@@ -1 +0,0 @@
-44da04bba32c6fbb281c187d7382eabf9cf3cf674dc9f469335345dfe7268e2818a725531749822cd788eb96ce8c56ecb3535f30c757da77fb67630c050de4f3

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.16/expo.modules.ui-58.0.16.pom.md5

@@ -1 +0,0 @@
-22c38dd6d4b789603e333d4c0a25d138

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.16/expo.modules.ui-58.0.16.pom.sha1

@@ -1 +0,0 @@
-de7f94f1b4c3356f8244f8b620146bb9f37c52b8

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.16/expo.modules.ui-58.0.16.pom.sha256

@@ -1 +0,0 @@
-2bc1691b86aa0689fbf3bd19f3904aed5b40d206a8a152a03bf27c92eb871f28

package/local-maven-repo/expo/modules/ui/expo.modules.ui/58.0.16/expo.modules.ui-58.0.16.pom.sha512

@@ -1 +0,0 @@
-528fce22a7b79c091d7dab483702c8e99ae783b76bd79c6b11e2086d9c59308f28a1b77e9379d8dc81f3ce6b3916f100d8c5c873ac165f75f780262ae8f56264