feat: rename defaultValues values

This commit is contained in:
Benjy Cui
2015-10-30 17:21:28 +08:00
parent 7991918a96
commit 0b0271053a
2 changed files with 19 additions and 16 deletions
+2 -2
View File
@@ -26,11 +26,11 @@ React.render(
</div>
<div style={style}>
<p>双滑块</p>
<Slider range={true} min={10} max={90} values={[0, 30]} onChange={onChange} />
<Slider range={true} min={10} max={90} defaultValue={[0, 30]} onChange={onChange} />
</div>
<div style={style}>
<p>双滑块step=20 </p>
<Slider range={true} dots step={20} values={[0, 30]} onChange={onChange} included={false} />
<Slider range={true} dots step={20} defaultValue={[0, 30]} onChange={onChange} included={false} />
</div>
<div style={style}>
<p>分段式滑块包含关系</p>
+17 -14
View File
@@ -37,15 +37,16 @@ class Slider extends React.Component {
let upperBound;
let lowerBound;
if (props.range) {
const values = (props.values || props.defaultValues);
upperBound = this.trimAlignValue(values[1]);
lowerBound = this.trimAlignValue(values[0]);
const value = (props.value || props.defaultValue || [0, 0]);
upperBound = this.trimAlignValue(value[1]);
lowerBound = this.trimAlignValue(value[0]);
} else if (props.marks.length > 0) {
upperBound = this.calcValueFromProps(props);
} else {
// Note: Maybe `value` is `0`.
// So, check the existence of `value` with `in`.
const value = ('value' in props ? props.value : props.defaultValue);
const defaultValue = ('defauleValue' in props ? props.defaultValue : 0);
const value = ('value' in props ? props.value : defaultValue);
upperBound = this.trimAlignValue(value);
}
@@ -72,11 +73,11 @@ class Slider extends React.Component {
componentWillReceiveProps(nextProps) {
if (nextProps.range) {
const values = nextProps.values;
if (values) {
const value = nextProps.value;
if (value) {
this.setState({
upperBound: values[1],
lowerBound: values[0],
upperBound: value[1],
lowerBound: value[0],
});
}
} else if ('value' in nextProps) {
@@ -372,11 +373,15 @@ Slider.propTypes = {
min: React.PropTypes.number,
max: React.PropTypes.number,
step: React.PropTypes.number,
defaultValue: React.PropTypes.number,
defaultValues: React.PropTypes.arrayOf(React.PropTypes.number),
defaultValue: React.PropTypes.oneOfType([
React.PropTypes.number,
React.PropTypes.arrayOf(React.PropTypes.number),
]),
defaultIndex: React.PropTypes.number,
value: React.PropTypes.number,
values: React.PropTypes.arrayOf(React.PropTypes.number),
value: React.PropTypes.oneOfType([
React.PropTypes.number,
React.PropTypes.arrayOf(React.PropTypes.number),
]),
index: React.PropTypes.number,
marks: React.PropTypes.array,
included: React.PropTypes.bool,
@@ -396,8 +401,6 @@ Slider.defaultProps = {
min: 0,
max: 100,
step: 1,
defaultValue: 0,
defaultValues: [0, 0],
defaultIndex: 0,
marks: [],
included: true,