Skip to content
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

Emit changes to pointersInside #3348

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Emit changes to pointersInside #3348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3e11de
Emit changes to pointersInside on Android
oblador Jan 21, 2025
169b82c
Emit changes to pointersInside on iOS
oblador Jan 21, 2025
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
3 changes: 3 additions & 0 deletions 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 @@ -363,6 +363,7 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
x = adaptedTransformedEvent.x
y = adaptedTransformedEvent.y
numberOfPointers = adaptedTransformedEvent.pointerCount
val wasWithinBounds = isWithinBounds
isWithinBounds = isWithinBounds(view, x, y)
if (shouldCancelWhenOutside && !isWithinBounds) {
if (state == STATE_ACTIVE) {
Expand All @@ -386,6 +387,8 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
sourceEvent.action == MotionEvent.ACTION_HOVER_EXIT
) {
onHandleHover(adaptedTransformedEvent, adaptedSourceEvent)
} else if (sourceEvent.action == MotionEvent.ACTION_MOVE && state == STATE_ACTIVE && wasWithinBounds != isWithinBounds) {
orchestrator!!.onHandlerStateChange(this, state, state)
} else {
onHandle(adaptedTransformedEvent, adaptedSourceEvent)
}
Expand Down
2 changes: 1 addition & 1 deletion apple/RNGestureHandler.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ - (void)sendEventsInState:(RNGestureHandlerState)state
forViewWithTag:(nonnull NSNumber *)reactTag
withExtraData:(RNGestureHandlerEventExtraData *)extraData
{
if (state != _lastState) {
if (state != _lastState || state == RNGestureHandlerStateActive) {
// don't send change events from END to FAILED or CANCELLED, this may happen when gesture is ended in `onTouchesUp`
// callback
if (_lastState == RNGestureHandlerStateEnd &&
Expand Down
Loading