@swmansion/react-native-bottom-sheet 0.7.2 → 0.7.3

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

@@ -426,20 +426,18 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
   private fun isScrollViewAtTop(): Boolean {
     val scrollView = findScrollView(sheetContainer) ?: return true
     if (!isTouchInsideView(scrollView)) return true
-    return !scrollView.canScrollVertically(-1)
+    val inverted = isViewInverted(scrollView)
+    return if (inverted) !scrollView.canScrollVertically(1) else !scrollView.canScrollVertically(-1)
   }
 
   private fun isTouchInsideView(target: View): Boolean {
-    val targetLocation = IntArray(2)
-    target.getLocationOnScreen(targetLocation)
+    val rect = android.graphics.Rect()
+    if (!target.getGlobalVisibleRect(rect)) return false
     val myLocation = IntArray(2)
     getLocationOnScreen(myLocation)
-    val touchScreenX = myLocation[0] + initialTouchX
-    val touchScreenY = myLocation[1] + initialTouchY
-    return touchScreenX >= targetLocation[0] &&
-      touchScreenX < targetLocation[0] + target.width &&
-      touchScreenY >= targetLocation[1] &&
-      touchScreenY < targetLocation[1] + target.height
+    val touchScreenX = (myLocation[0] + initialTouchX).toInt()
+    val touchScreenY = (myLocation[1] + initialTouchY).toInt()
+    return rect.contains(touchScreenX, touchScreenY)
   }
 
   private fun findScrollView(view: View): View? {
@@ -452,6 +450,19 @@ class BottomSheetView(context: Context) : ReactViewGroup(context) {
     return null
   }
 
+  private fun isViewInverted(view: View): Boolean {
+    val values = FloatArray(9)
+    var current: View? = view
+    while (current != null && current !== sheetContainer) {
+      if (!current.matrix.isIdentity) {
+        current.matrix.getValues(values)
+        if (values[android.graphics.Matrix.MSCALE_Y] < 0) return true
+      }
+      current = current.parent as? View
+    }
+    return false
+  }
+
   // MARK: - Cleanup
 
   fun destroy() {

package/ios/RNSBottomSheetHostingView.swift

@@ -344,6 +344,15 @@ public final class RNSBottomSheetHostingView: UIView {
     return nil
   }
 
+  private func isViewInverted(_ view: UIView) -> Bool {
+    var current: UIView? = view
+    while let v = current, v !== sheetContainer {
+      if v.transform.d < 0 { return true }
+      current = v.superview
+    }
+    return false
+  }
+
   public override func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
     guard gestureRecognizer === panGesture else { return true }
 
@@ -365,6 +374,11 @@ public final class RNSBottomSheetHostingView: UIView {
     guard let scrollView = firstScrollView(in: sheetContainer) else { return true }
     let locationInScroll = panGesture.location(in: scrollView)
     guard scrollView.bounds.contains(locationInScroll) else { return true }
+    let inverted = isViewInverted(scrollView)
+    if inverted {
+      let maxOffsetY = scrollView.contentSize.height - scrollView.bounds.height + scrollView.adjustedContentInset.bottom
+      return scrollView.contentOffset.y >= maxOffsetY
+    }
     return scrollView.contentOffset.y <= 0
   }
 }

package/package.json

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