@swmansion/react-native-bottom-sheet 0.15.0-next.7 → 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

@@ -620,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/react-native-bottom-sheet",
-  "version": "0.15.0-next.7",
+  "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",