Skip to content

[Android] Don't remap pointer ids on native handlers #3933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
j-piasecki wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[Android] Don't remap pointer ids on native handlers #3933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion ...gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,12 @@ open class GestureHandler {

private fun isTrackingPointer(pointerId: Int) = trackedPointerIDs[pointerId] != -1

/**
* Controls whether adapted events should preserve original Android pointer IDs
* instead of remapping them to local 0-based IDs.
*/
protected open fun shouldPreserveOriginalPointerIds(): Boolean = false

private fun needAdapt(event: MotionEvent): Boolean {
if (event.pointerCount != trackedPointersIDsCount) {
return true
Expand Down Expand Up @@ -269,6 +275,7 @@ open class GestureHandler {
}
}
initPointerProps(trackedPointersIDsCount)
val preserveOriginalIds = shouldPreserveOriginalPointerIds()
var count = 0
val deltaX = event.rawX - event.x
val deltaY = event.rawY - event.y
Expand All @@ -279,7 +286,11 @@ open class GestureHandler {
val origPointerId = event.getPointerId(index)
if (trackedPointerIDs[origPointerId] != -1) {
event.getPointerProperties(index, pointerProps[count])
pointerProps[count]!!.id = trackedPointerIDs[origPointerId]
pointerProps[count]!!.id = if (preserveOriginalIds) {
origPointerId
} else {
trackedPointerIDs[origPointerId]
}
event.getPointerCoords(index, pointerCoords[count])
if (index == actionIndex) {
action = action or (count shl MotionEvent.ACTION_POINTER_INDEX_SHIFT)
Expand Down
5 changes: 5 additions & 0 deletions ...ndler/android/src/main/java/com/swmansion/gesturehandler/core/NativeViewGestureHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ class NativeViewGestureHandler : GestureHandler() {
shouldCancelWhenOutside = true
}

// Preserve original pointer IDs when adapting events. This ensures consistency with
// events that flow through super.dispatchTouchEvent() before the handler activates,
// preventing pointer ID mismatches that cause crashes in native views.
override fun shouldPreserveOriginalPointerIds(): Boolean = true

override fun resetConfig() {
super.resetConfig()
shouldActivateOnStart = DEFAULT_SHOULD_ACTIVATE_ON_START
Expand Down