@expo/ui 58.0.14 → 58.0.16

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 58.0.16
+
+### Patch Changes
+
+- [Internal] Bump precompiled artifacts due to ABI breakage in expo-modules-jsi, which makes `JavaScriptValue` a non-copyable struct. ([#51368](https://github.com/expo/expo/pull/51368) by [@tsapeta](https://github.com/tsapeta))
+- [iOS] Fix the community `BottomSheet` clipping its content when the sheet is narrower than the window, as on iPhone Duo. When the sheet sized itself to its content, the content was pinned to the window width and centered in the sheet, so its leading edge was cut off. The content now takes its width from the sheet and its height from the content. `presentationSizing` takes a `fitted` option (`{ horizontal, vertical }`) to fit a sheet to its content on one axis only. ([#51319](https://github.com/expo/expo/pull/51319) by [@intergalacticspacehighway](https://github.com/intergalacticspacehighway))
+- [Android] Fix an `RNHostView` that ignores touches when a Compose button with a ripple in the same `Host` was pressed earlier. The ripple container that Compose adds was found first during React Native's touch-target search, so the touch went to the `Host` instead of the hosted view. ([#51237](https://github.com/expo/expo/pull/51237) by [@intergalacticspacehighway](https://github.com/intergalacticspacehighway))
+- Fixed `measure()` of views hosted in `RNHostView` inside SwiftUI and Jetpack Compose containers. ([#50715](https://github.com/expo/expo/pull/50715) by [@intergalacticspacehighway](https://github.com/intergalacticspacehighway))
+- Added a development warning when a `Host` renders directly inside another `Host` without an `RNHostView`. The universal `BottomSheet` no longer adds its own `Host` when it renders inside one. ([#50715](https://github.com/expo/expo/pull/50715) by [@intergalacticspacehighway](https://github.com/intergalacticspacehighway))
+- [iOS] Fixed `measure()` of views hosted in `RNHostView` when SwiftUI insets the `Host`'s content, for example by the safe area. ([#50727](https://github.com/expo/expo/pull/50727) by [@intergalacticspacehighway](https://github.com/intergalacticspacehighway))
+- [Android] Fix the community `MenuView` opening detached above its anchor near the bottom of the screen, and add a `properties` prop to the Jetpack Compose `DropdownMenu`. ([#51412](https://github.com/expo/expo/pull/51412) by [@intergalacticspacehighway](https://github.com/intergalacticspacehighway))
+- [Android] Fix a numeric `width()` modifier crashing the app on launch with `FieldCastException: Cannot cast value for field 'width'` since the `IntrinsicSize` support added in 57.0.22 / 58.0.9. JS numbers reach the modifier record as `Double`, which matched neither branch of `Either<Int, IntrinsicSizeType>`; the field is now `Either<Double, IntrinsicSizeType>`, so numeric widths convert again and `width(IntrinsicSize.Min|Max)` keeps working. ([#51322](https://github.com/expo/expo/pull/51322) by [@expo-bot](https://github.com/expo-bot))
+- [iOS] Add `cornerRadius` and `opacity` to `Chart`'s `pieStyle`. Pie slices could not have rounded corners, and their opacity was fixed at 0.8, so a chart drawn in solid colors always looked washed out. Both default to the previous behavior. Rounded corners let a single-slice donut work as a progress ring with rounded ends. ([#51351](https://github.com/expo/expo/pull/51351) by [@jsg2021](https://github.com/jsg2021))
+
+## 58.0.15
+
+### Patch Changes
+
+- [iOS] Fix `Chart` ignoring `lineStyle.width` on line charts. The line mark applied `.lineStyle` twice (once for the dash pattern, once for the width), and the first one wins, so lines always rendered at 1 pt. The width and the dash pattern are now set in one `StrokeStyle`. ([#51283](https://github.com/expo/expo/pull/51283) by [@brentvatne](https://github.com/brentvatne))
+- [Android] Add `showTitle` and `showHeadline` to the Jetpack Compose `DateTimePicker`, `DatePickerDialog`, `DateRangePicker`, and `DateRangePickerDialog` to hide Material 3's title and headline. The community `DateTimePicker` with `presentation="inline"` now hides both on Android, matching iOS. To keep the title and headline, use `DateTimePicker` from `@expo/ui/jetpack-compose` instead. ([#51274](https://github.com/expo/expo/pull/51274) by [@IGx89](https://github.com/IGx89))
+- [Android] Fix a `Pressable` (or any JS responder) being cancelled when a `MaskedView`, or any other component that renders a `Host`, is laid over it. Once React Native grants the JS responder, the responder's view intercepts the touch stream and sends `ACTION_CANCEL` to its native children, including that `Host`. The `Host` reported this cancel as Compose claiming the gesture, which cancelled the press it belonged to. Holds longer than about 30 ms never fired `onPress`. ([#51163](https://github.com/expo/expo/pull/51163) by [@1kuko3](https://github.com/1kuko3))
+- Fix iOS `Picker` not reporting a selection that equals the last `selection` prop when the user changes it again before the prop updates. ([#51196](https://github.com/expo/expo/pull/51196) by [@expo-bot](https://github.com/expo-bot))
+- [iOS] Add `searchable` and `searchToolbarBehavior` SwiftUI modifiers. ([#50369](https://github.com/expo/expo/pull/50369) by [@expo-bot](https://github.com/expo-bot))
+
 ## 58.0.14
 
 ### 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.14'
+version = '58.0.16'
 
 android {
   namespace "expo.modules.ui"
   defaultConfig {
     versionCode 1
-    versionName "58.0.14"
+    versionName "58.0.16"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   buildFeatures {

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

@@ -4,6 +4,7 @@ import androidx.compose.material3.AlertDialog
 import androidx.compose.ui.res.stringResource
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.DatePicker
+import androidx.compose.material3.DatePickerColors
 import androidx.compose.material3.DatePickerDefaults
 import androidx.compose.material3.DatePickerDialog
 import androidx.compose.material3.DatePickerState
@@ -158,6 +159,8 @@ data class DateTimePickerProps(
   val variant: Variant = Variant.PICKER,
   val displayedComponents: DisplayedComponents = DisplayedComponents.DATE,
   val showVariantToggle: Boolean = true,
+  val showTitle: Boolean = true,
+  val showHeadline: Boolean = true,
   val is24Hour: Boolean = true,
   val color: AndroidColor? = null,
   val elementColors: DateTimePickerColorOverrides = DateTimePickerColorOverrides(),
@@ -170,6 +173,8 @@ data class DatePickerDialogProps(
   val initialDate: Long? = null,
   val variant: Variant = Variant.PICKER,
   val showVariantToggle: Boolean = true,
+  val showTitle: Boolean = true,
+  val showHeadline: Boolean = true,
   val confirmButtonLabel: String? = null,
   val dismissButtonLabel: String? = null,
   val color: AndroidColor? = null,
@@ -396,7 +401,7 @@ fun ExpoDatePickerDialogContent(props: DatePickerDialogProps, onDateSelected: (D
     // Material3's year-selector chevron tints from the ambient LocalContentColor (which defaults to
     // black), not `navigationContentColor`; bind the local so the chevron honors the navigation color.
     CompositionLocalProvider(LocalContentColor provides colors.navigationContentColor) {
-      DatePicker(
+      MaterialDatePicker(
         modifier = if (displayMode == DisplayMode.Picker) {
           Modifier.wrapContentHeight(align = Alignment.Top, unbounded = true)
         } else {
@@ -404,6 +409,8 @@ fun ExpoDatePickerDialogContent(props: DatePickerDialogProps, onDateSelected: (D
         },
         state = state,
         showModeToggle = props.showVariantToggle,
+        showTitle = props.showTitle,
+        showHeadline = props.showHeadline,
         colors = colors
       )
     }
@@ -507,15 +514,41 @@ fun ExpoDatePicker(modifier: Modifier = Modifier, props: DateTimePickerProps, on
   // Material3's year-selector chevron tints from the ambient LocalContentColor (which defaults to
   // black), not `navigationContentColor`; bind the local so the chevron honors the navigation color.
   CompositionLocalProvider(LocalContentColor provides colors.navigationContentColor) {
-    DatePicker(
+    MaterialDatePicker(
       modifier = modifier,
       state = state,
       showModeToggle = props.showVariantToggle,
+      showTitle = props.showTitle,
+      showHeadline = props.showHeadline,
       colors = colors
     )
   }
 }
 
+// Material 3 hides the title or headline when its slot is `null`. Its default slots pad themselves
+// with private constants, so branch on the call instead of copying them, keeping the defaults exact.
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun MaterialDatePicker(
+  modifier: Modifier = Modifier,
+  state: DatePickerState,
+  showModeToggle: Boolean,
+  showTitle: Boolean,
+  showHeadline: Boolean,
+  colors: DatePickerColors
+) {
+  when {
+    showTitle && showHeadline ->
+      DatePicker(state = state, modifier = modifier, colors = colors, showModeToggle = showModeToggle)
+    showTitle ->
+      DatePicker(state = state, modifier = modifier, colors = colors, headline = null, showModeToggle = showModeToggle)
+    showHeadline ->
+      DatePicker(state = state, modifier = modifier, colors = colors, title = null, showModeToggle = showModeToggle)
+    else ->
+      DatePicker(state = state, modifier = modifier, colors = colors, title = null, headline = null, showModeToggle = showModeToggle)
+  }
+}
+
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ExpoTimePicker(modifier: Modifier = Modifier, props: DateTimePickerProps, onDateSelected: (DatePickerResult) -> Unit) {

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

@@ -1,6 +1,7 @@
 package expo.modules.ui
 
 import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.DatePickerColors
 import androidx.compose.material3.DatePickerDefaults
 import androidx.compose.material3.DatePickerDialog
 import androidx.compose.material3.DateRangePicker
@@ -13,6 +14,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.stringResource
 import expo.modules.kotlin.records.Field
@@ -38,6 +40,8 @@ data class DateRangePickerProps(
   val initialEndDate: Long? = null,
   val variant: Variant = Variant.PICKER,
   val showVariantToggle: Boolean = true,
+  val showTitle: Boolean = true,
+  val showHeadline: Boolean = true,
   val color: AndroidColor? = null,
   val elementColors: DateTimePickerColorOverrides = DateTimePickerColorOverrides(),
   val selectableDates: SelectableDatesRecord? = null,
@@ -50,6 +54,8 @@ data class DateRangePickerDialogProps(
   val initialEndDate: Long? = null,
   val variant: Variant = Variant.PICKER,
   val showVariantToggle: Boolean = true,
+  val showTitle: Boolean = true,
+  val showHeadline: Boolean = true,
   val confirmButtonLabel: String? = null,
   val dismissButtonLabel: String? = null,
   val color: AndroidColor? = null,
@@ -147,9 +153,11 @@ fun ExpoDateRangePickerDialogContent(
     ApplyDatePickerDialogKeyboardBehavior(displayMode)
 
     CompositionLocalProvider(LocalContentColor provides colors.navigationContentColor) {
-      DateRangePicker(
+      MaterialDateRangePicker(
         state = state,
         showModeToggle = props.showVariantToggle,
+        showTitle = props.showTitle,
+        showHeadline = props.showHeadline,
         colors = colors
       )
     }
@@ -181,11 +189,36 @@ fun FunctionalComposableScope.DateRangePickerContent(
 
   val colors = buildDatePickerColors(props.elementColors, props.color.composeOrNull)
   CompositionLocalProvider(LocalContentColor provides colors.navigationContentColor) {
-    DateRangePicker(
+    MaterialDateRangePicker(
       modifier = modifier,
       state = state,
       showModeToggle = props.showVariantToggle,
+      showTitle = props.showTitle,
+      showHeadline = props.showHeadline,
       colors = colors
     )
   }
 }
+
+// See MaterialDatePicker: branching keeps Material 3's own default title and headline slots.
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun MaterialDateRangePicker(
+  modifier: Modifier = Modifier,
+  state: DateRangePickerState,
+  showModeToggle: Boolean,
+  showTitle: Boolean,
+  showHeadline: Boolean,
+  colors: DatePickerColors
+) {
+  when {
+    showTitle && showHeadline ->
+      DateRangePicker(state = state, modifier = modifier, colors = colors, showModeToggle = showModeToggle)
+    showTitle ->
+      DateRangePicker(state = state, modifier = modifier, colors = colors, headline = null, showModeToggle = showModeToggle)
+    showHeadline ->
+      DateRangePicker(state = state, modifier = modifier, colors = colors, title = null, showModeToggle = showModeToggle)
+    else ->
+      DateRangePicker(state = state, modifier = modifier, colors = colors, title = null, headline = null, showModeToggle = showModeToggle)
+  }
+}

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

@@ -2,6 +2,7 @@
 
 package expo.modules.ui
 
+import android.os.Handler
 import android.os.Looper
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.SwitchDefaults
@@ -77,6 +78,8 @@ class ExpoUIModule : Module() {
       // Tags restart in the next app context, so an entry whose view was never torn down would be
       // read by an unrelated view after a reload.
       NativeStatePropsGetter().clearAllContentOrigins()
+      // React Native destroys modules on a background thread, but `ZeroContentOrigins` is UI-thread only.
+      Handler(Looper.getMainLooper()).post { ZeroContentOrigins.clear() }
 
       imageLoader?.close()
       imageLoader = null

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

@@ -4,6 +4,7 @@ package expo.modules.ui
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.view.MotionEvent
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.displayCutout
@@ -120,6 +121,26 @@ internal class HostView(context: Context, appContext: AppContext) :
   private val onLayoutContent by EventDispatcher<LayoutContentEvent>()
   private var lastDispatchedContentSize: IntSize? = null
 
+  /**
+   * True while this view passes down an `ACTION_CANCEL` that came from its React Native parent,
+   * not from a Compose gesture detector. React Native already owns that gesture: the usual cause is
+   * the JS responder's view intercepting the stream, which cancels its native children.
+   */
+  internal var isDispatchingCancelFromParent = false
+    private set
+
+  override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
+    if (ev.actionMasked != MotionEvent.ACTION_CANCEL) {
+      return super.dispatchTouchEvent(ev)
+    }
+    isDispatchingCancelFromParent = true
+    try {
+      return super.dispatchTouchEvent(ev)
+    } finally {
+      isDispatchingCancelFromParent = false
+    }
+  }
+
   @Composable
   override fun ComposableScope.Content() {
     val context = LocalContext.current

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

@@ -147,7 +147,7 @@ internal enum class IntrinsicSizeType(val value: String) : Enumerable {
 
 @OptimizedRecord
 internal data class ComposeWidthParams(
-  @Field val width: Either<Int, IntrinsicSizeType>? = null
+  @Field val width: Either<Double, IntrinsicSizeType>? = null
 ) : Record
 
 @OptimizedRecord
@@ -496,7 +496,7 @@ object ModifierRegistry {
       if (width?.`is`(IntrinsicSizeType::class) == true) {
         Modifier.width(width.second().toComposeIntrinsicSize())
       } else {
-        Modifier.width((width?.first() ?: 0).dp)
+        Modifier.width((width?.first() ?: 0.0).dp)
       }
     }
 

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

@@ -8,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewParent
 import android.widget.FrameLayout
+import androidx.annotation.UiThread
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -25,6 +26,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.layout.positionInRoot
+import androidx.compose.ui.platform.AbstractComposeView
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.viewinterop.AndroidView
@@ -45,6 +47,7 @@ import expo.modules.kotlin.views.ComposableScope
 import expo.modules.kotlin.views.ComposeProps
 import expo.modules.kotlin.views.ExpoComposeView
 import expo.modules.kotlin.views.OptimizedComposeProps
+import java.util.WeakHashMap
 
 @OptimizedComposeProps
 internal data class RNHostViewProps(
@@ -151,6 +154,25 @@ internal class RNHostView(context: Context, appContext: AppContext) :
     shadowNodeProxy.clearContentOrigin()
   }
 
+  // Compose places the views between this view and its `Host`, so `measure()` must skip their Yoga
+  // origins. A zero content origin on each one does that while this view is attached.
+  private var composeAncestors: List<ExpoComposeView<*>> = emptyList()
+
+  override fun onAttachedToWindow() {
+    super.onAttachedToWindow()
+    composeAncestors = generateSequence(parent) { it.parent }
+      .takeWhile { it is ExpoComposeView<*> && !it.shouldUseAndroidLayout }
+      .filterIsInstance<ExpoComposeView<*>>()
+      .toList()
+    composeAncestors.forEach(ZeroContentOrigins::acquire)
+  }
+
+  override fun onDetachedFromWindow() {
+    super.onDetachedFromWindow()
+    composeAncestors.forEach(ZeroContentOrigins::release)
+    composeAncestors = emptyList()
+  }
+
   @Composable
   override fun ComposableScope.Content() {
     val matchContentsHorizontal = props.matchContentsHorizontal.value ?: false
@@ -294,6 +316,44 @@ internal class RNHostView(context: Context, appContext: AppContext) :
   }
 }
 
+/**
+ * Counts, for each Compose ancestor, the attached `RNHostView`s below it. Several can share an
+ * ancestor, so the ancestor's zero content origin is set when its count becomes 1 and cleared when
+ * it returns to 0.
+ */
+internal object ZeroContentOrigins {
+  private val counts = WeakHashMap<ExpoComposeView<*>, Int>()
+
+  @UiThread
+  fun acquire(view: ExpoComposeView<*>) {
+    val count = counts[view] ?: 0
+    if (count == 0) {
+      view.shadowNodeProxy.setContentOrigin(0.0, 0.0)
+    }
+    counts[view] = count + 1
+  }
+
+  @UiThread
+  fun release(view: ExpoComposeView<*>) {
+    val count = counts[view] ?: return
+    if (count > 1) {
+      counts[view] = count - 1
+      return
+    }
+    counts.remove(view)
+    view.shadowNodeProxy.clearContentOrigin()
+  }
+
+  /**
+   * Called on reload, after the content origins themselves are cleared. A late `release` from the
+   * old app context then finds no count and can't clear an entry for a reused tag.
+   */
+  @UiThread
+  fun clear() {
+    counts.clear()
+  }
+}
+
 /**
  * Removes [wrapper] from the view that currently contains it, and clears its bounds.
  *
@@ -309,6 +369,28 @@ internal fun detachForReuse(wrapper: View) {
   wrapper.layout(0, 0, 0, 0)
 }
 
+/**
+ * React Native looks for touch targets from the last child to the first, and Compose appends helper
+ * views such as ripple containers to its owner view after the hosted views. Those helpers have no
+ * React tag, so a touch on them goes to the `Host` instead of the hosted view.
+ * This is a workaround: React Native has no way to let the `Host` choose the touch target.
+ * This causes https://github.com/expo/expo/issues/51159
+ */
+internal fun keepLastForTouchTargeting(composeOwnerView: ViewGroup, hostedViewsContainer: View) {
+  if (composeOwnerView.indexOfChild(hostedViewsContainer) != composeOwnerView.childCount - 1) {
+    composeOwnerView.bringChildToFront(hostedViewsContainer)
+  }
+  composeOwnerView.setOnHierarchyChangeListener(object : ViewGroup.OnHierarchyChangeListener {
+    override fun onChildViewAdded(parent: View, child: View) {
+      if (child !== hostedViewsContainer) {
+        composeOwnerView.bringChildToFront(hostedViewsContainer)
+      }
+    }
+
+    override fun onChildViewRemoved(parent: View, child: View) = Unit
+  })
+}
+
 /**
  * A thin FrameLayout that intercepts touch events and dispatches them to JS via
  * JSTouchDispatcher/JSPointerDispatcher, replicating the pattern from React Native's
@@ -379,8 +461,25 @@ private class TouchDispatchingRootViewGroup(
     // and we must not override those values.
   }
 
+  override fun onAttachedToWindow() {
+    super.onAttachedToWindow()
+    // Walk up until the parent is the ComposeView. That ancestor is the Compose owner view, and the
+    // child we came from is the container that Compose keeps all hosted views in.
+    var hostedViewsContainer: View = this
+    var composeOwnerView = parent as? ViewGroup
+    while (composeOwnerView != null && composeOwnerView.parent !is AbstractComposeView) {
+      hostedViewsContainer = composeOwnerView
+      composeOwnerView = composeOwnerView.parent as? ViewGroup
+    }
+    composeOwnerView?.let { keepLastForTouchTargeting(it, hostedViewsContainer) }
+  }
+
   override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
-    if (ev.actionMasked == MotionEvent.ACTION_CANCEL && !dispatchesTouchesToJS) {
+    if (
+      ev.actionMasked == MotionEvent.ACTION_CANCEL &&
+      !dispatchesTouchesToJS &&
+      !isCancelFromReactNative()
+    ) {
       // Compose cancels this subtree when a gesture detector above it claims the gesture. The
       // ancestor root, which dispatches this subtree's touches, keeps streaming moves, so a
       // `Pressable` still fires on release. Tell it a native child took over.
@@ -434,6 +533,23 @@ private class TouchDispatchingRootViewGroup(
     return handled
   }
 
+  /**
+   * Whether this cancel reached the `Host` from React Native rather than from Compose. The JS
+   * responder's view intercepts the stream once it's granted, which cancels its native children,
+   * including the `Host` of a `MaskedView` laid over a `Pressable`. JS still owns that gesture, so
+   * reporting it as a native one would cancel the press it belongs to.
+   */
+  private fun isCancelFromReactNative(): Boolean {
+    var current: ViewParent? = parent
+    while (current != null) {
+      if (current is HostView) {
+        return current.isDispatchingCancelFromParent
+      }
+      current = current.parent
+    }
+    return false
+  }
+
   private inline fun notifyAncestorRootViews(block: (RootView) -> Unit) {
     var current: ViewParent? = parent
     while (current != null) {

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

@@ -6,6 +6,7 @@ import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.MenuDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.PopupProperties
 import expo.modules.kotlin.views.FunctionalComposableScope
 import expo.modules.ui.UIComposableScope
 import expo.modules.ui.ModifierRegistry
@@ -29,7 +30,13 @@ fun FunctionalComposableScope.DropdownMenuContent(
       shape = props.cornerRadius?.let { RoundedCornerShape(it.dp) } ?: MenuDefaults.shape,
       shadowElevation = props.shadowElevation?.dp ?: MenuDefaults.ShadowElevation,
       expanded = props.expanded,
-      onDismissRequest = onDismissRequest
+      onDismissRequest = onDismissRequest,
+      properties = PopupProperties(
+        focusable = props.properties.focusable,
+        dismissOnBackPress = props.properties.dismissOnBackPress,
+        dismissOnClickOutside = props.properties.dismissOnClickOutside,
+        clippingEnabled = props.properties.clippingEnabled
+      )
     ) {
       itemsSlotView?.let {
         with(UIComposableScope()) {

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

@@ -1,7 +1,10 @@
 package expo.modules.ui.menu
 
 import android.graphics.Color
+import expo.modules.kotlin.records.Field
+import expo.modules.kotlin.records.Record
 import expo.modules.kotlin.types.Enumerable
+import expo.modules.kotlin.types.OptimizedRecord
 import expo.modules.kotlin.views.ComposeProps
 import expo.modules.ui.ModifierList
 import expo.modules.kotlin.views.OptimizedComposeProps
@@ -11,6 +14,14 @@ enum class ActivationMethod(val value: String) : Enumerable {
   LONG_PRESS("longPress")
 }
 
+@OptimizedRecord
+data class ExpoPopupProperties(
+  @Field val focusable: Boolean = true,
+  @Field val dismissOnBackPress: Boolean = true,
+  @Field val dismissOnClickOutside: Boolean = true,
+  @Field val clippingEnabled: Boolean = true
+) : Record
+
 @OptimizedComposeProps
 data class DropdownMenuProps(
   val activationMethod: ActivationMethod = ActivationMethod.SINGLE_PRESS,
@@ -18,5 +29,6 @@ data class DropdownMenuProps(
   val color: Color? = null,
   val cornerRadius: Float? = null,
   val modifiers: ModifierList = emptyList(),
-  val shadowElevation: Float? = null
+  val shadowElevation: Float? = null,
+  val properties: ExpoPopupProperties = ExpoPopupProperties()
 ) : ComposeProps

package/build/NativeTreeContext.d.ts

@@ -0,0 +1,10 @@
+/**
+ * `true` inside a `Host`, where SwiftUI or Jetpack Compose renders the content. `RNHostView` sets it
+ * back to `false`, because its children are React Native views again.
+ */
+export declare const NativeTreeContext: import("react").Context<boolean>;
+export declare function useIsInsideNativeTree(): boolean;
+/**
+ * Warns once in development when a `Host` renders directly inside another `Host`'s native content.
+ */
+export declare function useWarnIfNestedHost(layoutSystem: 'SwiftUI' | 'Jetpack Compose'): void;

package/build/NativeTreeContext.js

@@ -0,0 +1,25 @@
+import { createContext, useContext, useEffect } from 'react';
+/**
+ * `true` inside a `Host`, where SwiftUI or Jetpack Compose renders the content. `RNHostView` sets it
+ * back to `false`, because its children are React Native views again.
+ */ export const NativeTreeContext = /*#__PURE__*/ createContext(false);
+export function useIsInsideNativeTree() {
+    return useContext(NativeTreeContext);
+}
+let warned = false;
+/**
+ * Warns once in development when a `Host` renders directly inside another `Host`'s native content.
+ */ export function useWarnIfNestedHost(layoutSystem) {
+    const isNested = useIsInsideNativeTree();
+    useEffect(()=>{
+        if (__DEV__ && isNested && !warned) {
+            warned = true;
+            console.warn(`[@expo/ui] A \`Host\` is rendered directly inside another \`Host\`'s ${layoutSystem} content. ` + `${layoutSystem} places it, but React Native can't see where, so its layout and \`measure()\` ` + `can be wrong, and a \`Pressable\` inside it can cancel its press. Wrap the nested \`Host\` in ` + `\`RNHostView\`, or render its ${layoutSystem} components directly in the outer \`Host\`.`);
+        }
+    }, [
+        isNested,
+        layoutSystem
+    ]);
+}
+
+//# sourceMappingURL=NativeTreeContext.js.map

package/build/NativeTreeContext.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["NativeTreeContext.tsx"],"sourcesContent":[null],"names":["createContext","useContext","useEffect","NativeTreeContext","useIsInsideNativeTree","warned","useWarnIfNestedHost","layoutSystem","isNested","__DEV__","console","warn"],"mappings":"AAAA,SAASA,aAAa,EAAEC,UAAU,EAAEC,SAAS,QAAQ,QAAQ;AAE7D;;;CAGC,GACD,OAAO,MAAMC,kCAAoBH,cAAc,OAAO;AAEtD,OAAO,SAASI;IACd,OAAOH,WAAWE;AACpB;AAEA,IAAIE,SAAS;AAEb;;CAEC,GACD,OAAO,SAASC,oBAAoBC,YAA2C;IAC7E,MAAMC,WAAWJ;IACjBF,UAAU;QACR,IAAIO,WAAWD,YAAY,CAACH,QAAQ;YAClCA,SAAS;YACTK,QAAQC,IAAI,CACV,CAAC,qEAAqE,EAAEJ,aAAa,UAAU,CAAC,GAC9F,GAAGA,aAAa,8EAA8E,CAAC,GAC/F,CAAC,8FAA8F,CAAC,GAChG,CAAC,8BAA8B,EAAEA,aAAa,2CAA2C,CAAC;QAEhG;IACF,GAAG;QAACC;QAAUD;KAAa;AAC7B"}

package/build/State/useWorkletCallback.d.ts

@@ -1,6 +1,6 @@
 import type { SharedObject } from 'expo';
 /**
- * A worklet function wrapped for native code, returned by [`useWorkletCallback`](#useworkletcallback).
+ * A worklet function wrapped for native code, returned by [`useWorkletCallback`](#useworkletcallbackcallback).
  * Pass it to a modifier or prop that accepts worklet callbacks, which then runs it synchronously on
  * the UI thread.
  */

package/build/community/bottom-sheet/BottomSheet.ios.js

@@ -177,8 +177,14 @@ function findNearestDetentIndex(detents, position) {
     const modifiers = useMemo(()=>{
         const bg = extractBackgroundColor(backgroundStyle);
         return [
-            ...fitToContents ? [
-                presentationSizing('fitted')
+            ...fitToContents ? // the system choose the width.
+            [
+                presentationSizing('automatic', {
+                    fitted: {
+                        horizontal: false,
+                        vertical: true
+                    }
+                })
             ] : [
                 presentationDetents(detents, {
                     selection: selectedDetent,
@@ -218,10 +224,11 @@ function findNearestDetentIndex(detents, position) {
                     children: /*#__PURE__*/ _jsx(Group, {
                         modifiers: modifiers,
                         children: /*#__PURE__*/ _jsx(RNHostView, {
-                            matchContents: fitToContents,
+                            matchContents: fitToContents ? {
+                                vertical: true
+                            } : false,
                             children: /*#__PURE__*/ _jsx(View, {
                                 style: fitToContents ? {
-                                    width,
                                     paddingTop: handleComponent !== null ? 16 : 0
                                 } : {
                                     flexGrow: 1,

package/build/community/bottom-sheet/BottomSheet.ios.js.map

@@ -1 +1 @@
-{"version":3,"sources":["community/bottom-sheet/BottomSheet.ios.tsx"],"sourcesContent":[null],"names":["useCallback","useEffect","useImperativeHandle","useMemo","useRef","useState","useWindowDimensions","View","StyleSheet","BottomSheet","NativeBottomSheet","Group","Host","RNHostView","interactiveDismissDisabled","presentationBackground","presentationDetents","presentationDragIndicator","presentationSizing","BottomSheetContext","BottomSheetInternalContext","SheetScrollContextReset","parseSnapPoint","useBottomSheet","extractBackgroundColor","style","undefined","flat","flatten","color","backgroundColor","snapPointToDetent","point","parsed","type","fraction","value","height","detentsAreEqual","a","b","findDetentIndex","detents","detent","findIndex","d","findNearestDetentIndex","position","nearestIndex","nearestDist","Infinity","forEach","i","pValue","dValue","dist","Math","abs","props","ref","snapPoints","snapPointsProp","index","indexProp","onChange","onClose","onDismiss","enablePanDownToClose","enableDynamicSizing","handleComponent","backgroundStyle","children","width","isPresented","setIsPresented","currentIndex","setCurrentIndex","max","currentIndexRef","closedRef","onChangeRef","current","onCloseRef","onDismissRef","length","map","selectedDetent","fitToContents","internalContextValue","fireCloseCallbacks","clampedIndex","min","handlePresentedChange","presented","handleDetentChange","newIndex","methods","snapToIndex","close","snapToPosition","expand","collapse","forceClose","present","dismiss","modifiers","bg","selection","onSelectionChange","Provider","pointerEvents","onIsPresentedChange","matchContents","paddingTop","flexGrow"],"mappings":"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"}
+{"version":3,"sources":["community/bottom-sheet/BottomSheet.ios.tsx"],"sourcesContent":[null],"names":["useCallback","useEffect","useImperativeHandle","useMemo","useRef","useState","useWindowDimensions","View","StyleSheet","BottomSheet","NativeBottomSheet","Group","Host","RNHostView","interactiveDismissDisabled","presentationBackground","presentationDetents","presentationDragIndicator","presentationSizing","BottomSheetContext","BottomSheetInternalContext","SheetScrollContextReset","parseSnapPoint","useBottomSheet","extractBackgroundColor","style","undefined","flat","flatten","color","backgroundColor","snapPointToDetent","point","parsed","type","fraction","value","height","detentsAreEqual","a","b","findDetentIndex","detents","detent","findIndex","d","findNearestDetentIndex","position","nearestIndex","nearestDist","Infinity","forEach","i","pValue","dValue","dist","Math","abs","props","ref","snapPoints","snapPointsProp","index","indexProp","onChange","onClose","onDismiss","enablePanDownToClose","enableDynamicSizing","handleComponent","backgroundStyle","children","width","isPresented","setIsPresented","currentIndex","setCurrentIndex","max","currentIndexRef","closedRef","onChangeRef","current","onCloseRef","onDismissRef","length","map","selectedDetent","fitToContents","internalContextValue","fireCloseCallbacks","clampedIndex","min","handlePresentedChange","presented","handleDetentChange","newIndex","methods","snapToIndex","close","snapToPosition","expand","collapse","forceClose","present","dismiss","modifiers","bg","fitted","horizontal","vertical","selection","onSelectionChange","Provider","pointerEvents","onIsPresentedChange","matchContents","paddingTop","flexGrow"],"mappings":"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"}

package/build/community/datetime-picker/DateTimePicker.android.js

@@ -98,6 +98,10 @@ export function DateTimePicker(props) {
             color: accentColor,
             onDateSelected: onDateSelected,
             showVariantToggle: false,
+            // Match iOS, where the inline picker has no label: hide Material 3's "Select date" title
+            // and its selected-date headline.
+            showTitle: false,
+            showHeadline: false,
             ...testID ? {
                 testID
             } : undefined