@expo/ui 57.0.13 → 57.0.15

package/ios/RNHostView.swift

@@ -5,22 +5,59 @@ import ExpoModulesCore
 
 internal final class RNHostViewProps: ExpoSwiftUI.ViewProps {
   @Field var matchContents: Bool = false
+  /**
+   Adds LeafNode and MeasurableYogaNode trait in Shadow node
+   */
+  @Field var expoInternalSizeFromChildren: Bool = false
+  /**
+   Whether this view owns its subtree's touches and is the origin its content is measured from. Set
+   by the JavaScript side for content presented in its own view controller — see `RNHostView.tsx`,
+   which reads it from the sheet or popover presenting the content.
+
+   Also read by `ExpoViewShadowNode` in C++, which turns it into the `RootNodeKind` trait so
+   `measure()` stops its ancestor walk here.
+   */
+  @Field var layoutRoot: Bool = false
 }
 
+// Touches and `measure()` must agree on a coordinate space. Which space depends on where the
+// content sits:
+//  Normal tree:
+//    The surface root above us already dispatches, in surface coordinates. We attach
+//    nothing and publish a content origin, so `measure()` matches those touches.
+//  Sheet, popover:  
+//    Presented in its own view controller, so nothing above dispatches and the
+//    content would get no touches at all. We attach our own handler, and
+//   `layoutRoot` measures from this view — the space those touches arrive in.
+//
+// Attaching a handler in the normal tree would give the subtree two streams in two spaces: UIKit
+// delivers a touch to the hit view and every ancestor, and the root's cannot be suppressed from
+// below, so presses would cancel on any movement.
 struct RNHostView: ExpoSwiftUI.View {
 
   @ObservedObject var props: RNHostViewProps
-  // Owns the RCTSurfaceTouchHandler we attach to the hosted RN view so it is detached again when
-  // this host disappears.
   @StateObject private var touchHandler = RNHostTouchHandler()
 
   var body: some View {
+    hostedContent
+      .modifier(
+        PublishContentOriginModifier(
+          shadowNodeProxy: props.shadowNodeProxy,
+          isEnabled: !props.layoutRoot
+        )
+      )
+  }
+
+  @ViewBuilder
+  private var hostedContent: some View {
     if props.matchContents, let childUIView = firstChildUIView {
       ApplySizeFromYogaNode(childUIView: childUIView) {
         Children()
       }
       .onAppear {
-        touchHandler.attach(to: childUIView)
+        if props.layoutRoot {
+          touchHandler.attach(to: childUIView)
+        }
       }
       .onDisappear {
         touchHandler.detach()
@@ -40,7 +77,7 @@ struct RNHostView: ExpoSwiftUI.View {
         .frame(maxWidth: .infinity, maxHeight: .infinity)
         .modifier(ReportSizeToYogaNodeModifier(shadowNodeProxy: props.shadowNodeProxy))
         .onAppear {
-          if let view = firstChildUIView {
+          if props.layoutRoot, let view = firstChildUIView {
             touchHandler.attach(to: view)
           }
         }
@@ -55,6 +92,29 @@ struct RNHostView: ExpoSwiftUI.View {
   }
 }
 
+// Publishes where SwiftUI placed this view inside its `Host`, so `measure()` reports the position
+// the hosted content actually occupies.
+private struct PublishContentOriginModifier: ViewModifier {
+  let shadowNodeProxy: ExpoSwiftUI.ShadowNodeProxy
+  let isEnabled: Bool
+
+  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)
+        }
+        .onDisappear {
+          shadowNodeProxy.clearContentOrigin?()
+        }
+    } else {
+      content
+    }
+  }
+}
+
 // Tracks the `RCTSurfaceTouchHandler` attached to a hosted RN view so it can be detached when the
 // `RNHostView` disappears, instead of leaking onto the recycled component view.
 private final class RNHostTouchHandler: ObservableObject {

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

@@ -0,0 +1 @@
+727cf7bc8ccb03288f429d152d19ebb8

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

@@ -0,0 +1 @@
+8f8ba3c03ae3deb578a50866e3aa7c1da0a1608a

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

@@ -0,0 +1 @@
+c0de9f779e4c1fa3758abcbbee8831628a015e11cc4d7242fd1c1ead65a62eef

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

@@ -0,0 +1 @@
+20a3c1eb5e1bddbb7b3708606f314fbffaa9165cff2e148826fd2e7cd7e1def14e2b3e7ef1190ba853b66f5a71f3d32c05c71f7c7e98dc8470d2e5c2bfccd752

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

@@ -0,0 +1 @@
+edd3e3bac5983521c3fb8ba7a1830f75

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

@@ -0,0 +1 @@
+413330dc1478358eefbcd2ad21a352e69567b868

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

@@ -0,0 +1 @@
+3954246789a3258d28107744fc6c8ffb721f105c6403279b0e93ca1a961bcddb

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

@@ -0,0 +1 @@
+0fed5da498418bb5841100fac2b2f04d302598b81abd4159f62c8f1caecca14b831712cfff61039087834f9f1f32fe6b695cbab710e70a1b969e0bae70e471f0

package/local-maven-repo/expo/modules/ui/expo.modules.ui/{57.0.13/expo.modules.ui-57.0.13.module → 57.0.15/expo.modules.ui-57.0.15.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "expo.modules.ui",
     "module": "expo.modules.ui",
-    "version": "57.0.13",
+    "version": "57.0.15",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,13 +24,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.ui-57.0.13.aar",
-          "url": "expo.modules.ui-57.0.13.aar",
-          "size": 1992502,
-          "sha512": "faa66634546960f551adaa7cda25a99fc7cff82c44a44f9ff7e6e272d562fa26bea6d54c54f0135e50c7cfab38cf0eee9496ab9ddb8f2c704a9a11a690568817",
-          "sha256": "8ba276c06e3fda532a8966a0adc15f3c5e32067ffea21c69b9bf91c449cef93a",
-          "sha1": "bd3b99b6985648ac5a8b5250422386cb9777482e",
-          "md5": "64fd0f1ca916ebe5cb6d23da5899df6c"
+          "name": "expo.modules.ui-57.0.15.aar",
+          "url": "expo.modules.ui-57.0.15.aar",
+          "size": 1996194,
+          "sha512": "0fed5da498418bb5841100fac2b2f04d302598b81abd4159f62c8f1caecca14b831712cfff61039087834f9f1f32fe6b695cbab710e70a1b969e0bae70e471f0",
+          "sha256": "3954246789a3258d28107744fc6c8ffb721f105c6403279b0e93ca1a961bcddb",
+          "sha1": "413330dc1478358eefbcd2ad21a352e69567b868",
+          "md5": "edd3e3bac5983521c3fb8ba7a1830f75"
         }
       ]
     },
