Compare commits

..
27 Commits
Author SHA1 Message Date
Benjy Cui 6347b6d0c6 bump 3.5.0 2016-03-22 16:55:02 +08:00
Benjy Cui 6a5573b6ca feat: support React.Component in marks 2016-03-22 16:53:38 +08:00
Benjy Cui e030ba9f9d refactor: rename Dots to Steps 2016-03-22 16:27:50 +08:00
Benjy Cui daaea139b9 bump 3.4.0 2016-03-17 15:48:33 +08:00
Boris Serdiuk 2641880783 Merge pull request #82 from react-component/feat-mark-style
feat: support set style of specific mark point
2016-03-17 10:30:45 +03:00
Benjy Cui d6e81a692c feat: support set style of specific mark point 2016-03-17 09:45:55 +08:00
Benjy Cui 0512ee6ee0 Merge pull request #71 from kalinichenko/master
put marks in correct order so one can style it
2016-02-02 20:53:13 +08:00
Andrey Kalinichenko 613a2ae213 put marks in correct order so one can style it 2016-02-02 11:35:10 +01:00
yiminghe 2cb0dbce6f fix: work with rc-form 2016-01-30 18:52:12 +08:00
Benjy Cui f850dab6c4 bump 3.3.1 2015-12-21 09:59:02 +08:00
Benjy Cui f3c1d4bd3d fix: the key of dots should be unique #64 2015-12-21 09:57:30 +08:00
Benjy Cui 4d795b01cc chore: update unit test 2015-12-18 17:30:34 +08:00
Benjy Cui 959007ed30 bump 3.3.0 2015-12-18 10:11:50 +08:00
Benjy Cui 079469b765 refactor: the default value of tipFormatter 2015-12-18 10:10:52 +08:00
Benjy Cui ddb2bf670b Merge pull request #61 from frank-weindel/hide-the-tip
If tipFormatter is null, don't show the tip
2015-12-18 09:18:41 +08:00
Frank Weindel 4c57f3ecca Refactor isNoTip expression 2015-12-17 10:49:29 -05:00
Frank Weindel 24f3b755b2 Add example for hiding the tooltip 2015-12-17 10:48:54 -05:00
Frank Weindel 867e252631 Add documentation on how to hide the tip 2015-12-16 16:42:13 -05:00
Frank Weindel 39de81dfa9 If tipFormatter is null, don't show the tip 2015-12-16 16:38:15 -05:00
Benjy Cui 978d877323 bump 3.2.0 2015-12-16 09:30:46 +08:00
Boris Serdiuk a1ae3a8374 Merge pull request #60 from react-component/fix-rerender
fix: crash when rerender #57
2015-12-15 13:53:31 +03:00
Benjy Cui 15f568283c fix: crash when rerender #57 2015-12-15 11:32:41 +08:00
Benjy Cui e85d325542 Merge pull request #59 from react-component/feat-allowCross
feat: add `allowCross` property #56
2015-12-15 09:06:09 +08:00
Benjy Cui 395fa6c201 feat: add allowCross property #56 2015-12-12 08:45:28 +08:00
Benjy Cui 0329df0c5a bump 3.1.4 2015-12-07 14:40:57 +08:00
Boris Serdiuk 7fa8dfdd03 Merge pull request #55 from react-component/fix-align
fix: value should be aligned if `min` `max` changed
2015-12-07 09:23:51 +03:00
Benjy Cui 555f5a0660 fix: value should be aligned if min max changed 2015-12-06 09:21:17 +08:00
10 changed files with 252 additions and 88 deletions
+10 -4
View File
@@ -90,9 +90,9 @@ ReactDOM.render(<Rcslider />, container);
</tr> </tr>
<tr> <tr>
<td>marks</td> <td>marks</td>
<td>object {number: string}</td> <td>object{number: string} or object{number: object{ style, label }}</td>
<td>{}</td> <td>{}</td>
<td>Mark on the slider. The key determines the position, and the value determines what will show.</td> <td>Mark on the slider. The key determines the position, and the value determines what will show. If you want to set the style of a specific mark point, the value should be an object which contains `style` and `label` properties.</td>
</tr> </tr>
<tr> <tr>
<td>step</td> <td>step</td>
@@ -106,6 +106,12 @@ ReactDOM.render(<Rcslider />, container);
<td>false</td> <td>false</td>
<td>Determines the type of slider. If range is `true`, two handles will be rendered in order to select a range.</td> <td>Determines the type of slider. If range is `true`, two handles will be rendered in order to select a range.</td>
</tr> </tr>
<tr>
<td>allowCross</td>
<td>boolean</td>
<td>true</td>
<td>When `range` is `true`, `allowCross` could be set as `true` to allow those two handles cross.</td>
</tr>
<tr> <tr>
<td>defaultValue</td> <td>defaultValue</td>
<td>number or [number, number]</td> <td>number or [number, number]</td>
@@ -138,9 +144,9 @@ ReactDOM.render(<Rcslider />, container);
</tr> </tr>
<tr> <tr>
<td>tipFormatter</td> <td>tipFormatter</td>
<td>function</td> <td>function or `null`</td>
<td></td> <td></td>
<td>Format the value of the tooltip if it shows.</td> <td>Format the value of the tooltip if it shows. If `null` the tooltip will always be hidden.</td>
</tr> </tr>
<tr> <tr>
<td>dots</td> <td>dots</td>
+9 -3
View File
@@ -7,10 +7,16 @@ const Slider = require('rc-slider');
const style = {width: 400, margin: 50}; const style = {width: 400, margin: 50};
const marks = { const marks = {
'-10': '-10°C', '-10': '-10°C',
0: '0°C', 0: <strong>0°C</strong>,
26: '26°C', 26: '26°C',
37: '37°C', 37: '37°C',
100: '100°C', 50: '50°C',
100: {
style: {
color: 'red',
},
label: <strong>100°C</strong>,
},
}; };
function log(value) { function log(value) {
@@ -25,7 +31,7 @@ ReactDOM.render(
</div> </div>
<div style={style}> <div style={style}>
<p>Slider with marks and steps</p> <p>Slider with marks and steps</p>
<Slider min={-10} marks={marks} step={10} onChange={log} defaultValue={20} /> <Slider dots min={-10} marks={marks} step={10} onChange={log} defaultValue={20} />
</div> </div>
<div style={style}> <div style={style}>
+44 -4
View File
@@ -1,3 +1,4 @@
/* eslint react/no-multi-comp: 0 */
require('rc-slider/assets/index.less'); require('rc-slider/assets/index.less');
const React = require('react'); const React = require('react');
@@ -16,22 +17,57 @@ const CustomizedRange = React.createClass({
value: [20, 40], value: [20, 40],
}; };
}, },
onChange: function(value) { onSliderChange: function(value) {
log(value); log(value);
this.setState({ this.setState({
value: value, value: value,
}); });
}, },
render: function() { render: function() {
return <Slider range value={this.state.value} onChange={this.onChange} />; return <Slider range value={this.state.value} onChange={this.onSliderChange} />;
},
});
const DynamicBounds = React.createClass({
getInitialState() {
return {
min: 0,
max: 100,
};
},
onSliderChange: function(value) {
log(value);
},
onMinChange: function(e) {
this.setState({
min: +e.target.value || 0,
});
},
onMaxChange: function(e) {
this.setState({
max: +e.target.value || 100,
});
},
render: function() {
return (
<div>
<label>Min: </label>
<input type="number" value={this.state.min} onChange={this.onMinChange} />
<br />
<label>Max: </label>
<input type="number" value={this.state.max} onChange={this.onMaxChange} />
<br /><br />
<Slider range defaultValue={[20, 50]} min={this.state.min} max={this.state.max} onChange={this.onSliderChange} />
</div>
);
}, },
}); });
ReactDOM.render( ReactDOM.render(
<div> <div>
<div style={style}> <div style={style}>
<p>Basic Range</p> <p>Basic Range`allowCross=false`</p>
<Slider range defaultValue={[0, 20]} onChange={log} /> <Slider range allowCross={false} defaultValue={[0, 20]} onChange={log} />
</div> </div>
<div style={style}> <div style={style}>
<p>Basic Range`step=20` </p> <p>Basic Range`step=20` </p>
@@ -49,5 +85,9 @@ ReactDOM.render(
<p>Customized Range</p> <p>Customized Range</p>
<CustomizedRange /> <CustomizedRange />
</div> </div>
<div style={style}>
<p>Range with dynamic `max` `min`</p>
<DynamicBounds />
</div>
</div> </div>
, document.getElementById('__react-content')); , document.getElementById('__react-content'));
+46 -2
View File
@@ -1,3 +1,4 @@
/* eslint react/no-multi-comp: 0 */
require('rc-slider/assets/index.less'); require('rc-slider/assets/index.less');
const React = require('react'); const React = require('react');
@@ -21,14 +22,49 @@ const CustomizedSlider = React.createClass({
value: 50, value: 50,
}; };
}, },
onChange: function(value) { onSliderChange: function(value) {
log(value); log(value);
this.setState({ this.setState({
value: value, value: value,
}); });
}, },
render: function() { render: function() {
return <Slider value={this.state.value} onChange={this.onChange} />; return <Slider value={this.state.value} onChange={this.onSliderChange} />;
},
});
const DynamicBounds = React.createClass({
getInitialState: function() {
return {
min: 0,
max: 100,
};
},
onSliderChange: function(value) {
log(value);
},
onMinChange: function(e) {
this.setState({
min: +e.target.value || 0,
});
},
onMaxChange: function(e) {
this.setState({
max: +e.target.value || 100,
});
},
render: function() {
return (
<div>
<label>Min: </label>
<input type="number" value={this.state.min} onChange={this.onMinChange} />
<br />
<label>Max: </label>
<input type="number" value={this.state.max} onChange={this.onMaxChange} />
<br /><br />
<Slider defaultValue={50} min={this.state.min} max={this.state.max} onChange={this.onSliderChange} />
</div>
);
}, },
}); });
@@ -50,6 +86,10 @@ ReactDOM.render(
<p>Basic Slider with `tipFormatter`</p> <p>Basic Slider with `tipFormatter`</p>
<Slider tipFormatter={percentFormatter} tipTransitionName="rc-slider-tooltip-zoom-down" onChange={log} /> <Slider tipFormatter={percentFormatter} tipTransitionName="rc-slider-tooltip-zoom-down" onChange={log} />
</div> </div>
<div style={style}>
<p>Basic Slider without tooltip</p>
<Slider tipFormatter={null} onChange={log} />
</div>
<div style={style}> <div style={style}>
<p>Controlled Slider</p> <p>Controlled Slider</p>
<Slider value={50} /> <Slider value={50} />
@@ -58,5 +98,9 @@ ReactDOM.render(
<p>Customized Slider</p> <p>Customized Slider</p>
<CustomizedSlider /> <CustomizedSlider />
</div> </div>
<div style={style}>
<p>Slider with dynamic `min` `max`</p>
<DynamicBounds />
</div>
</div> </div>
, document.getElementById('__react-content')); , document.getElementById('__react-content'));
+2 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "rc-slider", "name": "rc-slider",
"version": "3.1.3", "version": "3.5.0",
"description": "slider ui component for react", "description": "slider ui component for react",
"keywords": [ "keywords": [
"react", "react",
@@ -51,6 +51,7 @@
], ],
"dependencies": { "dependencies": {
"classnames": "^2.2.1", "classnames": "^2.2.1",
"object-assign": "^4.0.1",
"rc-tooltip": "3.x", "rc-tooltip": "3.x",
"rc-util": "3.x" "rc-util": "3.x"
} }
+1 -1
View File
@@ -42,7 +42,7 @@ export default class Handle extends React.Component {
prefixCls={className.replace('slider-handle', 'tooltip')} prefixCls={className.replace('slider-handle', 'tooltip')}
placement="top" placement="top"
visible={isTooltipVisible} visible={isTooltipVisible}
overlay={<span>{tipFormatter ? tipFormatter(value) : value}</span>} overlay={<span>{tipFormatter(value)}</span>}
delay={0} delay={0}
transitionName={tipTransitionName}> transitionName={tipTransitionName}>
{handle} {handle}
+9 -3
View File
@@ -8,7 +8,7 @@ const Marks = ({className, marks, included, upperBound, lowerBound, max, min}) =
const markWidth = unit * 0.9; const markWidth = unit * 0.9;
const range = max - min; const range = max - min;
const elements = marksKeys.map(parseFloat).map((point) => { const elements = marksKeys.map(parseFloat).sort((a, b) => a - b).map((point) => {
const isActived = (!included && point === upperBound) || const isActived = (!included && point === upperBound) ||
(included && point <= upperBound && point >= lowerBound); (included && point <= upperBound && point >= lowerBound);
const markClassName = classNames({ const markClassName = classNames({
@@ -19,8 +19,14 @@ const Marks = ({className, marks, included, upperBound, lowerBound, max, min}) =
const style = { width: markWidth + '%' }; const style = { width: markWidth + '%' };
style.left = (point - min) / range * 100 - markWidth / 2 + '%'; style.left = (point - min) / range * 100 - markWidth / 2 + '%';
return (<span className={markClassName} style={style} key={point}> const markPoint = marks[point];
{marks[point]} const markPointIsObject = typeof markPoint === 'object' &&
!React.isValidElement(markPoint);
const markLabel = markPointIsObject ? markPoint.label : markPoint;
const markStyle = markPointIsObject ?
{ ...style, ...markPoint.style } : style;
return (<span className={markClassName} style={markStyle} key={point}>
{markLabel}
</span>); </span>);
}); });
+75 -32
View File
@@ -1,9 +1,10 @@
import React from 'react'; import React from 'react';
import {Dom as DomUtils} from 'rc-util'; import {Dom as DomUtils} from 'rc-util';
import classNames from 'classnames'; import classNames from 'classnames';
import objectAssign from 'object-assign';
import Track from './Track'; import Track from './Track';
import Handle from './Handle'; import Handle from './Handle';
import Dots from './Dots'; import Steps from './Steps';
import Marks from './Marks'; import Marks from './Marks';
function noop() { function noop() {
@@ -33,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;
@@ -66,34 +67,48 @@ class Slider extends React.Component {
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
if (!('value' in nextProps || 'min' in nextProps || 'max' in nextProps)) return;
const {lowerBound, upperBound} = this.state;
if (nextProps.range) { if (nextProps.range) {
const value = nextProps.value; const value = nextProps.value || [lowerBound, upperBound];
if (value) { const nextUpperBound = this.trimAlignValue(value[1], nextProps);
this.setState({ const nextLowerBound = this.trimAlignValue(value[0], nextProps);
upperBound: value[1], if (nextLowerBound === lowerBound && nextUpperBound === upperBound) return;
lowerBound: value[0],
});
}
} else if ('value' in nextProps) {
this.setState({ this.setState({
upperBound: nextProps.value, upperBound: nextUpperBound,
lowerBound: nextLowerBound,
}); });
if (this.isValueOutOfBounds(upperBound, nextProps) ||
this.isValueOutOfBounds(lowerBound, nextProps)) {
this.props.onChange([nextLowerBound, nextUpperBound]);
}
} else {
const value = nextProps.value !== undefined ? nextProps.value : upperBound;
const nextValue = this.trimAlignValue(value, nextProps);
if (nextValue === upperBound && lowerBound === nextProps.min) return;
this.setState({
upperBound: nextValue,
lowerBound: nextProps.min,
});
if (this.isValueOutOfBounds(upperBound, nextProps)) {
this.props.onChange(nextValue);
}
} }
} }
onChange(handle, value) { onChange(state) {
const props = this.props; const props = this.props;
const isNotControlled = !('value' in props); const isNotControlled = !('value' in props);
if (isNotControlled) { if (isNotControlled) {
this.setState({[handle]: value}); this.setState(state);
} else if (state.handle) {
this.setState({handle: state.handle});
} }
const state = this.state; const data = objectAssign({}, this.state, state);
const data = {
upperBound: state.upperBound,
lowerBound: state.lowerBound,
};
data[handle] = value;
const changedValue = props.range ? [data.lowerBound, data.upperBound] : data.upperBound; const changedValue = props.range ? [data.lowerBound, data.upperBound] : data.upperBound;
props.onChange(changedValue); props.onChange(changedValue);
} }
@@ -125,7 +140,26 @@ class Slider extends React.Component {
const oldValue = state[state.handle]; const oldValue = state[state.handle];
if (value === oldValue) return; if (value === oldValue) return;
this.onChange(state.handle, value); if (props.allowCross && value < state.lowerBound && state.handle === 'upperBound') {
this.onChange({
handle: 'lowerBound',
lowerBound: value,
upperBound: this.state.lowerBound,
});
return;
}
if (props.allowCross && value > state.upperBound && state.handle === 'lowerBound') {
this.onChange({
handle: 'upperBound',
upperBound: value,
lowerBound: this.state.upperBound,
});
return;
}
this.onChange({
[state.handle]: value,
});
} }
onTouchStart(e) { onTouchStart(e) {
@@ -180,7 +214,9 @@ class Slider extends React.Component {
const oldValue = state[valueNeedChanging]; const oldValue = state[valueNeedChanging];
if (value === oldValue) return; if (value === oldValue) return;
this.onChange(valueNeedChanging, value); this.onChange({
[valueNeedChanging]: value,
});
} }
getValue() { getValue() {
@@ -214,10 +250,14 @@ class Slider extends React.Component {
return precision; return precision;
} }
trimAlignValue(v) { isValueOutOfBounds(value, props) {
return value < props.min || value > props.max;
}
trimAlignValue(v, nextProps) {
const state = this.state || {}; const state = this.state || {};
const {handle, lowerBound, upperBound} = state; const {handle, lowerBound, upperBound} = state;
const {marks, step, min, max} = this.props; const {marks, step, min, max, allowCross} = objectAssign({}, this.props, nextProps || {});
let val = v; let val = v;
if (val <= min) { if (val <= min) {
@@ -226,10 +266,10 @@ class Slider extends React.Component {
if (val >= max) { if (val >= max) {
val = max; val = max;
} }
if (handle === 'upperBound' && val <= lowerBound) { if (!allowCross && handle === 'upperBound' && val <= lowerBound) {
val = lowerBound; val = lowerBound;
} }
if (handle === 'lowerBound' && val >= upperBound) { if (!allowCross && handle === 'lowerBound' && val >= upperBound) {
val = upperBound; val = upperBound;
} }
@@ -293,23 +333,23 @@ 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);
const handleClassName = prefixCls + '-handle'; const handleClassName = prefixCls + '-handle';
const isNoTip = (step === null) && !tipFormatter; const isNoTip = (step === null) || (tipFormatter === null);
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({
@@ -326,12 +366,12 @@ class Slider extends React.Component {
{lower} {lower}
<Track className={prefixCls + '-track'} included={isIncluded} <Track className={prefixCls + '-track'} included={isIncluded}
offset={lowerOffset} length={upperOffset - lowerOffset}/> offset={lowerOffset} length={upperOffset - lowerOffset}/>
<Dots prefixCls={prefixCls} marks={marks} dots={dots} step={step} <Steps 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>
); );
@@ -363,6 +403,7 @@ Slider.propTypes = {
tipFormatter: React.PropTypes.func, tipFormatter: React.PropTypes.func,
dots: React.PropTypes.bool, dots: React.PropTypes.bool,
range: React.PropTypes.bool, range: React.PropTypes.bool,
allowCross: React.PropTypes.bool,
}; };
Slider.defaultProps = { Slider.defaultProps = {
@@ -376,10 +417,12 @@ Slider.defaultProps = {
onBeforeChange: noop, onBeforeChange: noop,
onChange: noop, onChange: noop,
onAfterChange: noop, onAfterChange: noop,
tipFormatter: value => value,
included: true, included: true,
disabled: false, disabled: false,
dots: false, dots: false,
range: false, range: false,
allowCross: true,
}; };
export default Slider; export default Slider;
+4 -2
View File
@@ -5,13 +5,15 @@ function calcPoints(marks, dots, step, min, max) {
const points = Object.keys(marks).map(parseFloat); const points = Object.keys(marks).map(parseFloat);
if (dots) { if (dots) {
for (let i = min; i <= max; i = i + step) { for (let i = min; i <= max; i = i + step) {
if (points.indexOf(i) >= 0) continue;
points.push(i); points.push(i);
} }
} }
return points; return points;
} }
const Dots = ({prefixCls, marks, dots, step, included, lowerBound, upperBound, max, min}) => { const Steps = ({prefixCls, marks, dots, step, included,
lowerBound, upperBound, max, min}) => {
const range = max - min; const range = max - min;
const elements = calcPoints(marks, dots, step, min, max).map((point) => { const elements = calcPoints(marks, dots, step, min, max).map((point) => {
const offset = (point - min) / range * 100 + '%'; const offset = (point - min) / range * 100 + '%';
@@ -30,4 +32,4 @@ const Dots = ({prefixCls, marks, dots, step, included, lowerBound, upperBound, m
return <div className={prefixCls + '-step'}>{elements}</div>; return <div className={prefixCls + '-step'}>{elements}</div>;
}; };
export default Dots; export default Steps;
+52 -36
View File
@@ -22,28 +22,36 @@ describe('rc-slider', function() {
expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-track').length).to.be(1); expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-track').length).to.be(1);
}); });
it('should render a Slider with correct value and CSS style', () => { it('should render a Slider with default value correctly', () => {
const sliderWithDefaultValue = ReactDOM.render(<Slider defaultValue={50} />, div); const sliderWithDefaultValue = ReactDOM.render(<Slider defaultValue={50} />, div);
expect(sliderWithDefaultValue.state.upperBound).to.be(50); expect(sliderWithDefaultValue.state.upperBound).to.be(50);
expect(ReactTestUtils expect(ReactTestUtils
.scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[0] .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[0]
.style.cssText) .style.cssText)
.to.be('left: 50%; '); .to.match(/left: 50%;/);
expect(ReactTestUtils
.scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
.style.cssText)
.to.be('left: 0%; width: 50%; visibility: visible; ');
const trackStyle = ReactTestUtils
.scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
.style.cssText;
expect(trackStyle).to.match(/left: 0%;/);
expect(trackStyle).to.match(/width: 50%;/);
expect(trackStyle).to.match(/visibility: visible;/);
});
it('should render a Slider with value corrently', () => {
const sliderWithValue = ReactDOM.render(<Slider value={50} />, div); const sliderWithValue = ReactDOM.render(<Slider value={50} />, div);
expect(sliderWithValue.state.upperBound).to.be(50); expect(sliderWithValue.state.upperBound).to.be(50);
expect(ReactTestUtils expect(ReactTestUtils
.scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[0] .scryRenderedDOMComponentsWithClass(sliderWithValue, 'rc-slider-handle')[0]
.style.cssText) .style.cssText)
.to.be('left: 50%; '); .to.match(/left: 50%;/);
expect(ReactTestUtils
.scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0] const trackStyle = ReactTestUtils
.style.cssText) .scryRenderedDOMComponentsWithClass(sliderWithValue, 'rc-slider-track')[0]
.to.be('left: 0%; width: 50%; visibility: visible; '); .style.cssText;
expect(trackStyle).to.match(/left: 0%;/);
expect(trackStyle).to.match(/width: 50%;/);
expect(trackStyle).to.match(/visibility: visible;/);
}); });
it('should render a Range with correct DOM structure', () => { it('should render a Range with correct DOM structure', () => {
@@ -53,38 +61,46 @@ describe('rc-slider', function() {
expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-track').length).to.be(1); expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-track').length).to.be(1);
}); });
it('should render a Range with correct value and CSS style', () => { it('should render a Range with default value correctly', () => {
const sliderWithDefaultValue = ReactDOM.render(<Slider range defaultValue={[0, 50]} />, div); const rangeWithDefaultValue = ReactDOM.render(<Slider range defaultValue={[0, 50]} />, div);
expect(sliderWithDefaultValue.state.lowerBound).to.be(0); expect(rangeWithDefaultValue.state.lowerBound).to.be(0);
expect(sliderWithDefaultValue.state.upperBound).to.be(50); expect(rangeWithDefaultValue.state.upperBound).to.be(50);
expect(ReactTestUtils expect(ReactTestUtils
.scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[0] .scryRenderedDOMComponentsWithClass(rangeWithDefaultValue, 'rc-slider-handle')[0]
.style.cssText) .style.cssText)
.to.be('left: 50%; '); .to.match(/left: 50%;/);
expect(ReactTestUtils expect(ReactTestUtils
.scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[1] .scryRenderedDOMComponentsWithClass(rangeWithDefaultValue, 'rc-slider-handle')[1]
.style.cssText) .style.cssText)
.to.be('left: 0%; '); .to.match(/left: 0%;/);
expect(ReactTestUtils
.scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
.style.cssText)
.to.be('left: 0%; width: 50%; visibility: visible; ');
const sliderWithValue = ReactDOM.render(<Slider range value={[50, 100]} />, div); const trackStyle = ReactTestUtils
expect(sliderWithValue.state.lowerBound).to.be(50); .scryRenderedDOMComponentsWithClass(rangeWithDefaultValue, 'rc-slider-track')[0]
expect(sliderWithValue.state.upperBound).to.be(100); .style.cssText;
expect(trackStyle).to.match(/left: 0%;/);
expect(trackStyle).to.match(/width: 50%;/);
expect(trackStyle).to.match(/visibility: visible;/);
});
it('should render a Range with value correctly', () => {
const rangeWithValue = ReactDOM.render(<Slider range value={[50, 100]} />, div);
expect(rangeWithValue.state.lowerBound).to.be(50);
expect(rangeWithValue.state.upperBound).to.be(100);
expect(ReactTestUtils expect(ReactTestUtils
.scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[0] .scryRenderedDOMComponentsWithClass(rangeWithValue, 'rc-slider-handle')[0]
.style.cssText) .style.cssText)
.to.be('left: 100%; '); .to.match(/left: 100%;/);
expect(ReactTestUtils expect(ReactTestUtils
.scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[1] .scryRenderedDOMComponentsWithClass(rangeWithValue, 'rc-slider-handle')[1]
.style.cssText) .style.cssText)
.to.be('left: 50%; '); .to.match(/left: 50%;/);
expect(ReactTestUtils
.scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0] const trackStyle = ReactTestUtils
.style.cssText) .scryRenderedDOMComponentsWithClass(rangeWithValue, 'rc-slider-track')[0]
.to.be('width: 50%; visibility: visible; left: 50%; '); .style.cssText;
expect(trackStyle).to.match(/left: 50%;/);
expect(trackStyle).to.match(/width: 50%;/);
expect(trackStyle).to.match(/visibility: visible;/);
}); });
it('should render dots correctly when `dots=true`', () => { it('should render dots correctly when `dots=true`', () => {
@@ -106,7 +122,7 @@ describe('rc-slider', function() {
expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-mark-text')[1].innerHTML).to.be('30'); expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-mark-text')[1].innerHTML).to.be('30');
expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-mark-text')[2].innerHTML).to.be('100'); expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-mark-text')[2].innerHTML).to.be('100');
const range = ReactDOM.render(<Slider range value={30} marks={marks} />, div); const range = ReactDOM.render(<Slider range value={[0, 30]} marks={marks} />, div);
expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-mark-text').length).to.be(3); expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-mark-text').length).to.be(3);
}); });