fix: hitTest in RCTScrollView

aleclarson · aleclarson · commit 80ae3f304328 · 2019-08-09T21:58:51.000-04:00
It now takes contentOffset into account.
diff --git a/React/Views/ScrollView/RCTScrollView.m b/React/Views/ScrollView/RCTScrollView.m
@@ -718,8 +718,12 @@ - (void)sendScrollEventWithName:(NSString *)eventName
 
 - (NSView *)hitTest:(NSPoint)point
 {
-  // TODO: adjust "point" based on scroll offset
-  return [self.documentView hitTest:point];
+  // Note: This assumes "contentView.clipsToBounds" is YES.
+  if (!CGRectContainsPoint(self.frame, point)) {
+    return nil;
+  }
+  NSPoint contentOffset = self.contentView.bounds.origin;
+  return [self.documentView hitTest:(NSPoint){point.x + contentOffset.x, point.y + contentOffset.y}];
 }
 
 @end

Original file line number	Diff line number	Diff line change
`@@ -718,8 +718,12 @@ - (void)sendScrollEventWithName:(NSString *)eventName`
`718`	`718`
`719`	`719`	`- (NSView *)hitTest:(NSPoint)point`
`720`	`720`	`{`
`721`		`- // TODO: adjust "point" based on scroll offset`
`722`		`- return [self.documentView hitTest:point];`
	`721`	`+ // Note: This assumes "contentView.clipsToBounds" is YES.`
	`722`	`+ if (!CGRectContainsPoint(self.frame, point)) {`
	`723`	`+ return nil;`
	`724`	`+ }`
	`725`	`+ NSPoint contentOffset = self.contentView.bounds.origin;`
	`726`	`+ return [self.documentView hitTest:(NSPoint){point.x + contentOffset.x, point.y + contentOffset.y}];`
`723`	`727`	`}`
`724`	`728`
`725`	`729`	`@end`