diff --git a/React/Views/RCTNavigator.m b/React/Views/RCTNavigator.m index 77b02730fc7..03b4a79b7c8 100644 --- a/React/Views/RCTNavigator.m +++ b/React/Views/RCTNavigator.m @@ -449,11 +449,7 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)aDecoder) - (void)dispatchFakeScrollEvent { - [_bridge.eventDispatcher sendScrollEventWithType:RCTScrollEventTypeMove - reactTag:self.reactTag - scrollView:nil - userData:nil - coalescingKey:0]; + [_bridge.eventDispatcher sendFakeScrollEvent:self.reactTag]; } /** diff --git a/React/Views/RCTScrollView.h b/React/Views/RCTScrollView.h index 655e8eb7059..056e0040f5c 100644 --- a/React/Views/RCTScrollView.h +++ b/React/Views/RCTScrollView.h @@ -56,13 +56,8 @@ @interface RCTEventDispatcher (RCTScrollView) /** - * Send a scroll event. - * (You can send a fake scroll event by passing nil for scrollView). + * Send a fake scroll event. */ -- (void)sendScrollEventWithType:(RCTScrollEventType)type - reactTag:(NSNumber *)reactTag - scrollView:(UIScrollView *)scrollView - userData:(NSDictionary *)userData - coalescingKey:(uint16_t)coalescingKey; +- (void)sendFakeScrollEvent:(NSNumber *)reactTag; @end diff --git a/React/Views/RCTScrollView.m b/React/Views/RCTScrollView.m index 5440084e6ad..703de4db301 100644 --- a/React/Views/RCTScrollView.m +++ b/React/Views/RCTScrollView.m @@ -931,29 +931,26 @@ RCT_SET_AND_PRESERVE_OFFSET(setScrollIndicatorInsets, scrollIndicatorInsets, UIE _coalescingKey++; _lastEmittedEventType = type; } - [_eventDispatcher sendScrollEventWithType:type - reactTag:reactTag - scrollView:scrollView - userData:userData - coalescingKey:_coalescingKey]; + RCTScrollEvent *scrollEvent = [[RCTScrollEvent alloc] initWithType:type + reactTag:reactTag + scrollView:scrollView + userData:userData + coalescingKey:_coalescingKey]; + [_eventDispatcher sendEvent:scrollEvent]; } @end @implementation RCTEventDispatcher (RCTScrollView) -- (void)sendScrollEventWithType:(RCTScrollEventType)type - reactTag:(NSNumber *)reactTag - scrollView:(UIScrollView *)scrollView - userData:(NSDictionary *)userData - coalescingKey:(uint16_t)coalescingKey +- (void)sendFakeScrollEvent:(NSNumber *)reactTag { - RCTScrollEvent *scrollEvent = [[RCTScrollEvent alloc] initWithType:type + RCTScrollEvent *fakeScrollEvent = [[RCTScrollEvent alloc] initWithType:RCTScrollEventTypeMove reactTag:reactTag - scrollView:scrollView - userData:userData - coalescingKey:coalescingKey]; - [self sendEvent:scrollEvent]; + scrollView:nil + userData:nil + coalescingKey:0]; + [self sendEvent:fakeScrollEvent]; } @end