From 3e89c3ea3b706c8d8b9dac3787c242ceaaf732e3 Mon Sep 17 00:00:00 2001 From: Martin Kralik Date: Wed, 3 Feb 2016 05:22:12 -0800 Subject: [PATCH] removed `coalescingKey` from events (2/7) Summary: This property was never used, so I'm removing it. public ___ //This diff is part of a larger stack. For high level overview what's going on jump to D2884593.// Reviewed By: javache Differential Revision: D2884587 fb-gh-sync-id: acd5e576cd13a02e77225f3b308232f8331d3b61 --- .../UIExplorer/UIExplorerUnitTests/RCTEventDispatcherTests.m | 1 - React/Base/RCTEventDispatcher.h | 1 - React/Base/RCTEventDispatcher.m | 4 +--- React/Views/RCTScrollView.m | 5 ----- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTEventDispatcherTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTEventDispatcherTests.m index d75f26445..4cf5c2cd7 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTEventDispatcherTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTEventDispatcherTests.m @@ -30,7 +30,6 @@ @synthesize viewTag = _viewTag; @synthesize eventName = _eventName; @synthesize body = _body; -@synthesize coalescingKey = _coalescingKey; - (instancetype)initWithViewTag:(NSNumber *)viewTag eventName:(NSString *)eventName body:(NSDictionary *)body { diff --git a/React/Base/RCTEventDispatcher.h b/React/Base/RCTEventDispatcher.h index 6f7e7ac07..a6d0bd0ae 100644 --- a/React/Base/RCTEventDispatcher.h +++ b/React/Base/RCTEventDispatcher.h @@ -49,7 +49,6 @@ RCT_EXTERN NSString *RCTNormalizeInputEventName(NSString *eventName); @property (nonatomic, strong, readonly) NSNumber *viewTag; @property (nonatomic, copy, readonly) NSString *eventName; @property (nonatomic, copy, readonly) NSDictionary *body; -@property (nonatomic, assign, readonly) uint16_t coalescingKey; - (BOOL)canCoalesce; - (id)coalesceWithEvent:(id)newEvent; diff --git a/React/Base/RCTEventDispatcher.m b/React/Base/RCTEventDispatcher.m index 4b2df3e9c..5681c3fed 100644 --- a/React/Base/RCTEventDispatcher.m +++ b/React/Base/RCTEventDispatcher.m @@ -30,9 +30,7 @@ static NSNumber *RCTGetEventID(id event) { return @( event.viewTag.intValue | - (((uint64_t)event.eventName.hash & 0xFFFF) << 32) | - (((uint64_t)event.coalescingKey) << 48) - ); + (((uint64_t)event.eventName.hash & 0xFFFF) << 32)); } @interface RCTEventDispatcher() diff --git a/React/Views/RCTScrollView.m b/React/Views/RCTScrollView.m index c69aabb19..97ede2145 100644 --- a/React/Views/RCTScrollView.m +++ b/React/Views/RCTScrollView.m @@ -59,11 +59,6 @@ CGFloat const ZINDEX_STICKY_HEADER = 50; RCT_NOT_IMPLEMENTED(- (instancetype)init) -- (uint16_t)coalescingKey -{ - return 0; -} - - (NSDictionary *)body { NSDictionary *body = @{