@expo/ui 58.0.15 → 58.0.16

package/build/swift-ui/Host/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["swift-ui/Host/index.tsx"],"sourcesContent":[null],"names":["requireNativeView","I18nManager","TextInputHostProvider","useTextInputHostRef","useMergeRefs","createViewModifierEventListener","HostNativeView","Host","props","matchContents","onLayoutContent","ignoreSafeArea","modifiers","layoutDirection","seedColor","ref","restProps","hostRef","mergedRef","undefined","matchContentsVertical","vertical","matchContentsHorizontal","horizontal","getConstants","isRTL"],"mappings":";AAAA,SAASA,iBAAiB,QAAQ,OAAO;AAEzC,SAASC,WAAW,QAAyD,eAAe;AAE5F,SAASC,qBAAqB,EAAEC,mBAAmB,QAAQ,iBAAiB;AAC5E,SAASC,YAAY,QAAQ,2BAA2B;AACxD,SAASC,+BAA+B,QAAQ,qBAAqB;AAyDrE,MAAMC,iBAMFN,kBAAkB,UAAU;AAEhC;;CAEC,GACD,OAAO,SAASO,KAAKC,KAAgB;IACnC,MAAM,EACJC,aAAa,EACbC,eAAe,EACfC,cAAc,EACdC,SAAS,EACTC,eAAe,EACfC,SAAS,EACTC,GAAG,EACH,GAAGC,WACJ,GAAGR;IACJ,MAAMS,UAAUd;IAChB,MAAMe,YAAYd,aAAaW,KAAKE;IAEpC,qBACE,KAACf;QAAsBe,SAASA;kBAC9B,cAAA,KAACX;YACCM,WAAWA;YACV,GAAIA,YAAYP,gCAAgCO,aAAaO,SAAS;YACvEC,uBACE,OAAOX,kBAAkB,WAAWA,cAAcY,QAAQ,GAAGZ;YAE/Da,yBACE,OAAOb,kBAAkB,WAAWA,cAAcc,UAAU,GAAGd;YAEjEC,iBAAiBA;YACjBG,iBACEA,mBAAoBZ,CAAAA,YAAYuB,YAAY,GAAGC,KAAK,GAAG,gBAAgB,aAAY;YAErFd,gBAAgBA;YAChBG,WAAWA;YACV,GAAGE,SAAS;YACbD,KAAKG;;;AAIb"}
+{"version":3,"sources":["swift-ui/Host/index.tsx"],"sourcesContent":[null],"names":["requireNativeView","I18nManager","NativeTreeContext","useWarnIfNestedHost","TextInputHostProvider","useTextInputHostRef","useMergeRefs","createViewModifierEventListener","HostNativeView","Host","props","matchContents","onLayoutContent","ignoreSafeArea","modifiers","layoutDirection","seedColor","ref","children","restProps","hostRef","mergedRef","undefined","matchContentsVertical","vertical","matchContentsHorizontal","horizontal","getConstants","isRTL","Provider","value"],"mappings":";AAAA,SAASA,iBAAiB,QAAQ,OAAO;AAEzC,SAASC,WAAW,QAAyD,eAAe;AAE5F,SAASC,iBAAiB,EAAEC,mBAAmB,QAAQ,0BAA0B;AACjF,SAASC,qBAAqB,EAAEC,mBAAmB,QAAQ,iBAAiB;AAC5E,SAASC,YAAY,QAAQ,2BAA2B;AACxD,SAASC,+BAA+B,QAAQ,qBAAqB;AAyDrE,MAAMC,iBAMFR,kBAAkB,UAAU;AAEhC;;CAEC,GACD,OAAO,SAASS,KAAKC,KAAgB;IACnC,MAAM,EACJC,aAAa,EACbC,eAAe,EACfC,cAAc,EACdC,SAAS,EACTC,eAAe,EACfC,SAAS,EACTC,GAAG,EACHC,QAAQ,EACR,GAAGC,WACJ,GAAGT;IACJ,MAAMU,UAAUf;IAChB,MAAMgB,YAAYf,aAAaW,KAAKG;IACpCjB,oBAAoB;IAEpB,qBACE,KAACC;QAAsBgB,SAASA;kBAC9B,cAAA,KAACZ;YACCM,WAAWA;YACV,GAAIA,YAAYP,gCAAgCO,aAAaQ,SAAS;YACvEC,uBACE,OAAOZ,kBAAkB,WAAWA,cAAca,QAAQ,GAAGb;YAE/Dc,yBACE,OAAOd,kBAAkB,WAAWA,cAAce,UAAU,GAAGf;YAEjEC,iBAAiBA;YACjBG,iBACEA,mBAAoBd,CAAAA,YAAY0B,YAAY,GAAGC,KAAK,GAAG,gBAAgB,aAAY;YAErFf,gBAAgBA;YAChBG,WAAWA;YACV,GAAGG,SAAS;YACbF,KAAKI;sBACL,cAAA,KAACnB,kBAAkB2B,QAAQ;gBAACC,KAAK;0BAAEZ;;;;AAI3C"}

package/build/swift-ui/RNHostView.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createElement as _createElement } from "react";
 import { requireNativeView } from 'expo';
+import { NativeTreeContext } from '../NativeTreeContext';
 import { PresentedContentContext, useIsPresentedInOwnWindow } from '../PresentedContentContext';
 import { resolveMatchContents } from '../utils/matchContents';
 const RNHostNativeView = requireNativeView('ExpoUI', 'RNHostView');
@@ -22,7 +23,10 @@ export function RNHostView({ matchContents, ...props }) {
         key: `${matchContentsHorizontal}-${matchContentsVertical}`
     }, /*#__PURE__*/ _jsx(PresentedContentContext.Provider, {
         value: false,
-        children: props.children
+        children: /*#__PURE__*/ _jsx(NativeTreeContext.Provider, {
+            value: false,
+            children: props.children
+        })
     }));
 }
 

package/build/swift-ui/RNHostView.js.map

