diff --git a/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandlerOrchestrator.kt b/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandlerOrchestrator.kt index e78ca64526..eeeae20776 100644 --- a/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandlerOrchestrator.kt +++ b/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandlerOrchestrator.kt @@ -624,7 +624,7 @@ class GestureHandlerOrchestrator( val childrenCount = viewGroup.childCount for (i in childrenCount - 1 downTo 0) { - val child = viewConfigHelper.getChildInDrawingOrderAtIndex(viewGroup, i) + val child = viewGroup.getChildAt(i) if (canReceiveEvents(child)) { val childPoint = tempPoint transformPointToChildViewCoords(coords[0], coords[1], viewGroup, child, childPoint) diff --git a/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/HoverGestureHandler.kt b/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/HoverGestureHandler.kt index 3784c4f5c7..43db8eff05 100644 --- a/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/HoverGestureHandler.kt +++ b/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/HoverGestureHandler.kt @@ -7,7 +7,6 @@ import android.view.MotionEvent import android.view.View import android.view.ViewGroup import com.swmansion.gesturehandler.react.RNGestureHandlerRootHelper -import com.swmansion.gesturehandler.react.RNViewConfigurationHelper import com.swmansion.gesturehandler.react.events.eventbuilders.HoverGestureHandlerEventDataBuilder class HoverGestureHandler : GestureHandler() { @@ -44,7 +43,7 @@ class HoverGestureHandler : GestureHandler() { if (rootView is ViewGroup) { for (i in 0 until rootView.childCount) { - val child = viewConfigHelper.getChildInDrawingOrderAtIndex(rootView, i) + val child = rootView.getChildAt(i) return isViewDisplayedOverAnother(view, other, child) ?: continue } } @@ -145,8 +144,4 @@ class HoverGestureHandler : GestureHandler() { override fun createEventBuilder(handler: HoverGestureHandler) = HoverGestureHandlerEventDataBuilder(handler) } - - companion object { - private val viewConfigHelper = RNViewConfigurationHelper() - } } diff --git a/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/ViewConfigurationHelper.kt b/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/ViewConfigurationHelper.kt index c8069f3ea0..fad4d614a7 100644 --- a/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/ViewConfigurationHelper.kt +++ b/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/ViewConfigurationHelper.kt @@ -5,6 +5,5 @@ import android.view.ViewGroup interface ViewConfigurationHelper { fun getPointerEventsConfigForView(view: View): PointerEventsConfig - fun getChildInDrawingOrderAtIndex(parent: ViewGroup, index: Int): View fun isViewClippingChildren(view: ViewGroup): Boolean } diff --git a/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNViewConfigurationHelper.kt b/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNViewConfigurationHelper.kt index 14352674e4..4fc3f1a056 100644 --- a/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNViewConfigurationHelper.kt +++ b/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNViewConfigurationHelper.kt @@ -38,12 +38,6 @@ class RNViewConfigurationHelper : ViewConfigurationHelper { } } - override fun getChildInDrawingOrderAtIndex(parent: ViewGroup, index: Int): View = if (parent is ReactViewGroup) { - parent.getChildAt(parent.getZIndexMappedChildIndex(index)) - } else { - parent.getChildAt(index) - } - override fun isViewClippingChildren(view: ViewGroup) = when { view.clipChildren -> true view is ReactScrollView -> view.overflow != "visible"