Fix of rotation and pinch gesture on android #2983
Merged
Conversation
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
m-bert
reviewed
Jul 4, 2024
android/src/main/java/com/swmansion/gesturehandler/core/RotationGestureHandler.kt
Outdated
Show resolved
Hide resolved
j-piasecki
reviewed
Jul 5, 2024
| @@ -74,7 +74,7 @@ class PinchGestureHandler : GestureHandler<PinchGestureHandler>() { | |||
| if (sourceEvent.actionMasked == MotionEvent.ACTION_POINTER_UP) { | |||
| activePointers -= 1 | |||
| } | |||
| if (state == STATE_ACTIVE && activePointers < 2) { | |||
| if (state == STATE_ACTIVE && activePointers == 0) { | |||
There was a problem hiding this comment.
Did you check which state the gesture goes to after lifting all the fingers? I'm not sure whether this branch will get evaluated in this form (activePointers may never equal 0, I think on ACTION_UP the pointer being lifted is still counted in the event)
There was a problem hiding this comment.
That's correct, this if statement is useless at this point.
There was a problem hiding this comment.
I think it can be simply changed to something like this:
if action is ACTION_UP:
if (state == ACTIVE):
end()
else
fail()
android/src/main/java/com/swmansion/gesturehandler/core/RotationGestureDetector.kt
Outdated
Show resolved
Hide resolved
…onGestureHandler.kt Co-authored-by: Michał Bert <63123542+m-bert@users.noreply.github.com>
…onGestureDetector.kt Co-authored-by: Jakub Piasecki <jakub.piasecki@swmansion.com>
j-piasecki
reviewed
Jul 5, 2024
android/src/main/java/com/swmansion/gesturehandler/core/RotationGestureDetector.kt
Show resolved
Hide resolved
j-piasecki
reviewed
Jul 8, 2024
| @@ -59,7 +59,7 @@ class RotationGestureHandler : GestureHandler<RotationGestureHandler>() { | |||
| anchorY = point.y | |||
| } | |||
| if (sourceEvent.actionMasked == MotionEvent.ACTION_UP) { | |||
| if (state == STATE_ACTIVE) { | |||
| if (state == STATE_ACTIVE && sourceEvent.pointerCount == 0) { | |||
There was a problem hiding this comment.
Is this change necessary? I think it's the same as with pinch - pointerCount may never be equal to 0.
| @@ -74,10 +74,13 @@ class PinchGestureHandler : GestureHandler<PinchGestureHandler>() { | |||
| if (sourceEvent.actionMasked == MotionEvent.ACTION_POINTER_UP) { | |||
| activePointers -= 1 | |||
There was a problem hiding this comment.
I don't think activePointers is being used anymore, can you remove it?
|
Can you also update the title of the PR? |
coado
changed the title
j-piasecki
approved these changes
Jul 9, 2024
github-merge-queue bot
pushed a commit
to valora-inc/wallet
that referenced
this pull request
Aug 6, 2024
…5714) [](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [react-native-gesture-handler](https://github.com/software-mansion/react-native-gesture-handler) | [`^2.17.1` -> `^2.18.1`](https://renovatebot.com/diffs/npm/react-native-gesture-handler/2.17.1/2.18.1) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>software-mansion/react-native-gesture-handler (react-native-gesture-handler)</summary> ### [`v2.18.1`](https://github.com/software-mansion/react-native-gesture-handler/releases/tag/2.18.1) [Compare Source](https://github.com/software-mansion/react-native-gesture-handler/compare/2.18.0...2.18.1) #### 🐛 Bug fixes - Fix build on RN 0.74 by [@​m-bert](https://github.com/m-bert) in [software-mansion/react-native-gesture-handler#3024 #### What's Changed - Bump ws from 6.2.2 to 6.2.3 in /example by [@​dependabot](https://github.com/dependabot) in [software-mansion/react-native-gesture-handler#3003 - Bump requirejs from 2.3.6 to 2.3.7 by [@​dependabot](https://github.com/dependabot) in [software-mansion/react-native-gesture-handler#3009 - Bump fast-xml-parser from 4.2.5 to 4.4.1 by [@​dependabot](https://github.com/dependabot) in [software-mansion/react-native-gesture-handler#3016 - Bump ws from 6.2.2 to 6.2.3 in /docs by [@​dependabot](https://github.com/dependabot) in [software-mansion/react-native-gesture-handler#3021 - Add documentation page for `Pressable` component by [@​latekvo](https://github.com/latekvo) in [software-mansion/react-native-gesture-handler#2992 - Add docs page for Reanimated Swipeable by [@​latekvo](https://github.com/latekvo) in [software-mansion/react-native-gesture-handler#2962 **Full Changelog**: software-mansion/react-native-gesture-handler@2.18.0...2.18.1 ### [`v2.18.0`](https://github.com/software-mansion/react-native-gesture-handler/releases/tag/2.18.0) [Compare Source](https://github.com/software-mansion/react-native-gesture-handler/compare/2.17.1...2.18.0) #### ❗ Important changes - Create a separate component out of the new Swipeable row by [@​latekvo](https://github.com/latekvo) in [software-mansion/react-native-gesture-handler#2936 - Create gesturized pressable component by [@​latekvo](https://github.com/latekvo) in [software-mansion/react-native-gesture-handler#2942, [software-mansion/react-native-gesture-handler#2977, [software-mansion/react-native-gesture-handler#2982, [software-mansion/react-native-gesture-handler#2981 - Support for React Native 0.75 by [@​j-piasecki](https://github.com/j-piasecki) in [software-mansion/react-native-gesture-handler#2966 #### 👍 Improvements - \[macOS] Add `ForceTouch` warning by [@​m-bert](https://github.com/m-bert) in [software-mansion/react-native-gesture-handler#2954 - Remove shared value read on the JS thread during detector update by [@​j-piasecki](https://github.com/j-piasecki) in [software-mansion/react-native-gesture-handler#2957 - Use a newer constructor for all Gesture Handler events on Android by [@​j-piasecki](https://github.com/j-piasecki) in [software-mansion/react-native-gesture-handler#2967 - Persist rotation and pinch gesture through pointer changes on android by [@​coado](https://github.com/coado) in [software-mansion/react-native-gesture-handler#2983 - \[macOS] Add `NativeViewGestureHandler` by [@​m-bert](https://github.com/m-bert) in [software-mansion/react-native-gesture-handler#3004 - Add `enabled` prop support to swipeable by [@​latekvo](https://github.com/latekvo) in [software-mansion/react-native-gesture-handler#3011 #### 🐛 Bug fixes - Make handler comparator work only on non-null objects by [@​j-piasecki](https://github.com/j-piasecki) in [software-mansion/react-native-gesture-handler#2964 - fix: bind scope to null to prevent issues with inline requires by [@​EvanBacon](https://github.com/EvanBacon) in [software-mansion/react-native-gesture-handler#2972 - Replace `queueMicrotask` with `requestAnimationFrame` by [@​m-bert](https://github.com/m-bert) in [software-mansion/react-native-gesture-handler#2969 - Resolve circular dependencies on JS side by [@​latekvo](https://github.com/latekvo) in [software-mansion/react-native-gesture-handler#2970 - Fix Android native buttons emitting 2 press events when talkback is enabled by [@​latekvo](https://github.com/latekvo) in [software-mansion/react-native-gesture-handler#3002 - Fix `ScrollView` intercepting touches through out-of-bounds children by [@​j-piasecki](https://github.com/j-piasecki) in [software-mansion/react-native-gesture-handler#3017 - Change `onPress` argument in buttons by [@​m-bert](https://github.com/m-bert) in [software-mansion/react-native-gesture-handler#3006 - \[macOS] Fix handlers not responding after opening context menu by [@​m-bert](https://github.com/m-bert) in [software-mansion/react-native-gesture-handler#3008 - \[iOS | macOS] Fix translation calculation in `LongPress` by [@​m-bert](https://github.com/m-bert) in [software-mansion/react-native-gesture-handler#3013 - Fix cancelling manual activation gestures blocking interactivity on iOS by [@​latekvo](https://github.com/latekvo) in [software-mansion/react-native-gesture-handler#3007 #### 🔢 Miscellaneous - Bump ws from 6.2.2 to 6.2.3 in /FabricExample by [@​dependabot](https://github.com/dependabot) in [software-mansion/react-native-gesture-handler#2949 - Bump braces from 3.0.2 to 3.0.3 in /MacOSExample by [@​dependabot](https://github.com/dependabot) in [software-mansion/react-native-gesture-handler#2956 - docs: bump `@swmansion/t-rex-ui` to 0.0.12 by [@​patrycjakalinska](https://github.com/patrycjakalinska) in [software-mansion/react-native-gesture-handler#2958 - Bump braces from 3.0.2 to 3.0.3 in /FabricExample by [@​dependabot](https://github.com/dependabot) in [software-mansion/react-native-gesture-handler#2965 - Set consistent prettier version across all package.jsons by [@​latekvo](https://github.com/latekvo) in [software-mansion/react-native-gesture-handler#2971 - Change naming scheme in package.json from camelCase to dash-case by [@​latekvo](https://github.com/latekvo) in [software-mansion/react-native-gesture-handler#2973 - Unify comments and simplify some conditions. by [@​m-bert](https://github.com/m-bert) in [software-mansion/react-native-gesture-handler#2984 - docs: Update Expo installation instructions by [@​amandeepmittal](https://github.com/amandeepmittal) in [software-mansion/react-native-gesture-handler#2991 - Bump fast-loops from 1.1.3 to 1.1.4 in /docs by [@​dependabot](https://github.com/dependabot) in [software-mansion/react-native-gesture-handler#2986 - Remove plural form in docs by [@​m-bert](https://github.com/m-bert) in [software-mansion/react-native-gesture-handler#2995 - Bump fast-loops from 1.1.3 to 1.1.4 in /example by [@​dependabot](https://github.com/dependabot) in [software-mansion/react-native-gesture-handler#2994 - Don't run old arch integrity check on every PR by [@​j-piasecki](https://github.com/j-piasecki) in [software-mansion/react-native-gesture-handler#2998 - docs: fix footer on landing by [@​patrycjakalinska](https://github.com/patrycjakalinska) in [software-mansion/react-native-gesture-handler#2997 - docs: Replace HireUsSection with `@swmansion/t-rex-ui` component by [@​patrycjakalinska](https://github.com/patrycjakalinska) in [software-mansion/react-native-gesture-handler#2996 - Mention `drawerWillShow` in `DrawerLayout` docs by [@​m-bert](https://github.com/m-bert) in [software-mansion/react-native-gesture-handler#3000 - chore: Refactor gradle task to JS scripts by [@​maciekstosio](https://github.com/maciekstosio) in [software-mansion/react-native-gesture-handler#3001 - Update dependencies related to tests by [@​j-piasecki](https://github.com/j-piasecki) in [software-mansion/react-native-gesture-handler#3005 - \[macOS] Switch `hasPointerInside` to `containsPointInView` by [@​m-bert](https://github.com/m-bert) in [software-mansion/react-native-gesture-handler#3012 #### New Contributors - [@​coado](https://github.com/coado) made their first contribution in [software-mansion/react-native-gesture-handler#2983 - [@​amandeepmittal](https://github.com/amandeepmittal) made their first contribution in [software-mansion/react-native-gesture-handler#2991 **Full Changelog**: software-mansion/react-native-gesture-handler@2.17.0...2.18.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 5pm,every weekend" in timezone America/Los_Angeles, Automerge - "after 5pm,every weekend" in timezone America/Los_Angeles. 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/valora-inc/wallet). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQ0MC43IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJucG0iLCJyZW5vdmF0ZSJdfQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: valora-bot <valorabot@valoraapp.com>
](https://renovatebot.com){kind=link}
This was referenced Sep 14, 2024
This was referenced Sep 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Fixing rotation and pinch gesture to continue to work after releasing one of a key pointers.
Test plan
I've checked if each example on the test app still works.