@@ -1 +1 @@
-{"version":3,"sources":["swift-ui/RNHostView.tsx"],"sourcesContent":[null],"names":["requireNativeView","PresentedContentContext","useIsPresentedInOwnWindow","resolveMatchContents","RNHostNativeView","RNHostView","matchContents","props","layoutRoot","horizontal","matchContentsHorizontal","vertical","matchContentsVertical","expoInternalSizeFromChildren","key","Provider","value","children"],"mappings":";;AAAA,SAASA,iBAAiB,QAAQ,OAAO;AAGzC,SAASC,uBAAuB,EAAEC,yBAAyB,QAAQ,6BAA6B;AAChG,SAASC,oBAAoB,QAAQ,yBAAyB;AAE9D,MAAMC,mBAA6CJ,kBAAkB,UAAU;AAoB/E,OAAO,SAASK,WAAW,EAAEC,aAAa,EAAE,GAAGC,OAAwB;IACrE,6FAA6F;IAC7F,sEAAsE;IACtE,4FAA4F;IAC5F,0BAA0B;IAC1B,MAAMC,aAAaN;IACnB,MAAM,EAAEO,YAAYC,uBAAuB,EAAEC,UAAUC,qBAAqB,EAAE,GAC5ET,qBAAqBG;IAEvB,qBACE,eAACF;QACE,GAAGG,KAAK;QACTC,YAAYA;QACZE,yBAAyBA;QACzBE,uBAAuBA;QACvBC,8BAA8BH,2BAA2BE;QACzD,iDAAiD;QACjD,mEAAmE;QACnEE,KAAK,GAAGJ,wBAAwB,CAAC,EAAEE,uBAAuB;qBAE1D,KAACX,wBAAwBc,QAAQ;QAACC,OAAO;kBACtCT,MAAMU,QAAQ;;AAIvB"}
+{"version":3,"sources":["swift-ui/RNHostView.tsx"],"sourcesContent":[null],"names":["requireNativeView","NativeTreeContext","PresentedContentContext","useIsPresentedInOwnWindow","resolveMatchContents","RNHostNativeView","RNHostView","matchContents","props","layoutRoot","horizontal","matchContentsHorizontal","vertical","matchContentsVertical","expoInternalSizeFromChildren","key","Provider","value","children"],"mappings":";;AAAA,SAASA,iBAAiB,QAAQ,OAAO;AAGzC,SAASC,iBAAiB,QAAQ,uBAAuB;AACzD,SAASC,uBAAuB,EAAEC,yBAAyB,QAAQ,6BAA6B;AAChG,SAASC,oBAAoB,QAAQ,yBAAyB;AAE9D,MAAMC,mBAA6CL,kBAAkB,UAAU;AAoB/E,OAAO,SAASM,WAAW,EAAEC,aAAa,EAAE,GAAGC,OAAwB;IACrE,6FAA6F;IAC7F,sEAAsE;IACtE,4FAA4F;IAC5F,0BAA0B;IAC1B,MAAMC,aAAaN;IACnB,MAAM,EAAEO,YAAYC,uBAAuB,EAAEC,UAAUC,qBAAqB,EAAE,GAC5ET,qBAAqBG;IAEvB,qBACE,eAACF;QACE,GAAGG,KAAK;QACTC,YAAYA;QACZE,yBAAyBA;QACzBE,uBAAuBA;QACvBC,8BAA8BH,2BAA2BE;QACzD,iDAAiD;QACjD,mEAAmE;QACnEE,KAAK,GAAGJ,wBAAwB,CAAC,EAAEE,uBAAuB;qBAE1D,KAACX,wBAAwBc,QAAQ;QAACC,OAAO;kBAEvC,cAAA,KAAChB,kBAAkBe,QAAQ;YAACC,OAAO;sBAAQT,MAAMU,QAAQ;;;AAIjE"}

package/build/swift-ui/modifiers/presentationModifiers.d.ts

@@ -87,11 +87,27 @@ export declare const interactiveDismissDisabled: (isDisabled?: boolean) => Modif
  * sheets remain edge-attached and detents drive the height.
  */
 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 declare const presentationSizing: (sizing: PresentationSizingType) => ModifierConfig;
+export declare const presentationSizing: (sizing: PresentationSizingType, options?: PresentationSizingOptions) => ModifierConfig;

package/build/swift-ui/modifiers/presentationModifiers.js