@@ -141,13 +141,13 @@
       ],
       "files": [
         {
-          "name": "expo.modules.ui-57.0.13.aar",
-          "url": "expo.modules.ui-57.0.13.aar",
-          "size": 1992502,
-          "sha512": "faa66634546960f551adaa7cda25a99fc7cff82c44a44f9ff7e6e272d562fa26bea6d54c54f0135e50c7cfab38cf0eee9496ab9ddb8f2c704a9a11a690568817",
-          "sha256": "8ba276c06e3fda532a8966a0adc15f3c5e32067ffea21c69b9bf91c449cef93a",
-          "sha1": "bd3b99b6985648ac5a8b5250422386cb9777482e",
-          "md5": "64fd0f1ca916ebe5cb6d23da5899df6c"
+          "name": "expo.modules.ui-57.0.15.aar",
+          "url": "expo.modules.ui-57.0.15.aar",
+          "size": 1996194,
+          "sha512": "0fed5da498418bb5841100fac2b2f04d302598b81abd4159f62c8f1caecca14b831712cfff61039087834f9f1f32fe6b695cbab710e70a1b969e0bae70e471f0",
+          "sha256": "3954246789a3258d28107744fc6c8ffb721f105c6403279b0e93ca1a961bcddb",
+          "sha1": "413330dc1478358eefbcd2ad21a352e69567b868",
+          "md5": "edd3e3bac5983521c3fb8ba7a1830f75"
         }
       ]
     },
