Remove redundant 'defaultValue'. Fix bug when 'min' greater than zero.

tyfoo · Oct 9, 2015 · 29964f5 · 29964f5
1 parent 2b6c3f7
commit 29964f5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/docs/src/app/components/pages/components/sliders.jsx b/docs/src/app/components/pages/components/sliders.jsx
@@ -23,12 +23,6 @@ class SlidersPage extends React.Component {
             header: 'required',
             desc: 'The name of the slider. Behaves like the name attribute of an input element.'
           },
-          {
-            name: 'defaultValue',
-            type: 'number',
-            header: 'default: 0',
-            desc: 'The default value of the slider.'
-          },
           {
             name: 'description',
             type: 'string',
@@ -131,8 +125,8 @@ class SlidersPage extends React.Component {
         componentInfo={componentInfo}>
         <CodeExample code={Code}>
           <Slider name="slider1" />
-          <Slider name="slider2" defaultValue={0.5} step={0.10} />
-          <Slider name="slider3" defaultValue={1}/>
+          <Slider name="slider2" value={0.5} step={0.10} />
+          <Slider name="slider3" value={1}/>
           <Slider name="slider1" disabled={true} />
           <Slider name="slider2" disabled={true} value={0.5} />
           <Slider name="slider3" disabled={true} value={1} />

diff --git a/docs/src/app/components/raw-code/sliders-code.txt b/docs/src/app/components/raw-code/sliders-code.txt
@@ -1,8 +1,8 @@
 //Default
 <Slider name="slider1" />
 // With starting value
-<Slider name="slider2" defaultValue={0.5} step={0.10} />
-<Slider name="slider3" defaultValue={1} />
+<Slider name="slider2" value={0.5} step={0.10} />
+<Slider name="slider3" value={1} />
 // Disabled with fixed value
 <Slider name="slider1" disabled={true} />
 <Slider name="slider2" disabled={true} value={0.5} />

diff --git a/src/slider.jsx b/src/slider.jsx
@@ -51,7 +51,6 @@ const Slider = React.createClass({
 
   propTypes: {
     name: React.PropTypes.string.isRequired,
-    defaultValue: valueInRangePropType,
     description: React.PropTypes.string,
     disabled: React.PropTypes.bool,
     error: React.PropTypes.string,
@@ -80,7 +79,6 @@ const Slider = React.createClass({
 
   getDefaultProps() {
     return {
-      defaultValue: 0,
       disabled: false,
       max: 1,
       min: 0,
@@ -92,7 +90,7 @@ const Slider = React.createClass({
   getInitialState() {
     let value = this.props.value;
     if (value === undefined) {
-      value = this.props.defaultValue;
+      value = this.props.min;
     }
     let percent = (value - this.props.min) / (this.props.max - this.props.min);
     if (isNaN(percent)) percent = 0;