@@ -81,11 +81,13 @@ documentation](https://developer.apple.com/documentation/swiftui/view/presentati
 /**
  * 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)=>createModifier('presentationSizing', {
-        sizing
+ */ export const presentationSizing = (sizing, options)=>createModifier('presentationSizing', {
+        sizing,
+        ...options
     });
 
 //# sourceMappingURL=presentationModifiers.js.map

package/build/swift-ui/modifiers/presentationModifiers.js.map

@@ -1 +1 @@
-{"version":3,"sources":["swift-ui/modifiers/presentationModifiers.ts"],"sourcesContent":[null],"names":["createModifier","createModifierWithEventListener","resolveShapeStyle","presentationDetents","detents","options","params","selection","onSelectionChange","args","detent","presentationDragIndicator","visibility","presentationCornerRadius","cornerRadius","presentationBackgroundInteraction","interaction","interactionType","presentationBackground","style","interactiveDismissDisabled","isDisabled","presentationSizing","sizing"],"mappings":"AAAA,SACEA,cAAc,EACdC,+BAA+B,QAE1B,mBAAmB;AAC1B,SAASC,iBAAiB,QAAyB,eAAe;AAWlE;;;;;;;;;CASC,GACD,OAAO,MAAMC,sBAAsB,CACjCC,SACAC;IAKA,MAAMC,SAAS;QAAEF;QAASG,WAAWF,SAASE;IAAU;IAExD,MAAM,EAAEC,iBAAiB,EAAE,GAAGH,WAAW,CAAC;IAC1C,IAAIG,mBAAmB;QACrB,OAAOP,gCACL,uBACA,CAACQ;YACCD,kBAAkBC,KAAKC,MAAM;QAC/B,GACAJ;IAEJ;IAEA,OAAON,eAAe,uBAAuBM;AAC/C,EAAE;AAEF;;;;;;CAMC,GACD,OAAO,MAAMK,4BAA4B,CAACC,aACxCZ,eAAe,6BAA6B;QAAEY;IAAW,GAAG;AAE9D;;;;;;CAMC,GACD,OAAO,MAAMC,2BAA2B,CAACC,eACvCd,eAAe,4BAA4B;QAAEc;IAAa,GAAG;AAW/D;;;;;;CAMC,GACD,OAAO,MAAMC,oCAAoC,CAC/CC;IAEA,IAAI,OAAOA,gBAAgB,UAAU;QACnC,OAAOhB,eAAe,qCAAqC;YAAEiB,iBAAiBD;QAAY;IAC5F;IACA,OAAOhB,eAAe,qCAAqC;QACzDiB,iBAAiB;QACjBP,QAAQM,YAAYN,MAAM;IAC5B;AACF,EAAE;AAEF;;;;;;;;;;;CAWC,GACD,OAAO,MAAMQ,yBAAyB,CAACC,QACrCnB,eAAe,0BAA0B;QAAEmB,OAAOjB,kBAAkBiB;IAAO,GAAG;AAEhF;;;;CAIC,GACD,OAAO,MAAMC,6BAA6B,CAACC,aAAsB,IAAI,GACnErB,eAAe,8BAA8B;QAAEqB;IAAW,GAAG;AAc/D;;;;;;CAMC,GACD,OAAO,MAAMC,qBAAqB,CAACC,SACjCvB,eAAe,sBAAsB;QAAEuB;IAAO,GAAG"}
+{"version":3,"sources":["swift-ui/modifiers/presentationModifiers.ts"],"sourcesContent":[null],"names":["createModifier","createModifierWithEventListener","resolveShapeStyle","presentationDetents","detents","options","params","selection","onSelectionChange","args","detent","presentationDragIndicator","visibility","presentationCornerRadius","cornerRadius","presentationBackgroundInteraction","interaction","interactionType","presentationBackground","style","interactiveDismissDisabled","isDisabled","presentationSizing","sizing"],"mappings":"AAAA,SACEA,cAAc,EACdC,+BAA+B,QAE1B,mBAAmB;AAC1B,SAASC,iBAAiB,QAAyB,eAAe;AAWlE;;;;;;;;;CASC,GACD,OAAO,MAAMC,sBAAsB,CACjCC,SACAC;IAKA,MAAMC,SAAS;QAAEF;QAASG,WAAWF,SAASE;IAAU;IAExD,MAAM,EAAEC,iBAAiB,EAAE,GAAGH,WAAW,CAAC;IAC1C,IAAIG,mBAAmB;QACrB,OAAOP,gCACL,uBACA,CAACQ;YACCD,kBAAkBC,KAAKC,MAAM;QAC/B,GACAJ;IAEJ;IAEA,OAAON,eAAe,uBAAuBM;AAC/C,EAAE;AAEF;;;;;;CAMC,GACD,OAAO,MAAMK,4BAA4B,CAACC,aACxCZ,eAAe,6BAA6B;QAAEY;IAAW,GAAG;AAE9D;;;;;;CAMC,GACD,OAAO,MAAMC,2BAA2B,CAACC,eACvCd,eAAe,4BAA4B;QAAEc;IAAa,GAAG;AAW/D;;;;;;CAMC,GACD,OAAO,MAAMC,oCAAoC,CAC/CC;IAEA,IAAI,OAAOA,gBAAgB,UAAU;QACnC,OAAOhB,eAAe,qCAAqC;YAAEiB,iBAAiBD;QAAY;IAC5F;IACA,OAAOhB,eAAe,qCAAqC;QACzDiB,iBAAiB;QACjBP,QAAQM,YAAYN,MAAM;IAC5B;AACF,EAAE;AAEF;;;;;;;;;;;CAWC,GACD,OAAO,MAAMQ,yBAAyB,CAACC,QACrCnB,eAAe,0BAA0B;QAAEmB,OAAOjB,kBAAkBiB;IAAO,GAAG;AAEhF;;;;CAIC,GACD,OAAO,MAAMC,6BAA6B,CAACC,aAAsB,IAAI,GACnErB,eAAe,8BAA8B;QAAEqB;IAAW,GAAG;AA2B/D;;;;;;;CAOC,GACD,OAAO,MAAMC,qBAAqB,CAChCC,QACAlB,UACGL,eAAe,sBAAsB;QAAEuB;QAAQ,GAAGlB,OAAO;IAAC,GAAG"}

package/build/types.d.ts

@@ -44,3 +44,30 @@ 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/build/types.js

@@ -1,7 +1,7 @@
 /**
  * @hidden
  */ /**
- * Properties for the dialog window, matching `DialogProperties` in Compose.
+ * Properties for the popup window, matching `PopupProperties` in Compose.
  */ export { };
 
 //# sourceMappingURL=types.js.map

package/build/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["types.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;;CAEC,GAwBD;;CAEC,GACD,WAsBE"}
+{"version":3,"sources":["types.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;;CAEC,GAmDD;;CAEC,GACD,WAuBE"}

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

@@ -2,6 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { Column, Host, ModalBottomSheet } from '@expo/ui/jetpack-compose';
 import { fillMaxHeight, padding, testID as testIDModifier } from '@expo/ui/jetpack-compose/modifiers';
 import { useEffect, useRef, useState } from 'react';
+import { useIsInsideNativeTree } from '../../NativeTreeContext';
 import { resolveContentPadding } from './utils';
 // M3 `ModalBottomSheet` only has partial/expanded states.
 // Only allow the partial state when the consumer requested a partial-friendly snap point.
@@ -16,6 +17,7 @@ function shouldFillMaxHeight(snapPoints) {
     return snapPoints.some((sp)=>sp === 'full' || typeof sp === 'object' && 'fraction' in sp && sp.fraction >= 1);
 }
 export function BottomSheet({ children, isPresented, onDismiss, showDragIndicator = true, snapPoints, testID, modifiers, shouldDismissOnBackPress = true, shouldDismissOnClickOutside = true, scrimColor, contentPadding, containerColor, contentColor }) {
+    const isInsideHost = useIsInsideNativeTree();
     const sheetRef = useRef(null);
     const [mount, setMount] = useState(isPresented);
     useEffect(()=>{
@@ -49,29 +51,35 @@ export function BottomSheet({ children, isPresented, onDismiss, showDragIndicato
     ];
     if (shouldFillMaxHeight(snapPoints)) contentModifiers.push(fillMaxHeight());
     if (testID) contentModifiers.push(testIDModifier(testID));
+    const sheet = /*#__PURE__*/ _jsx(ModalBottomSheet, {
+        ref: sheetRef,
+        onDismissRequest: onDismiss,
+        showDragHandle: showDragIndicator,
+        skipPartiallyExpanded: shouldSkipPartiallyExpanded(snapPoints),
+        properties: {
+            shouldDismissOnBackPress,
+            shouldDismissOnClickOutside
+        },
+        scrimColor: scrimColor,
+        containerColor: containerColor,
+        contentColor: contentColor,
+        modifiers: modifiers,
+        children: /*#__PURE__*/ _jsx(Column, {
+            modifiers: contentModifiers,
+            children: children
+        })
+    });
+    // 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 /*#__PURE__*/ _jsx(Host, {
         style: {
             position: 'absolute'
         },
         pointerEvents: "none",
-        children: /*#__PURE__*/ _jsx(ModalBottomSheet, {
-            ref: sheetRef,
-            onDismissRequest: onDismiss,
-            showDragHandle: showDragIndicator,
-            skipPartiallyExpanded: shouldSkipPartiallyExpanded(snapPoints),
-            properties: {
-                shouldDismissOnBackPress,
-                shouldDismissOnClickOutside
-            },
-            scrimColor: scrimColor,
-            containerColor: containerColor,
-            contentColor: contentColor,
-            modifiers: modifiers,
-            children: /*#__PURE__*/ _jsx(Column, {
-                modifiers: contentModifiers,
-                children: children
-            })
-        })
+        children: sheet
     });
 }
 export * from './types';

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

@@ -1 +1 @@
-{"version":3,"sources":["universal/BottomSheet/index.android.tsx"],"sourcesContent":[null],"names":["Column","Host","ModalBottomSheet","fillMaxHeight","padding","testID","testIDModifier","useEffect","useRef","useState","resolveContentPadding","shouldSkipPartiallyExpanded","snapPoints","length","some","sp","fraction","shouldFillMaxHeight","BottomSheet","children","isPresented","onDismiss","showDragIndicator","modifiers","shouldDismissOnBackPress","shouldDismissOnClickOutside","scrimColor","contentPadding","containerColor","contentColor","sheetRef","mount","setMount","cancelled","current","hide","then","top","bottom","left","right","contentModifiers","push","style","position","pointerEvents","ref","onDismissRequest","showDragHandle","skipPartiallyExpanded","properties"],"mappings":";AAAA,SAASA,MAAM,EAAEC,IAAI,EAAEC,gBAAgB,QAAkC,2BAA2B;AACpG,SACEC,aAAa,EACbC,OAAO,EACPC,UAAUC,cAAc,QAEnB,qCAAqC;AAC5C,SAASC,SAAS,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,QAAQ;AAGpD,SAASC,qBAAqB,QAAQ,UAAU;AAEhD,0DAA0D;AAC1D,0FAA0F;AAC1F,SAASC,4BAA4BC,UAAmC;IACtE,IAAI,CAACA,cAAcA,WAAWC,MAAM,KAAK,GAAG,OAAO;IACnD,OAAO,CAACD,WAAWE,IAAI,CACrB,CAACC,KACCA,OAAO,UACN,OAAOA,OAAO,YAAY,cAAcA,MAAMA,GAAGC,QAAQ,GAAG,KAC5D,OAAOD,OAAO,YAAY,YAAYA;AAE7C;AAEA,wCAAwC;AACxC,uGAAuG;AACvG,SAASE,oBAAoBL,UAAmC;IAC9D,IAAI,CAACA,cAAcA,WAAWC,MAAM,KAAK,GAAG,OAAO;IACnD,OAAOD,WAAWE,IAAI,CACpB,CAACC,KAAOA,OAAO,UAAW,OAAOA,OAAO,YAAY,cAAcA,MAAMA,GAAGC,QAAQ,IAAI;AAE3F;AAEA,OAAO,SAASE,YAAY,EAC1BC,QAAQ,EACRC,WAAW,EACXC,SAAS,EACTC,oBAAoB,IAAI,EACxBV,UAAU,EACVP,MAAM,EACNkB,SAAS,EACTC,2BAA2B,IAAI,EAC/BC,8BAA8B,IAAI,EAClCC,UAAU,EACVC,cAAc,EACdC,cAAc,EACdC,YAAY,EACK;IACjB,MAAMC,WAAWtB,OAA4B;IAC7C,MAAM,CAACuB,OAAOC,SAAS,GAAGvB,SAASW;IAEnCb,UAAU;QACR,IAAIa,aAAa;YACfY,SAAS;YACT;QACF;QACA,IAAIC,YAAY;QAChBH,SAASI,OAAO,EAAEC,OAAOC,KAAK;YAC5B,IAAI,CAACH,WAAWD,SAAS;QAC3B;QACA,OAAO;YACLC,YAAY;QACd;IACF,GAAG;QAACb;KAAY;IAEhB,IAAI,CAACW,OAAO;QACV,OAAO;IACT;IAEA,6FAA6F;IAC7F,qCAAqC;IACrC,MAAM,EAAEM,GAAG,EAAEC,MAAM,EAAEC,IAAI,EAAEC,KAAK,EAAE,GAAG9B,sBAAsBiB,gBAAgB;QACzEU,KAAKf,oBAAoB,IAAI;QAC7BgB,QAAQ;QACRC,MAAM;QACNC,OAAO;IACT;IACA,MAAMC,mBAAqC;QAACrC,QAAQmC,MAAMF,KAAKG,OAAOF;KAAQ;IAC9E,IAAIrB,oBAAoBL,aAAa6B,iBAAiBC,IAAI,CAACvC;IAC3D,IAAIE,QAAQoC,iBAAiBC,IAAI,CAACpC,eAAeD;IAEjD,qBACE,KAACJ;QAAK0C,OAAO;YAAEC,UAAU;QAAW;QAAGC,eAAc;kBACnD,cAAA,KAAC3C;YACC4C,KAAKhB;YACLiB,kBAAkB1B;YAClB2B,gBAAgB1B;YAChB2B,uBAAuBtC,4BAA4BC;YACnDsC,YAAY;gBAAE1B;gBAA0BC;YAA4B;YACpEC,YAAYA;YACZE,gBAAgBA;YAChBC,cAAcA;YACdN,WAAWA;sBACX,cAAA,KAACvB;gBAAOuB,WAAWkB;0BAAmBtB;;;;AAI9C;AAEA,cAAc,UAAU"}
+{"version":3,"sources":["universal/BottomSheet/index.android.tsx"],"sourcesContent":[null],"names":["Column","Host","ModalBottomSheet","fillMaxHeight","padding","testID","testIDModifier","useEffect","useRef","useState","useIsInsideNativeTree","resolveContentPadding","shouldSkipPartiallyExpanded","snapPoints","length","some","sp","fraction","shouldFillMaxHeight","BottomSheet","children","isPresented","onDismiss","showDragIndicator","modifiers","shouldDismissOnBackPress","shouldDismissOnClickOutside","scrimColor","contentPadding","containerColor","contentColor","isInsideHost","sheetRef","mount","setMount","cancelled","current","hide","then","top","bottom","left","right","contentModifiers","push","sheet","ref","onDismissRequest","showDragHandle","skipPartiallyExpanded","properties","style","position","pointerEvents"],"mappings":";AAAA,SAASA,MAAM,EAAEC,IAAI,EAAEC,gBAAgB,QAAkC,2BAA2B;AACpG,SACEC,aAAa,EACbC,OAAO,EACPC,UAAUC,cAAc,QAEnB,qCAAqC;AAC5C,SAASC,SAAS,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,QAAQ;AAEpD,SAASC,qBAAqB,QAAQ,0BAA0B;AAEhE,SAASC,qBAAqB,QAAQ,UAAU;AAEhD,0DAA0D;AAC1D,0FAA0F;AAC1F,SAASC,4BAA4BC,UAAmC;IACtE,IAAI,CAACA,cAAcA,WAAWC,MAAM,KAAK,GAAG,OAAO;IACnD,OAAO,CAACD,WAAWE,IAAI,CACrB,CAACC,KACCA,OAAO,UACN,OAAOA,OAAO,YAAY,cAAcA,MAAMA,GAAGC,QAAQ,GAAG,KAC5D,OAAOD,OAAO,YAAY,YAAYA;AAE7C;AAEA,wCAAwC;AACxC,uGAAuG;AACvG,SAASE,oBAAoBL,UAAmC;IAC9D,IAAI,CAACA,cAAcA,WAAWC,MAAM,KAAK,GAAG,OAAO;IACnD,OAAOD,WAAWE,IAAI,CACpB,CAACC,KAAOA,OAAO,UAAW,OAAOA,OAAO,YAAY,cAAcA,MAAMA,GAAGC,QAAQ,IAAI;AAE3F;AAEA,OAAO,SAASE,YAAY,EAC1BC,QAAQ,EACRC,WAAW,EACXC,SAAS,EACTC,oBAAoB,IAAI,EACxBV,UAAU,EACVR,MAAM,EACNmB,SAAS,EACTC,2BAA2B,IAAI,EAC/BC,8BAA8B,IAAI,EAClCC,UAAU,EACVC,cAAc,EACdC,cAAc,EACdC,YAAY,EACK;IACjB,MAAMC,eAAerB;IACrB,MAAMsB,WAAWxB,OAA4B;IAC7C,MAAM,CAACyB,OAAOC,SAAS,GAAGzB,SAASY;IAEnCd,UAAU;QACR,IAAIc,aAAa;YACfa,SAAS;YACT;QACF;QACA,IAAIC,YAAY;QAChBH,SAASI,OAAO,EAAEC,OAAOC,KAAK;YAC5B,IAAI,CAACH,WAAWD,SAAS;QAC3B;QACA,OAAO;YACLC,YAAY;QACd;IACF,GAAG;QAACd;KAAY;IAEhB,IAAI,CAACY,OAAO;QACV,OAAO;IACT;IAEA,6FAA6F;IAC7F,qCAAqC;IACrC,MAAM,EAAEM,GAAG,EAAEC,MAAM,EAAEC,IAAI,EAAEC,KAAK,EAAE,GAAG/B,sBAAsBiB,gBAAgB;QACzEW,KAAKhB,oBAAoB,IAAI;QAC7BiB,QAAQ;QACRC,MAAM;QACNC,OAAO;IACT;IACA,MAAMC,mBAAqC;QAACvC,QAAQqC,MAAMF,KAAKG,OAAOF;KAAQ;IAC9E,IAAItB,oBAAoBL,aAAa8B,iBAAiBC,IAAI,CAACzC;IAC3D,IAAIE,QAAQsC,iBAAiBC,IAAI,CAACtC,eAAeD;IAEjD,MAAMwC,sBACJ,KAAC3C;QACC4C,KAAKd;QACLe,kBAAkBzB;QAClB0B,gBAAgBzB;QAChB0B,uBAAuBrC,4BAA4BC;QACnDqC,YAAY;YAAEzB;YAA0BC;QAA4B;QACpEC,YAAYA;QACZE,gBAAgBA;QAChBC,cAAcA;QACdN,WAAWA;kBACX,cAAA,KAACxB;YAAOwB,WAAWmB;sBAAmBvB;;;IAI1C,8FAA8F;IAC9F,6CAA6C;IAC7C,IAAIW,cAAc;QAChB,OAAOc;IACT;IACA,qBACE,KAAC5C;QAAKkD,OAAO;YAAEC,UAAU;QAAW;QAAGC,eAAc;kBAClDR;;AAGP;AAEA,cAAc,UAAU"}

package/build/universal/BottomSheet/index.ios.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { BottomSheet as SwiftUIBottomSheet, Group, Host } from '@expo/ui/swift-ui';
 import { frame, padding, presentationBackground, presentationDetents, presentationDragIndicator } from '@expo/ui/swift-ui/modifiers';
+import { useIsInsideNativeTree } from '../../NativeTreeContext';
 import { resolveContentPadding } from './utils';
 function snapPointToDetent(snapPoint) {
     if (snapPoint === 'half') return 'medium';
@@ -8,6 +9,7 @@ function snapPointToDetent(snapPoint) {
     return snapPoint;
 }
 export function BottomSheet({ children, isPresented, onDismiss, showDragIndicator = true, snapPoints, testID, modifiers, contentPadding, containerColor }) {
+    const isInsideHost = useIsInsideNativeTree();
     const { top, bottom, left, right } = resolveContentPadding(contentPadding, {
         top: 16,
         bottom: 0,
@@ -36,23 +38,29 @@ export function BottomSheet({ children, isPresented, onDismiss, showDragIndicato
     if (modifiers?.length) {
         presentationModifiers.push(...modifiers);
     }
+    const sheet = /*#__PURE__*/ _jsx(SwiftUIBottomSheet, {
+        isPresented: isPresented,
+        onIsPresentedChange: (presented)=>{
+            if (!presented) onDismiss();
+        },
+        fitToContents: !snapPoints || snapPoints.length === 0,
+        testID: testID,
+        children: /*#__PURE__*/ _jsx(Group, {
+            modifiers: presentationModifiers,
+            children: children
+        })
+    });
+    // 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 /*#__PURE__*/ _jsx(Host, {
         style: {
             position: 'absolute'
         },
         pointerEvents: "none",
-        children: /*#__PURE__*/ _jsx(SwiftUIBottomSheet, {
-            isPresented: isPresented,
-            onIsPresentedChange: (presented)=>{
-                if (!presented) onDismiss();
-            },
-            fitToContents: !snapPoints || snapPoints.length === 0,
-            testID: testID,
-            children: /*#__PURE__*/ _jsx(Group, {
-                modifiers: presentationModifiers,
-                children: children
-            })
-        })
+        children: sheet
     });
 }
 export * from './types';

package/build/universal/BottomSheet/index.ios.js.map

@@ -1 +1 @@
-{"version":3,"sources":["universal/BottomSheet/index.ios.tsx"],"sourcesContent":[null],"names":["BottomSheet","SwiftUIBottomSheet","Group","Host","frame","padding","presentationBackground","presentationDetents","presentationDragIndicator","resolveContentPadding","snapPointToDetent","snapPoint","children","isPresented","onDismiss","showDragIndicator","snapPoints","testID","modifiers","contentPadding","containerColor","top","bottom","left","right","presentationModifiers","maxWidth","Infinity","alignment","leading","trailing","length","push","map","style","position","pointerEvents","onIsPresentedChange","presented","fitToContents"],"mappings":";AAAA,SAASA,eAAeC,kBAAkB,EAAEC,KAAK,EAAEC,IAAI,QAAQ,oBAAoB;AACnF,SACEC,KAAK,EACLC,OAAO,EACPC,sBAAsB,EACtBC,mBAAmB,EACnBC,yBAAyB,QAGpB,8BAA8B;AAGrC,SAASC,qBAAqB,QAAQ,UAAU;AAEhD,SAASC,kBAAkBC,SAAoB;IAC7C,IAAIA,cAAc,QAAQ,OAAO;IACjC,IAAIA,cAAc,QAAQ,OAAO;IACjC,OAAOA;AACT;AAEA,OAAO,SAASX,YAAY,EAC1BY,QAAQ,EACRC,WAAW,EACXC,SAAS,EACTC,oBAAoB,IAAI,EACxBC,UAAU,EACVC,MAAM,EACNC,SAAS,EACTC,cAAc,EACdC,cAAc,EACG;IACjB,MAAM,EAAEC,GAAG,EAAEC,MAAM,EAAEC,IAAI,EAAEC,KAAK,EAAE,GAAGf,sBAAsBU,gBAAgB;QACzEE,KAAK;QACLC,QAAQ;QACRC,MAAM;QACNC,OAAO;IACT;IACA,MAAMC,wBAA0C;QAC9CrB,MAAM;YAAEsB,UAAUC;YAAUC,WAAW;QAAa;QACpDvB,QAAQ;YAAEgB;YAAKC;YAAQO,SAASN;YAAMO,UAAUN;QAAM;QACtDhB,0BAA0BO,oBAAoB,YAAY;KAC3D;IACD,IAAIC,cAAcA,WAAWe,MAAM,GAAG,GAAG;QACvCN,sBAAsBO,IAAI,CAACzB,oBAAoBS,WAAWiB,GAAG,CAACvB;IAChE;IACA,IAAIU,gBAAgB;QAClBK,sBAAsBO,IAAI,CAAC1B,uBAAuBc;IACpD;IACA,IAAIF,WAAWa,QAAQ;QACrBN,sBAAsBO,IAAI,IAAId;IAChC;IAEA,qBACE,KAACf;QAAK+B,OAAO;YAAEC,UAAU;QAAW;QAAGC,eAAc;kBACnD,cAAA,KAACnC;YACCY,aAAaA;YACbwB,qBAAqB,CAACC;gBACpB,IAAI,CAACA,WAAWxB;YAClB;YACAyB,eAAe,CAACvB,cAAcA,WAAWe,MAAM,KAAK;YACpDd,QAAQA;sBACR,cAAA,KAACf;gBAAMgB,WAAWO;0BAAwBb;;;;AAIlD;AAEA,cAAc,UAAU"}
+{"version":3,"sources":["universal/BottomSheet/index.ios.tsx"],"sourcesContent":[null],"names":["BottomSheet","SwiftUIBottomSheet","Group","Host","frame","padding","presentationBackground","presentationDetents","presentationDragIndicator","useIsInsideNativeTree","resolveContentPadding","snapPointToDetent","snapPoint","children","isPresented","onDismiss","showDragIndicator","snapPoints","testID","modifiers","contentPadding","containerColor","isInsideHost","top","bottom","left","right","presentationModifiers","maxWidth","Infinity","alignment","leading","trailing","length","push","map","sheet","onIsPresentedChange","presented","fitToContents","style","position","pointerEvents"],"mappings":";AAAA,SAASA,eAAeC,kBAAkB,EAAEC,KAAK,EAAEC,IAAI,QAAQ,oBAAoB;AACnF,SACEC,KAAK,EACLC,OAAO,EACPC,sBAAsB,EACtBC,mBAAmB,EACnBC,yBAAyB,QAGpB,8BAA8B;AAErC,SAASC,qBAAqB,QAAQ,0BAA0B;AAEhE,SAASC,qBAAqB,QAAQ,UAAU;AAEhD,SAASC,kBAAkBC,SAAoB;IAC7C,IAAIA,cAAc,QAAQ,OAAO;IACjC,IAAIA,cAAc,QAAQ,OAAO;IACjC,OAAOA;AACT;AAEA,OAAO,SAASZ,YAAY,EAC1Ba,QAAQ,EACRC,WAAW,EACXC,SAAS,EACTC,oBAAoB,IAAI,EACxBC,UAAU,EACVC,MAAM,EACNC,SAAS,EACTC,cAAc,EACdC,cAAc,EACG;IACjB,MAAMC,eAAeb;IACrB,MAAM,EAAEc,GAAG,EAAEC,MAAM,EAAEC,IAAI,EAAEC,KAAK,EAAE,GAAGhB,sBAAsBU,gBAAgB;QACzEG,KAAK;QACLC,QAAQ;QACRC,MAAM;QACNC,OAAO;IACT;IACA,MAAMC,wBAA0C;QAC9CvB,MAAM;YAAEwB,UAAUC;YAAUC,WAAW;QAAa;QACpDzB,QAAQ;YAAEkB;YAAKC;YAAQO,SAASN;YAAMO,UAAUN;QAAM;QACtDlB,0BAA0BQ,oBAAoB,YAAY;KAC3D;IACD,IAAIC,cAAcA,WAAWgB,MAAM,GAAG,GAAG;QACvCN,sBAAsBO,IAAI,CAAC3B,oBAAoBU,WAAWkB,GAAG,CAACxB;IAChE;IACA,IAAIU,gBAAgB;QAClBM,sBAAsBO,IAAI,CAAC5B,uBAAuBe;IACpD;IACA,IAAIF,WAAWc,QAAQ;QACrBN,sBAAsBO,IAAI,IAAIf;IAChC;IAEA,MAAMiB,sBACJ,KAACnC;QACCa,aAAaA;QACbuB,qBAAqB,CAACC;YACpB,IAAI,CAACA,WAAWvB;QAClB;QACAwB,eAAe,CAACtB,cAAcA,WAAWgB,MAAM,KAAK;QACpDf,QAAQA;kBACR,cAAA,KAAChB;YAAMiB,WAAWQ;sBAAwBd;;;IAI9C,8FAA8F;IAC9F,6CAA6C;IAC7C,IAAIS,cAAc;QAChB,OAAOc;IACT;IACA,qBACE,KAACjC;QAAKqC,OAAO;YAAEC,UAAU;QAAW;QAAGC,eAAc;kBAClDN;;AAGP;AAEA,cAAc,UAAU"}

package/ios/ChartView.swift

@@ -59,6 +59,8 @@ struct BarChartStyle: Record {
 struct PieChartStyle: Record {
   @Field var innerRadius: Double = 0.3
   @Field var angularInset: Double = 2.0
+  @Field var cornerRadius: Double = 0.0
+  @Field var opacity: Double = 0.8
 }
 
 struct PointChartStyle: Record {
@@ -115,10 +117,11 @@ public struct ChartView: ExpoSwiftUI.View {
 
   @available(iOS 17.0, tvOS 17.0, *)
   private func createBasePieMark(for dataPoint: ChartDataPoint) -> SectorMark {
-    let style = props.pieStyle ?? PieChartStyle()
-    return SectorMark(angle: .value("Value", dataPoint.y), innerRadius: .ratio(style.innerRadius), angularInset: style.angularInset)
+    return SectorMark(angle: .value("Value", dataPoint.y), innerRadius: .ratio(pieStyle.innerRadius), angularInset: pieStyle.angularInset)
   }
 
+  private var pieStyle: PieChartStyle { props.pieStyle ?? PieChartStyle() }
+
   @available(iOS 16.0, tvOS 16.0, *)
   private func createAreaMark(for dataPoint: ChartDataPoint) -> some ChartContent {
     if let numericX = dataPoint.xNumericValue {
@@ -212,9 +215,9 @@ public struct ChartView: ExpoSwiftUI.View {
           case .pie:
             if #available(iOS 17.0, tvOS 17.0, *) {
               if hasIndividualColors {
-                createBasePieMark(for: dataPoint).foregroundStyle(dataPoint.color ?? .blue).opacity(0.8)
+                createBasePieMark(for: dataPoint).foregroundStyle(dataPoint.color ?? .blue).cornerRadius(CGFloat(pieStyle.cornerRadius)).opacity(pieStyle.opacity)
               } else {
-                createBasePieMark(for: dataPoint).foregroundStyle(by: .value("Category", dataPoint.xValue)).opacity(0.8)
+                createBasePieMark(for: dataPoint).foregroundStyle(by: .value("Category", dataPoint.xValue)).cornerRadius(CGFloat(pieStyle.cornerRadius)).opacity(pieStyle.opacity)
               }
             }
           case .rectangle:

package/ios/DataListForEachView.swift

@@ -48,6 +48,7 @@ struct DataListForEachItemView: ExpoSwiftUI.View {
 
   var body: some View {
     Children()
+      .publishZeroContentOrigin(props.shadowNodeProxy)
   }
 }
 

package/ios/GridView.swift

@@ -41,6 +41,7 @@ public struct GridRowView: ExpoSwiftUI.View {
     if #available(iOS 16.0, macOS 13.0, tvOS 16.0, *) {
       GridRow {
         Children()
+          .publishZeroContentOrigin(props.shadowNodeProxy)
       }
     } else {
       EmptyView()

package/ios/HostView.swift

@@ -3,11 +3,28 @@
 import SwiftUI
 import ExpoModulesCore
 
-/// Coordinate space anchored at the `Host`, so hosted React Native views can report where SwiftUI
-/// actually placed them. Name it last in the chain: Yoga measures a hosted view from the `Host`
-/// component view, so any `Host` inset or alignment has to be inside this space, not outside it.
+/// Coordinate space anchored at the `Host`'s SwiftUI root, which macOS measures hosted React Native
+/// views from. iOS uses `HostingViewReference` instead, because this space starts after the
+/// safe-area inset that `UIHostingController` applies to the root.
 internal let expoHostCoordinateSpace = "expo.ui.host"
 
+/// The enclosing `Host`'s UIKit view, which Yoga laid out. iOS measures hosted React Native views
+/// from it.
+internal final class HostingViewReference {
+  weak var view: UIView?
+}
+
+private struct HostingViewEnvironmentKey: EnvironmentKey {
+  static let defaultValue: HostingViewReference? = nil
+}
+
+extension EnvironmentValues {
+  var expoHostingView: HostingViewReference? {
+    get { self[HostingViewEnvironmentKey.self] }
+    set { self[HostingViewEnvironmentKey.self] = newValue }
+  }
+}
+
 internal enum ExpoColorScheme: String, Enumerable {
   case light
   case dark
@@ -46,7 +63,11 @@ internal final class HostViewProps: ExpoSwiftUI.ViewProps, ExpoSwiftUI.SafeAreaC
   @Field var ignoreSafeArea: ExpoSwiftUI.IgnoreSafeArea?
   @Field var modifiers: ModifierArray?
   var onLayoutContent = EventDispatcher()
-  weak var hostingView: UIView?
+  let hostingViewReference = HostingViewReference()
+  var hostingView: UIView? {
+    get { hostingViewReference.view }
+    set { hostingViewReference.view = newValue }
+  }
 }
 
 struct HostView: ExpoSwiftUI.View, ExpoSwiftUI.WithHostingView {
@@ -68,6 +89,7 @@ struct HostView: ExpoSwiftUI.View, ExpoSwiftUI.WithHostingView {
       HostLayout {
         Children()
       }
+      .environment(\.expoHostingView, props.hostingViewReference)
       .fixedSize(horizontal: props.matchContentsHorizontal, vertical: props.matchContentsVertical)
       .modifier(LayoutDirectionModifier(layoutDirection: layoutDirection))
       .modifier(ColorSchemeModifier(colorScheme: props.colorScheme?.toColorScheme()))
@@ -90,6 +112,7 @@ struct HostView: ExpoSwiftUI.View, ExpoSwiftUI.WithHostingView {
       ZStack(alignment: alignment) {
         Children()
       }
+      .environment(\.expoHostingView, props.hostingViewReference)
       .fixedSize(horizontal: props.matchContentsHorizontal, vertical: props.matchContentsVertical)
       .modifier(LayoutDirectionModifier(layoutDirection: layoutDirection))
       .modifier(ColorSchemeModifier(colorScheme: props.colorScheme?.toColorScheme()))

package/ios/Modifiers/PresentationModifiers.swift

@@ -238,23 +238,39 @@ internal enum PresentationSizingOption: String, Enumerable {
   case page
 }
 
+internal struct PresentationSizingFittedAxes: Record {
+  @Field var horizontal: Bool = false
+  @Field var vertical: Bool = false
+}
+
 internal struct PresentationSizingModifier: ViewModifier, Record {
   @Field var sizing: PresentationSizingOption = .automatic
+  @Field var fitted: PresentationSizingFittedAxes?
 
   func body(content: Content) -> some View {
     if #available(iOS 18.0, tvOS 18.0, macOS 15.0, *) {
       switch sizing {
       case .automatic:
-        content.presentationSizing(.automatic)
+        applySizing(content, .automatic)
       case .fitted:
-        content.presentationSizing(.fitted)
+        applySizing(content, .fitted)
       case .form:
-        content.presentationSizing(.form)
+        applySizing(content, .form)
       case .page:
-        content.presentationSizing(.page)
+        applySizing(content, .page)
       }
     } else {
       content
     }
   }
+
+  @available(iOS 18.0, tvOS 18.0, macOS 15.0, *)
+  @ViewBuilder
+  private func applySizing(_ content: Content, _ sizing: some PresentationSizing) -> some View {
+    if let fitted {
+      content.presentationSizing(sizing.fitted(horizontal: fitted.horizontal, vertical: fitted.vertical))
+    } else {
+      content.presentationSizing(sizing)
+    }
+  }
 }

package/ios/NamespaceView.swift

@@ -21,6 +21,7 @@ internal struct NamespaceView: ExpoSwiftUI.View {
     NamespaceRegistry.shared.registerNamespace(namespace, forKey: props.id)
 
     return Children()
+      .publishZeroContentOrigin(props.shadowNodeProxy)
       .onDisappear {
         NamespaceRegistry.shared.unregisterNamespace(forKey: props.id)
       }

package/ios/RNHostView.swift

@@ -107,14 +107,17 @@ struct RNHostView: ExpoSwiftUI.View {
 private struct PublishContentOriginModifier: ViewModifier {
   let shadowNodeProxy: ExpoSwiftUI.ShadowNodeProxy
   let isEnabled: Bool
+  @Environment(\.expoHostingView) private var hostingView
 
   func body(content: Content) -> some View {
     if isEnabled {
       content
-        .onGeometryChange(for: CGRect.self) { proxy in
-          proxy.frame(in: .named(expoHostCoordinateSpace))
-        } action: { frame in
-          shadowNodeProxy.setContentOrigin?(frame.origin)
+        .onGeometryChange(for: CGPoint?.self) { proxy in
+          originInHost(proxy)
+        } action: { origin in
+          if let origin {
+            shadowNodeProxy.setContentOrigin?(origin)
+          }
         }
         .onDisappear {
           shadowNodeProxy.clearContentOrigin?()
@@ -123,6 +126,18 @@ private struct PublishContentOriginModifier: ViewModifier {
       content
     }
   }
+
+  // Relative to the `Host`'s UIKit view, which Yoga laid out, so a safe-area inset is included.
+  private func originInHost(_ proxy: GeometryProxy) -> CGPoint? {
+    #if os(macOS)
+    return proxy.frame(in: .named(expoHostCoordinateSpace)).origin
+    #else
+    guard let hostView = hostingView?.view, let window = hostView.window else {
+      return nil
+    }
+    return hostView.convert(proxy.frame(in: .global).origin, from: window)
+    #endif
+  }
 }
 
 // Tracks the `RCTSurfaceTouchHandler` attached to a hosted RN view so it can be detached when the

package/ios/SlotView.swift

@@ -17,6 +17,7 @@ public struct SlotView: ExpoSwiftUI.View {
 
   public var body: some View {
     Children()
+      .publishZeroContentOrigin(props.shadowNodeProxy)
   }
 
   func extra<T>(_ key: String, as type: T.Type = T.self) -> T? {

package/ios/TabView/TabView.swift

@@ -56,7 +56,9 @@ internal struct TabView: ExpoSwiftUI.View {
           systemImage: tab.props.systemImage ?? "",
           value: tab.props.value
         ) {
+          // The tab's own body does not run here, so publish its zero content origin on its content.
           Self.tabContent(for: tab.props.children ?? [])
+            .publishZeroContentOrigin(tab.props.shadowNodeProxy)
         }
 #if !os(tvOS)
         .badge(Self.badgeText(from: tab.props.modifiers))

package/ios/ToolbarView.swift

@@ -15,7 +15,8 @@ private struct ToolbarContentView: View {
     let children = props.children ?? []
 
     if children.contains(where: isItem) {
-      children.reduce(base) { view, child in
+      // The content slot's own body does not run here, so publish its zero content origin on the base.
+      children.reduce(AnyView(base.publishZeroContentOrigin(props.shadowNodeProxy))) { view, child in
         let childView: any View = child.childView
 
         guard let slot = child.childView as? SlotView, slot.props.name == "item" else {

package/ios/UIBaseView.swift

@@ -19,6 +19,19 @@ public struct UIBaseView<Props: UIBaseViewProps, Content: ExpoSwiftUI.View<Props
     innerView
       .applyAccessibilityIdentifier(props.testID)
       .applyModifiers(props.modifiers, appContext: props.appContext, globalEventDispatcher: props.globalEventDispatcher)
+      .publishZeroContentOrigin(props.shadowNodeProxy)
+  }
+}
+
+extension View {
+  /**
+   SwiftUI places this view, so `measure()` must skip its Yoga origin. A zero content origin does that,
+   and `RNHostView` reports its own position inside the `Host`. Core clears the entry on teardown.
+   */
+  func publishZeroContentOrigin(_ shadowNodeProxy: ExpoSwiftUI.ShadowNodeProxy) -> some View {
+    onAppear {
+      shadowNodeProxy.setContentOrigin?(.zero)
+    }
   }
 }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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