@expo/ui 57.0.10 → 57.0.12

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

@@ -9,6 +9,7 @@ import {
 } from '@expo/ui/swift-ui/modifiers';
 
 import type { BottomSheetProps, SnapPoint } from './types';
+import { resolveContentPadding } from './utils';
 
 function snapPointToDetent(snapPoint: SnapPoint): PresentationDetent {
   if (snapPoint === 'half') return 'medium';
@@ -24,10 +25,17 @@ export function BottomSheet({
   snapPoints,
   testID,
   modifiers,
+  contentPadding,
 }: BottomSheetProps) {
+  const { top, bottom, left, right } = resolveContentPadding(contentPadding, {
+    top: 16,
+    bottom: 0,
+    left: 16,
+    right: 16,
+  });
   const presentationModifiers: ModifierConfig[] = [
     frame({ maxWidth: Infinity, alignment: 'topLeading' }),
-    padding({ top: 16, leading: 16, trailing: 16 }),
+    padding({ top, bottom, leading: left, trailing: right }),
     presentationDragIndicator(showDragIndicator ? 'visible' : 'hidden'),
   ];
   if (snapPoints && snapPoints.length > 0) {

package/src/universal/BottomSheet/index.tsx

@@ -2,6 +2,7 @@ import { useColorScheme } from 'react-native';
 import { Drawer } from 'vaul';
 
 import type { BottomSheetProps, SnapPoint } from './types';
+import { resolveContentPadding } from './utils';
 
 // Visually-hidden style for the screen-reader-only Drawer.Title.
 const visuallyHiddenStyle: React.CSSProperties = {
@@ -33,8 +34,15 @@ export function BottomSheet({
   showDragIndicator = true,
   snapPoints,
   testID,
+  contentPadding,
 }: BottomSheetProps) {
   const isDark = useColorScheme() === 'dark';
+  const { top, bottom, left, right } = resolveContentPadding(contentPadding, {
+    top: 16,
+    bottom: 16,
+    left: 16,
+    right: 16,
+  });
   const vaulSnapPoints = snapPoints?.length ? snapPoints.map(snapPointToVaul) : undefined;
   const hasSnapPoints = vaulSnapPoints != null;
 
@@ -60,7 +68,15 @@ export function BottomSheet({
           {/* Radix Dialog requires a title for a11y; render visually-hidden. */}
           <Drawer.Title style={visuallyHiddenStyle}>Bottom sheet</Drawer.Title>
           {showDragIndicator && <Drawer.Handle />}
-          <div style={innerStyle} data-testid={testID}>
+          <div
+            style={{
+              ...innerStyle,
+              paddingTop: top,
+              paddingBottom: bottom,
+              paddingLeft: left,
+              paddingRight: right,
+            }}
+            data-testid={testID}>
             {children}
           </div>
         </Drawer.Content>
@@ -99,7 +115,6 @@ const noSnapPointContentStyle: React.CSSProperties = {
 };
 
 const innerStyle: React.CSSProperties = {
-  padding: 16,
   overflow: 'auto',
 };
 

package/src/universal/BottomSheet/types.ts

@@ -15,6 +15,19 @@ import type { ModifierConfig } from '../../types';
  */
 export type SnapPoint = 'half' | 'full' | { fraction: number } | { height: number };
 
+/**
+ * Padding between a [`BottomSheet`](#bottomsheet) and its content — a single value applied to every
+ * edge, or per-edge values where an edge that is left out is `0`.
+ */
+export type BottomSheetContentPadding =
+  | number
+  | {
+      top?: number;
+      bottom?: number;
+      left?: number;
+      right?: number;
+    };
+
 /**
  * Props for the [`BottomSheet`](#bottomsheet) component, a modal sheet that slides up from the bottom of the screen.
  */
@@ -50,11 +63,31 @@ export interface BottomSheetProps {
    */
   snapPoints?: SnapPoint[];
 
+  /**
+   * Padding between the sheet and [`children`](#children), in dp on Android, points on iOS, and
+   * CSS pixels on web. Pass `0` for content that reaches the sheet's edges.
+   *
+   * When omitted, each platform keeps the inset it applies by default.
+   *
+   * @example `contentPadding={0}` — full-bleed content
+   * @example `contentPadding={{ top: 8, bottom: 24 }}` — no horizontal inset
+   */
+  contentPadding?: BottomSheetContentPadding;
+
   /**
    * Identifier used to locate the component in end-to-end tests.
    */
   testID?: string;
 
+  /**
+   * Whether pressing the Android hardware back button (or back gesture) dismisses the bottom sheet.
+   * When `false`, the back press does not dismiss the sheet (note: the press still does not reach
+   * React Native's `BackHandler`).
+   * @default true
+   * @platform android
+   */
+  shouldDismissOnBackPress?: boolean;
+
   /**
    * Platform-specific modifier escape hatch. Pass an array of modifier configs
    * from `@expo/ui/swift-ui/modifiers` or `@expo/ui/jetpack-compose/modifiers`.

package/src/universal/BottomSheet/utils.ts

@@ -0,0 +1,35 @@
+import type { BottomSheetContentPadding } from './types';
+
+export type ResolvedContentPadding = {
+  top: number;
+  bottom: number;
+  left: number;
+  right: number;
+};
+
+/**
+ * Resolves the `contentPadding` prop against the inset the platform applies when the prop is
+ * omitted. A number applies to every edge, and an edge left out of an object is `0`.
+ */
+export function resolveContentPadding(
+  contentPadding: BottomSheetContentPadding | undefined,
+  platformDefault: ResolvedContentPadding
+): ResolvedContentPadding {
+  if (contentPadding == null) {
+    return platformDefault;
+  }
+  if (typeof contentPadding === 'number') {
+    return {
+      top: contentPadding,
+      bottom: contentPadding,
+      left: contentPadding,
+      right: contentPadding,
+    };
+  }
+  return {
+    top: contentPadding.top ?? 0,
+    bottom: contentPadding.bottom ?? 0,
+    left: contentPadding.left ?? 0,
+    right: contentPadding.right ?? 0,
+  };
+}

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

@@ -1 +0,0 @@
-861e2a9fc90c0f77fb3e0c4b1e733bda

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

@@ -1 +0,0 @@
-ab9529856e2d9014c4500bd026ef87271d46390e

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

@@ -1 +0,0 @@
-daa8952f564fc49bf1e8248beaa2f2bc5f305c02f01f9ea9f9209323034d7cdf

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

@@ -1 +0,0 @@
-6773d96e9e4bc26584cb012c44b9e9f6afd9d4d099aa7c93eb35a2089a77b71155a671302db4a9f9d97267c310ad266476d2bbb04ce77cc4fa36f7b3e262e696

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

@@ -1 +0,0 @@
-b64c5776b5d32cb3e45c463040737d7a

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

@@ -1 +0,0 @@
-128612487df27ee99651882fde63af29121cec37

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

@@ -1 +0,0 @@
-497fae34b972934a9eb0ae4b1343527eb1e5f872ad97c44de758d4e3095cf2d9

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

@@ -1 +0,0 @@
-65dd5f448fa7a5db1112becf801262b96f1ded388023a72616e1623ed9eb3fa1aaa25e479db58ee56aed07e97a1e5d72c3b66c4eecd6c8de39f67f92c1dbf993

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

@@ -1 +0,0 @@
-055f1fdb95709fdc3b49eece5b5fbfeb

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

@@ -1 +0,0 @@
-50ff217e440913da2e4012ea61dda7727808e484

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

@@ -1 +0,0 @@
-c79327c07e0ada70fa83a5b245fca76f7664aa45920bfd547c84008ad06464ab

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

@@ -1 +0,0 @@
-50884390eba625182faf35c12c524d62b90eec6936e381f26b7ee7c50f3d85304ea0dc6922876cee54492283770714332c4cc4ede2cc9d605e5ff8698fd01197

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

@@ -1 +0,0 @@
-935ffadd6cf043d40b19b964cb3ef39c

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

@@ -1 +0,0 @@
-2d91e78a3e97454791f366df9ddca9fcbae04387

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

@@ -1 +0,0 @@
-17b90d969bfae0e720e475072158f0cd5f9ebf9c17a19628d4e89a71804f5d10

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

@@ -1 +0,0 @@
-9a5997ae6c7ac0870d23e87ac434f0ca01d3bb6fecd0cd6bcaa5fcf7afa8997314955813a41488c4c55724a8623996733256ea4189d08342c9f34945681e5a95