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

[macOS] Switch hasPointerInside to containsPointInView #3012

Merged
merged 2 commits into from
Jul 29, 2024
Merged

[macOS] Switch hasPointerInside to containsPointInView #3012

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bef4272
Move check to parent class
m-bert Jul 29, 2024
9b0ad80
Remove different implementations
m-bert Jul 29, 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
7 changes: 1 addition & 6 deletions apple/Handlers/RNNativeViewHandler.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@ - (void)touchesCancelled:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)ev
}

#else
- (BOOL)hasPointerInside
{
return NSPointInRect([self locationInView:self.view], self.view.bounds);
}

- (void)mouseDown:(NSEvent *)event
{
[_gestureHandler setCurrentPointerTypeToMouse];
Expand Down Expand Up @@ -231,7 +226,7 @@ - (void)handleTouchCancel:(UIView *)sender forEvent:(UIEvent *)event

- (RNGestureHandlerEventExtraData *)eventExtraData:(RNDummyGestureRecognizer *)recognizer
{
return [RNGestureHandlerEventExtraData forPointerInside:[recognizer hasPointerInside]
return [RNGestureHandlerEventExtraData forPointerInside:[self containsPointInView]
withPointerType:RNGestureHandlerMouse];
}

Expand Down
Loading