Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
@property (nonatomic, assign) UIEdgeInsets hitTestEdgeInsets;
@property (nonatomic, assign) CGFloat borderRadius;
@property (nonatomic) BOOL userEnabled;
@property (nonatomic, copy) NSString *pointerEvents;

#if TARGET_OS_OSX && RCT_NEW_ARCH_ENABLED
- (void)mountChildComponentView:(RNGHUIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,29 @@ - (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event

- (RNGHUIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
{
NSString *pointerEvents = _pointerEvents ?: @"auto";

if ([pointerEvents isEqualToString:@"none"]) {
return nil;
}

if ([pointerEvents isEqualToString:@"box-none"]) {
for (UIView *subview in [self.subviews reverseObjectEnumerator]) {
if (!subview.isHidden && subview.alpha > 0) {
CGPoint convertedPoint = [subview convertPoint:point fromView:self];
UIView *hitView = [subview hitTest:convertedPoint withEvent:event];
if (hitView != nil && [self shouldHandleTouch:hitView]) {
return hitView;
}
}
}
return nil;
}

if ([pointerEvents isEqualToString:@"box-only"]) {
return [self pointInside:point withEvent:event] ? self : nil;
}

RNGHUIView *inner = [super hitTest:point withEvent:event];
while (inner && ![self shouldHandleTouch:inner]) {
inner = inner.superview;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,27 @@
#import <react/renderer/components/rngesturehandler_codegen/EventEmitters.h>
#import <react/renderer/components/rngesturehandler_codegen/Props.h>
#import <react/renderer/components/rngesturehandler_codegen/RCTComponentViewHelpers.h>
#import <react/renderer/components/view/ViewProps.h>

#import "RNGestureHandlerButton.h"

using namespace facebook::react;

static NSString *RCTPointerEventsToString(facebook::react::PointerEventsMode pointerEvents)
{
switch (pointerEvents) {
case facebook::react::PointerEventsMode::None:
return @"none";
case facebook::react::PointerEventsMode::BoxNone:
return @"box-none";
case facebook::react::PointerEventsMode::BoxOnly:
return @"box-only";
case facebook::react::PointerEventsMode::Auto:
default:
return @"auto";
Comment thread
huextrat marked this conversation as resolved.
Outdated
}
}

@interface RNGestureHandlerButtonComponentView () <RCTRNGestureHandlerButtonViewProtocol>
@end

Expand Down Expand Up @@ -207,8 +223,37 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
_buttonView.hitTestEdgeInsets = UIEdgeInsetsMake(
-newProps.hitSlop.top, -newProps.hitSlop.left, -newProps.hitSlop.bottom, -newProps.hitSlop.right);

if (!oldProps) {
_buttonView.pointerEvents = RCTPointerEventsToString(newProps.pointerEvents);
} else {
const auto &oldButtonProps = *std::static_pointer_cast<const RNGestureHandlerButtonProps>(oldProps);
if (oldButtonProps.pointerEvents != newProps.pointerEvents) {
_buttonView.pointerEvents = RCTPointerEventsToString(newProps.pointerEvents);
}
}

[super updateProps:props oldProps:oldProps];
}

#if !TARGET_OS_OSX
// Override hitTest to forward touches to _buttonView
// This is necessary because RCTViewComponentView's hitTest might handle pointerEvents
// from ViewProps and prevent touches from reaching _buttonView (which is the contentView).
// Since _buttonView has its own pointerEvents handling, we always forward to it.
- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
{
if (![self pointInside:point withEvent:event]) {
return nil;
}

CGPoint buttonPoint = [self convertPoint:point toView:_buttonView];

UIView *hitView = [_buttonView hitTest:buttonPoint withEvent:event];

return hitView;
Comment thread
huextrat marked this conversation as resolved.
Outdated
}
#endif

@end

Class<RCTComponentViewProtocol> RNGestureHandlerButtonCls(void)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
#import "RNGestureHandlerButtonManager.h"
#import "RNGestureHandlerButton.h"

static NSString *RCTPointerEventsToString(RCTPointerEvents pointerEvents)
{
switch (pointerEvents) {
case RCTPointerEventsNone:
return @"none";
case RCTPointerEventsBoxNone:
return @"box-none";
case RCTPointerEventsBoxOnly:
return @"box-only";
default:
return @"auto";
}
}

@implementation RNGestureHandlerButtonManager

RCT_EXPORT_MODULE(RNGestureHandlerButton)
Expand Down Expand Up @@ -28,6 +42,16 @@ @implementation RNGestureHandlerButtonManager
}
}

RCT_CUSTOM_VIEW_PROPERTY(pointerEvents, RCTPointerEvents, RNGestureHandlerButton)
{
if (json) {
RCTPointerEvents pointerEvents = [RCTConvert RCTPointerEvents:json];
view.pointerEvents = RCTPointerEventsToString(pointerEvents);
} else {
view.pointerEvents = @"auto";
}
}

- (RNGHUIView *)view
{
return (RNGHUIView *)[RNGestureHandlerButton new];
Expand Down