@@ -161,13 +161,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.ui-57.0.13-sources.jar",
-          "url": "expo.modules.ui-57.0.13-sources.jar",
-          "size": 99038,
-          "sha512": "e5168296d77aefce39432efe6ebece0da6c78ee8dfcde914ae0166912b335b277f482bd0a347c52fc02d95a4f1bab27c004d0fd46b5aa90c3e047b036b2b316f",
-          "sha256": "202b4f6d1b483d93f4a457a0c2823fb597e90e2ceb05a355e35bbd2a0f847097",
-          "sha1": "477d48b6fb609e6e83752cf761439f3432207248",
-          "md5": "28e3a694241e4bc5167c6a9ff2470b87"
+          "name": "expo.modules.ui-57.0.15-sources.jar",
+          "url": "expo.modules.ui-57.0.15-sources.jar",
+          "size": 101673,
+          "sha512": "20a3c1eb5e1bddbb7b3708606f314fbffaa9165cff2e148826fd2e7cd7e1def14e2b3e7ef1190ba853b66f5a71f3d32c05c71f7c7e98dc8470d2e5c2bfccd752",
+          "sha256": "c0de9f779e4c1fa3758abcbbee8831628a015e11cc4d7242fd1c1ead65a62eef",
+          "sha1": "8f8ba3c03ae3deb578a50866e3aa7c1da0a1608a",
+          "md5": "727cf7bc8ccb03288f429d152d19ebb8"
         }
       ]
     }

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

@@ -0,0 +1 @@
+2795adc5211a8fc7f863c991f23d839d

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

@@ -0,0 +1 @@
+0b9ff6c6054311175dc6bd90b07c314a7ede6f84

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

@@ -0,0 +1 @@
+78e5605f43fc4b0f3d2f9a15f1c4fdec5c2ea8cd318b91c420b6eb15dd5eb494

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

@@ -0,0 +1 @@
+5f05356766b79d9fdcf15c07d42f0d07954b8ccf6603f68f05ce2c1520ef4a7be053913ea4dc39f8c9d778ab0e844d3933e057b56073a68eecb6acbc4dffca05

package/local-maven-repo/expo/modules/ui/expo.modules.ui/{57.0.13/expo.modules.ui-57.0.13.pom → 57.0.15/expo.modules.ui-57.0.15.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>expo.modules.ui</groupId>
   <artifactId>expo.modules.ui</artifactId>
-  <version>57.0.13</version>
+  <version>57.0.15</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/57.0.15/expo.modules.ui-57.0.15.pom.md5

@@ -0,0 +1 @@
+5a8652e710f6244614c44748103be21e

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

@@ -0,0 +1 @@
+20bca33f9608309fa2b6d4b60f481576201db951

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

@@ -0,0 +1 @@
+05310f77cf9090370c199b477a3a20040419deaf872950d919fe112d9820ca3b

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

@@ -0,0 +1 @@
+872bf3ee828e9dcea87db32b2396a6eb3cccacffdedf263d0f85a7943ca20d09fbb5e97c6f20bcd2852e128597f47f67ed957b76350335de57c13f5a103cd67f

package/local-maven-repo/expo/modules/ui/expo.modules.ui/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>expo.modules.ui</groupId>
   <artifactId>expo.modules.ui</artifactId>
   <versioning>
-    <latest>57.0.13</latest>
-    <release>57.0.13</release>
+    <latest>57.0.15</latest>
+    <release>57.0.15</release>
     <versions>
-      <version>57.0.13</version>
+      <version>57.0.15</version>
     </versions>
-    <lastUpdated>20260824074615</lastUpdated>
+    <lastUpdated>20260901160721</lastUpdated>
   </versioning>
 </metadata>

package/local-maven-repo/expo/modules/ui/expo.modules.ui/maven-metadata.xml.md5

@@ -1 +1 @@
-c5687c59b58e66b61d7ad8422409a52b
+ef804b0b5130bf45649f48809235610b

package/local-maven-repo/expo/modules/ui/expo.modules.ui/maven-metadata.xml.sha1

@@ -1 +1 @@
-19e37e7626a16f1bed2cb5e7e532fe5b2849156f
+00c505224838ff5cfc459029b30fbe70426dc730

package/local-maven-repo/expo/modules/ui/expo.modules.ui/maven-metadata.xml.sha256

@@ -1 +1 @@
-53945cd66292791187c0bc9fab8427ab497726954b09a946a1b4324dc85ac04f
+0f4c9b5ca861ed3f22c5b000a3022934d9956a512c8c28ddb6b70f883ba75503

package/local-maven-repo/expo/modules/ui/expo.modules.ui/maven-metadata.xml.sha512

@@ -1 +1 @@
-e3b22c7838747c4ad21b1a89b65060b12b1511e30770682da53e9056895af8cbad35096654e090e29bc57b794de2f6b0390f70db5c4d3b75187edbbf36f321cb
+786895d2586ce5fb37d448df152d909e98c025c03aaf2270c419fd12255f58901f577deb0cb4d9f63fad7d3c591b528caee5583839c481d23c1737e8646dd681

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/ui",
-  "version": "57.0.13",
+  "version": "57.0.15",
   "description": "A collection of UI components",
   "sideEffects": [
     "*.fx.js",
@@ -96,8 +96,8 @@
     "@types/react": "~19.2.0",
     "react-native-reanimated": "4.5.1",
     "react-native-worklets": "0.10.1",
-    "expo": "57.0.16",
-    "expo-module-scripts": "56.0.3"
+    "expo-module-scripts": "56.0.3",
+    "expo": "57.0.19"
   },
   "jest": {
     "preset": "expo-module-scripts"
@@ -121,7 +121,7 @@
       "optional": true
     }
   },
