@swmansion/react-native-bottom-sheet 0.7.2 → 0.8.0-next.1

package/android/src/main/java/com/swmansion/reactnativebottomsheet/BottomSheetView.kt

@@ -1,6 +1,9 @@
 package com.swmansion.reactnativebottomsheet
 
 import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
 import android.view.Choreographer
 import android.view.MotionEvent
 import android.view.VelocityTracker
@@ -37,6 +40,12 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
   private var detentSpecs: List<DetentSpec> = emptyList()
   private var targetIndex: Int = 0
   var animateIn: Boolean = true
+  var modal: Boolean = false
+    set(value) {
+      field = value
+      updateInteractionState()
+      updateScrim()
+    }
   private var pendingIndex: Int? = null
   private var hasLaidOut = false
   private var isPanning = false
@@ -44,6 +53,7 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
   // MARK: - Internal
 
   private val sheetContainer = FrameLayout(context)
+  private val scrimPaint = Paint(Paint.ANTI_ALIAS_FLAG)
   private var activeAnimation: SpringAnimation? = null
   private var velocityTracker: VelocityTracker? = null
   private var choreographerCallback: Choreographer.FrameCallback? = null
@@ -55,6 +65,9 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
   private var initialTouchX = 0f
   private var lastTouchY = 0f
   private var activePointerId = MotionEvent.INVALID_POINTER_ID
+  private var scrimPressed = false
+  private var scrimColor = Color.argb(128, 0, 0, 0)
+  private var scrimProgress = 0f
 
   init {
     clipChildren = false
@@ -141,6 +154,11 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
     updateShadowState(sheetContainer.translationY)
   }
 
+  override fun dispatchDraw(canvas: Canvas) {
+    drawScrim(canvas)
+    super.dispatchDraw(canvas)
+  }
+
   private fun layoutSheetChildren() {
     for (i in 0 until sheetContainer.childCount) {
       val child = sheetContainer.getChildAt(i)
@@ -175,6 +193,7 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
     }
 
     requestLayout()
+    updateScrim()
   }
 
   fun setIndex(newIndex: Int) {
@@ -190,6 +209,11 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
     snapToIndex(newIndex, 0f)
   }
 
+  fun setScrimColor(color: Int?) {
+    scrimColor = color ?: Color.argb(128, 0, 0, 0)
+    invalidate()
+  }
+
   // MARK: - Snap logic
 
   private fun translationY(index: Int): Float {
@@ -198,6 +222,12 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
     return maxHeight - snapHeight
   }
 
+  private val closedIndex: Int?
+    get() = detentSpecs.indexOfFirst { it.height == 0f }.takeIf { it >= 0 }
+
+  private val firstNonZeroDetentHeight: Float
+    get() = detentSpecs.firstOrNull { it.height > 0f }?.height ?: 0f
+
   private val draggableMinTy: Float
     get() {
       val highestIndex = detentSpecs.indices.lastOrNull { !detentSpecs[it].programmatic } ?: 0
@@ -216,7 +246,10 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
   private fun emitPosition() {
     val maxHeight = detentSpecs.lastOrNull()?.height ?: height.toFloat()
     val ty = sheetContainer.translationY
-    listener?.onPositionChange(((maxHeight - ty) / density).toDouble())
+    val position = maxHeight - ty
+    updateScrim(position)
+    updateInteractionState()
+    listener?.onPositionChange((position / density).toDouble())
     updateShadowState(ty)
   }
 
@@ -276,6 +309,7 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
         stopChoreographer()
         emitPosition()
         activeAnimation = null
+        updateInteractionState()
         listener?.onIndexChange(index)
       }
     }
@@ -308,6 +342,13 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
   override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
     val sheetTop = sheetContainer.top + sheetContainer.translationY
     if (ev.actionMasked == MotionEvent.ACTION_DOWN && ev.y < sheetTop) {
+      if (isScrimVisible()) {
+        initialTouchX = ev.x
+        initialTouchY = ev.y
+        lastTouchY = ev.y
+        scrimPressed = true
+        return true
+      }
       return false
     }
 
@@ -350,12 +391,37 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
         initialTouchX = 0f
         initialTouchY = 0f
         activePointerId = MotionEvent.INVALID_POINTER_ID
