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(fabric): Add conditional coordinate space conversion for native view hit testing #2291

Merged
merged 3 commits into from
Nov 29, 2024
+10 −0
Merged

fix(fabric): Add conditional coordinate space conversion for native view hit testing #2291

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8952e31
[fabric] Add conditional coordinate space conversion for native view …
Nov 8, 2023
10c973a
fix(fabric): don't import RCTView into RCTViewComponentView
Saadnajmi Nov 21, 2024
953c929
refactor(fabric): Make the diff in `[RCTViewComponentView betterHitTe…
Saadnajmi Nov 28, 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
11 changes: 10 additions & 1 deletion packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,16 @@ - (RCTUIView *)betterHitTest:(CGPoint)point withEvent:(UIEvent *)event // [macOS
}

for (RCTUIView *subview in [self.subviews reverseObjectEnumerator]) { // [macOS]
RCTUIView *hitView = [subview hitTest:[subview convertPoint:point fromView:self] withEvent:event]; // [macOS]
// Native macOS views require the point to be in the super view coordinate space for hit testing. [macOS]
Saadnajmi marked this conversation as resolved.
Show resolved Hide resolved
CGPoint hitTestPoint = point;
#if TARGET_OS_OSX // [macOS
// Fabric components use the target view coordinate space for hit testing
if ([subview isKindOfClass:[RCTViewComponentView class]]) {
hitTestPoint = [subview convertPoint:point fromView:self];
}
#endif // macOS]

RCTUIView *hitView = [subview hitTest:hitTestPoint withEvent:event]; // [macOS]
if (hitView) {
return hitView;
}
Expand Down
Loading