-  "gitHead": "52fc013ec8c75e89ba8f83c167e4b6b0416e6bf7",
+  "gitHead": "b76ecf192c5325793bcea31dd9bb8efd91f9ad7f",
   "scripts": {
     "build": "expo-module build",
     "clean": "expo-module clean",

package/src/PresentedContentContext.tsx

@@ -0,0 +1,22 @@
+import { createContext, useContext, type ReactNode } from 'react';
+
+export const PresentedContentContext = createContext(false);
+
+/**
+ * Whether the surrounding content is presented in its own view controller — a sheet, a popover
+ * — rather than in the React Native surface.
+ *
+ * `RNHostView` needs this because nothing above such content dispatches React Native touches: the
+ * surface root is not one of its ancestors. A hosted view there has to dispatch its own touches and
+ * be the origin its content is measured from, and both of those come from a single `layoutRoot`
+ * prop.
+ *
+ * Defaults to `false`, so content that is not wrapped keeps deferring to the surface root.
+ */
+export function useIsPresentedInOwnWindow(): boolean {
+  return useContext(PresentedContentContext);
+}
+
+export function PresentedContent({ children }: { children: ReactNode }) {
+  return <PresentedContentContext.Provider value>{children}</PresentedContentContext.Provider>;
+}

package/src/community/pager-view/PagerView.android.tsx

@@ -77,13 +77,7 @@ export function PagerView(props: PagerViewProps) {
   const pages = Children.toArray(children)
     .filter((child): child is ReactElement => isValidElement(child))
     .map((child, index) => (
-      <RNHostView
-        key={child.key ?? String(index)}
-        // Overlap pages at one origin so each page's RN shadow position matches
-        // where Compose draws it; otherwise `measure()`-based hit-testing
-        // (e.g. `Pressable`) misfires on pages after the first (#46386).
-        style={StyleSheet.absoluteFill}
-        modifiers={[fillMaxSize()]}>
+      <RNHostView key={child.key ?? String(index)} modifiers={[fillMaxSize()]}>
         <View style={styles.page} pointerEvents={index === settledPage ? 'auto' : 'none'}>
           {child}
         </View>

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

@@ -1,6 +1,7 @@
 import { requireNativeView } from 'expo';
 import { type ColorValue } from 'react-native';
 
+import { PresentedContent } from '../../PresentedContentContext';
 import { type ViewEvent, type ModifierConfig, type DialogProperties } from '../../types';
 import { createViewModifierEventListener } from '../modifiers/utils';
 
@@ -123,7 +124,11 @@ function AlertDialogIcon(props: { children: React.ReactNode }) {
  */
 function AlertDialogComponent(props: AlertDialogProps) {
   const { children, ...restProps } = props;
-  return <AlertDialogNativeView {...transformProps(restProps)}>{children}</AlertDialogNativeView>;
+  return (
+    <AlertDialogNativeView {...transformProps(restProps)}>
+      <PresentedContent>{children}</PresentedContent>
+    </AlertDialogNativeView>
+  );
 }
 
 AlertDialogComponent.Title = AlertDialogTitle;

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

@@ -1,5 +1,6 @@
 import { requireNativeView } from 'expo';
 
+import { PresentedContent } from '../../PresentedContentContext';
 import { type ViewEvent, type ModifierConfig, type DialogProperties } from '../../types';
 import { createViewModifierEventListener } from '../modifiers/utils';
 
@@ -51,7 +52,12 @@ function transformProps(props: BasicAlertDialogProps): NativeBasicAlertDialogPro
  * Unlike `AlertDialog`, this component does not have structured title/text/buttons slots.
  */
 export function BasicAlertDialog(props: BasicAlertDialogProps) {
-  return <BasicAlertDialogNativeView {...transformProps(props)} />;
+  const { children, ...rest } = props;
+  return (
+    <BasicAlertDialogNativeView {...transformProps(rest as BasicAlertDialogProps)}>
+      <PresentedContent>{children}</PresentedContent>
+    </BasicAlertDialogNativeView>
+  );
 }
 
 // Re-exported so the docs generator includes DialogProperties on the BasicAlertDialog API page.

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

@@ -2,6 +2,7 @@ import { requireNativeView } from 'expo';
 import type { ReactNode } from 'react';
 import type { StyleProp, ViewStyle, ColorValue } from 'react-native';
 
+import { PresentedContent } from '../../PresentedContentContext';
 import type { ModifierConfig } from '../../types';
 import { createViewModifierEventListener } from '../modifiers/utils';
 
@@ -67,7 +68,12 @@ type NativeMenuProps = {
  * Children should be `DropdownMenuItem` components or other native views.
  */
 export function Items(props: { children: ReactNode }) {
-  return <SlotNativeView slotName="items">{props.children}</SlotNativeView>;
+  // The items are presented in their own popup window; the trigger stays in the React Native surface.
+  return (
+    <SlotNativeView slotName="items">
+      <PresentedContent>{props.children}</PresentedContent>
+    </SlotNativeView>
+  );
 }
 Items.tag = 'Items';
 

package/src/jetpack-compose/ExposedDropdownMenuBox/ExposedDropdownMenu.tsx

@@ -2,6 +2,7 @@ import { requireNativeView } from 'expo';
 import type { ReactNode } from 'react';
 import { type ColorValue } from 'react-native';
 
+import { PresentedContent } from '../../PresentedContentContext';
 import { type ModifierConfig } from '../../types';
 import { createViewModifierEventListener } from '../modifiers/utils';
 
@@ -48,7 +49,8 @@ export function ExposedDropdownMenu(props: ExposedDropdownMenuProps) {
       modifiers={modifiers}
       {...(modifiers ? createViewModifierEventListener(modifiers) : undefined)}
       {...restProps}>
-      {children}
+      {/* The menu is a popup in its own window. The anchor stays in `ExposedDropdownMenuBox`. */}
+      <PresentedContent>{children}</PresentedContent>
     </NativeView>
   );
 }

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

@@ -1,5 +1,5 @@
 import { requireNativeView } from 'expo';
-import { useMemo } from 'react';
+import { useMemo, type Ref } from 'react';
 import {
   type ColorSchemeName,
   type ColorValue,
@@ -9,6 +9,8 @@ import {
   useColorScheme as useRNColorScheme,
 } from 'react-native';
 
+import { TextInputHostProvider, useTextInputHostRef } from '../../keyboard';
+import { useMergeRefs } from '../../utils/useMergeRefs';
 import { getMaterialColors, HostPaletteContext } from '../colors';
 import { type PrimitiveBaseProps } from '../layout';
 
@@ -65,6 +67,8 @@ export interface HostProps extends PrimitiveBaseProps {
   children: React.ReactNode;
   style?: StyleProp<ViewStyle>;
   pointerEvents?: 'box-none' | 'none' | 'box-only' | 'auto';
+  /** @hidden */
+  ref?: Ref<any>;
 }
 
 type NativeHostProps = Omit<HostProps, 'colorScheme'> & {
@@ -72,6 +76,7 @@ type NativeHostProps = Omit<HostProps, 'colorScheme'> & {
   matchContentsHorizontal?: boolean;
   colorScheme?: ColorSchemeName;
   seedColor?: ColorValue;
+  ref?: Ref<any>;
 };
 
 const HostNativeView: React.ComponentType<NativeHostProps> = requireNativeView(
@@ -87,6 +92,7 @@ export function Host(props: HostProps) {
     layoutDirection,
     colorScheme,
     seedColor,
+    ref,
     ...restProps
   } = props;
   const schemeString = colorScheme === 'light' || colorScheme === 'dark' ? colorScheme : undefined;
@@ -97,25 +103,30 @@ export function Host(props: HostProps) {
     () => getMaterialColors({ scheme: resolvedScheme, seedColor }),
     [resolvedScheme, seedColor]
   );
+  const hostRef = useTextInputHostRef();
+  const mergedRef = useMergeRefs(ref, hostRef);
 
   return (
     <HostPaletteContext.Provider value={palette}>
-      <HostNativeView
-        {...restProps}
-        modifiers={modifiers}
-        matchContentsVertical={
-          typeof matchContents === 'object' ? matchContents.vertical : matchContents
-        }
-        matchContentsHorizontal={
-          typeof matchContents === 'object' ? matchContents.horizontal : matchContents
-        }
-        colorScheme={schemeString}
-        seedColor={seedColor}
-        onLayoutContent={onLayoutContent}
-        layoutDirection={
-          layoutDirection ?? (I18nManager.getConstants().isRTL ? 'rightToLeft' : 'leftToRight')
-        }
-      />
+      <TextInputHostProvider hostRef={hostRef}>
+        <HostNativeView
+          {...restProps}
+          modifiers={modifiers}
+          matchContentsVertical={
+            typeof matchContents === 'object' ? matchContents.vertical : matchContents
+          }
+          matchContentsHorizontal={
+            typeof matchContents === 'object' ? matchContents.horizontal : matchContents
+          }
+          colorScheme={schemeString}
+          seedColor={seedColor}
+          onLayoutContent={onLayoutContent}
+          layoutDirection={
+            layoutDirection ?? (I18nManager.getConstants().isRTL ? 'rightToLeft' : 'leftToRight')
+          }
+          ref={mergedRef}
+        />
+      </TextInputHostProvider>
     </HostPaletteContext.Provider>
   );
 }

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

@@ -2,6 +2,7 @@ import { requireNativeView } from 'expo';
 import type { Ref, ReactNode, ComponentType } from 'react';
 import type { ColorValue } from 'react-native';
 
+import { PresentedContent } from '../../PresentedContentContext';
 import { type ModifierConfig } from '../../types';
 import { createViewModifierEventListener } from '../modifiers/utils';
 
@@ -138,7 +139,13 @@ function DragHandle(props: { children: ReactNode }) {
  * A Material Design modal bottom sheet.
  */
 function ModalBottomSheetComponent(props: ModalBottomSheetProps) {
-  return <ModalBottomSheetNativeView {...transformProps(props)} />;
+  const { children, ...rest } = props;
+  // The whole sheet, drag handle included, is presented in its own window, so all of it is marked.
+  return (
+    <ModalBottomSheetNativeView {...transformProps(rest as ModalBottomSheetProps)}>
+      <PresentedContent>{children}</PresentedContent>
+    </ModalBottomSheetNativeView>
+  );
 }
 
 ModalBottomSheetComponent.DragHandle = DragHandle;

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

@@ -128,9 +128,38 @@ export const CircularProgressIndicator = createProgressComponent<CircularProgres
 
 // endregion
 
+// region WavyProgressIndicators
+
+/**
+ * Wave configuration shared by the wavy progress indicator variants.
+ */
+export type WavyProgressCommonConfig = {
+  /**
+   * Height of the wave, where `0` draws a flat line and `1` draws the full wave height.
+   * When set, the amplitude stays the same across the whole track.
+   * When omitted, a determinate indicator uses the Material 3 default, which flattens the wave as
+   * progress approaches `0` and `1`.
+   * An indeterminate indicator defaults to the full wave height.
+   */
+  amplitude?: number;
+  /**
+   * Length of a single wave in dp. `CircularWavyProgressIndicator` rounds this to fit a whole
+   * number of waves around the ring, so the wave it draws can be slightly shorter or longer.
+   */
+  wavelength?: number;
+  /**
+   * Speed of the wave in dp per second. Defaults to `wavelength`, which advances the wave by one
+   * wavelength per second. Set it to `0` to stop the wave from moving.
+   */
+  waveSpeed?: number;
+};
+
+// endregion
+
 // region LinearWavyProgressIndicator
 
-export interface LinearWavyProgressIndicatorProps extends ProgressCommonConfig {
+export interface LinearWavyProgressIndicatorProps
+  extends ProgressCommonConfig, WavyProgressCommonConfig {
   /**
    * Size of the stop indicator in dp at the end of the determinate progress track.
    */
@@ -149,7 +178,8 @@ export const LinearWavyProgressIndicator =
 
 // region CircularWavyProgressIndicator
 
-export interface CircularWavyProgressIndicatorProps extends ProgressCommonConfig {}
+export interface CircularWavyProgressIndicatorProps
+  extends ProgressCommonConfig, WavyProgressCommonConfig {}
 
 /**
  * A circular progress indicator with wavy animation style.