rename

Author: osdnk

ios/Handlers/RNNativeViewHandler.m

@@ -97,21 +97,21 @@ - (void)handleTouchDown:(UIView *)sender forEvent:(UIEvent *)event
         }
     }
 
-    [self sendStateTransitions:RNGestureHandlerStateActive
+    [self sendStateTransitionIfNeeded:RNGestureHandlerStateActive
              forViewWithTag:sender.reactTag
               withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES]];
 }
 
 - (void)handleTouchUpOutside:(UIView *)sender forEvent:(UIEvent *)event
 {
-    [self sendStateTransitions:RNGestureHandlerStateEnd
+    [self sendStateTransitionIfNeeded:RNGestureHandlerStateEnd
              forViewWithTag:sender.reactTag
               withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO]];
 }
 
 - (void)handleTouchUpInside:(UIView *)sender forEvent:(UIEvent *)event
 {
-    [self sendStateTransitions:RNGestureHandlerStateEnd
+    [self sendStateTransitionIfNeeded:RNGestureHandlerStateEnd
              forViewWithTag:sender.reactTag
               withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES]];
 }
@@ -122,26 +122,26 @@ - (void)handleDragExit:(UIView *)sender forEvent:(UIEvent *)event
     if (self.shouldCancelWhenOutside) {
         UIControl *control = (UIControl *)sender;
         [control cancelTrackingWithEvent:event];
-        [self sendStateTransitions:RNGestureHandlerStateEnd
+        [self sendStateTransitionIfNeeded:RNGestureHandlerStateEnd
                  forViewWithTag:sender.reactTag
                   withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO]];
     } else {
-        [self sendStateTransitions:RNGestureHandlerStateActive
+        [self sendStateTransitionIfNeeded:RNGestureHandlerStateActive
                  forViewWithTag:sender.reactTag
                   withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO]];
     }
 }
 
 - (void)handleDragEnter:(UIView *)sender forEvent:(UIEvent *)event
 {
-    [self sendStateTransitions:RNGestureHandlerStateActive
+    [self sendStateTransitionIfNeeded:RNGestureHandlerStateActive
              forViewWithTag:sender.reactTag
               withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES]];
 }
 
 - (void)handleTouchCancel:(UIView *)sender forEvent:(UIEvent *)event
 {
-    [self sendStateTransitions:RNGestureHandlerStateCancelled
+    [self sendStateTransitionIfNeeded:RNGestureHandlerStateCancelled
              forViewWithTag:sender.reactTag
               withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO]];
 }

ios/Handlers/RNTapHandler.m

@@ -85,11 +85,6 @@ - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
     [self triggerAction];
 }
 
--(void) setState:(UIGestureRecognizerState)state {
-  [super setState:state];
-  [_gestureHandler handleGestureStateTransition:self];
-}
-
 - (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
 {
     [super touchesMoved:touches withEvent:event];

ios/RNGestureHandler.h

@@ -69,7 +69,7 @@ if (value != nil) recognizer.prop = [RCTConvert type:value]; \
            forViewWithTag:(nonnull NSNumber *)reactTag
             withExtraData:(RNGestureHandlerEventExtraData *)extraData;
 
-- (void)sendStateTransitions:(RNGestureHandlerState)state
+- (void)sendStateTransitionIfNeeded:(RNGestureHandlerState)state
            forViewWithTag:(nonnull NSNumber *)reactTag
             withExtraData:(RNGestureHandlerEventExtraData *)extraData;
 

ios/RNGestureHandler.m

@@ -157,7 +157,7 @@ - (void)handleGesture:(UIGestureRecognizer *)recognizer
 - (void)handleGestureStateTransition:(UIGestureRecognizer *)recognizer
 {
   RNGestureHandlerEventExtraData *eventData = [self eventExtraData:recognizer];
-  [self sendStateTransitions:self.state forViewWithTag:recognizer.view.reactTag withExtraData:eventData];
+  [self sendStateTransitionIfNeeded:self.state forViewWithTag:recognizer.view.reactTag withExtraData:eventData];
   if (_lastState == UIGestureRecognizerStatePossible && (self.state == UIGestureRecognizerStateFailed || self.state == UIGestureRecognizerStateCancelled)) {
    // [self reset];
   }
@@ -173,13 +173,13 @@ - (void)sendEventsInState:(RNGestureHandlerState)state
                                                          extraData:extraData];
 
 
-
+    [self sendStateTransitionIfNeeded:state forViewWithTag:reactTag withExtraData:extraData];
     if (state == RNGestureHandlerStateActive) {
         [self.emitter sendTouchEvent:touchEvent];
     }
 }
 
-- (void) sendStateTransitions:(RNGestureHandlerState)state
+- (void) sendStateTransitionIfNeeded:(RNGestureHandlerState)state
                forViewWithTag:(nonnull NSNumber *)reactTag
                 withExtraData:(RNGestureHandlerEventExtraData *)extraData {
   if (state != _lastState) {