Merge pull request mui#1589 from KapJI/slider-minvalue

[Slider] Remove redundant 'defaultValue'. Fix bug when 'min' is greater than zero.
tyfoo · Oct 30, 2015 · fd346dd · fd346dd
2 parents 9be7261 + a3e9cad
commit fd346dd
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/slider.jsx b/src/slider.jsx
@@ -80,7 +80,6 @@ const Slider = React.createClass({
 
   getDefaultProps() {
     return {
-      defaultValue: 0,
       disabled: false,
       max: 1,
       min: 0,
@@ -93,7 +92,7 @@ const Slider = React.createClass({
   getInitialState() {
     let value = this.props.value;
     if (value === undefined) {
-      value = this.props.defaultValue;
+      value = this.props.defaultValue !== undefined ? this.props.defaultValue : this.props.min;
     }
     let percent = (value - this.props.min) / (this.props.max - this.props.min);
     if (isNaN(percent)) percent = 0;
@@ -113,7 +112,7 @@ const Slider = React.createClass({
     let newMuiTheme = nextContext.muiTheme ? nextContext.muiTheme : this.state.muiTheme;
     this.setState({muiTheme: newMuiTheme});
 
-    if (nextProps.value !== undefined) {
+    if (nextProps.value !== undefined && !this.state.dragging) {
       this.setValue(nextProps.value);
     }
   },