Make blocksGesture symmetric on native iOS
#3322
Conversation
There was a problem hiding this comment.
Looks good!
What I'd suggest is to move this nil check before other checks, like this:
code
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
shouldRequireFailureOfGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
{
RNGestureHandler *handler = [RNGestureHandler findGestureHandlerByRecognizer:otherGestureRecognizer];
if(handler == nil) {
return NO;
}
if ([_handlersToWaitFor count]) {
for (NSNumber *handlerTag in _handlersToWaitFor) {
if ([handler.tag isEqual:handlerTag]) {
return YES;
}
}
}
for (NSNumber *handlerTag in handler->_handlersThatShouldWait) {
if ([_tag isEqual:handlerTag]) {
return YES;
}
}
return NO;
}or at least combine it with and:
if (handler != nil && [_handlersToWaitFor count]) {
apple/RNGestureHandler.mm
Outdated
| for (NSNumber *handlerTag in handler->_handlersThatShouldWait) { | ||
| if ([_tag isEqual:handlerTag]) { | ||
| return YES; | ||
| } |
There was a problem hiding this comment.
Shouldn't we also check [_handlersThatShouldWait count], as above?
There was a problem hiding this comment.
I moved the null check up and removed the check for [_handlersThatShouldWait count] entirely - I don't really see the difference it makes when the list is empty.
|
Yes, this does seem to resolve the issue! |
|
Curiously, moving to Edit: here's the Android issue, #3326 |
Description
Should fix #3321
This PR makes the native implementation of
blocksGesturesymmetric. Previously, the logic was implemented only inshouldBeRequiredToFailByGestureRecognizer, now, it's also inshouldRequireFailureOfGestureRecognizer.Test plan
Tested on the code from the issue