Compare commits

...
1 Commits
Author SHA1 Message Date
yiminghe 2cb0dbce6f fix: work with rc-form 2016-01-30 18:52:12 +08:00
2 changed files with 9 additions and 9 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "rc-slider", "name": "rc-slider",
"version": "3.3.1", "version": "3.3.2",
"description": "slider ui component for react", "description": "slider ui component for react",
"keywords": [ "keywords": [
"react", "react",
+8 -8
View File
@@ -34,7 +34,7 @@ class Slider extends React.Component {
const {range, min, max} = props; const {range, min, max} = props;
const initialValue = range ? [min, min] : min; const initialValue = range ? [min, min] : min;
const defaultValue = ('defaultValue' in props ? props.defaultValue : initialValue); const defaultValue = ('defaultValue' in props ? props.defaultValue : initialValue);
const value = ('value' in props ? props.value : defaultValue); const value = (props.value !== undefined ? props.value : defaultValue);
let upperBound; let upperBound;
let lowerBound; let lowerBound;
@@ -81,11 +81,11 @@ class Slider extends React.Component {
lowerBound: nextLowerBound, lowerBound: nextLowerBound,
}); });
if (this.isValueOutOfBounds(upperBound, nextProps) || if (this.isValueOutOfBounds(upperBound, nextProps) ||
this.isValueOutOfBounds(lowerBound, nextProps)) { this.isValueOutOfBounds(lowerBound, nextProps)) {
this.props.onChange([nextLowerBound, nextUpperBound]); this.props.onChange([nextLowerBound, nextUpperBound]);
} }
} else { } else {
const value = 'value' in nextProps ? nextProps.value : upperBound; const value = nextProps.value !== undefined ? nextProps.value : upperBound;
const nextValue = this.trimAlignValue(value, nextProps); const nextValue = this.trimAlignValue(value, nextProps);
if (nextValue === upperBound && lowerBound === nextProps.min) return; if (nextValue === upperBound && lowerBound === nextProps.min) return;
@@ -333,7 +333,7 @@ class Slider extends React.Component {
render() { render() {
const {handle, upperBound, lowerBound} = this.state; const {handle, upperBound, lowerBound} = this.state;
const {className, prefixCls, disabled, dots, included, range, step, const {className, prefixCls, disabled, dots, included, range, step,
marks, max, min, tipTransitionName, tipFormatter, children} = this.props; marks, max, min, tipTransitionName, tipFormatter, children} = this.props;
const upperOffset = this.calcOffset(upperBound); const upperOffset = this.calcOffset(upperBound);
const lowerOffset = this.calcOffset(lowerBound); const lowerOffset = this.calcOffset(lowerBound);
@@ -343,13 +343,13 @@ class Slider extends React.Component {
const upper = (<Handle className={handleClassName} const upper = (<Handle className={handleClassName}
noTip={isNoTip} tipTransitionName={tipTransitionName} tipFormatter={tipFormatter} noTip={isNoTip} tipTransitionName={tipTransitionName} tipFormatter={tipFormatter}
offset={upperOffset} value={upperBound} dragging={handle === 'upperBound'} />); offset={upperOffset} value={upperBound} dragging={handle === 'upperBound'}/>);
let lower = null; let lower = null;
if (range) { if (range) {
lower = (<Handle className={handleClassName} lower = (<Handle className={handleClassName}
noTip={isNoTip} tipTransitionName={tipTransitionName} tipFormatter={tipFormatter} noTip={isNoTip} tipTransitionName={tipTransitionName} tipFormatter={tipFormatter}
offset={lowerOffset} value={lowerBound} dragging={handle === 'lowerBound'} />); offset={lowerOffset} value={lowerBound} dragging={handle === 'lowerBound'}/>);
} }
const sliderClassName = classNames({ const sliderClassName = classNames({
@@ -368,10 +368,10 @@ class Slider extends React.Component {
offset={lowerOffset} length={upperOffset - lowerOffset}/> offset={lowerOffset} length={upperOffset - lowerOffset}/>
<Dots prefixCls={prefixCls} marks={marks} dots={dots} step={step} <Dots prefixCls={prefixCls} marks={marks} dots={dots} step={step}
included={isIncluded} lowerBound={lowerBound} included={isIncluded} lowerBound={lowerBound}
upperBound={upperBound} max={max} min={min} /> upperBound={upperBound} max={max} min={min}/>
<Marks className={prefixCls + '-mark'} marks={marks} <Marks className={prefixCls + '-mark'} marks={marks}
included={isIncluded} lowerBound={lowerBound} included={isIncluded} lowerBound={lowerBound}
upperBound={upperBound} max={max} min={min} /> upperBound={upperBound} max={max} min={min}/>
{children} {children}
</div> </div>
); );