Set viewTag for RCTTouchEvent to avoid EventID conflict

Summary: Using target view's reactTag as viewTag for RCTTouchEvent. Fix issue #9503 Closes #9952 Differential Revision: D3880152 Pulled By: majak fbshipit-source-id: 1025aae6a6a1d5074496a9e4a6cf7dfebc713dc7
facebook · Sep 16, 2016 · 610c482 · 610c482
1 parent b62ed2f
commit 610c482
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/React/Base/RCTTouchEvent.h b/React/Base/RCTTouchEvent.h
@@ -18,6 +18,7 @@
 @interface RCTTouchEvent : NSObject <RCTEvent>
 
 - (instancetype)initWithEventName:(NSString *)eventName
+                         reactTag:(NSNumber *)reactTag
                      reactTouches:(NSArray<NSDictionary *> *)reactTouches
                    changedIndexes:(NSArray<NSNumber *> *)changedIndexes
                     coalescingKey:(uint16_t)coalescingKey NS_DESIGNATED_INITIALIZER;

diff --git a/React/Base/RCTTouchEvent.m b/React/Base/RCTTouchEvent.m
@@ -21,11 +21,13 @@ @implementation RCTTouchEvent
 @synthesize viewTag = _viewTag;
 
 - (instancetype)initWithEventName:(NSString *)eventName
+                         reactTag:(NSNumber *)reactTag
                      reactTouches:(NSArray<NSDictionary *> *)reactTouches
                    changedIndexes:(NSArray<NSNumber *> *)changedIndexes
                     coalescingKey:(uint16_t)coalescingKey
 {
   if (self = [super init]) {
+    _viewTag = reactTag;
     _eventName = eventName;
     _reactTouches = reactTouches;
     _changedIndexes = changedIndexes;

diff --git a/React/Base/RCTTouchHandler.m b/React/Base/RCTTouchHandler.m
@@ -199,6 +199,7 @@ - (void)_updateAndDispatchTouches:(NSSet<UITouch *> *)touches
   }
 
   RCTTouchEvent *event = [[RCTTouchEvent alloc] initWithEventName:eventName
+                                                         reactTag:self.view.reactTag
                                                      reactTouches:reactTouches
                                                    changedIndexes:changedIndexes
                                                     coalescingKey:_coalescingKey];