Merge branch 'main' into @akwasniewski/fix-ripple

akwasniewski · web-flow · commit 63c8aa978add · 2025-10-29T09:56:55.000+01:00
diff --git a/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootView.kt b/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRootView.kt
@@ -40,11 +40,11 @@ class RNGestureHandlerRootView(context: Context?) : ReactViewGroup(context) {
     super.dispatchTouchEvent(event)
   }
 
-  override fun dispatchGenericMotionEvent(event: MotionEvent) =
-    if (rootViewEnabled && rootHelper!!.dispatchTouchEvent(event)) {
+  override fun dispatchGenericMotionEvent(ev: MotionEvent) =
+    if (rootViewEnabled && rootHelper!!.dispatchTouchEvent(ev)) {
       true
     } else {
-      super.dispatchGenericMotionEvent(event)
+      super.dispatchGenericMotionEvent(ev)
     }
 
   override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,11 @@ class RNGestureHandlerRootView(context: Context?) : ReactViewGroup(context) {`
`40`	`40`	`super.dispatchTouchEvent(event)`
`41`	`41`	`}`
`42`	`42`
`43`		`- override fun dispatchGenericMotionEvent(event: MotionEvent) =`
`44`		`- if (rootViewEnabled && rootHelper!!.dispatchTouchEvent(event)) {`
	`43`	`+ override fun dispatchGenericMotionEvent(ev: MotionEvent) =`
	`44`	`+ if (rootViewEnabled && rootHelper!!.dispatchTouchEvent(ev)) {`
`45`	`45`	`true`
`46`	`46`	`} else {`
`47`		`- super.dispatchGenericMotionEvent(event)`
	`47`	`+ super.dispatchGenericMotionEvent(ev)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {`