@expo/ui 58.0.15 → 58.0.16

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

@@ -3,7 +3,7 @@
   "component": {
     "group": "expo.modules.ui",
     "module": "expo.modules.ui",
-    "version": "58.0.15",
+    "version": "58.0.16",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,13 +24,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.ui-58.0.15.aar",
-          "url": "expo.modules.ui-58.0.15.aar",
-          "size": 1847287,
-          "sha512": "a96d874afa65f7edf884a6b9ea0d01b7d2eb2f1aeb86db4afaaeefa6073f153f29cafe8a1ce8ae9c8c6069cfe8534197add3dba900e350e381598cf3e76e8c79",
-          "sha256": "85ad13c4695409acef3dad5a8fd8cb6cbd472bcf2ac7d6514b3f0e9fd3b3d590",
-          "sha1": "019221c48e7c0648984cb5603c4927d391a241cd",
-          "md5": "620eb66ce22bd9cd4c1e0a0c6c0812f1"
+          "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"
         }
       ]
     },
@@ -141,13 +141,13 @@
       ],
       "files": [
         {
-          "name": "expo.modules.ui-58.0.15.aar",
-          "url": "expo.modules.ui-58.0.15.aar",
-          "size": 1847287,
-          "sha512": "a96d874afa65f7edf884a6b9ea0d01b7d2eb2f1aeb86db4afaaeefa6073f153f29cafe8a1ce8ae9c8c6069cfe8534197add3dba900e350e381598cf3e76e8c79",
-          "sha256": "85ad13c4695409acef3dad5a8fd8cb6cbd472bcf2ac7d6514b3f0e9fd3b3d590",
-          "sha1": "019221c48e7c0648984cb5603c4927d391a241cd",
-          "md5": "620eb66ce22bd9cd4c1e0a0c6c0812f1"
+          "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"
         }
       ]
     },
@@ -161,13 +161,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.ui-58.0.15-sources.jar",
-          "url": "expo.modules.ui-58.0.15-sources.jar",
-          "size": 111654,
-          "sha512": "5569d8f73d7b0d41af8d77ca8cb4e8685384113a45e151b9c6cdad1b660844183067026b2fc16c150ac409a0a097fb4ac78c4f5c31afe56862f306f8daf7c538",
-          "sha256": "651218fb79e50f51035a06d7e88ef8cd9cd391f8b66edcf46abdc431f0a41cfc",
-          "sha1": "584c7a2ab4d40b05b4658c93c1a689ce0587dc06",
-          "md5": "2ea3d659cdac9ba8f6d43d9679a48905"
+          "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"
         }
       ]
     }

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

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

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

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

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

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

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

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

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

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>expo.modules.ui</groupId>
   <artifactId>expo.modules.ui</artifactId>
-  <version>58.0.15</version>
+  <version>58.0.16</version>
   <packaging>aar</packaging>
   <name>expo.modules.ui</name>
   <url>https://github.com/expo/expo</url>

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

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

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

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

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/ui",
-  "version": "58.0.15",
+  "version": "58.0.16",
   "description": "A collection of UI components",
   "keywords": [
     "Jetpack Compose",

package/src/NativeTreeContext.tsx

@@ -0,0 +1,31 @@
+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 = createContext(false);
+
+export function useIsInsideNativeTree(): boolean {
+  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: 'SwiftUI' | 'Jetpack Compose'): void {
+  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]);
+}

package/src/community/bottom-sheet/BottomSheet.ios.tsx

