From 610c4826a56c797b5062a85a4bc4d6234476bf9d Mon Sep 17 00:00:00 2001
From: littlesome <lituo@lituodeiMac.local>
Date: Fri, 16 Sep 2016 16:12:17 -0700
Subject: [PATCH] Set viewTag for RCTTouchEvent to avoid EventID conflict

Summary:
Using target view's reactTag as viewTag for RCTTouchEvent.

Fix issue https://github.com/facebook/react-native/issues/9503
Closes https://github.com/facebook/react-native/pull/9952

Differential Revision: D3880152

Pulled By: majak

fbshipit-source-id: 1025aae6a6a1d5074496a9e4a6cf7dfebc713dc7
---
 React/Base/RCTTouchEvent.h   | 1 +
 React/Base/RCTTouchEvent.m   | 2 ++
 React/Base/RCTTouchHandler.m | 1 +
 3 files changed, 4 insertions(+)

diff --git a/React/Base/RCTTouchEvent.h b/React/Base/RCTTouchEvent.h
index 54cd1594d..d426c6b5d 100644
--- 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
index 16b5cc0ab..d328d860b 100644
--- a/React/Base/RCTTouchEvent.m
+++ b/React/Base/RCTTouchEvent.m
@@ -21,11 +21,13 @@
 @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
index e1025016c..a5cea9c51 100644
--- a/React/Base/RCTTouchHandler.m
+++ b/React/Base/RCTTouchHandler.m
@@ -199,6 +199,7 @@ typedef NS_ENUM(NSInteger, RCTTouchEventType) {
   }
 
   RCTTouchEvent *event = [[RCTTouchEvent alloc] initWithEventName:eventName
+                                                         reactTag:self.view.reactTag
                                                      reactTouches:reactTouches
                                                    changedIndexes:changedIndexes
                                                     coalescingKey:_coalescingKey];