+        scrimPressed = false
       }
     }
     return false
   }
 
   override fun onTouchEvent(event: MotionEvent): Boolean {
+    if (scrimPressed) {
+      when (event.actionMasked) {
+        MotionEvent.ACTION_MOVE -> {
+          val sheetTop = sheetContainer.top + sheetContainer.translationY
+          if (event.y >= sheetTop || abs(event.y - initialTouchY) > touchSlop) {
+            scrimPressed = false
+          }
+          return true
+        }
+        MotionEvent.ACTION_UP -> {
+          val closeIndex = closedIndex
+          scrimPressed = false
+          if (closeIndex != null && isScrimVisible()) {
+            snapToIndex(closeIndex, 0f)
+          }
+          return true
+        }
+        MotionEvent.ACTION_CANCEL -> {
+          scrimPressed = false
+          return true
+        }
+      }
+    }
+
     when (event.actionMasked) {
       MotionEvent.ACTION_MOVE -> {
         if (!isPanning) beginPan(event)
@@ -426,20 +492,18 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
   private fun isScrollViewAtTop(): Boolean {
     val scrollView = findScrollView(sheetContainer) ?: return true
     if (!isTouchInsideView(scrollView)) return true
-    return !scrollView.canScrollVertically(-1)
+    val inverted = isViewInverted(scrollView)
+    return if (inverted) !scrollView.canScrollVertically(1) else !scrollView.canScrollVertically(-1)
   }
 
   private fun isTouchInsideView(target: View): Boolean {
-    val targetLocation = IntArray(2)
-    target.getLocationOnScreen(targetLocation)
+    val rect = android.graphics.Rect()
+    if (!target.getGlobalVisibleRect(rect)) return false
     val myLocation = IntArray(2)
     getLocationOnScreen(myLocation)
-    val touchScreenX = myLocation[0] + initialTouchX
-    val touchScreenY = myLocation[1] + initialTouchY
-    return touchScreenX >= targetLocation[0] &&
-      touchScreenX < targetLocation[0] + target.width &&
-      touchScreenY >= targetLocation[1] &&
-      touchScreenY < targetLocation[1] + target.height
+    val touchScreenX = (myLocation[0] + initialTouchX).toInt()
+    val touchScreenY = (myLocation[1] + initialTouchY).toInt()
+    return rect.contains(touchScreenX, touchScreenY)
   }
 
   private fun findScrollView(view: View): View? {
@@ -452,6 +516,19 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
     return null
   }
 
+  private fun isViewInverted(view: View): Boolean {
+    val values = FloatArray(9)
+    var current: View? = view
+    while (current != null && current !== sheetContainer) {
+      if (!current.matrix.isIdentity) {
+        current.matrix.getValues(values)
+        if (values[android.graphics.Matrix.MSCALE_Y] < 0) return true
+      }
+      current = current.parent as? View
+    }
+    return false
+  }
+
   // MARK: - Cleanup
 
   fun destroy() {
@@ -469,9 +546,51 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
     initialTouchX = 0f
     lastTouchY = 0f
     activePointerId = MotionEvent.INVALID_POINTER_ID
+    scrimPressed = false
     sheetContainer.translationY = 0f
+    scrimProgress = 0f
     sheetContainer.removeAllViews()
     stateWrapper = null
     lastShadowOffsetY = Float.NaN
   }
+
+  private fun updateScrim(position: Float = currentSheetHeight()) {
+    if (!modal) {
+      scrimProgress = 0f
+      invalidate()
+      return
+    }
+
+    val threshold = firstNonZeroDetentHeight
+    scrimProgress =
+      if (threshold <= 0f) 0f else (position / threshold).coerceIn(0f, 1f)
+    invalidate()
+  }
+
+  private fun updateInteractionState() {
+    pointerEvents =
+      if (modal && (activeAnimation != null || isPanning || isScrimVisible())) {
+        PointerEvents.AUTO
+      } else {
+        PointerEvents.BOX_NONE
+      }
+  }
+
+  private fun currentSheetHeight(): Float {
+    val maxHeight = detentSpecs.lastOrNull()?.height ?: height.toFloat()
+    return maxHeight - sheetContainer.translationY
+  }
+
+  private fun isScrimVisible(): Boolean = modal && currentSheetHeight() > 1f
+
+  private fun drawScrim(canvas: Canvas) {
+    if (!modal || scrimProgress <= 0.001f) {
+      return
+    }
+
+    val alpha = (Color.alpha(scrimColor) * scrimProgress).toInt().coerceIn(0, 255)
+    scrimPaint.color =
+      Color.argb(alpha, Color.red(scrimColor), Color.green(scrimColor), Color.blue(scrimColor))
+    canvas.drawRect(0f, 0f, width.toFloat(), height.toFloat(), scrimPaint)
+  }
 }

package/android/src/main/java/com/swmansion/reactnativebottomsheet/BottomSheetViewManager.kt

@@ -109,6 +109,16 @@ class BottomSheetViewManager :
     view.animateIn = animateIn
   }
 
+  @ReactProp(name = "modal")
+  override fun setModal(view: BottomSheetView, modal: Boolean) {
+    view.modal = modal
+  }
+
+  @ReactProp(name = "scrimColor", customType = "Color")
+  override fun setScrimColor(view: BottomSheetView, scrimColor: Int?) {
+    view.setScrimColor(scrimColor)
+  }
+
   override fun onDropViewInstance(view: BottomSheetView) {
     super.onDropViewInstance(view)
     view.destroy()

package/ios/BottomSheetComponentView.mm

@@ -64,6 +64,14 @@ using namespace facebook::react;
     _sheetView.animateIn = newViewProps.animateIn;
   }
 
+  if (newViewProps.modal != oldViewProps.modal) {
+    _sheetView.modal = newViewProps.modal;
+  }
+
+  if (newViewProps.scrimColor != oldViewProps.scrimColor) {
+    [_sheetView setScrimColor:RCTUIColorFromSharedColor(newViewProps.scrimColor)];
+  }
+
   [super updateProps:props oldProps:oldProps];
 }
 

package/ios/BottomSheetContentView.h

@@ -13,10 +13,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, weak, nullable) id<BottomSheetContentViewDelegate> delegate;
 @property (nonatomic) BOOL animateIn;
+@property (nonatomic) BOOL modal;
 @property (nonatomic, readonly) UIView *sheetContainer;
 
 - (void)setDetents:(NSArray<NSDictionary *> *)raw;
 - (void)setDetentIndex:(NSInteger)newIndex;