@@ -199,8 +199,9 @@ export function BottomSheet(props: BottomSheetProps) {
     const bg = extractBackgroundColor(backgroundStyle);
     return [
       ...(fitToContents
-        ? // Makes the iPad sheet size to that content instead of opening near full height.
-          [presentationSizing('fitted')]
+        ? // Fits the sheet height to the content (iPad opens near full height otherwise) and lets
+          // the system choose the width.
+          [presentationSizing('automatic', { fitted: { horizontal: false, vertical: true } })]
         : [
             presentationDetents(detents, {
               selection: selectedDetent,
@@ -231,16 +232,16 @@ export function BottomSheet(props: BottomSheetProps) {
             onDismiss={fireCloseCallbacks}
             fitToContents={fitToContents}>
             <Group modifiers={modifiers}>
-              <RNHostView matchContents={fitToContents}>
+              <RNHostView matchContents={fitToContents ? { vertical: true } : false}>
                 {/* paddingTop compensates for tighter spacing between native drag indicator and content
                     compared to gorhom's handle. flexGrow:1 + height:0 (flex-basis 0) fills the snap-point
                     height without inheriting the scrollable child's intrinsic content height. With matchContents,
-                    RNHostView lays the hosted view out at its own size, so `width` gives it the sheet width
-                    while its height stays content-sized. */}
+                    RNHostView takes the width from the sheet, which can be narrower than the window, and
+                    the height from the content. */}
                 <View
                   style={
                     fitToContents
-                      ? { width, paddingTop: handleComponent !== null ? 16 : 0 }
+                      ? { paddingTop: handleComponent !== null ? 16 : 0 }
                       : { flexGrow: 1, height: 0, paddingTop: handleComponent !== null ? 16 : 0 }
                   }>
                   <SheetScrollContextReset>{children}</SheetScrollContextReset>

package/src/community/menu/MenuView.android.tsx

@@ -12,8 +12,12 @@ import { Icon } from '../../jetpack-compose/Icon';
 import { RNHostView } from '../../jetpack-compose/RNHostView';
 import { Text as ComposeText } from '../../jetpack-compose/Text';
 import { useMaterialColors } from '../../jetpack-compose/colors';
+import type { PopupProperties } from '../../types';
 import type { MenuAction, MenuComponentProps, MenuComponentRef, NativeActionEvent } from './types';
 
+// Clipped popups drop the status bar offset, so edge-to-edge menus near the bottom detach from the anchor.
+const POPUP_PROPERTIES: PopupProperties = { clippingEnabled: false };
+
 function actionId(action: MenuAction): string {
   return action.id ?? action.title;
 }
@@ -82,7 +86,10 @@ function MenuActionItem({ action, onPressAction, dismissAll, destructiveColor }:
       );
     }
     return (
-      <DropdownMenu expanded={submenuExpanded} onDismissRequest={() => setSubmenuExpanded(false)}>
+      <DropdownMenu
+        expanded={submenuExpanded}
+        onDismissRequest={() => setSubmenuExpanded(false)}
+        properties={POPUP_PROPERTIES}>
         <DropdownMenu.Trigger>
           <DropdownMenuItem
             enabled={!attributes?.disabled}
@@ -191,7 +198,10 @@ export function MenuView(props: MenuComponentProps & { ref?: React.Ref<MenuCompo
   return (
     <View style={style} testID={testID}>
       <Host colorScheme={colorScheme} matchContents>
-        <DropdownMenu expanded={expanded} onDismissRequest={dismissAll}>
+        <DropdownMenu
+          expanded={expanded}
+          onDismissRequest={dismissAll}
+          properties={POPUP_PROPERTIES}>
           <DropdownMenu.Trigger>
             <RNHostView matchContents>
               <Pressable

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

@@ -3,7 +3,7 @@ import type { ReactNode } from 'react';
 import type { StyleProp, ViewStyle, ColorValue } from 'react-native';
 
 import { PresentedContent } from '../../PresentedContentContext';
-import type { ModifierConfig } from '../../types';
+import type { ModifierConfig, PopupProperties } from '../../types';
 import { createViewModifierEventListener } from '../modifiers/utils';
 
 const MenuNativeView: React.ComponentType<NativeMenuProps> = requireNativeView(
@@ -59,6 +59,13 @@ export interface DropdownMenuProps {
    */
   shadowElevation?: number;
 
+  /**
+   * Properties for the popup window of the dropdown menu.
+   *
+   * @platform android
+   */
+  properties?: PopupProperties;
+
   /**
    * Optional styles to apply to the `DropdownMenu`.
    */
@@ -76,6 +83,7 @@ type NativeMenuProps = {
   color?: ColorValue;
   cornerRadius?: number;
   shadowElevation?: number;
+  properties?: PopupProperties;
   style?: StyleProp<ViewStyle>;
   modifiers?: ModifierConfig[];
   children?: ReactNode;
@@ -129,3 +137,6 @@ DropdownMenu.Items = Items;
 
 export { DropdownMenu };
 export { DropdownMenuItem } from './DropdownMenuItem';
+
+// Re-exported so the docs generator includes PopupProperties on the DropdownMenu API page.
+export type { PopupProperties };

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

@@ -9,6 +9,7 @@ import {
   useColorScheme as useRNColorScheme,
 } from 'react-native';
 
+import { NativeTreeContext, useWarnIfNestedHost } from '../../NativeTreeContext';
 import { TextInputHostProvider, useTextInputHostRef } from '../../keyboard';
 import { useMergeRefs } from '../../utils/useMergeRefs';
 import { getMaterialColors, HostPaletteContext } from '../colors';
@@ -93,6 +94,7 @@ export function Host(props: HostProps) {
     colorScheme,
     seedColor,
     ref,
+    children,
     ...restProps
   } = props;
   const schemeString = colorScheme === 'light' || colorScheme === 'dark' ? colorScheme : undefined;
@@ -105,6 +107,7 @@ export function Host(props: HostProps) {
   );
   const hostRef = useTextInputHostRef();
   const mergedRef = useMergeRefs(ref, hostRef);
+  useWarnIfNestedHost('Jetpack Compose');
 
   return (
     <HostPaletteContext.Provider value={palette}>
@@ -124,8 +127,9 @@ export function Host(props: HostProps) {
           layoutDirection={
             layoutDirection ?? (I18nManager.getConstants().isRTL ? 'rightToLeft' : 'leftToRight')
           }
-          ref={mergedRef}
-        />
+          ref={mergedRef}>
+          <NativeTreeContext.Provider value>{children}</NativeTreeContext.Provider>
+        </HostNativeView>
       </TextInputHostProvider>
     </HostPaletteContext.Provider>
   );

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

@@ -2,6 +2,7 @@ import { requireNativeView } from 'expo';
 import type { ReactElement, ComponentType } from 'react';
 import type { LayoutChangeEvent } from 'react-native';
 
+import { NativeTreeContext } from '../../NativeTreeContext';
 import { PresentedContentContext, useIsPresentedInOwnWindow } from '../../PresentedContentContext';
 import type { ModifierConfig } from '../../types';
 import { resolveMatchContents } from '../../utils/matchContents';
@@ -80,7 +81,8 @@ export function RNHostView(props: RNHostProps) {
       key={`${nativeProps.matchContentsHorizontal}-${nativeProps.matchContentsVertical}`}>
       {/* Reset context here so only nearest RNHostView becomes the layout root for its children, and not any other RNHostView above it in the tree. */}
       <PresentedContentContext.Provider value={false}>
-        {props.children}
+        {/* Hosted children are React Native views again, so a `Host` among them is not nested. */}
+        <NativeTreeContext.Provider value={false}>{props.children}</NativeTreeContext.Provider>
       </PresentedContentContext.Provider>
     </NativeRNHostView>
   );

package/src/swift-ui/Chart/index.tsx

@@ -102,6 +102,16 @@ export type PieChartStyle = {
    * Space between slices in points.
    */
   angularInset?: number;
+  /**
+   * Corner radius of each slice in points. On a donut, half the ring's thickness gives fully rounded ends.
+   * @default 0
+   */
+  cornerRadius?: number;
+  /**
+   * Opacity of each slice, from 0 to 1.
+   * @default 0.8
+   */
+  opacity?: number;
 };
 
 /**

package/src/swift-ui/Host/index.tsx

@@ -2,6 +2,7 @@ import { requireNativeView } from 'expo';
 import type { Ref } from 'react';
 import { I18nManager, type ColorValue, type StyleProp, type ViewStyle } from 'react-native';
 
+import { NativeTreeContext, useWarnIfNestedHost } from '../../NativeTreeContext';
 import { TextInputHostProvider, useTextInputHostRef } from '../../keyboard';
 import { useMergeRefs } from '../../utils/useMergeRefs';
 import { createViewModifierEventListener } from '../modifiers/utils';
@@ -81,10 +82,12 @@ export function Host(props: HostProps) {
     layoutDirection,
     seedColor,
     ref,
+    children,
     ...restProps
   } = props;
   const hostRef = useTextInputHostRef();
   const mergedRef = useMergeRefs(ref, hostRef);
+  useWarnIfNestedHost('SwiftUI');
 
   return (
     <TextInputHostProvider hostRef={hostRef}>
@@ -104,8 +107,9 @@ export function Host(props: HostProps) {
         ignoreSafeArea={ignoreSafeArea}
         seedColor={seedColor}
         {...restProps}
-        ref={mergedRef}
-      />
+        ref={mergedRef}>
+        <NativeTreeContext.Provider value>{children}</NativeTreeContext.Provider>
+      </HostNativeView>
     </TextInputHostProvider>
   );
 }

package/src/swift-ui/RNHostView.tsx

@@ -1,6 +1,7 @@
 import { requireNativeView } from 'expo';
 import type { LayoutChangeEvent } from 'react-native';
 
+import { NativeTreeContext } from '../NativeTreeContext';
 import { PresentedContentContext, useIsPresentedInOwnWindow } from '../PresentedContentContext';
 import { resolveMatchContents } from '../utils/matchContents';
 
@@ -45,7 +46,8 @@ export function RNHostView({ matchContents, ...props }: RNHostViewProps) {
       key={`${matchContentsHorizontal}-${matchContentsVertical}`}>
       {/* Reset context here so only nearest RNHostView becomes the layout root for its children, and not any other RNHostView above it in the tree. */}
       <PresentedContentContext.Provider value={false}>
-        {props.children}
+        {/* Hosted children are React Native views again, so a `Host` among them is not nested. */}
+        <NativeTreeContext.Provider value={false}>{props.children}</NativeTreeContext.Provider>
       </PresentedContentContext.Provider>
     </RNHostNativeView>
   );

package/src/swift-ui/modifiers/presentationModifiers.ts

@@ -130,12 +130,28 @@ export const interactiveDismissDisabled = (isDisabled: boolean = true) =>
  */
 export type PresentationSizingType = 'automatic' | 'fitted' | 'form' | 'page';
 
+/**
+ * Options for the `presentationSizing` modifier.
+ */
+export type PresentationSizingOptions = {
+  /**
+   * The axes on which the sheet fits its content. An axis that is not set keeps the size from
+   * `sizing`. For example, `{ horizontal: false, vertical: true }` fits the height to the content
+   * and lets the system choose the width.
+   * @see Official [SwiftUI documentation](https://developer.apple.com/documentation/swiftui/presentationsizing/fitted(horizontal:vertical:)).
+   */
+  fitted?: { horizontal?: boolean; vertical?: boolean };
+};
+
 /**
  * Sets the sizing of a sheet presentation.
  * @param sizing - The sizing behavior to apply.
+ * @param options - Additional sizing options.
  * @platform ios 18.0+
  * @platform tvos 18.0+
  * @see Official [SwiftUI documentation](https://developer.apple.com/documentation/swiftui/view/presentationsizing(_:)).
  */
-export const presentationSizing = (sizing: PresentationSizingType) =>
-  createModifier('presentationSizing', { sizing });
+export const presentationSizing = (
+  sizing: PresentationSizingType,
+  options?: PresentationSizingOptions
+) => createModifier('presentationSizing', { sizing, ...options });

package/src/types.ts

@@ -50,3 +50,31 @@ export type DialogProperties = {
    */
   decorFitsSystemWindows?: boolean;
 };
+
+/**
+ * Properties for the popup window, matching `PopupProperties` in Compose.
+ */
+export type PopupProperties = {
+  /**
+   * Whether the popup is focusable. When `true`, the popup receives IME events and key presses,
+   * such as the back button.
+   * @default true
+   */
+  focusable?: boolean;
+  /**
+   * Whether the popup can be dismissed by pressing the back button. Has no effect when `focusable` is `false`.
+   * @default true
+   */
+  dismissOnBackPress?: boolean;
+  /**
+   * Whether the popup can be dismissed by clicking outside of its bounds.
+   * @default true
+   */
+  dismissOnClickOutside?: boolean;
+  /**
+   * Whether the popup window is clipped to the screen boundaries. Set to `false` to let it extend
+   * beyond them, which positions the popup accurately.
+   * @default true
+   */
+  clippingEnabled?: boolean;
+};

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

@@ -7,6 +7,7 @@ import {
 } from '@expo/ui/jetpack-compose/modifiers';
 import { useEffect, useRef, useState } from 'react';
 
+import { useIsInsideNativeTree } from '../../NativeTreeContext';
 import type { BottomSheetProps, SnapPoint } from './types';
 import { resolveContentPadding } from './utils';
 
@@ -46,6 +47,7 @@ export function BottomSheet({
   containerColor,
   contentColor,
 }: BottomSheetProps) {
+  const isInsideHost = useIsInsideNativeTree();
   const sheetRef = useRef<ModalBottomSheetRef>(null);
   const [mount, setMount] = useState(isPresented);
 
@@ -79,20 +81,29 @@ export function BottomSheet({
   if (shouldFillMaxHeight(snapPoints)) contentModifiers.push(fillMaxHeight());
   if (testID) contentModifiers.push(testIDModifier(testID));
 
+  const sheet = (
+    <ModalBottomSheet
+      ref={sheetRef}
+      onDismissRequest={onDismiss}
+      showDragHandle={showDragIndicator}
+      skipPartiallyExpanded={shouldSkipPartiallyExpanded(snapPoints)}
+      properties={{ shouldDismissOnBackPress, shouldDismissOnClickOutside }}
+      scrimColor={scrimColor}
+      containerColor={containerColor}
+      contentColor={contentColor}
+      modifiers={modifiers}>
+      <Column modifiers={contentModifiers}>{children}</Column>
+    </ModalBottomSheet>
+  );
+
+  // Already inside a `Host`, for example nested in another sheet's content: a `Host` of its own
+  // would be a `Host` directly inside Compose.
+  if (isInsideHost) {
+    return sheet;
+  }
   return (
     <Host style={{ position: 'absolute' }} pointerEvents="none">
-      <ModalBottomSheet
-        ref={sheetRef}
-        onDismissRequest={onDismiss}
-        showDragHandle={showDragIndicator}
-        skipPartiallyExpanded={shouldSkipPartiallyExpanded(snapPoints)}
-        properties={{ shouldDismissOnBackPress, shouldDismissOnClickOutside }}
-        scrimColor={scrimColor}
-        containerColor={containerColor}
-        contentColor={contentColor}
-        modifiers={modifiers}>
-        <Column modifiers={contentModifiers}>{children}</Column>
-      </ModalBottomSheet>
+      {sheet}
     </Host>
   );
 }

package/src/universal/BottomSheet/index.ios.tsx

@@ -9,6 +9,7 @@ import {
   type PresentationDetent,
 } from '@expo/ui/swift-ui/modifiers';
 
+import { useIsInsideNativeTree } from '../../NativeTreeContext';
 import type { BottomSheetProps, SnapPoint } from './types';
 import { resolveContentPadding } from './utils';
 
@@ -29,6 +30,7 @@ export function BottomSheet({
   contentPadding,
   containerColor,
 }: BottomSheetProps) {
+  const isInsideHost = useIsInsideNativeTree();
   const { top, bottom, left, right } = resolveContentPadding(contentPadding, {
     top: 16,
     bottom: 0,
@@ -50,17 +52,26 @@ export function BottomSheet({
     presentationModifiers.push(...modifiers);
   }
 
+  const sheet = (
+    <SwiftUIBottomSheet
+      isPresented={isPresented}
+      onIsPresentedChange={(presented) => {
+        if (!presented) onDismiss();
+      }}
+      fitToContents={!snapPoints || snapPoints.length === 0}
+      testID={testID}>
+      <Group modifiers={presentationModifiers}>{children}</Group>
+    </SwiftUIBottomSheet>
+  );
+
+  // Already inside a `Host`, for example nested in another sheet's content: a `Host` of its own
+  // would be a `Host` directly inside SwiftUI.
+  if (isInsideHost) {
+    return sheet;
+  }
   return (
     <Host style={{ position: 'absolute' }} pointerEvents="none">
-      <SwiftUIBottomSheet
-        isPresented={isPresented}
-        onIsPresentedChange={(presented) => {
-          if (!presented) onDismiss();
-        }}
-        fitToContents={!snapPoints || snapPoints.length === 0}
-        testID={testID}>
-        <Group modifiers={presentationModifiers}>{children}</Group>
-      </SwiftUIBottomSheet>
+      {sheet}
     </Host>
   );
 }

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

@@ -1 +0,0 @@
-2ea3d659cdac9ba8f6d43d9679a48905

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

@@ -1 +0,0 @@
-584c7a2ab4d40b05b4658c93c1a689ce0587dc06

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

@@ -1 +0,0 @@
-651218fb79e50f51035a06d7e88ef8cd9cd391f8b66edcf46abdc431f0a41cfc

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

@@ -1 +0,0 @@
-5569d8f73d7b0d41af8d77ca8cb4e8685384113a45e151b9c6cdad1b660844183067026b2fc16c150ac409a0a097fb4ac78c4f5c31afe56862f306f8daf7c538

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

@@ -1 +0,0 @@
-620eb66ce22bd9cd4c1e0a0c6c0812f1

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

@@ -1 +0,0 @@
-019221c48e7c0648984cb5603c4927d391a241cd

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

@@ -1 +0,0 @@
-85ad13c4695409acef3dad5a8fd8cb6cbd472bcf2ac7d6514b3f0e9fd3b3d590

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

@@ -1 +0,0 @@
-a96d874afa65f7edf884a6b9ea0d01b7d2eb2f1aeb86db4afaaeefa6073f153f29cafe8a1ce8ae9c8c6069cfe8534197add3dba900e350e381598cf3e76e8c79

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

@@ -1 +0,0 @@
-fc251634bb3745225f5169f231131343

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

@@ -1 +0,0 @@
-1f0478b4c8bf3bc52458f429fc59e10278b2ac2c

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

@@ -1 +0,0 @@
-baecdb10cef2e99a106a69d8d1755408faeb3f7f7442966d5e3dbcbfe6e26674

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

@@ -1 +0,0 @@
-85d71daab274f7e80382dda25bb4fb673bb5d058b58b2f8c6e28cf39f4ff349c9809182bfce05a5395311f2ddf0dd31a830372c49445aaca933908c1327c91ca

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

@@ -1 +0,0 @@
-223bfc33e7ee51c3db838076f94cfb1f

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

@@ -1 +0,0 @@
-a9a1e9a3be5d9cd7679f76f857b875155c2bb756

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

@@ -1 +0,0 @@
-64dbcdae5d503a5245fae1cd35a5a4821daa772a7010e1b76b2fc5bc7fbc5b16

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

@@ -1 +0,0 @@
-074cbafb601c2b44e22ddc7b09f878b4b98ea71a877ff50c93eab6f7d9c8c18d7629b7fb5e044f9f4d61ef7599e06e9ffdb9d312bae0c4e6d8031eefbfaee45f