[Slider] Return 'defaultValue' back

tyfoo · Oct 30, 2015 · a3e9cad · a3e9cad
1 parent 28a0477
commit a3e9cad
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/docs/src/app/components/pages/components/sliders.jsx b/docs/src/app/components/pages/components/sliders.jsx
@@ -23,6 +23,12 @@ 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',
@@ -125,8 +131,8 @@ class SlidersPage extends React.Component {
         componentInfo={componentInfo}>
         <CodeExample code={Code}>
           <Slider name="slider1" />
-          <Slider name="slider2" value={0.5} step={0.10} />
-          <Slider name="slider3" value={1}/>
+          <Slider name="slider2" defaultValue={0.5} step={0.10} />
+          <Slider name="slider3" defaultValue={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" value={0.5} step={0.10} />
-<Slider name="slider3" value={1} />
+<Slider name="slider2" defaultValue={0.5} step={0.10} />
+<Slider name="slider3" defaultValue={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,6 +51,7 @@ const Slider = React.createClass({
 
   propTypes: {
     name: React.PropTypes.string.isRequired,
+    defaultValue: valueInRangePropType,
     description: React.PropTypes.string,
     disabled: React.PropTypes.bool,
     error: React.PropTypes.string,
@@ -90,7 +91,7 @@ const Slider = React.createClass({
   getInitialState() {
     let value = this.props.value;
     if (value === undefined) {
-      value = this.props.min;
+      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;