@swmansion/react-native-bottom-sheet 0.15.0-next.6 → 0.15.0-next.8

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

@@ -825,12 +825,42 @@ class BottomSheetHostView(context: Context) : ReactViewGroup(context) {
       }
     }
 
-    if (view.canScrollVertically(1) || view.canScrollVertically(-1)) {
+    if (isVerticallyScrollable(view)) {
       return view
     }
     return null
   }
 
+  private fun isVerticallyScrollable(view: View): Boolean {
+    if (!view.canScrollVertically(1) && !view.canScrollVertically(-1)) {
+      return false
+    }
+    return getReactScrollEnabled(view) != false
+  }
+
+  private fun getReactScrollEnabled(view: View): Boolean? {
+    val method =
+      try {
+        view.javaClass.getMethod("getScrollEnabled")
+      } catch (_: NoSuchMethodException) {
+        return null
+      }
+
+    if (
+      method.returnType != Boolean::class.javaPrimitiveType &&
+        method.returnType != Boolean::class.javaObjectType
+    ) {
+      return null
+    }
+
+    return try {
+      method.isAccessible = true
+      method.invoke(view) as? Boolean
+    } catch (_: Exception) {
+      null
+    }
+  }
+
   private fun isViewInverted(view: View): Boolean {
     val values = FloatArray(9)
     var current: View? = view

package/ios/BottomSheetHostingView.swift

@@ -189,10 +189,18 @@ public final class BottomSheetHostingView: UIView {
   }
 
   private var presentedSheetFrame: CGRect {
-    if activeSpring != nil, let presentation = sheetContainer.layer.presentation() {
-      return presentation.frame
-    }
-    return sheetContainer.frame
+    guard activeSpring != nil else { return sheetContainer.frame }
+    // Mid-settle, derive the on-screen frame from the spring instead of the
+    // presentation layer (which lags one commit behind right after a snap
+    // starts). The container's transform is translation-only.
+    let size = sheetContainer.bounds.size
+    let center = sheetContainer.center
+    return CGRect(
+      x: center.x - size.width / 2,
+      y: center.y - size.height / 2 + currentTranslationY,
+      width: size.width,
+      height: size.height
+    )
   }
 
   override public func point(inside point: CGPoint, with _: UIEvent?) -> Bool {
@@ -518,7 +526,7 @@ public final class BottomSheetHostingView: UIView {
 
   @discardableResult
   private func cancelActiveSpring() -> CGFloat {
-    let visualTy = sheetContainer.layer.presentation()?.affineTransform().ty ?? sheetContainer.transform.ty
+    let visualTy = currentTranslationY
     activeSpring = nil
     activeSpringEmitsSettle = false
     stopDisplayLink()
@@ -612,6 +620,7 @@ public final class BottomSheetHostingView: UIView {
   }
 
   private func isVerticallyScrollable(_ scrollView: UIScrollView) -> Bool {
+    guard scrollView.isScrollEnabled else { return false }
     let verticalInset = scrollView.adjustedContentInset.top + scrollView.adjustedContentInset.bottom
     let visibleHeight = max(0, scrollView.bounds.height - verticalInset)
     return scrollView.alwaysBounceVertical || scrollView.contentSize.height > visibleHeight
@@ -914,11 +923,15 @@ extension BottomSheetHostingView: UIGestureRecognizerDelegate {
 private extension BottomSheetHostingView {
   var currentTranslationY: CGFloat {
     // During a settle the modal is driven by a keyframe animation on the render
-    // server, so the live on-screen value lives on the presentation layer (the
-    // model `transform` already holds the final target). A drag assigns
-    // `transform` directly, so outside a settle the model value is correct.
-    if activeSpring != nil, let presentation = sheetContainer.layer.presentation() {
-      return presentation.affineTransform().ty
+    // server (the model `transform` already holds the final target), so read the
+    // analytical spring the keyframes were sampled from. The presentation layer
+    // is deliberately not used: right after a snap starts it still holds the
+    // previously committed transform, and that stale value (e.g. the identity
+    // transform from before the first layout) reads as a wide-open sheet — which
+    // briefly flashed the scrim on mount. A drag assigns `transform` directly,
+    // so outside a settle the model value is correct.
+    if let spring = activeSpring {
+      return spring.value(at: CACurrentMediaTime())
     }
     return sheetContainer.transform.ty
   }
@@ -940,6 +953,14 @@ private extension BottomSheetHostingView {
       return
     }
 
+    // Until the first layout places the sheet, the identity transform reads as
+    // a fully-open sheet; keep the scrim hidden until the sheet is positioned.
+    if !hasLaidOut {
+      scrimView.alpha = 0
+      scrimView.isHidden = true
+      return
+    }
+
     // If we're settled on the closed detent, dynamic detent/content updates can
     // momentarily report a stale non-zero position. Keep scrim fully hidden.
     if

package/package.json

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