Skip to content

Commit a3e9cad

Browse files
committed
[Slider] Return 'defaultValue' back
1 parent 28a0477 commit a3e9cad

3 files changed

Lines changed: 12 additions & 5 deletions

File tree

docs/src/app/components/pages/components/sliders.jsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ class SlidersPage extends React.Component {
2323
header: 'required',
2424
desc: 'The name of the slider. Behaves like the name attribute of an input element.'
2525
},
26+
{
27+
name: 'defaultValue',
28+
type: 'number',
29+
header: 'default: 0',
30+
desc: 'The default value of the slider.'
31+
},
2632
{
2733
name: 'description',
2834
type: 'string',
@@ -125,8 +131,8 @@ class SlidersPage extends React.Component {
125131
componentInfo={componentInfo}>
126132
<CodeExample code={Code}>
127133
<Slider name="slider1" />
128-
<Slider name="slider2" value={0.5} step={0.10} />
129-
<Slider name="slider3" value={1}/>
134+
<Slider name="slider2" defaultValue={0.5} step={0.10} />
135+
<Slider name="slider3" defaultValue={1}/>
130136
<Slider name="slider1" disabled={true} />
131137
<Slider name="slider2" disabled={true} value={0.5} />
132138
<Slider name="slider3" disabled={true} value={1} />

docs/src/app/components/raw-code/sliders-code.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//Default
22
<Slider name="slider1" />
33
// With starting value
4-
<Slider name="slider2" value={0.5} step={0.10} />
5-
<Slider name="slider3" value={1} />
4+
<Slider name="slider2" defaultValue={0.5} step={0.10} />
5+
<Slider name="slider3" defaultValue={1} />
66
// Disabled with fixed value
77
<Slider name="slider1" disabled={true} />
88
<Slider name="slider2" disabled={true} value={0.5} />

src/slider.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ const Slider = React.createClass({
5151

5252
propTypes: {
5353
name: React.PropTypes.string.isRequired,
54+
defaultValue: valueInRangePropType,
5455
description: React.PropTypes.string,
5556
disabled: React.PropTypes.bool,
5657
error: React.PropTypes.string,
@@ -90,7 +91,7 @@ const Slider = React.createClass({
9091
getInitialState() {
9192
let value = this.props.value;
9293
if (value === undefined) {
93-
value = this.props.min;
94+
value = this.props.defaultValue !== undefined ? this.props.defaultValue : this.props.min;
9495
}
9596
let percent = (value - this.props.min) / (this.props.max - this.props.min);
9697
if (isNaN(percent)) percent = 0;

0 commit comments

Comments
 (0)