+- (void)setScrimColor:(UIColor *_Nullable)color;
 - (void)mountChildComponentView:(UIView *)childView atIndex:(NSInteger)index;
 - (void)unmountChildComponentView:(UIView *)childView;
 - (void)resetSheetState;

package/ios/BottomSheetContentView.mm

@@ -40,6 +40,16 @@
   return _impl.sheetContainer;
 }
 
+- (BOOL)modal
+{
+  return _impl.modal;
+}
+
+- (void)setModal:(BOOL)modal
+{
+  _impl.modal = modal;
+}
+
 - (void)setDetents:(NSArray<NSDictionary *> *)raw
 {
   [_impl setDetents:raw];
@@ -50,6 +60,11 @@
   [_impl setDetentIndex:newIndex];
 }
 
+- (void)setScrimColor:(UIColor *)color
+{
+  _impl.scrimColor = color;
+}
+
 - (void)mountChildComponentView:(UIView *)childView atIndex:(NSInteger)index
 {
   [_impl mountChildComponentView:childView atIndex:index];

package/ios/RNSBottomSheetHostingView.swift

@@ -13,15 +13,25 @@ private struct DetentSpec {
 @objcMembers
 public final class RNSBottomSheetHostingView: UIView {
   public weak var eventDelegate: RNSBottomSheetHostingViewDelegate?
+  public var modal: Bool = false {
+    didSet { updateScrim() }
+  }
+  public var scrimColor: UIColor? = UIColor.black.withAlphaComponent(0.5) {
+    didSet { scrimView.backgroundColor = scrimColor }
+  }
 
   private var detentSpecs: [DetentSpec] = [] {
-    didSet { setNeedsLayout() }
+    didSet {
+      setNeedsLayout()
+      updateScrim()
+    }
   }
 
   private var targetIndex: Int = 0
   public var animateIn: Bool = true
 
   public let sheetContainer = UIView()
+  private let scrimView = UIControl()
   private var panGesture: UIPanGestureRecognizer!
   private var activeAnimator: UIViewPropertyAnimator?
   private var displayLink: CADisplayLink?
@@ -35,6 +45,12 @@ public final class RNSBottomSheetHostingView: UIView {
     backgroundColor = .clear
     clipsToBounds = false
 
+    scrimView.backgroundColor = scrimColor
+    scrimView.alpha = 0
+    scrimView.isHidden = true
+    scrimView.addTarget(self, action: #selector(handleScrimPress), for: .touchUpInside)
+    addSubview(scrimView)
+
     sheetContainer.backgroundColor = .clear
     sheetContainer.clipsToBounds = false
     addSubview(sheetContainer)
@@ -81,6 +97,7 @@ public final class RNSBottomSheetHostingView: UIView {
     super.layoutSubviews()
     guard bounds.width > 0, bounds.height > 0 else { return }
 
+    scrimView.frame = bounds
     let maxHeight = detentSpecs.last?.height ?? bounds.height
     sheetContainer.bounds = CGRect(x: 0, y: 0, width: bounds.width, height: maxHeight)
     sheetContainer.center = CGPoint(x: bounds.width / 2, y: bounds.height - maxHeight / 2)
@@ -106,6 +123,7 @@ public final class RNSBottomSheetHostingView: UIView {
 
     if activeAnimator != nil || isPanning { return }
     sheetContainer.transform = CGAffineTransform(translationX: 0, y: translationY(for: targetIndex))
+    updateScrim()
   }
 
   private var presentedSheetFrame: CGRect {
@@ -116,12 +134,21 @@ public final class RNSBottomSheetHostingView: UIView {
   }
 
   public override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
-    presentedSheetFrame.contains(point)
+    if presentedSheetFrame.contains(point) {
+      return true
+    }
+
+    return isScrimVisible && bounds.contains(point)
   }
 
   public override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
     guard self.point(inside: point, with: event) else { return nil }
 
+    if isScrimVisible && !presentedSheetFrame.contains(point) {
+      let scrimPoint = convert(point, to: scrimView)
+      return scrimView.hitTest(scrimPoint, with: event)
+    }
+
     let containerPoint = convert(point, to: sheetContainer)
     guard sheetContainer.bounds.contains(containerPoint) else { return nil }
     return sheetContainer.hitTest(containerPoint, with: event)
@@ -169,6 +196,8 @@ public final class RNSBottomSheetHostingView: UIView {
     isPanning = false
     setContentInteractionEnabled(true)
     sheetContainer.transform = .identity
+    scrimView.alpha = 0
+    scrimView.isHidden = true
     for subview in sheetContainer.subviews {
       subview.removeFromSuperview()
     }
@@ -194,10 +223,31 @@ public final class RNSBottomSheetHostingView: UIView {
     return (minTy: translationY(for: highestIndex), maxTy: translationY(for: lowestIndex))
   }
 
+  private var closedIndex: Int? {
+    detentSpecs.firstIndex(where: { $0.height == 0 })
+  }
+
+  private var firstNonZeroDetentHeight: CGFloat {
+    detentSpecs.first(where: { $0.height > 0 })?.height ?? 0
+  }
+
+  private var currentSheetHeight: CGFloat {
+    let maxHeight = detentSpecs.last?.height ?? bounds.height
+    let ty = sheetContainer.layer.presentation()?.affineTransform().ty ?? sheetContainer.transform.ty
+    return maxHeight - ty
+  }
+
+  private var isScrimVisible: Bool {
+    modal && currentSheetHeight > 0.5
+  }
+
   private func emitPosition() {
     let maxHeight = detentSpecs.last?.height ?? bounds.height
     let ty = sheetContainer.layer.presentation()?.affineTransform().ty ?? sheetContainer.transform.ty
-    eventDelegate?.bottomSheetHostingView(self, didChangePosition: maxHeight - ty)
+    let position = maxHeight - ty
+    updateScrim(forPosition: position)
+    updateInteractionState()
+    eventDelegate?.bottomSheetHostingView(self, didChangePosition: position)
   }
 
   private func startDisplayLink() {
@@ -227,6 +277,19 @@ public final class RNSBottomSheetHostingView: UIView {
     emitPosition()
   }
 
+  @objc private func handleScrimPress() {
+    guard
+      modal,
+      let closedIndex,
+      targetIndex != closedIndex,
+      activeAnimator == nil || currentSheetHeight > 0.5
+    else {
+      return
+    }
+
+    snapToIndex(closedIndex, velocity: 0)
+  }
+
   private func snapToIndex(_ index: Int, velocity: CGFloat) {
     guard index >= 0, index < detentSpecs.count else { return }
     targetIndex = index
@@ -252,6 +315,7 @@ public final class RNSBottomSheetHostingView: UIView {
       self.emitPosition()
       self.activeAnimator = nil
       self.setContentInteractionEnabled(true)
+      self.updateInteractionState()
       self.eventDelegate?.bottomSheetHostingView(self, didChangeIndex: index)
     }
     animator.startAnimation()
@@ -344,6 +408,15 @@ public final class RNSBottomSheetHostingView: UIView {
     return nil
   }
 
+  private func isViewInverted(_ view: UIView) -> Bool {
+    var current: UIView? = view
+    while let v = current, v !== sheetContainer {
+      if v.transform.d < 0 { return true }
+      current = v.superview
+    }
+    return false
+  }
+
   public override func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
     guard gestureRecognizer === panGesture else { return true }
 
@@ -365,6 +438,11 @@ public final class RNSBottomSheetHostingView: UIView {
     guard let scrollView = firstScrollView(in: sheetContainer) else { return true }
     let locationInScroll = panGesture.location(in: scrollView)
     guard scrollView.bounds.contains(locationInScroll) else { return true }
+    let inverted = isViewInverted(scrollView)
+    if inverted {
+      let maxOffsetY = scrollView.contentSize.height - scrollView.bounds.height + scrollView.adjustedContentInset.bottom
+      return scrollView.contentOffset.y >= maxOffsetY
+    }
     return scrollView.contentOffset.y <= 0
   }
 }
@@ -385,3 +463,32 @@ extension RNSBottomSheetHostingView: UIGestureRecognizerDelegate {
     return false
   }
 }
+
+private extension RNSBottomSheetHostingView {
+  func updateScrim() {
+    updateScrim(forPosition: currentSheetHeight)
+    updateInteractionState()
+  }
+
+  func updateScrim(forPosition position: CGFloat) {
+    guard modal else {
+      scrimView.alpha = 0
+      scrimView.isHidden = true
+      return
+    }
+
+    let threshold = firstNonZeroDetentHeight
+    let progress: CGFloat
+    if threshold <= 0 {
+      progress = 0
+    } else {
+      progress = min(1, max(0, position / threshold))
+    }
+    scrimView.alpha = progress
+    scrimView.isHidden = progress <= 0.001
+  }
+
+  func updateInteractionState() {
+    scrimView.isUserInteractionEnabled = modal && (closedIndex != nil) && !scrimView.isHidden
+  }
+}

package/lib/module/BottomSheet.js

@@ -1,29 +1,17 @@
 "use strict";
 
-import { useEffect, useRef, useState } from 'react';
-import { Animated, Pressable, StyleSheet, View, useWindowDimensions } from 'react-native';
+import { useRef, useState } from 'react';
+import { Animated, StyleSheet, View, useWindowDimensions } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import BottomSheetNativeComponent from './BottomSheetNativeComponent';
 import { Portal } from "./BottomSheetProvider.js";
 import { resolveDetent } from "./bottomSheetUtils.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export { programmatic } from "./bottomSheetUtils.js";
-const DefaultScrim = ({
-  progress,
-  color
-}) => {
-  return /*#__PURE__*/_jsx(Animated.View, {
-    style: [StyleSheet.absoluteFill, {
-      flex: 1,
-      backgroundColor: color,
-      opacity: progress
-    }]
-  });
-};
 export const BottomSheet = ({
   children,
   style,
-  detents = [0, 'max'],
+  detents = [0, 'content'],
   index,
   animateIn = true,
   onIndexChange,
@@ -32,13 +20,11 @@ export const BottomSheet = ({
   scrimColor = 'rgba(0, 0, 0, 0.5)'
 }) => {
   const {
-    height: screenHeight
+    height: windowHeight
   } = useWindowDimensions();
   const insets = useSafeAreaInsets();
-  const maxHeight = screenHeight - insets.top;
+  const maxHeight = windowHeight - insets.top;
   const [contentHeight, setContentHeight] = useState(0);
-  const currentPositionRef = useRef(0);
-  const scrimProgress = useRef(new Animated.Value(0)).current;
   const sheetOpacity = useRef(new Animated.Value(0)).current;
   const resolvedDetents = detents.map(detent => {
     const value = resolveDetent(detent, contentHeight, maxHeight);
@@ -52,61 +38,18 @@ export const BottomSheet = ({
   };
   const clampedIndex = Math.max(0, Math.min(index, resolvedDetents.length - 1));
   const isCollapsed = (resolvedDetents[clampedIndex]?.height ?? 0) === 0;
-  const scrimPressEnabledRef = useRef(!modal || isCollapsed);
-  const previousIsCollapsedRef = useRef(isCollapsed);
-  const firstNonzeroDetent = resolvedDetents.find(detent => detent.height > 0)?.height ?? 0;
-  useEffect(() => {
-    const progress = firstNonzeroDetent <= 0 ? 0 : Math.min(1, Math.max(0, currentPositionRef.current / firstNonzeroDetent));
-    scrimProgress.setValue(progress);
-  }, [firstNonzeroDetent, scrimProgress]);
-  useEffect(() => {
-    if (!modal) {
-      scrimPressEnabledRef.current = true;
-      previousIsCollapsedRef.current = isCollapsed;
-      return undefined;
-    }
-    if (previousIsCollapsedRef.current && !isCollapsed) {
-      scrimPressEnabledRef.current = false;
-      previousIsCollapsedRef.current = isCollapsed;
-      const frame = requestAnimationFrame(() => {
-        scrimPressEnabledRef.current = true;
-      });
-      return () => cancelAnimationFrame(frame);
-    }
-    scrimPressEnabledRef.current = !isCollapsed;
-    previousIsCollapsedRef.current = isCollapsed;
-    return undefined;
-  }, [isCollapsed, modal]);
   const handleIndexChange = event => {
     onIndexChange?.(event.nativeEvent.index);
   };
   const handlePositionChange = event => {
     const height = event.nativeEvent.position;
-    currentPositionRef.current = height;
-    const progress = firstNonzeroDetent <= 0 ? 0 : Math.min(1, Math.max(0, height / firstNonzeroDetent));
-    scrimProgress.setValue(progress);
     sheetOpacity.setValue(height === 0 ? 0 : 1);
     onPositionChange?.(height);
   };
-  const closedIndex = resolvedDetents.findIndex(detent => detent.height === 0);
-  const handleScrimPress = () => {
-    if (closedIndex === -1 || clampedIndex === closedIndex || !scrimPressEnabledRef.current) {
-      return;
-    }
-    onIndexChange?.(closedIndex);
-  };
-  const scrimElement = modal ? /*#__PURE__*/_jsx(DefaultScrim, {
-    progress: scrimProgress,
-    color: scrimColor
-  }) : null;
-  const sheet = /*#__PURE__*/_jsxs(Animated.View, {
+  const sheet = /*#__PURE__*/_jsx(Animated.View, {
     style: StyleSheet.absoluteFill,
     pointerEvents: modal ? isCollapsed ? 'none' : 'auto' : 'box-none',
-    children: [modal && scrimElement !== null ? /*#__PURE__*/_jsx(Pressable, {
-      style: StyleSheet.absoluteFill,
-      onPress: handleScrimPress,
-      children: scrimElement
-    }) : null, /*#__PURE__*/_jsx(Animated.View, {
+    children: /*#__PURE__*/_jsx(Animated.View, {
       pointerEvents: "box-none",
       style: [StyleSheet.absoluteFill, {
         opacity: sheetOpacity
@@ -118,11 +61,16 @@ export const BottomSheet = ({
           left: 0,
           right: 0,
           bottom: 0,
-          height: maxHeight
+          // The native host always spans the full height of its container.
+          // Detents are still capped to `maxHeight`, so the sheet itself
+          // never extends under the status bar.
+          height: windowHeight
         }, style],
         detents: resolvedDetents,
         index: index,
         animateIn: animateIn,
+        modal: modal,
+        scrimColor: scrimColor,
         onIndexChange: handleIndexChange,
         onPositionChange: handlePositionChange,
         children: /*#__PURE__*/_jsxs(View, {
@@ -136,7 +84,7 @@ export const BottomSheet = ({
           })]
         })
       })
-    })]
+    })
   });
   if (modal) {
     return /*#__PURE__*/_jsx(Portal, {

package/lib/module/BottomSheet.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useRef","useState","Animated","Pressable","StyleSheet","View","useWindowDimensions","useSafeAreaInsets","BottomSheetNativeComponent","Portal","resolveDetent","jsx","_jsx","jsxs","_jsxs","programmatic","DefaultScrim","progress","color","style","absoluteFill","flex","backgroundColor","opacity","BottomSheet","children","detents","index","animateIn","onIndexChange","onPositionChange","modal","scrimColor","height","screenHeight","insets","maxHeight","top","contentHeight","setContentHeight","currentPositionRef","scrimProgress","Value","current","sheetOpacity","resolvedDetents","map","detent","value","Math","max","min","isDetentProgrammatic","handleSentinelLayout","event","nativeEvent","layout","y","clampedIndex","length","isCollapsed","scrimPressEnabledRef","previousIsCollapsedRef","firstNonzeroDetent","find","setValue","undefined","frame","requestAnimationFrame","cancelAnimationFrame","handleIndexChange","handlePositionChange","position","closedIndex","findIndex","handleScrimPress","scrimElement","sheet","pointerEvents","onPress","left","right","bottom","collapsable","onLayout"],"sourceRoot":"../../src","sources":["BottomSheet.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useRef","useState","Animated","StyleSheet","View","useWindowDimensions","useSafeAreaInsets","BottomSheetNativeComponent","Portal","resolveDetent","jsx","_jsx","jsxs","_jsxs","programmatic","BottomSheet","children","style","detents","index","animateIn","onIndexChange","onPositionChange","modal","scrimColor","height","windowHeight","insets","maxHeight","top","contentHeight","setContentHeight","sheetOpacity","Value","current","resolvedDetents","map","detent","value","Math","max","min","isDetentProgrammatic","handleSentinelLayout","event","nativeEvent","layout","y","clampedIndex","length","isCollapsed","handleIndexChange","handlePositionChange","position","setValue","sheet","absoluteFill","pointerEvents","opacity","left","right","bottom","collapsable","flex","onLayout"],"sourceRoot":"../../src","sources":["BottomSheet.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/BottomSheetNativeComponent.ts

@@ -1,6 +1,7 @@
 import {
   codegenNativeComponent,
   type CodegenTypes,
+  type ColorValue,
   type ViewProps,
 } from 'react-native';
 
@@ -13,6 +14,8 @@ export interface NativeProps extends ViewProps {
   detents: ReadonlyArray<NativeDetent>;
   index: CodegenTypes.Int32;
   animateIn: boolean;
+  modal: boolean;
+  scrimColor: ColorValue;
   onIndexChange?: CodegenTypes.DirectEventHandler<
     Readonly<{ index: CodegenTypes.Int32 }>
   >;

package/lib/module/bottomSheetUtils.js

@@ -41,7 +41,7 @@ export const findSnapTarget = (currentTranslate, velocityY, currentIndex, allPos
 export const resolveDetent = (detent, contentHeight, maxHeight) => {
   const detentValueInput = detentValue(detent);
   if (typeof detentValueInput === 'number') return detentValueInput;
-  if (detentValueInput === 'max') {
+  if (detentValueInput === 'content') {
     return contentHeight > 0 ? Math.min(contentHeight, maxHeight) : maxHeight;
   }
   throw new Error(`Invalid detent: \`${detentValueInput}\`.`);

package/lib/module/bottomSheetUtils.js.map

@@ -1 +1 @@
-{"version":3,"names":["programmatic","value","detentValue","detent","isDetentProgrammatic","VELOCITY_THRESHOLD","findSnapTarget","currentTranslate","velocityY","currentIndex","allPositions","draggablePositions","filter","position","isDraggable","effectivePositions","length","targetIndex","minDistance","Infinity","distance","Math","abs","translateY","index","lowerPosition","sort","a","b","undefined","upperPosition","resolveDetent","contentHeight","maxHeight","detentValueInput","min","Error","clampIndex","detentCount","max"],"sourceRoot":"../../src","sources":["bottomSheetUtils.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["programmatic","value","detentValue","detent","isDetentProgrammatic","VELOCITY_THRESHOLD","findSnapTarget","currentTranslate","velocityY","currentIndex","allPositions","draggablePositions","filter","position","isDraggable","effectivePositions","length","targetIndex","minDistance","Infinity","distance","Math","abs","translateY","index","lowerPosition","sort","a","b","undefined","upperPosition","resolveDetent","contentHeight","maxHeight","detentValueInput","min","Error","clampIndex","detentCount","max"],"sourceRoot":"../../src","sources":["bottomSheetUtils.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/BottomSheet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BottomSheet.d.ts","sourceRoot":"","sources":["../../../src/BottomSheet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA+B,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AACpE,OAAO,KAAK,EAAqB,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAY5E,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,oBAAoB,CAAC;AAChE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAmBlD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,SAAS,CAAC;IACpB,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,WAAW,GAAI,qGAUzB,gBAAgB,4CAiJlB,CAAC"}
+{"version":3,"file":"BottomSheet.d.ts","sourceRoot":"","sources":["../../../src/BottomSheet.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AACzD,OAAO,KAAK,EAAqB,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAM5E,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,oBAAoB,CAAC;AAChE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,SAAS,CAAC;IACpB,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,WAAW,GAAI,qGAUzB,gBAAgB,4CA+ElB,CAAC"}

package/lib/typescript/src/BottomSheetNativeComponent.d.ts

@@ -1,4 +1,4 @@
-import { type CodegenTypes, type ViewProps } from 'react-native';
+import { type CodegenTypes, type ColorValue, type ViewProps } from 'react-native';
 type NativeDetent = Readonly<{
     height: CodegenTypes.Double;
     programmatic: boolean;
@@ -7,6 +7,8 @@ export interface NativeProps extends ViewProps {
     detents: ReadonlyArray<NativeDetent>;
     index: CodegenTypes.Int32;
     animateIn: boolean;
+    modal: boolean;
+    scrimColor: ColorValue;
     onIndexChange?: CodegenTypes.DirectEventHandler<Readonly<{
         index: CodegenTypes.Int32;
     }>>;

package/lib/typescript/src/BottomSheetNativeComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BottomSheetNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/BottomSheetNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAEtB,KAAK,YAAY,GAAG,QAAQ,CAAC;IAC3B,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC;IAC5B,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC,CAAC;AAEH,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACrC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,YAAY,CAAC,kBAAkB,CAC7C,QAAQ,CAAC;QAAE,KAAK,EAAE,YAAY,CAAC,KAAK,CAAA;KAAE,CAAC,CACxC,CAAC;IACF,gBAAgB,CAAC,EAAE,YAAY,CAAC,kBAAkB,CAChD,QAAQ,CAAC;QAAE,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAA;KAAE,CAAC,CAC5C,CAAC;CACH;;AAED,wBAAsE"}
+{"version":3,"file":"BottomSheetNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/BottomSheetNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAEtB,KAAK,YAAY,GAAG,QAAQ,CAAC;IAC3B,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC;IAC5B,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC,CAAC;AAEH,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IACrC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,CAAC,EAAE,YAAY,CAAC,kBAAkB,CAC7C,QAAQ,CAAC;QAAE,KAAK,EAAE,YAAY,CAAC,KAAK,CAAA;KAAE,CAAC,CACxC,CAAC;IACF,gBAAgB,CAAC,EAAE,YAAY,CAAC,kBAAkB,CAChD,QAAQ,CAAC;QAAE,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAA;KAAE,CAAC,CAC5C,CAAC;CACH;;AAED,wBAAsE"}

package/lib/typescript/src/bottomSheetUtils.d.ts

@@ -1,4 +1,4 @@
-export type DetentValue = number | 'max';
+export type DetentValue = number | 'content';
 export type Detent = DetentValue | {
     value: DetentValue;
     programmatic?: boolean;

package/lib/typescript/src/bottomSheetUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bottomSheetUtils.d.ts","sourceRoot":"","sources":["../../../src/bottomSheetUtils.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,KAAK,CAAC;AAEzC,MAAM,MAAM,MAAM,GACd,WAAW,GACX;IAAE,KAAK,EAAE,WAAW,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEnD,eAAO,MAAM,YAAY,GAAI,OAAO,WAAW,KAAG,MAGhD,CAAC;AAEH,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,KAAG,WAG5C,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,QAAQ,MAAM,KAAG,OAKrD,CAAC;AAIF,eAAO,MAAM,cAAc,GACzB,kBAAkB,MAAM,EACxB,WAAW,MAAM,EACjB,cAAc,MAAM,EACpB,cAAc;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,EAAE,WAiC5E,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,QAAQ,MAAM,EACd,eAAe,MAAM,EACrB,WAAW,MAAM,WAQlB,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,OAAO,MAAM,EAAE,aAAa,MAAM,WAG5D,CAAC"}
+{"version":3,"file":"bottomSheetUtils.d.ts","sourceRoot":"","sources":["../../../src/bottomSheetUtils.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,SAAS,CAAC;AAE7C,MAAM,MAAM,MAAM,GACd,WAAW,GACX;IAAE,KAAK,EAAE,WAAW,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEnD,eAAO,MAAM,YAAY,GAAI,OAAO,WAAW,KAAG,MAGhD,CAAC;AAEH,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,KAAG,WAG5C,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,QAAQ,MAAM,KAAG,OAKrD,CAAC;AAIF,eAAO,MAAM,cAAc,GACzB,kBAAkB,MAAM,EACxB,WAAW,MAAM,EACjB,cAAc,MAAM,EACpB,cAAc;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,EAAE,WAiC5E,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,QAAQ,MAAM,EACd,eAAe,MAAM,EACrB,WAAW,MAAM,WAQlB,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,OAAO,MAAM,EAAE,aAAa,MAAM,WAG5D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/react-native-bottom-sheet",
-  "version": "0.7.2",
+  "version": "0.8.0-next.1",
   "description": "Provides bottom-sheet components for React Native.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/BottomSheet.tsx

@@ -1,12 +1,6 @@
-import { useEffect, useRef, useState, type ReactNode } from 'react';
+import { useRef, useState, type ReactNode } from 'react';
 import type { LayoutChangeEvent, StyleProp, ViewStyle } from 'react-native';
-import {
-  Animated,
-  Pressable,
-  StyleSheet,
-  View,
-  useWindowDimensions,
-} from 'react-native';
+import { Animated, StyleSheet, View, useWindowDimensions } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 import BottomSheetNativeComponent from './BottomSheetNativeComponent';
@@ -15,23 +9,6 @@ import { type Detent, resolveDetent } from './bottomSheetUtils';
 export type { Detent, DetentValue } from './bottomSheetUtils';
 export { programmatic } from './bottomSheetUtils';
 
-const DefaultScrim = ({
-  progress,
-  color,
-}: {
-  progress: Animated.Value;
-  color: string;
-}) => {
-  return (
-    <Animated.View
-      style={[
-        StyleSheet.absoluteFill,
-        { flex: 1, backgroundColor: color, opacity: progress },
-      ]}
-    />
-  );
-};
-
 export interface BottomSheetProps {
   children: ReactNode;
   style?: StyleProp<ViewStyle>;
@@ -47,7 +24,7 @@ export interface BottomSheetProps {
 export const BottomSheet = ({
   children,
   style,
-  detents = [0, 'max'],
+  detents = [0, 'content'],
   index,
   animateIn = true,
   onIndexChange,
@@ -55,12 +32,10 @@ export const BottomSheet = ({
   modal = false,
   scrimColor = 'rgba(0, 0, 0, 0.5)',
 }: BottomSheetProps) => {
-  const { height: screenHeight } = useWindowDimensions();
+  const { height: windowHeight } = useWindowDimensions();
   const insets = useSafeAreaInsets();
-  const maxHeight = screenHeight - insets.top;
+  const maxHeight = windowHeight - insets.top;
   const [contentHeight, setContentHeight] = useState(0);
-  const currentPositionRef = useRef(0);
-  const scrimProgress = useRef(new Animated.Value(0)).current;
   const sheetOpacity = useRef(new Animated.Value(0)).current;
 
   const resolvedDetents = detents.map((detent) => {
@@ -77,45 +52,6 @@ export const BottomSheet = ({
 
   const clampedIndex = Math.max(0, Math.min(index, resolvedDetents.length - 1));
   const isCollapsed = (resolvedDetents[clampedIndex]?.height ?? 0) === 0;
-  const scrimPressEnabledRef = useRef(!modal || isCollapsed);
-  const previousIsCollapsedRef = useRef(isCollapsed);
-  const firstNonzeroDetent =
-    resolvedDetents.find((detent) => detent.height > 0)?.height ?? 0;
-
-  useEffect(() => {
-    const progress =
-      firstNonzeroDetent <= 0
-        ? 0
-        : Math.min(
-            1,
-            Math.max(0, currentPositionRef.current / firstNonzeroDetent)
-          );
-    scrimProgress.setValue(progress);
-  }, [firstNonzeroDetent, scrimProgress]);
-
-  useEffect(() => {
-    if (!modal) {
-      scrimPressEnabledRef.current = true;
-      previousIsCollapsedRef.current = isCollapsed;
-      return undefined;
-    }
-
-    if (previousIsCollapsedRef.current && !isCollapsed) {
-      scrimPressEnabledRef.current = false;
-      previousIsCollapsedRef.current = isCollapsed;
-
-      const frame = requestAnimationFrame(() => {
-        scrimPressEnabledRef.current = true;
-      });
-
-      return () => cancelAnimationFrame(frame);
-    }
-
-    scrimPressEnabledRef.current = !isCollapsed;
-    previousIsCollapsedRef.current = isCollapsed;
-    return undefined;
-  }, [isCollapsed, modal]);
-
   const handleIndexChange = (event: { nativeEvent: { index: number } }) => {
     onIndexChange?.(event.nativeEvent.index);
   };
@@ -124,45 +60,15 @@ export const BottomSheet = ({
     nativeEvent: { position: number };
   }) => {
     const height = event.nativeEvent.position;
-    currentPositionRef.current = height;
-    const progress =
-      firstNonzeroDetent <= 0
-        ? 0
-        : Math.min(1, Math.max(0, height / firstNonzeroDetent));
-    scrimProgress.setValue(progress);
     sheetOpacity.setValue(height === 0 ? 0 : 1);
     onPositionChange?.(height);
   };
 
-  const closedIndex = resolvedDetents.findIndex(
-    (detent) => detent.height === 0
-  );
-  const handleScrimPress = () => {
-    if (
-      closedIndex === -1 ||
-      clampedIndex === closedIndex ||
-      !scrimPressEnabledRef.current
-    ) {
-      return;
-    }
-
-    onIndexChange?.(closedIndex);
-  };
-
-  const scrimElement = modal ? (
-    <DefaultScrim progress={scrimProgress} color={scrimColor} />
-  ) : null;
-
   const sheet = (
     <Animated.View
       style={StyleSheet.absoluteFill}
       pointerEvents={modal ? (isCollapsed ? 'none' : 'auto') : 'box-none'}
     >
-      {modal && scrimElement !== null ? (
-        <Pressable style={StyleSheet.absoluteFill} onPress={handleScrimPress}>
-          {scrimElement}
-        </Pressable>
-      ) : null}
       <Animated.View
         pointerEvents="box-none"
         style={[StyleSheet.absoluteFill, { opacity: sheetOpacity }]}
@@ -175,13 +81,18 @@ export const BottomSheet = ({
               left: 0,
               right: 0,
               bottom: 0,
-              height: maxHeight,
+              // The native host always spans the full height of its container.
+              // Detents are still capped to `maxHeight`, so the sheet itself
+              // never extends under the status bar.
+              height: windowHeight,
             },
             style,
           ]}
           detents={resolvedDetents}
           index={index}
           animateIn={animateIn}
+          modal={modal}
+          scrimColor={scrimColor}
           onIndexChange={handleIndexChange}
           onPositionChange={handlePositionChange}
         >

package/src/BottomSheetNativeComponent.ts

@@ -1,6 +1,7 @@
 import {
   codegenNativeComponent,
   type CodegenTypes,
+  type ColorValue,
   type ViewProps,
 } from 'react-native';
 
@@ -13,6 +14,8 @@ export interface NativeProps extends ViewProps {
   detents: ReadonlyArray<NativeDetent>;
   index: CodegenTypes.Int32;
   animateIn: boolean;
+  modal: boolean;
+  scrimColor: ColorValue;
   onIndexChange?: CodegenTypes.DirectEventHandler<
     Readonly<{ index: CodegenTypes.Int32 }>
   >;

package/src/bottomSheetUtils.ts

@@ -1,4 +1,4 @@
-export type DetentValue = number | 'max';
+export type DetentValue = number | 'content';
 
 export type Detent =
   | DetentValue
@@ -69,7 +69,7 @@ export const resolveDetent = (
 ) => {
   const detentValueInput = detentValue(detent);
   if (typeof detentValueInput === 'number') return detentValueInput;
-  if (detentValueInput === 'max') {
+  if (detentValueInput === 'content') {
     return contentHeight > 0 ? Math.min(contentHeight, maxHeight) : maxHeight;
   }
   throw new Error(`Invalid detent: \`${detentValueInput}\`.`);