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

Fix cancelling manual activation gestures blocking interactivity on iOS #3007

Merged
merged 4 commits into from
Jul 26, 2024
Merged

Fix cancelling manual activation gestures blocking interactivity on iOS #3007

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e7d502
add state reset logic to all compatible states
latekvo Jul 25, 2024
d282afe
revert native ios mistake
latekvo Jul 25, 2024
2847a68
add reset logic to all the remaining handlers
latekvo Jul 25, 2024
0d741f3
remove out-of-scope changes
latekvo Jul 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
1 change: 1 addition & 0 deletions apple/Handlers/RNFlingHandler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ - (void)touchesCancelled:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)ev
_lastPoint = [[[touches allObjects] objectAtIndex:0] locationInView:_gestureHandler.recognizer.view];
[super touchesCancelled:touches withEvent:event];
[_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
[self reset];
}

- (void)triggerAction
Expand Down
1 change: 1 addition & 0 deletions apple/Handlers/RNForceTouchHandler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ - (void)touchesCancelled:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)ev
{
[super touchesCancelled:touches withEvent:event];
[_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
[self reset];
}

- (void)handleForceWithTouches:(NSSet<RNGHUITouch *> *)touches
Expand Down
1 change: 1 addition & 0 deletions apple/Handlers/RNLongPressHandler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ - (void)touchesCancelled:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)ev
{
[super touchesCancelled:touches withEvent:event];
[_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
[self reset];
}

- (void)reset
Expand Down
1 change: 1 addition & 0 deletions apple/Handlers/RNManualHandler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ - (void)touchesCancelled:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)ev
{
[super touchesCancelled:touches withEvent:event];
[_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
[self reset];
}

- (void)reset
Expand Down
1 change: 1 addition & 0 deletions apple/Handlers/RNPanHandler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ - (void)interactionsEnded:(NSSet *)touches withEvent:(UIEvent *)event
- (void)interactionsCancelled:(NSSet *)touches withEvent:(UIEvent *)event
{
[_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
[self reset];
}

#if TARGET_OS_OSX
Expand Down
1 change: 1 addition & 0 deletions apple/Handlers/RNPinchHandler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ - (void)interactionsEnded:(NSSet *)touches withEvent:(UIEvent *)event
- (void)interactionsCancelled:(NSSet *)touches withEvent:(UIEvent *)event
{
[_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
[self reset];
}

#if TARGET_OS_OSX
Expand Down
2 changes: 2 additions & 0 deletions apple/Handlers/RNRotationHandler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,13 @@ - (void)interactionsMoved:(NSSet *)touches withEvent:(UIEvent *)event
- (void)interactionsEnded:(NSSet *)touches withEvent:(UIEvent *)event
{
[_gestureHandler.pointerTracker touchesEnded:touches withEvent:event];
[self reset];
latekvo marked this conversation as resolved.
Show resolved Hide resolved
}

- (void)interactionsCancelled:(NSSet *)touches withEvent:(UIEvent *)event
{
[_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
[self reset];
}

#if TARGET_OS_OSX
Expand Down
1 change: 1 addition & 0 deletions apple/Handlers/RNTapHandler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ - (void)touchesCancelled:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)ev
{
[super touchesCancelled:touches withEvent:event];
[self interactionsCancelled:touches withEvent:event];
[self reset];
}

#endif
Expand Down
Loading