@swmansion/react-native-bottom-sheet 0.9.4 → 0.10.0-next.1

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

@@ -260,12 +260,21 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
 
   private fun resolveDetentSpecs(): List<DetentSpec> {
     val maxHeight = resolvedMaxDetentHeight()
-    val contentHeight = validContentHeight().takeIf { it.isFinite() } ?: maxHeight
-    return rawDetentSpecs.map { spec ->
+    val measuredContentHeight =
+      validContentHeight().takeIf { maxHeight > 0f && it.isFinite() }?.coerceAtMost(maxHeight)
+    val contentHeight = measuredContentHeight ?: maxHeight
+    return rawDetentSpecs.mapIndexed { index, spec ->
       val height =
         when (spec.kind) {
-          DetentKind.POINTS -> spec.value
-          DetentKind.CONTENT -> contentHeight.coerceAtMost(maxHeight)
+          DetentKind.POINTS -> {
+            if (measuredContentHeight != null && spec.value > contentHeight) {
+              throw IllegalArgumentException(
+                "Invalid bottom sheet detent at index $index: fixed detent ${spec.value / density} exceeds measured content height ${contentHeight / density}."
+              )
+            }
+            spec.value
+          }
+          DetentKind.CONTENT -> contentHeight
         }.coerceIn(0f, maxHeight)
       DetentSpec(height = height, programmatic = spec.programmatic)
     }
@@ -451,6 +460,7 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
     }
 
     val targetTy = translationY(index)
+    val currentTy = sheetContainer.translationY
     activeAnimationEmitsSettle = emitSettle
     activeAnimation?.cancel()
 
@@ -461,8 +471,8 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
             dampingRatio = SpringForce.DAMPING_RATIO_NO_BOUNCY
             stiffness = SpringForce.STIFFNESS_MEDIUM
           }
-        setMinValue(minDetentTranslationY)
-        setMaxValue(maxDetentTranslationY)
+        setMinValue(minOf(minDetentTranslationY, currentTy, targetTy))
+        setMaxValue(maxOf(maxDetentTranslationY, currentTy, targetTy))
         setStartVelocity(velocity)
         addEndListener { _, canceled, _, _ ->
           if (canceled) {

package/ios/RNSBottomSheetHostingView.swift

@@ -130,7 +130,7 @@ public final class RNSBottomSheetHostingView: UIView {
       let indexToApply = pendingIndex ?? targetIndex
       let clampedIndex = max(0, min(detentSpecs.count - 1, indexToApply))
 
-      if animateIn && isInvalidContentDetentTarget(clampedIndex) {
+      if animateIn, isInvalidContentDetentTarget(clampedIndex) {
         targetIndex = clampedIndex
         pendingIndex = clampedIndex
         let closedTy = maximumResolvedDetentHeight ?? bounds.height
@@ -541,11 +541,20 @@ public final class RNSBottomSheetHostingView: UIView {
 
   private func resolveDetentSpecs() -> [DetentSpec] {
     let maxHeight = resolvedMaxDetentHeight
-    let contentHeight = validContentHeight.map { min($0, maxHeight) } ?? maxHeight
-    return rawDetentSpecs.map { spec in
+    let measuredContentHeight = maxHeight > 0 ? validContentHeight.map { min($0, maxHeight) } : nil
+    let contentHeight = measuredContentHeight ?? maxHeight
+    return rawDetentSpecs.enumerated().map { index, spec in
       let height: CGFloat
       switch spec.kind {
       case .points:
+        if measuredContentHeight != nil, spec.value > contentHeight {
+          NSException(
+            name: NSExceptionName.invalidArgumentException,
+            reason:
+            "Invalid bottom sheet detent at index \(index): fixed detent \(spec.value) exceeds measured content height \(contentHeight).",
+            userInfo: nil
+          ).raise()
+        }
         height = spec.value
       case .content:
         height = contentHeight

package/package.json

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