@expo/ui 58.0.15 → 58.0.17

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/build/universal/ListItem/ListItem.android.js

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

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

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

package/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.17/expo.modules.ui-58.0.17-sources.jar.md5

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -3,7 +3,7 @@
   "component": {
     "group": "expo.modules.ui",
     "module": "expo.modules.ui",
-    "version": "58.0.15",
+    "version": "58.0.17",
     "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.17.aar",
+          "url": "expo.modules.ui-58.0.17.aar",
+          "size": 1859361,
+          "sha512": "ba561fa50c9fde30184d2c36051e644fd87db59555b7b38f8e2e5b7096b03bf0d2aec3e53fff1831d2705d85b174ec1a7fc2e9cadc69c41237aac262bbea9365",
+          "sha256": "6cbb10f1e4cd5618c6997d87c2021e97c7bab1b8fc4ecc7be48f563e9c0e284a",
+          "sha1": "93a6d734857d79049d179014133d651be167840a",
+          "md5": "b51953e6905c7a42506ea0d23c859703"
         }
       ]
     },
@@ -65,28 +65,28 @@
           "group": "androidx.compose.foundation",
           "module": "foundation-android",
           "version": {
-            "requires": "1.10.6"
+            "requires": "1.12.1"
           }
         },
         {
           "group": "androidx.compose.ui",
           "module": "ui-android",
           "version": {
-            "requires": "1.10.6"
+            "requires": "1.12.1"
           }
         },
         {
           "group": "androidx.compose.material3",
           "module": "material3",
           "version": {
-            "requires": "1.5.0-alpha17"
+            "requires": "1.5.0-beta01"
           }
         },
         {
           "group": "androidx.compose.material3",
           "module": "material3-android",
           "version": {
-            "requires": "1.5.0-alpha17"
+            "requires": "1.5.0-beta01"
           }
         },
         {
@@ -141,13 +141,13 @@
       ],
       "files": [
         {
-          "name": "expo.modules.ui-58.0.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.17.aar",
+          "url": "expo.modules.ui-58.0.17.aar",
+          "size": 1859361,
+          "sha512": "ba561fa50c9fde30184d2c36051e644fd87db59555b7b38f8e2e5b7096b03bf0d2aec3e53fff1831d2705d85b174ec1a7fc2e9cadc69c41237aac262bbea9365",
+          "sha256": "6cbb10f1e4cd5618c6997d87c2021e97c7bab1b8fc4ecc7be48f563e9c0e284a",
+          "sha1": "93a6d734857d79049d179014133d651be167840a",
+          "md5": "b51953e6905c7a42506ea0d23c859703"
         }
       ]
     },
@@ -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.17-sources.jar",
+          "url": "expo.modules.ui-58.0.17-sources.jar",
+          "size": 113113,
+          "sha512": "10ed672c04082cf5f06e6ca6dca0f28229f11f3d503d46e5b61dbc7d3ad50bfdc1399838dd38dc5b8c1643ec375c4bf1672c95606ce28f7ed36384f66b829b68",
+          "sha256": "f9a24faad34f9f66bebcdde7d05a6cf72a8b4b9030819b80049de5084a694ef0",
+          "sha1": "5d7c4fd251da7578f23af5102d539533aefb3e64",
+          "md5": "83ac1d8d00a142a3ffa834c4a6c1db65"
         }
       ]
     }

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

@@ -0,0 +1 @@
+390c21f1bf1c8717fdcaf1855f4ba066

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

@@ -0,0 +1 @@
+43aed8719871e806fa4b5a0f69fe75da7a7424f8

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

@@ -0,0 +1 @@
+d9eeecec40ed29a204b843d0629816e5187519c1ba1af7d603696511f8a62100

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

@@ -0,0 +1 @@
+31f0b1ae5e0569d53a08e7814623d7680272d04bd24f24d3f769140c046097ce3d3a970d19293a9185f8406611ae6a98a742c6cde3cfa8c51a3236e4a23fbdc1

package/local-maven-repo/expo/modules/ui/expo.modules.ui/{58.0.15/expo.modules.ui-58.0.15.pom → 58.0.17/expo.modules.ui-58.0.17.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.17</version>
   <packaging>aar</packaging>
   <name>expo.modules.ui</name>
   <url>https://github.com/expo/expo</url>
@@ -57,25 +57,25 @@
     <dependency>
       <groupId>androidx.compose.foundation</groupId>
       <artifactId>foundation-android</artifactId>
-      <version>1.10.6</version>
+      <version>1.12.1</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>androidx.compose.ui</groupId>
       <artifactId>ui-android</artifactId>
-      <version>1.10.6</version>
+      <version>1.12.1</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>androidx.compose.material3</groupId>
       <artifactId>material3</artifactId>
-      <version>1.5.0-alpha17</version>
+      <version>1.5.0-beta01</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>androidx.compose.material3</groupId>
       <artifactId>material3-android</artifactId>
-      <version>1.5.0-alpha17</version>
+      <version>1.5.0-beta01</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

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

@@ -0,0 +1 @@
+3c5a264d323e2afb9aaf51b8dbe33548

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

@@ -0,0 +1 @@
+94dac94419f825b433dd7a57ba548ec8395a276f

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

@@ -0,0 +1 @@
+84381286ae177b29ab5287316eeb3f405532f1608c01d7535afdb85f8c0e9149

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

@@ -0,0 +1 @@
+9d1c51764187080d9adff9998f2fffd9702db44c55b4a507042747e0b6d3bab6e698966c5584d19c2b90c2b065e03148504c60dcc3a38f396b7218e6434f4b00

package/package.json

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

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]);
+}