-
-
Notifications
You must be signed in to change notification settings - Fork 982
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.
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
[Android] Fix gestures being able to activate despite their parent already being active #3095
Merged
latekvo
merged 10 commits into
main
from
@latekvo/fix-nested-gesture-stealing-activity-from-native-gesture
Sep 26, 2024
Merged
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
e65be38
add fix for activation-stealing gestures
latekvo 613ed7a
remove unnecessary native handler tag check
latekvo cd78133
add check for explicitly allowed simultaneous running
latekvo 208d664
make the handlersWithinHandlerBounds include itself into the set of h…
latekvo e82b044
Merge branch 'main' into @latekvo/fix-nested-gesture-stealing-activit…
latekvo b77e7fc
Merge branch 'main' into @latekvo/fix-nested-gesture-stealing-activit…
latekvo ba8596c
apply review suggestion - replace isWithinBounds with hasCommonPointers
latekvo b4fe4d8
apply simplification suggestion
latekvo ef986a0
remove unused function
latekvo 6d11f86
simplify 2 functions into a smaller one
latekvo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -85,11 +85,18 @@ 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 handlersWithinHandlerBounds(handler: GestureHandler<*>) = | ||
gestureHandlers.filter { handler.hasCommonPointers(it) } | ||
|
||
private fun shouldBeCancelledByActiveHandler(handler: GestureHandler<*>) = | ||
handlersWithinHandlerBounds(handler).any { 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 | ||
} | ||
|
@@ -702,5 +709,8 @@ class GestureHandlerOrchestrator( | |
state == GestureHandler.STATE_CANCELLED || | ||
state == GestureHandler.STATE_FAILED || | ||
state == GestureHandler.STATE_END | ||
|
||
private fun isActive(state: Int) = | ||
state == GestureHandler.STATE_ACTIVE | ||
latekvo marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think it is used anywhere 😅 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. removed ef986a0 |
||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This name is quite misleading. For me it suggests that we compare positions of native views, while in reality we check for common pointers.
What about
handlersWithCommonPointers
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this function was removed in 6d11f86