Skip to content

[Android] Fix native handlers attaching to a nested button instead of the detector's child #4464

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

Open
m-bert wants to merge 1 commit into
base: main
Choose a base branch
from
+0 −16
Open

[Android] Fix native handlers attaching to a nested button instead of the detector's child #4464

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
16 changes: 0 additions & 16 deletions .../android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerDetectorView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ package com.swmansion.gesturehandler.react

import android.content.Context
import android.view.View
import android.view.ViewGroup
import androidx.core.view.isNotEmpty
import com.facebook.react.bridge.ReadableArray
import com.facebook.react.uimanager.ThemedReactContext
import com.facebook.react.uimanager.UIManagerHelper
Expand Down Expand Up @@ -210,9 +208,6 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
// Note: RefreshControl is wrapped with a VirtualDetector, and native gestures for it are attached in `attachVirtualChildren`.
val id = if (child is ReactSwipeRefreshLayout) {
child.getChildAt(0).id
// TODO: figure out how to do it correctly
} else if (child is ViewGroup && child.isNotEmpty()) {
child.tryFindGestureHandlerButton()?.id ?: child.id
} else {
child.id
}
Expand Down Expand Up @@ -272,15 +267,4 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
}.filterNotNull()

private fun ReadableArray.toIntList(): List<Int> = List(size()) { getInt(it) }

private fun ViewGroup.tryFindGestureHandlerButton(): RNGestureHandlerButtonViewManager.ButtonViewGroup? {
if (isNotEmpty()) {
val child = getChildAt(0)
if (child is RNGestureHandlerButtonViewManager.ButtonViewGroup) {
return child
}
}

return null
}
}
Loading