End slider interaction when touches are cancelled

javache · facebook-github-bot-6 · commit 8f13560fd58e · 2015-09-25T11:42:32.000-07:00
Reviewed By: @jingc Differential Revision: D2479259
diff --git a/React/Base/RCTTouchHandler.m b/React/Base/RCTTouchHandler.m
@@ -242,7 +242,7 @@ - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
 {
   [super touchesBegan:touches withEvent:event];
 
-  // "start" has to record new touches beforeckirjiuhucekbebjditeucultigvijfe extracting the event.
+  // "start" has to record new touches before extracting the event.
   // "end"/"cancel" needs to remove the touch *after* extracting the event.
   [self _recordNewTouches:touches];
   if (_dispatchedInitialTouches) {
diff --git a/React/Views/RCTSliderManager.m b/React/Views/RCTSliderManager.m
@@ -22,8 +22,9 @@ - (UIView *)view
 {
   RCTSlider *slider = [RCTSlider new];
   [slider addTarget:self action:@selector(sliderValueChanged:) forControlEvents:UIControlEventValueChanged];
-  [slider addTarget:self action:@selector(sliderTouchEnd:) forControlEvents:UIControlEventTouchUpInside];
-  [slider addTarget:self action:@selector(sliderTouchEnd:) forControlEvents:UIControlEventTouchUpOutside];
+  [slider addTarget:self action:@selector(sliderTouchEnd:) forControlEvents:(UIControlEventTouchUpInside |
+                                                                             UIControlEventTouchUpOutside |
+                                                                             UIControlEventTouchCancel)];
   return slider;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ - (void)touchesBegan:(NSSet )touches withEvent:(UIEvent )event`
`242`	`242`	`{`
`243`	`243`	`[super touchesBegan:touches withEvent:event];`
`244`	`244`
`245`		`- // "start" has to record new touches beforeckirjiuhucekbebjditeucultigvijfe extracting the event.`
	`245`	`+ // "start" has to record new touches before extracting the event.`
`246`	`246`	`// "end"/"cancel" needs to remove the touch after extracting the event.`
`247`	`247`	`[self _recordNewTouches:touches];`
`248`	`248`	`if (_dispatchedInitialTouches) {`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,9 @@ - (UIView *)view`
`22`	`22`	`{`
`23`	`23`	`RCTSlider *slider = [RCTSlider new];`
`24`	`24`	`[slider addTarget:self action:@selector(sliderValueChanged:) forControlEvents:UIControlEventValueChanged];`
`25`		`- [slider addTarget:self action:@selector(sliderTouchEnd:) forControlEvents:UIControlEventTouchUpInside];`
`26`		`- [slider addTarget:self action:@selector(sliderTouchEnd:) forControlEvents:UIControlEventTouchUpOutside];`
	`25`	`+ [slider addTarget:self action:@selector(sliderTouchEnd:) forControlEvents:(UIControlEventTouchUpInside \|`
	`26`	`+ UIControlEventTouchUpOutside \|`
	`27`	`+ UIControlEventTouchCancel)];`
`27`	`28`	`return slider;`
`28`	`29`	`}`
`29`	`30`