Skip to content

[0.71][RCTTouchHandler] Add a small optimization to coordinate conversion #1903

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

Merged
merged 1 commit into from
Aug 14, 2023
Merged

[0.71][RCTTouchHandler] Add a small optimization to coordinate conversion #1903

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions React/Base/RCTTouchHandler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,10 @@ - (void)_updateReactTouchAtIndex:(NSInteger)touchIndex
NSEvent *nativeTouch = _nativeTouches[touchIndex];
CGPoint location = nativeTouch.locationInWindow;
RCTAssert(_cachedRootView, @"We were unable to find a root view for the touch");
CGPoint rootViewLocation = [_cachedRootView.window.contentView convertPoint:location toView:_cachedRootView];
CGPoint rootViewLocation = [_cachedRootView convertPoint:location fromView:nil];

NSView *touchView = _touchViews[touchIndex];
CGPoint touchViewLocation = [touchView convertPoint:location fromView:nil];
// JavaScript expects coordinates to have (0,0) at top left, unlike the macOS coordinate system
rootViewLocation.y = NSHeight([[_cachedRootView window] frame]) - rootViewLocation.y;
#endif // macOS]

NSMutableDictionary *reactTouch = _reactTouches[touchIndex];
Expand Down