Skip to content

Commit 29964f5

Browse files
committed
Remove redundant 'defaultValue'. Fix bug when 'min' greater than zero.
1 parent 2b6c3f7 commit 29964f5

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ 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-
},
3226
{
3327
name: 'description',
3428
type: 'string',
@@ -131,8 +125,8 @@ class SlidersPage extends React.Component {
131125
componentInfo={componentInfo}>
132126
<CodeExample code={Code}>
133127
<Slider name="slider1" />
134-
<Slider name="slider2" defaultValue={0.5} step={0.10} />
135-
<Slider name="slider3" defaultValue={1}/>
128+
<Slider name="slider2" value={0.5} step={0.10} />
129+
<Slider name="slider3" value={1}/>
136130
<Slider name="slider1" disabled={true} />
137131
<Slider name="slider2" disabled={true} value={0.5} />
138132
<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" defaultValue={0.5} step={0.10} />
5-
<Slider name="slider3" defaultValue={1} />
4+
<Slider name="slider2" value={0.5} step={0.10} />
5+
<Slider name="slider3" value={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: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ const Slider = React.createClass({
5151

5252
propTypes: {
5353
name: React.PropTypes.string.isRequired,
54-
defaultValue: valueInRangePropType,
5554
description: React.PropTypes.string,
5655
disabled: React.PropTypes.bool,
5756
error: React.PropTypes.string,
@@ -80,7 +79,6 @@ const Slider = React.createClass({
8079

8180
getDefaultProps() {
8281
return {
83-
defaultValue: 0,
8482
disabled: false,
8583
max: 1,
8684
min: 0,
@@ -92,7 +90,7 @@ const Slider = React.createClass({
9290
getInitialState() {
9391
let value = this.props.value;
9492
if (value === undefined) {
95-
value = this.props.defaultValue;
93+
value = this.props.min;
9694
}
9795
let percent = (value - this.props.min) / (this.props.max - this.props.min);
9896
if (isNaN(percent)) percent = 0;

0 commit comments

Comments
 (0)