limit fake scroll event emitting

majak · Facebook Github Bot 8 · commit 31bb85a210e8 · 2016-04-01T06:54:50.000-07:00
Summary:A need for sending a scroll events outside of scrollview made D3092854 a bit clunky. This diff kinda fixes it by tightening up emitting of fake scroll events just to the only usecase we have right now.

Why not just simply construct the event in `RCTNavigator`, so we can drop the code from `RCTScrollView` altogether?
`RCTScrollEvent` is private to `RCTScrollView`, and that's good. We don't want anyone have an ability to make up scroll events. Even this existing functionality should be sunset one day when we better integrate with native gesture recognizers.

Depends on D3092867.

Reviewed By: javache

Differential Revision: D3120751

fb-gh-sync-id: 6519c055b983cfd48c4b4a9d619c4452e12efda1
fbshipit-source-id: 6519c055b983cfd48c4b4a9d619c4452e12efda1
diff --git a/React/Views/RCTNavigator.m b/React/Views/RCTNavigator.m
@@ -449,11 +449,7 @@ - (void)handleTopOfStackChanged
 
 - (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
@@ -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
@@ -931,29 +931,26 @@ - (void)sendScrollEventWithType:(RCTScrollEventType)type
     _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

Original file line number	Diff line number	Diff line change
`@@ -449,11 +449,7 @@ - (void)handleTopOfStackChanged`
`449`	`449`
`450`	`450`	`- (void)dispatchFakeScrollEvent`
`451`	`451`	`{`
`452`		`- [_bridge.eventDispatcher sendScrollEventWithType:RCTScrollEventTypeMove`
`453`		`- reactTag:self.reactTag`
`454`		`- scrollView:nil`
`455`		`- userData:nil`
`456`		`- coalescingKey:0];`
	`452`	`+ [_bridge.eventDispatcher sendFakeScrollEvent:self.reactTag];`
`457`	`453`	`}`
`458`	`454`
`459`	`455`	`/**`