From 1615f9d16149c7082ce0e1485aa04a6f2108f7ba Mon Sep 17 00:00:00 2001
From: Eli White <eliwhite@fb.com>
Date: Fri, 1 Jun 2018 21:58:03 -0700
Subject: [PATCH] Slider remove $FlowFixMe #take2

Reviewed By: fkgozali

Differential Revision: D8246336

fbshipit-source-id: 21555a318bd823309ac2c285b49c2045338c2b28
---
 Libraries/Components/Slider/Slider.js | 38 +++++++++++----------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/Libraries/Components/Slider/Slider.js b/Libraries/Components/Slider/Slider.js
index efe22529f..52786a133 100644
--- a/Libraries/Components/Slider/Slider.js
+++ b/Libraries/Components/Slider/Slider.js
@@ -249,17 +249,10 @@ const Slider = createReactClass({
   },
 
   render: function() {
-    const {style, onValueChange, onSlidingComplete, ...props} = this.props;
-    /* $FlowFixMe(>=0.54.0 site=react_native_fb,react_native_oss) This comment
-     * suppresses an error found when Flow v0.54 was deployed. To see the error
-     * delete this comment and run Flow. */
-    props.style = [styles.slider, style];
+    const style = StyleSheet.compose(styles.slider, this.props.style);
 
-    /* $FlowFixMe(>=0.54.0 site=react_native_fb,react_native_oss) This comment
-     * suppresses an error found when Flow v0.54 was deployed. To see the error
-     * delete this comment and run Flow. */
-    props.onValueChange =
-      onValueChange &&
+    const onValueChange =
+      this.props.onValueChange &&
       ((event: Event) => {
         let userEvent = true;
         if (Platform.OS === 'android') {
@@ -267,26 +260,27 @@ const Slider = createReactClass({
           // dragging the slider.
           userEvent = event.nativeEvent.fromUser;
         }
-        onValueChange && userEvent && onValueChange(event.nativeEvent.value);
+        this.props.onValueChange &&
+          userEvent &&
+          this.props.onValueChange(event.nativeEvent.value);
       });
 
-    /* $FlowFixMe(>=0.54.0 site=react_native_fb,react_native_oss) This comment
-     * suppresses an error found when Flow v0.54 was deployed. To see the error
-     * delete this comment and run Flow. */
-    props.onChange = props.onValueChange;
+    const onChange = onValueChange;
 
-    /* $FlowFixMe(>=0.54.0 site=react_native_fb,react_native_oss) This comment
-     * suppresses an error found when Flow v0.54 was deployed. To see the error
-     * delete this comment and run Flow. */
-    props.onSlidingComplete =
-      onSlidingComplete &&
+    const onSlidingComplete =
+      this.props.onSlidingComplete &&
       ((event: Event) => {
-        onSlidingComplete && onSlidingComplete(event.nativeEvent.value);
+        this.props.onSlidingComplete &&
+          this.props.onSlidingComplete(event.nativeEvent.value);
       });
 
     return (
       <RCTSlider
-        {...props}
+        {...this.props}
+        style={style}
+        onChange={onChange}
+        onSlidingComplete={onSlidingComplete}
+        onValueChange={onValueChange}
         enabled={!this.props.disabled}
         onStartShouldSetResponder={() => true}
         onResponderTerminationRequest={() => false}