@swmansion/react-native-bottom-sheet 0.9.5 → 0.10.0-next.2

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

@@ -260,12 +260,20 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
 
   private fun resolveDetentSpecs(): List<DetentSpec> {
     val maxHeight = resolvedMaxDetentHeight()
-    val contentHeight =
-      validContentHeight().takeIf { it.isFinite() }?.coerceAtMost(maxHeight) ?: 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.coerceAtMost(contentHeight)
+          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)
@@ -284,12 +292,15 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
       return
     }
 
+    val previousMaxHeight = detentSpecs.maxOfOrNull { it.height } ?: resolvedMaxDetentHeight()
     detentSpecs = resolvedDetents
     if (width > 0 && height > 0 && detentSpecs.isNotEmpty()) {
       layoutSheetContainer(width, height)
 
       if (hasLaidOut && !isPanning) {
         targetIndex = targetIndex.coerceIn(0, detentSpecs.size - 1)
+        val newMaxHeight = detentSpecs.maxOfOrNull { it.height } ?: resolvedMaxDetentHeight()
+        val targetTy = translationY(targetIndex)
         if (activeAnimation != null && isTargetingClosedDetent) {
           suppressScrimForClosingTarget = true
           hideScrim()
@@ -301,17 +312,26 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
           activeAnimation = null
           activeAnimationEmitsSettle = false
           stopChoreographer()
-          sheetContainer.translationY =
-            currentTy.coerceIn(0f, detentSpecs.maxOfOrNull { it.height } ?: currentTy)
+          // Re-anchor the in-flight position to the new container height so the
+          // sheet surface keeps the same on-screen height across the resize.
+          val visibleHeight = previousMaxHeight - currentTy
+          sheetContainer.translationY = (newMaxHeight - visibleHeight).coerceIn(0f, newMaxHeight)
           emitPosition()
           snapToIndex(targetIndex, 0f, emitIndexChange = false, emitSettle = shouldEmitSettle)
         } else {
-          val targetTy = translationY(targetIndex)
-          val currentTy = sheetContainer.translationY
-          if (abs(targetTy - currentTy) <= 0.5f) {
+          val currentVisibleHeight = previousMaxHeight - sheetContainer.translationY
+          val targetHeight = detentSpecs.getOrNull(targetIndex)?.height ?: 0f
+          if (targetHeight <= currentVisibleHeight + 0.5f) {
+            // Content shrank (or is unchanged): snap immediately. Animating here
+            // would expose blank space below the shrunken content.
             sheetContainer.translationY = targetTy
             emitPosition()
           } else {
+            // Content grew: re-anchor at the current visible height, then animate
+            // up to the taller detent.
+            sheetContainer.translationY =
+              (newMaxHeight - currentVisibleHeight).coerceIn(0f, newMaxHeight)
+            emitPosition()
             snapToIndex(targetIndex, 0f, emitIndexChange = false, emitSettle = false)
           }
         }

package/ios/RNSBottomSheetHostingView.swift

@@ -60,7 +60,8 @@ public final class RNSBottomSheetHostingView: UIView {
   private var hasLaidOut = false
   private var isPanning = false
   private var isContentInteractionDisabled = false
-  private weak var contentHeightMarker: UIView?
+  private var contentHeightMarker: UIView?
+  private static var markerObservationContext = 0
 
   override public init(frame: CGRect) {
     super.init(frame: frame)
@@ -237,7 +238,7 @@ public final class RNSBottomSheetHostingView: UIView {
     hasLaidOut = false
     isPanning = false
     setContentInteractionEnabled(true)
-    contentHeightMarker = nil
+    stopObservingContentHeightMarker()
     sheetContainer.transform = .identity
     scrimView.alpha = 0
     scrimView.isHidden = true
@@ -541,12 +542,21 @@ 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:
-        height = min(spec.value, contentHeight)
+        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
       }
@@ -567,6 +577,7 @@ public final class RNSBottomSheetHostingView: UIView {
       return
     }
 
+    let previousMaxHeight = maximumResolvedDetentHeight ?? resolvedMaxDetentHeight
     detentSpecs = resolvedDetents
 
     guard bounds.width > 0, bounds.height > 0, !detentSpecs.isEmpty else {
@@ -575,6 +586,8 @@ public final class RNSBottomSheetHostingView: UIView {
 
     if hasLaidOut, !isPanning {
       targetIndex = max(0, min(detentSpecs.count - 1, targetIndex))
+      let newMaxHeight = maximumResolvedDetentHeight ?? resolvedMaxDetentHeight
+      let targetTy = translationY(for: targetIndex)
 
       if let animator = activeAnimator {
         stopDisplayLink()
@@ -583,19 +596,27 @@ public final class RNSBottomSheetHostingView: UIView {
         animator.stopAnimation(true)
         activeAnimator = nil
         activeAnimatorEmitsSettle = false
-        sheetContainer.transform = CGAffineTransform(
-          translationX: 0,
-          y: min(max(visualTy, 0), maximumResolvedDetentHeight ?? visualTy)
-        )
+        // Re-anchor the in-flight position to the new container height so the
+        // sheet surface keeps the same on-screen height across the resize.
+        let visibleHeight = previousMaxHeight - visualTy
+        let reanchoredTy = min(max(newMaxHeight - visibleHeight, 0), newMaxHeight)
+        sheetContainer.transform = CGAffineTransform(translationX: 0, y: reanchoredTy)
         emitPosition()
         snapToIndex(targetIndex, velocity: 0, emitIndexChange: false, emitSettle: shouldEmitSettle)
       } else {
-        let targetTy = translationY(for: targetIndex)
-        let currentTy = currentTranslationY
-        if abs(targetTy - currentTy) <= 0.5 {
+        let currentVisibleHeight = previousMaxHeight - currentTranslationY
+        let targetHeight = detent(at: targetIndex).height
+        if targetHeight <= currentVisibleHeight + 0.5 {
+          // Content shrank (or is unchanged): snap immediately. Animating here
+          // would expose blank space below the shrunken content.
           sheetContainer.transform = CGAffineTransform(translationX: 0, y: targetTy)
           emitPosition()
         } else {
+          // Content grew: re-anchor at the current visible height, then animate
+          // up to the taller detent.
+          let startTy = min(max(newMaxHeight - currentVisibleHeight, 0), newMaxHeight)
+          sheetContainer.transform = CGAffineTransform(translationX: 0, y: startTy)
+          emitPosition()
           snapToIndex(targetIndex, velocity: 0, emitIndexChange: false, emitSettle: false)
         }
       }
@@ -603,7 +624,50 @@ public final class RNSBottomSheetHostingView: UIView {
   }
 
   private func refreshContentHeightMarker() {
-    contentHeightMarker = findContentHeightMarker()
+    let marker = findContentHeightMarker()
+    guard marker !== contentHeightMarker else { return }
+    stopObservingContentHeightMarker()
+    contentHeightMarker = marker
+    if let marker {
+      // The marker's frame is updated by React Native when content above it
+      // resizes; observe its layer so we can re-resolve detents immediately
+      // instead of waiting for an unrelated layout pass. This is the iOS
+      // counterpart to Android's OnLayoutChangeListener on the marker.
+      marker.layer.addObserver(
+        self, forKeyPath: "position", options: [], context: &Self.markerObservationContext
+      )
+      marker.layer.addObserver(
+        self, forKeyPath: "bounds", options: [], context: &Self.markerObservationContext
+      )
+    }
+  }
+
+  private func stopObservingContentHeightMarker() {
+    guard let marker = contentHeightMarker else { return }
+    marker.layer.removeObserver(
+      self, forKeyPath: "position", context: &Self.markerObservationContext
+    )
+    marker.layer.removeObserver(
+      self, forKeyPath: "bounds", context: &Self.markerObservationContext
+    )
+    contentHeightMarker = nil
+  }
+
+  override public func observeValue(
+    forKeyPath keyPath: String?,
+    of object: Any?,
+    change: [NSKeyValueChangeKey: Any]?,
+    context: UnsafeMutableRawPointer?
+  ) {
+    if context == &Self.markerObservationContext {
+      refreshDetentsFromLayout()
+    } else {
+      super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)
+    }
+  }
+
+  deinit {
+    stopObservingContentHeightMarker()
   }
 
   private func findContentHeightMarker() -> UIView? {

package/package.json

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