@swmansion/react-native-bottom-sheet 0.9.4 → 0.9.5

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

@@ -260,12 +260,13 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
 
   private fun resolveDetentSpecs(): List<DetentSpec> {
     val maxHeight = resolvedMaxDetentHeight()
-    val contentHeight = validContentHeight().takeIf { it.isFinite() } ?: maxHeight
+    val contentHeight =
+      validContentHeight().takeIf { it.isFinite() }?.coerceAtMost(maxHeight) ?: maxHeight
     return rawDetentSpecs.map { spec ->
       val height =
         when (spec.kind) {
-          DetentKind.POINTS -> spec.value
-          DetentKind.CONTENT -> contentHeight.coerceAtMost(maxHeight)
+          DetentKind.POINTS -> spec.value.coerceAtMost(contentHeight)
+          DetentKind.CONTENT -> contentHeight
         }.coerceIn(0f, maxHeight)
       DetentSpec(height = height, programmatic = spec.programmatic)
     }
@@ -451,6 +452,7 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
     }
 
     val targetTy = translationY(index)
+    val currentTy = sheetContainer.translationY
     activeAnimationEmitsSettle = emitSettle
     activeAnimation?.cancel()
 
@@ -461,8 +463,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
@@ -546,7 +546,7 @@ public final class RNSBottomSheetHostingView: UIView {
       let height: CGFloat
       switch spec.kind {
       case .points:
-        height = spec.value
+        height = min(spec.value, contentHeight)
       case .content:
         height = contentHeight
       }

package/package.json

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