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

Jump to bottom

[Android] Fix gestures being able to activate despite their parent already being active #3095

Merged
merged 10 commits into from
Sep 26, 2024
Merged

[Android] Fix gestures being able to activate despite their parent already being active #3095

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e65be38
add fix for activation-stealing gestures
latekvo Sep 12, 2024
613ed7a
remove unnecessary native handler tag check
latekvo Sep 12, 2024
cd78133
add check for explicitly allowed simultaneous running
latekvo Sep 12, 2024
208d664
make the handlersWithinHandlerBounds include itself into the set of h…
latekvo Sep 12, 2024
e82b044
Merge branch 'main' into @latekvo/fix-nested-gesture-stealing-activit…
latekvo Sep 17, 2024
b77e7fc
Merge branch 'main' into @latekvo/fix-nested-gesture-stealing-activit…
latekvo Sep 25, 2024
ba8596c
apply review suggestion - replace isWithinBounds with hasCommonPointers
latekvo Sep 25, 2024
b4fe4d8
apply simplification suggestion
latekvo Sep 25, 2024
ef986a0
remove unused function
latekvo Sep 25, 2024
6d11f86
simplify 2 functions into a smaller one
latekvo Sep 25, 2024
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
8 changes: 6 additions & 2 deletions android/src/main/java/com/swmansion/gesturehandler/core/GestureHandlerOrchestrator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,15 @@ class GestureHandlerOrchestrator(
private fun hasOtherHandlerToWaitFor(handler: GestureHandler<*>) =
gestureHandlers.any { !isFinished(it.state) && shouldHandlerWaitForOther(handler, it) }

private fun shouldBeCancelledByFinishedHandler(handler: GestureHandler<*>) = gestureHandlers.any { shouldHandlerWaitForOther(handler, it) && it.state == GestureHandler.STATE_END }
private fun shouldBeCancelledByFinishedHandler(handler: GestureHandler<*>) =
gestureHandlers.any { shouldHandlerWaitForOther(handler, it) && it.state == GestureHandler.STATE_END }

private fun shouldBeCancelledByActiveHandler(handler: GestureHandler<*>) =
gestureHandlers.any { handler.hasCommonPointers(it) && it.state == GestureHandler.STATE_ACTIVE && !canRunSimultaneously(handler, it) }

private fun tryActivate(handler: GestureHandler<*>) {
// If we are waiting for a gesture that has successfully finished, we should cancel handler
if (shouldBeCancelledByFinishedHandler(handler)) {
if (shouldBeCancelledByFinishedHandler(handler) || shouldBeCancelledByActiveHandler(handler)) {
handler.cancel()
return
}
Expand Down
Loading