bump 4.0.0

Extend the handle classNames, and provide props so that
upper/lower handles are easily distinguishable in CSS & React.

* Use classNames() instead of string concatenation

.gitignore

@@ -23,4 +23,5 @@ node_modules
 dist
 assets/**/*.css
 build
-lib
+lib
+/coverage

HISTORY.md

@@ -1,6 +1,15 @@
 # History
 ----
 
+## 4.0.0 / 2016-08-12
+
+[#133](https://github.com/react-component/slider/pull/133) support multi-range ([@sosz](https://github.com/sosz))
+
+## 3.6.0 / 2016-04-01
+
+[#18](https://github.com/react-component/slider/issues/18) add `vertical` props ([@wnlee](https://github.com/WNLee))
+
+...
 
 ## 1.2.5 / 2015-07-13
 

LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+Copyright (c) 2015-present Alipay.com, https://www.alipay.com/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -34,6 +34,8 @@ slider ui component for react
 
 <img src="https://t.alipayobjects.com/images/T1wO8fXd4rXXXXXXXX.png" width="550"/>
 
+<img src="http://i.giphy.com/l46Cs36c9HrHMExoc.gif"/>
+
 
 ## Feature
 
@@ -50,6 +52,8 @@ slider ui component for react
 ## Usage
 
 ```js
+require('rc-slider/assets/index.css');
+
 var React = require('react');
 var ReactDOM = require('react-dom');
 var Rcslider = require('rc-slider');
@@ -90,9 +94,9 @@ ReactDOM.render(<Rcslider />, container);
         </tr>
         <tr>
           <td>marks</td>
-          <td>object {number: string}</td>
+          <td>object{number: string} or object{number: object{ style, label }}</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>
           <td>step</td>
@@ -102,21 +106,45 @@ ReactDOM.render(<Rcslider />, container);
         </tr>
         <tr>
           <td>range</td>
+          <td>boolean or number</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. If range is a number, multiple handles will be rendered (number + 1). Using `range={true}` is equivalent to `range={1}`.</td>
+        </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 handles to cross.</td>
+        </tr>
+        <tr>
+          <td>pushable</td>
+          <td>boolean or number</td>
+          <td>true</td>
+          <td>When `range` is `true`, `pushable` could be set as `true` to allow pushing of surrounding handles when moving an handle. When set to a number, the number will be the minimum ensured distance between handles. Example: <img src="http://i.giphy.com/l46Cs36c9HrHMExoc.gif"/></td>
+        </tr>
+        <tr>
+          <td>vertical</td>
           <td>boolean</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>If vertical is `true`, the slider will be vertical.</td>
         </tr>
         <tr>
           <td>defaultValue</td>
-          <td>number or [number, number]</td>
+          <td>number or [number, number, ...]</td>
           <td>0 or [0, 0]</td>
-          <td>Set initial positions of handles. If range is `false`, the type of `defaultValue` should be `number`. Otherwise, `[number, number]`</td>
+          <td>Set initial positions of handles. If range is `false`, the type of `defaultValue` should be `number`. Otherwise, `[number, number, ...]`</td>
         </tr>
         <tr>
           <td>value</td>
-          <td>number or [number, number]</td>
+          <td>number or [number, number, ...]</td>
           <td></td>
-          <td>Set current positions of handles. If range is `false`, the type of `defaultValue` should be `number`. Otherwise, `[number, number]`</td>
+          <td>Set current positions of handles. If range is `false`, the type of `defaultValue` should be `number`. Otherwise, `[number, number, ...]`</td>
+        </tr>
+        <tr>
+          <td>handle</td>
+          <td>Component</td>
+          <td></td>
+          <td>Provide a custom Handle to use in the slider by passing a component. This component will have a `value` and `offset` props used to define custom styling/content.</td>
         </tr>
         <tr>
           <td>included</td>
@@ -138,9 +166,9 @@ ReactDOM.render(<Rcslider />, container);
         </tr>
         <tr>
           <td>tipFormatter</td>
-          <td>function</td>
+          <td>function or `null`</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>
           <td>dots</td>

assets/index.less

@@ -94,7 +94,7 @@
 
   &-dot {
     position: absolute;
-    top: -2px;
+    bottom: -2px;
     margin-left: -4px;
     width: 8px;
     height: 8px;
@@ -133,6 +133,45 @@
   }
 }
 
+.@{prefixClass}-vertical {
+  width: 4px;
+  height: 100%;
+  .@{prefixClass} {
+    &-track {
+      bottom: 0;
+      width: 4px;
+    }
+
+    &-handle {
+      position: absolute;
+      margin-left: -5px;
+      margin-bottom: -7px;
+    }
+
+    &-mark {
+      top: 0;
+      left: 10px;
+      height: 100%;
+    }
+
+    &-step {
+      height: 100%;
+      width: 4px;
+    }
+
+    &-dot {
+      left: 2px;
+      margin-bottom: -4px;
+      &:first-child {
+        margin-bottom: -4px;
+      }
+      &:last-child {
+        margin-bottom: -4px;
+      }
+    }
+  }
+}
+
 .motion-common() {
   animation-duration: .3s;
   animation-fill-mode: both;

examples/custom-handles.html

@@ -0,0 +1 @@
+placeholder

examples/custom-handles.js

@@ -0,0 +1,44 @@
+require('rc-slider/assets/index.less');
+
+const React = require('react');
+const ReactDOM = require('react-dom');
+const Slider = require('rc-slider');
+
+const wrapperStyle = { width: 400, margin: 50 };
+
+const handleStyle = {
+  position: 'absolute',
+  transform: 'translate(-50%, -50%)',
+  cursor: 'pointer',
+  padding: '2px',
+  border: '2px solid #abe2fb',
+  borderRadius: '3px',
+  background: '#fff',
+  fontSize: '14px',
+  textAlign: 'center',
+  zIndex: 3,
+};
+
+const CustomHandle = props => {
+  const style = Object.assign({ left: props.offset + '%' }, handleStyle);
+  return (
+    <div style={style}>val: {props.value}</div>
+  );
+};
+CustomHandle.propTypes = {
+  value: React.PropTypes.any,
+  offset: React.PropTypes.number,
+};
+
+ReactDOM.render(
+  <div>
+    <div style={wrapperStyle}>
+      <p>Default slider</p>
+      <Slider min={0} max={20} defaultValue={3} />
+    </div>
+    <div style={wrapperStyle}>
+      <p>Slider with custom handle</p>
+      <Slider min={0} max={20} defaultValue={3} handle={<CustomHandle />} />
+    </div>
+  </div>
+  , document.getElementById('__react-content'));

examples/marks.js

@@ -4,13 +4,19 @@ const React = require('react');
 const ReactDOM = require('react-dom');
 const Slider = require('rc-slider');
 
-const style = {width: 400, margin: 50};
+const style = { width: 400, margin: 50 };
 const marks = {
   '-10': '-10°C',
-  0: '0°C',
+  0: <strong>0°C</strong>,
   26: '26°C',
   37: '37°C',
-  100: '100°C',
+  50: '50°C',
+  100: {
+    style: {
+      color: 'red',
+    },
+    label: <strong>100°C</strong>,
+  },
 };
 
 function log(value) {
@@ -25,7 +31,7 @@ ReactDOM.render(
     </div>
     <div style={style}>
       <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 style={style}>

examples/range.js

@@ -1,38 +1,78 @@
+/* eslint react/no-multi-comp: 0 */
 require('rc-slider/assets/index.less');
 
 const React = require('react');
 const ReactDOM = require('react-dom');
 const Slider = require('rc-slider');
 
-const style = {width: 400, margin: 50};
+const style = { width: 400, margin: 50 };
 
 function log(value) {
   console.log(value);
 }
 
 const CustomizedRange = React.createClass({
-  getInitialState: function() {
+  getInitialState() {
     return {
+      lowerBound: 20,
+      upperBound: 40,
       value: [20, 40],
     };
   },
-  onSliderChange: function(value) {
+  onLowerBoundChange(e) {
+    this.setState({ lowerBound: +e.target.value });
+  },
+  onUpperBoundChange(e) {
+    this.setState({ upperBound: +e.target.value });
+  },
+  onSliderChange(value) {
     log(value);
     this.setState({
-      value: value,
+      value,
     });
   },
-  onMinChange: function(e) {
+  handleApply() {
+    const { lowerBound, upperBound } = this.state;
+    this.setState({ value: [lowerBound, upperBound] });
+  },
+  render() {
+    return (
+      <div>
+        <label>LowerBound: </label>
+        <input type="number" value={this.state.lowerBound} onChange={this.onLowerBoundChange} />
+        <br />
+        <label>UpperBound: </label>
+        <input type="number" value={this.state.upperBound} onChange={this.onUpperBoundChange} />
+        <br />
+        <button onClick={this.handleApply}>Apply</button>
+        <br /><br />
+        <Slider range allowCross={false} value={this.state.value} onChange={this.onSliderChange} />
+      </div>
+    );
+  },
+});
+
+const DynamicBounds = React.createClass({
+  getInitialState() {
+    return {
+      min: 0,
+      max: 100,
+    };
+  },
+  onSliderChange(value) {
+    log(value);
+  },
+  onMinChange(e) {
     this.setState({
       min: +e.target.value || 0,
     });
   },
-  onMaxChange: function(e) {
+  onMaxChange(e) {
     this.setState({
       max: +e.target.value || 100,
     });
   },
-  render: function() {
+  render() {
     return (
       <div>
         <label>Min: </label>
@@ -41,7 +81,7 @@ const CustomizedRange = React.createClass({
         <label>Max: </label>
         <input type="number" value={this.state.max} onChange={this.onMaxChange} />
         <br /><br />
-        <Slider range value={this.state.value} min={this.state.min} max={this.state.max} onChange={this.onSliderChange} />
+        <Slider range defaultValue={[20, 50]} min={this.state.min} max={this.state.max} onChange={this.onSliderChange} />
       </div>
     );
   },
@@ -50,12 +90,12 @@ const CustomizedRange = React.createClass({
 ReactDOM.render(
   <div>
     <div style={style}>
-      <p>Basic Range</p>
-      <Slider range defaultValue={[0, 20]} onChange={log} />
+      <p>Basic Range，`allowCross=false`</p>
+      <Slider range allowCross={false} defaultValue={[0, 20]} onChange={log} />
     </div>
     <div style={style}>
       <p>Basic Range，`step=20` </p>
-      <Slider range step={20} defaultValue={[20, 40]} onBeforeChange={log} />
+      <Slider range step={20} defaultValue={[20, 20]} onBeforeChange={log} />
     </div>
     <div style={style}>
       <p>Basic Range，`step=20, dots` </p>
@@ -65,9 +105,17 @@ ReactDOM.render(
       <p>Controlled Range</p>
       <Slider range value={[20, 40]} />
     </div>
+    <div style={style}>
+      <p>Multi Range</p>
+      <Slider range={3} value={[20, 40, 60, 80]} />
+    </div>
     <div style={style}>
       <p>Customized Range</p>
       <CustomizedRange />
     </div>
+    <div style={style}>
+      <p>Range with dynamic `max` `min`</p>
+      <DynamicBounds />
+    </div>
   </div>
   , document.getElementById('__react-content'));

examples/slider.js

@@ -1,10 +1,11 @@
+/* eslint react/no-multi-comp: 0 */
 require('rc-slider/assets/index.less');
 
 const React = require('react');
 const ReactDOM = require('react-dom');
 const Slider = require('rc-slider');
 
-const style = {width: 400, margin: 50};
+const style = { width: 400, margin: 50 };
 
 function log(value) {
   console.log(value);
@@ -16,30 +17,46 @@ function percentFormatter(v) {
 }
 
 const CustomizedSlider = React.createClass({
-  getInitialState: function() {
+  getInitialState() {
     return {
       value: 50,
+    };
+  },
+  onSliderChange(value) {
+    log(value);
+    this.setState({
+      value,
+    });
+  },
+  onAfterChange(value) {
+    console.log(value);
+  },
+  render() {
+    return <Slider value={this.state.value} onChange={this.onSliderChange} onAfterChange={this.onAfterChange} />;
+  },
+});
+
+const DynamicBounds = React.createClass({
+  getInitialState() {
+    return {
       min: 0,
       max: 100,
     };
   },
-  onSliderChange: function(value) {
+  onSliderChange(value) {
     log(value);
-    this.setState({
-      value: value,
-    });
   },
-  onMinChange: function(e) {
+  onMinChange(e) {
     this.setState({
       min: +e.target.value || 0,
     });
   },
-  onMaxChange: function(e) {
+  onMaxChange(e) {
     this.setState({
       max: +e.target.value || 100,
     });
   },
-  render: function() {
+  render() {
     return (
       <div>
         <label>Min: </label>
@@ -48,7 +65,7 @@ const CustomizedSlider = React.createClass({
         <label>Max: </label>
         <input type="number" value={this.state.max} onChange={this.onMaxChange} />
         <br /><br />
-        <Slider value={this.state.value} min={this.state.min} max={this.state.max} onChange={this.onSliderChange} />
+        <Slider defaultValue={50} min={this.state.min} max={this.state.max} onChange={this.onSliderChange} />
       </div>
     );
   },
@@ -72,6 +89,10 @@ ReactDOM.render(
       <p>Basic Slider with `tipFormatter`</p>
       <Slider tipFormatter={percentFormatter} tipTransitionName="rc-slider-tooltip-zoom-down" onChange={log} />
     </div>
+    <div style={style}>
+      <p>Basic Slider without tooltip</p>
+      <Slider tipFormatter={null} onChange={log} />
+    </div>
     <div style={style}>
       <p>Controlled Slider</p>
       <Slider value={50} />
@@ -80,5 +101,9 @@ ReactDOM.render(
       <p>Customized Slider</p>
       <CustomizedSlider />
     </div>
+    <div style={style}>
+      <p>Slider with dynamic `min` `max`</p>
+      <DynamicBounds />
+    </div>
   </div>
   , document.getElementById('__react-content'));

examples/v-marks.html

@@ -0,0 +1 @@
+placeholder

examples/v-marks.js

@@ -0,0 +1,55 @@
+require('rc-slider/assets/index.less');
+
+const React = require('react');
+const ReactDOM = require('react-dom');
+const Slider = require('rc-slider');
+
+const style = { float: 'left', width: 160, height: 400, marginBottom: 160, marginLeft: 50 };
+const parentStyle = { overflow: 'hidden' };
+
+const marks = {
+  '-10': '-10°C',
+  0: <strong>0°C</strong>,
+  26: '26°C',
+  37: '37°C',
+  50: '50°C',
+  100: {
+    style: {
+      color: 'red',
+    },
+    label: <strong>100°C</strong>,
+  },
+};
+
+function log(value) {
+  console.log(value);
+}
+
+ReactDOM.render(
+  <div style={parentStyle}>
+    <div style={style}>
+      <p>Slider with marks, `step=null`</p>
+      <Slider vertical min={-10} marks={marks} step={null} onChange={log} defaultValue={20} />
+    </div>
+    <div style={style}>
+       <p>Slider with marks and steps</p>
+      <Slider vertical dots min={-10} marks={marks} step={10} onChange={log} defaultValue={20} />
+    </div>
+    <div style={style}>
+      <p>Slider with marks, `included=false`</p>
+      <Slider vertical min={-10} marks={marks} included={false} defaultValue={20} />
+    </div>
+    <div style={style}>
+      <p>Slider with marks and steps, `included=false`</p>
+      <Slider vertical min={-10} marks={marks} step={10} included={false} defaultValue={20} />
+    </div>
+    <div style={style}>
+      <p>Range with marks</p>
+      <Slider vertical min={-10} range marks={marks} onChange={log} defaultValue={[20, 40]} />
+    </div>
+    <div style={style}>
+      <p>Range with marks and steps</p>
+      <Slider vertical min={-10} range marks={marks} step={10} onChange={log} defaultValue={[20, 40]} />
+    </div>
+  </div>
+  , document.getElementById('__react-content'));

examples/v-range.js

@@ -0,0 +1,116 @@
+/* eslint react/no-multi-comp: 0 */
+require('rc-slider/assets/index.less');
+
+const React = require('react');
+const ReactDOM = require('react-dom');
+const Slider = require('rc-slider');
+
+const style = { float: 'left', width: 180, height: 400, marginBottom: 160, marginLeft: 50 };
+const parentStyle = { overflow: 'hidden' };
+
+function log(value) {
+  console.log(value);
+}
+
+const CustomizedRange = React.createClass({
+  getInitialState() {
+    return {
+      lowerBound: 20,
+      upperBound: 40,
+      value: [20, 40],
+    };
+  },
+  onLowerBoundChange(e) {
+    this.setState({ lowerBound: +e.target.value });
+  },
+  onUpperBoundChange(e) {
+    this.setState({ upperBound: +e.target.value });
+  },
+  onSliderChange(value) {
+    log(value);
+    this.setState({
+      value,
+    });
+  },
+  handleApply() {
+    const { lowerBound, upperBound } = this.state;
+    this.setState({ value: [lowerBound, upperBound] });
+  },
+  render() {
+    return (
+      <div style={style}>
+        <Slider range vertical allowCross={false} value={this.state.value} onChange={this.onSliderChange} />
+        <label>LowerBound: </label>
+        <input type="number" value={this.state.lowerBound} onChange={this.onLowerBoundChange} />
+        <br />
+        <label>UpperBound: </label>
+        <input type="number" value={this.state.upperBound} onChange={this.onUpperBoundChange} />
+        <br />
+        <button onClick={this.handleApply}>Apply</button>
+      </div>
+    );
+  },
+});
+
+const DynamicBounds = React.createClass({
+  getInitialState() {
+    return {
+      min: 0,
+      max: 100,
+    };
+  },
+  onSliderChange(value) {
+    log(value);
+  },
+  onMinChange(e) {
+    this.setState({
+      min: +e.target.value || 0,
+    });
+  },
+  onMaxChange(e) {
+    this.setState({
+      max: +e.target.value || 100,
+    });
+  },
+  render() {
+    return (
+      <div style={style}>
+        <Slider range vertical defaultValue={[20, 50]} min={this.state.min} max={this.state.max} onChange={this.onSliderChange} />
+        <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} />
+      </div>
+    );
+  },
+});
+
+ReactDOM.render(
+  <div style={parentStyle}>
+    <div style={style}>
+      <p>Basic Range，`allowCross=false`</p>
+      <Slider range vertical allowCross={false} defaultValue={[0, 20]} onChange={log} />
+    </div>
+    <div style={style}>
+      <p>Basic Range，`step=20` </p>
+      <Slider range vertical step={20} defaultValue={[20, 40]} onBeforeChange={log} />
+    </div>
+    <div style={style}>
+      <p>Basic Range，`step=20, dots` </p>
+      <Slider range vertical dots step={20} defaultValue={[20, 40]} onAfterChange={log} />
+    </div>
+    <div style={style}>
+      <p>Controlled Range</p>
+      <Slider range vertical value={[20, 40]} />
+    </div>
+    <div style={style}>
+      <p>Customized Range</p>
+      <CustomizedRange />
+    </div>
+    <div style={style}>
+      <p>Range with dynamic `max` `min`</p>
+      <DynamicBounds />
+    </div>
+  </div>
+  , document.getElementById('__react-content'));

examples/v-slider.html

@@ -0,0 +1 @@
+placeholder

examples/v-slider.js

@@ -0,0 +1,106 @@
+/* eslint react/no-multi-comp: 0 */
+require('rc-slider/assets/index.less');
+
+const React = require('react');
+const ReactDOM = require('react-dom');
+const Slider = require('rc-slider');
+
+const style = { float: 'left', width: 200, height: 400, marginBottom: 160, marginLeft: 50 };
+const parentStyle = { overflow: 'hidden' };
+
+function log(value) {
+  console.log(value);
+}
+
+
+function percentFormatter(v) {
+  return v + ' %';
+}
+
+const CustomizedSlider = React.createClass({
+  getInitialState() {
+    return {
+      value: 50,
+    };
+  },
+  onSliderChange(value) {
+    log(value);
+    this.setState({
+      value,
+    });
+  },
+  render() {
+    return <Slider vertical value={this.state.value} onChange={this.onSliderChange} />;
+  },
+});
+
+const DynamicBounds = React.createClass({
+  getInitialState() {
+    return {
+      min: 0,
+      max: 100,
+    };
+  },
+  onSliderChange(value) {
+    log(value);
+  },
+  onMinChange(e) {
+    this.setState({
+      min: +e.target.value || 0,
+    });
+  },
+  onMaxChange(e) {
+    this.setState({
+      max: +e.target.value || 100,
+    });
+  },
+  render() {
+    return (
+      <div style={style}>
+        <p>Slider with dynamic `min` `max`</p>
+        <Slider vertical defaultValue={50} min={this.state.min} max={this.state.max} onChange={this.onSliderChange} />
+        <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} />
+      </div>
+    );
+  },
+});
+
+ReactDOM.render(
+  <div style={parentStyle}>
+    <div style={style}>
+      <p>Basic Slider</p>
+      <Slider vertical tipTransitionName="rc-slider-tooltip-zoom-down" onChange={log} />
+    </div>
+    <div style={style}>
+      <p>Basic Slider，`step=20`</p>
+      <Slider vertical step={20} defaultValue={50} onBeforeChange={log} />
+    </div>
+    <div style={style}>
+      <p>Basic Slider，`step=20, dots`</p>
+      <Slider vertical dots step={20} defaultValue={100} onAfterChange={log} />
+    </div>
+    <div style={style}>
+      <p>Basic Slider with `tipFormatter`</p>
+      <Slider vertical tipFormatter={percentFormatter} tipTransitionName="rc-slider-tooltip-zoom-down" onChange={log} />
+    </div>
+    <div style={style}>
+      <p>Basic Slider without tooltip</p>
+      <Slider vertical tipFormatter={null} onChange={log} />
+    </div>
+    <div style={style}>
+      <p>Controlled Slider</p>
+      <Slider vertical value={50} />
+    </div>
+    <div style={style}>
+      <p>Customized Slider</p>
+      <CustomizedSlider />
+    </div>
+    <div>
+      <DynamicBounds />
+    </div>
+  </div>
+  , document.getElementById('__react-content'));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-slider",
-  "version": "3.1.4",
+  "version": "4.0.0",
   "description": "slider ui component for react",
   "keywords": [
     "react",
@@ -23,36 +23,38 @@
   ],
   "licenses": "MIT",
   "main": "./lib/index.js",
+  "style": "./assets/index.css",
   "config": {
     "port": 8005
   },
   "scripts": {
     "build": "rc-tools run build",
     "gh-pages": "rc-tools run gh-pages",
-    "start": "rc-server",
-    "pub": "rc-tools run pub",
+    "start": "rc-tools run server",
+    "pub": "rc-tools run pub --babel-runtime",
     "lint": "rc-tools run lint",
     "karma": "rc-tools run karma",
     "saucelabs": "rc-tools run saucelabs",
-    "browser-test": "rc-tools run browser-test",
-    "browser-test-cover": "rc-tools run browser-test-cover"
+    "test": "rc-tools run test",
+    "chrome-test": "rc-tools run chrome-test",
+    "coverage": "rc-tools run coverage"
   },
   "devDependencies": {
     "expect.js": "0.3.x",
     "pre-commit": "1.x",
-    "rc-server": "3.x",
-    "rc-tools": "4.x",
-    "react": "~0.14.0",
-    "react-addons-test-utils": "^0.14.0",
-    "react-dom": "~0.14.0"
+    "rc-tools": "^5.6.8",
+    "react": "^15.2.1",
+    "react-addons-test-utils": "^15.2.1",
+    "react-dom": "^15.2.1"
   },
   "pre-commit": [
     "lint"
   ],
   "dependencies": {
-    "classnames": "^2.2.1",
-    "object-assign": "^4.0.1",
-    "rc-tooltip": "3.x",
-    "rc-util": "3.x"
+    "babel-runtime": "6.x",
+    "classnames": "^2.2.5",
+    "rc-tooltip": "^3.4.2",
+    "rc-util": "^3.2.1",
+    "warning": "^3.0.0"
   }
 }

src/Handle.jsx

@@ -23,35 +23,51 @@ export default class Handle extends React.Component {
   }
 
   render() {
-    const props = this.props;
-    const {className, tipTransitionName, tipFormatter, offset, value} = props;
-    const {dragging, noTip} = props;
+    const {
+      prefixCls,
+      className,
+      tipTransitionName,
+      tipFormatter,
+      vertical,
+      offset,
+      value,
+      dragging,
+      noTip,
+    } = this.props;
 
-    const style = { left: offset + '%' };
-    const handle = (<div className={className} style={style}
-                      onMouseUp={this.showTooltip.bind(this)}
-                      onMouseEnter={this.showTooltip.bind(this)}
-                      onMouseLeave={this.hideTooltip.bind(this)}/>);
+    const style = vertical ? { bottom: offset + '%' } : { left: offset + '%' };
+    const handle = (
+      <div className={className} style={style}
+        onMouseUp={this.showTooltip.bind(this)}
+        onMouseEnter={this.showTooltip.bind(this)}
+        onMouseLeave={this.hideTooltip.bind(this)}
+      />
+    );
 
     if (noTip) {
       return handle;
     }
 
     const isTooltipVisible = dragging || this.state.isTooltipVisible;
-    return (<Tooltip
-              prefixCls={className.replace('slider-handle', 'tooltip')}
-              placement="top"
-              visible={isTooltipVisible}
-              overlay={<span>{tipFormatter ? tipFormatter(value) : value}</span>}
-              delay={0}
-              transitionName={tipTransitionName}>
-              {handle}
-            </Tooltip>);
+    return (
+      <Tooltip
+        prefixCls={prefixCls.replace('slider', 'tooltip')}
+        placement="top"
+        visible={isTooltipVisible}
+        overlay={<span>{tipFormatter(value)}</span>}
+        delay={0}
+        transitionName={tipTransitionName}
+      >
+        {handle}
+      </Tooltip>
+    );
   }
 }
 
 Handle.propTypes = {
+  prefixCls: React.PropTypes.string,
   className: React.PropTypes.string,
+  vertical: React.PropTypes.bool,
   offset: React.PropTypes.number,
   tipTransitionName: React.PropTypes.string,
   tipFormatter: React.PropTypes.func,

src/Marks.jsx

@@ -1,14 +1,14 @@
 import React from 'react';
 import classNames from 'classnames';
 
-const Marks = ({className, marks, included, upperBound, lowerBound, max, min}) => {
+const Marks = ({ className, vertical, marks, included, upperBound, lowerBound, max, min }) => {
   const marksKeys = Object.keys(marks);
   const marksCount = marksKeys.length;
   const unit = 100 / (marksCount - 1);
   const markWidth = unit * 0.9;
 
   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) ||
             (included && point <= upperBound && point >= lowerBound);
     const markClassName = classNames({
@@ -16,11 +16,28 @@ const Marks = ({className, marks, included, upperBound, lowerBound, max, min}) =
       [className + '-text-active']: isActived,
     });
 
-    const style = { width: markWidth + '%' };
-    style.left = (point - min) / range * 100 - markWidth / 2 + '%';
+    const bottomStyle = {
+      // height: markWidth + '%',
+      marginBottom: '-200' + '%',
+      bottom: (point - min) / range * 100 + '%',
+    };
 
-    return (<span className={markClassName} style={style} key={point}>
-             {marks[point]}
+    const leftStyle = {
+      width: markWidth + '%',
+      marginLeft: -markWidth / 2 + '%',
+      left: (point - min) / range * 100 + '%',
+    };
+
+    const style = vertical ? bottomStyle : leftStyle;
+
+    const markPoint = 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>);
   });
 

src/Slider.jsx

@@ -1,10 +1,9 @@
-import React from 'react';
-import {Dom as DomUtils} from 'rc-util';
+import React, { cloneElement } from 'react';
+import addEventListener from 'rc-util/lib/Dom/addEventListener';
 import classNames from 'classnames';
-import objectAssign from 'object-assign';
 import Track from './Track';
-import Handle from './Handle';
-import Dots from './Dots';
+import DefaultHandle from './Handle';
+import Steps from './Steps';
 import Marks from './Marks';
 
 function noop() {
@@ -14,12 +13,12 @@ function isNotTouchEvent(e) {
   return e.touches.length > 1 || (e.type.toLowerCase() === 'touchend' && e.touches.length > 0);
 }
 
-function getTouchPosition(e) {
-  return e.touches[0].pageX;
+function getTouchPosition(vertical, e) {
+  return vertical ? e.touches[0].clientY : e.touches[0].pageX;
 }
 
-function getMousePosition(e) {
-  return e.pageX;
+function getMousePosition(vertical, e) {
+  return vertical ? e.clientY : e.pageX;
 }
 
 function pauseEvent(e) {
@@ -31,92 +30,68 @@ class Slider extends React.Component {
   constructor(props) {
     super(props);
 
-    const {range, min, max} = props;
-    const initialValue = range ? [min, min] : min;
+    const { range, min, max } = props;
+    const initialValue = range ? Array.apply(null, Array(range + 1)).map(() => min) : min;
     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 lowerBound;
-    if (props.range) {
-      lowerBound = this.trimAlignValue(value[0]);
-      upperBound = this.trimAlignValue(value[1]);
-    } else {
-      upperBound = this.trimAlignValue(value);
-    }
+    const bounds = (range ? value : [min, value]).map(v => this.trimAlignValue(v));
 
     let recent;
-    if (props.range && upperBound === lowerBound) {
-      if (lowerBound === max) {
-        recent = 'lowerBound';
-      }
-      if (upperBound === min) {
-        recent = 'upperBound';
-      }
+    if (range && bounds[0] === bounds[bounds.length - 1] && bounds[0] === max) {
+      recent = 0;
     } else {
-      recent = 'upperBound';
+      recent = bounds.length - 1;
     }
 
     this.state = {
       handle: null,
-      recent: recent,
-      upperBound: upperBound,
-      // If Slider is not range, set `lowerBound` equal to `min`.
-      lowerBound: (lowerBound || min),
+      recent,
+      bounds,
     };
   }
 
   componentWillReceiveProps(nextProps) {
     if (!('value' in nextProps || 'min' in nextProps || 'max' in nextProps)) return;
 
-    const {lowerBound, upperBound} = this.state;
+    const { bounds } = this.state;
     if (nextProps.range) {
-      const value = nextProps.value;
-      const nextUpperBound = this.trimAlignValue(value[1], nextProps);
-      const nextLowerBound = this.trimAlignValue(value[0], nextProps);
-      if (nextLowerBound === lowerBound && nextUpperBound === upperBound) return;
+      const value = nextProps.value || bounds;
+      const nextBounds = value.map(v => this.trimAlignValue(v, nextProps));
+      if (nextBounds.every((v, i) => v === bounds[i])) return;
 
-      this.setState({
-        upperBound: nextUpperBound,
-        lowerBound: nextLowerBound,
-      });
-      if (this.isValueOutOfBounds(upperBound, nextProps) ||
-          this.isValueOutOfBounds(lowerBound, nextProps)) {
-        this.props.onChange([nextLowerBound, nextUpperBound]);
+      this.setState({ bounds: nextBounds });
+      if (bounds.some(v => this.isValueOutOfBounds(v, nextProps))) {
+        this.props.onChange(nextBounds);
       }
     } else {
-      const nextValue = this.trimAlignValue(nextProps.value, nextProps);
-      if (nextValue === upperBound && lowerBound === nextProps.min) return;
+      const value = nextProps.value !== undefined ? nextProps.value : bounds[1];
+      const nextValue = this.trimAlignValue(value, nextProps);
+      if (nextValue === bounds[1] && bounds[0] === nextProps.min) return;
 
-      this.setState({
-        upperBound: nextValue,
-        lowerBound: nextProps.min,
-      });
-      if (this.isValueOutOfBounds(upperBound, nextProps)) {
+      this.setState({ bounds: [nextProps.min, nextValue] });
+      if (this.isValueOutOfBounds(bounds[1], nextProps)) {
         this.props.onChange(nextValue);
       }
     }
   }
 
-  onChange(handle, value) {
+  onChange(state) {
     const props = this.props;
     const isNotControlled = !('value' in props);
     if (isNotControlled) {
-      this.setState({[handle]: value});
+      this.setState(state);
+    } else if (state.handle) {
+      this.setState({ handle: state.handle });
     }
 
-    const state = this.state;
-    const data = {
-      upperBound: state.upperBound,
-      lowerBound: state.lowerBound,
-    };
-    data[handle] = value;
-    const changedValue = props.range ? [data.lowerBound, data.upperBound] : data.upperBound;
+    const data = { ...this.state, ...state };
+    const changedValue = props.range ? data.bounds : data.bounds[1];
     props.onChange(changedValue);
   }
 
   onMouseMove(e) {
-    const position = getMousePosition(e);
+    const position = getMousePosition(this.props.vertical, e);
     this.onMove(e, position);
   }
 
@@ -126,7 +101,7 @@ class Slider extends React.Component {
       return;
     }
 
-    const position = getTouchPosition(e);
+    const position = getTouchPosition(this.props.vertical, e);
     this.onMove(e, position);
   }
 
@@ -135,27 +110,42 @@ class Slider extends React.Component {
     const props = this.props;
     const state = this.state;
 
-    const diffPosition = position - this.startPosition;
+    let diffPosition = position - this.startPosition;
+    diffPosition = this.props.vertical ? -diffPosition : diffPosition;
     const diffValue = diffPosition / this.getSliderLength() * (props.max - props.min);
 
     const value = this.trimAlignValue(this.startValue + diffValue);
     const oldValue = state[state.handle];
     if (value === oldValue) return;
 
-    this.onChange(state.handle, value);
+    const nextBounds = [...state.bounds];
+    nextBounds[state.handle] = value;
+    let nextHandle = state.handle;
+    if (props.pushable !== false) {
+      const originalValue = state.bounds[nextHandle];
+      this.pushSurroundingHandles(nextBounds, nextHandle, originalValue);
+    } else if (props.allowCross) {
+      nextBounds.sort((a, b) => a - b);
+      nextHandle = nextBounds.indexOf(value);
+    }
+    this.onChange({
+      handle: nextHandle,
+      bounds: nextBounds,
+    });
   }
 
   onTouchStart(e) {
     if (isNotTouchEvent(e)) return;
 
-    const position = getTouchPosition(e);
+    const position = getTouchPosition(this.props.vertical, e);
     this.onStart(position);
     this.addDocumentEvents('touch');
     pauseEvent(e);
   }
 
   onMouseDown(e) {
-    const position = getMousePosition(e);
+    if (e.button !== 0) { return; }
+    const position = getMousePosition(this.props.vertical, e);
     this.onStart(position);
     this.addDocumentEvents('mouse');
     pauseEvent(e);
@@ -170,22 +160,26 @@ class Slider extends React.Component {
     this.startPosition = position;
 
     const state = this.state;
-    const {upperBound, lowerBound} = state;
+    const { bounds } = state;
 
-    let valueNeedChanging = 'upperBound';
+    let valueNeedChanging = 1;
     if (this.props.range) {
-      const isLowerBoundCloser = Math.abs(upperBound - value) > Math.abs(lowerBound - value);
-      if (isLowerBoundCloser) {
-        valueNeedChanging = 'lowerBound';
+      let closestBound = 0;
+      for (let i = 1; i < bounds.length - 1; ++i) {
+        if (value > bounds[i]) { closestBound = i; }
       }
+      if (Math.abs(bounds[closestBound + 1] - value) < Math.abs(bounds[closestBound] - value)) {
+        closestBound = closestBound + 1;
+      }
+      valueNeedChanging = closestBound;
 
-      const isAtTheSamePoint = (upperBound === lowerBound);
+      const isAtTheSamePoint = (bounds[closestBound + 1] === bounds[closestBound]);
       if (isAtTheSamePoint) {
         valueNeedChanging = state.recent;
       }
 
-      if (isAtTheSamePoint && (value !== upperBound)) {
-        valueNeedChanging = value < upperBound ? 'lowerBound' : 'upperBound';
+      if (isAtTheSamePoint && (value !== bounds[closestBound + 1])) {
+        valueNeedChanging = value < bounds[closestBound + 1] ? closestBound : closestBound + 1;
       }
     }
 
@@ -194,15 +188,17 @@ class Slider extends React.Component {
       recent: valueNeedChanging,
     });
 
-    const oldValue = state[valueNeedChanging];
+    const oldValue = state.bounds[valueNeedChanging];
     if (value === oldValue) return;
 
-    this.onChange(valueNeedChanging, value);
+    const nextBounds = [...state.bounds];
+    nextBounds[valueNeedChanging] = value;
+    this.onChange({ bounds: nextBounds });
   }
 
   getValue() {
-    const {lowerBound, upperBound} = this.state;
-    return this.props.range ? [lowerBound, upperBound] : upperBound;
+    const { bounds } = this.state;
+    return this.props.range ? bounds : bounds[1];
   }
 
   getSliderLength() {
@@ -211,19 +207,18 @@ class Slider extends React.Component {
       return 0;
     }
 
-    return slider.clientWidth;
+    return this.props.vertical ? slider.clientHeight : slider.clientWidth;
   }
 
   getSliderStart() {
     const slider = this.refs.slider;
     const rect = slider.getBoundingClientRect();
 
-    return rect.left;
+    return this.props.vertical ? rect.top : rect.left;
   }
 
-  getPrecision() {
-    const props = this.props;
-    const stepString = props.step.toString();
+  getPrecision(step) {
+    const stepString = step.toString();
     let precision = 0;
     if (stepString.indexOf('.') >= 0) {
       precision = stepString.length - stepString.indexOf('.') - 1;
@@ -231,14 +226,35 @@ class Slider extends React.Component {
     return precision;
   }
 
+  /**
+   * Returns an array of possible slider points, taking into account both
+   * `marks` and `step`. The result is cached.
+   */
+  getPoints() {
+    const { marks, step, min, max } = this.props;
+    const cache = this._getPointsCache;
+    if (!cache || cache.marks !== marks || cache.step !== step) {
+      const pointsObject = { ...marks };
+      if (step !== null) {
+        for (let point = min; point <= max; point += step) {
+          pointsObject[point] = point;
+        }
+      }
+      const points = Object.keys(pointsObject).map(parseFloat);
+      points.sort((a, b) => a - b);
+      this._getPointsCache = { marks, step, points };
+    }
+    return this._getPointsCache.points;
+  }
+
   isValueOutOfBounds(value, props) {
     return value < props.min || value > props.max;
   }
 
   trimAlignValue(v, nextProps) {
     const state = this.state || {};
-    const {handle, lowerBound, upperBound} = state;
-    const {marks, step, min, max} = objectAssign({}, this.props, nextProps || {});
+    const { handle, bounds } = state;
+    const { marks, step, min, max, allowCross } = { ...this.props, ...(nextProps || {}) };
 
     let val = v;
     if (val <= min) {
@@ -247,35 +263,96 @@ class Slider extends React.Component {
     if (val >= max) {
       val = max;
     }
-    if (handle === 'upperBound' && val <= lowerBound) {
-      val = lowerBound;
+    /* eslint-disable eqeqeq */
+    if (!allowCross && handle != null && handle > 0 && val <= bounds[handle - 1]) {
+      val = bounds[handle - 1];
     }
-    if (handle === 'lowerBound' && val >= upperBound) {
-      val = upperBound;
+    if (!allowCross && handle != null && handle < bounds.length - 1 && val >= bounds[handle + 1]) {
+      val = bounds[handle + 1];
     }
+    /* eslint-enable eqeqeq */
 
     const points = Object.keys(marks).map(parseFloat);
     if (step !== null) {
-      const closestStep = Math.round(val / step) * step;
+      const closestStep = (Math.round((val - min) / step) * step) + min;
       points.push(closestStep);
     }
 
     const diffs = points.map((point) => Math.abs(val - point));
     const closestPoint = points[diffs.indexOf(Math.min.apply(Math, diffs))];
 
-    return step !== null ? parseFloat(closestPoint.toFixed(this.getPrecision())) : closestPoint;
+    return step !== null ? parseFloat(closestPoint.toFixed(this.getPrecision(step))) : closestPoint;
+  }
+
+  pushHandleOnePoint(bounds, handle, direction) {
+    const points = this.getPoints();
+    const pointIndex = points.indexOf(bounds[handle]);
+    const nextPointIndex = pointIndex + direction;
+    if (nextPointIndex >= points.length || nextPointIndex < 0) {
+      // reached the minimum or maximum available point, can't push anymore
+      return false;
+    }
+    const nextHandle = handle + direction;
+    const nextValue = points[nextPointIndex];
+    const { pushable: threshold } = this.props;
+    const diffToNext = direction * (bounds[nextHandle] - nextValue);
+    if (!this.pushHandle(bounds, nextHandle, direction, threshold - diffToNext)) {
+      // couldn't push next handle, so we won't push this one either
+      return false;
+    }
+    // push the handle
+    bounds[handle] = nextValue;
+    return true;
+  }
+
+  pushHandle(bounds, handle, direction, amount) {
+    const originalValue = bounds[handle];
+    let currentValue = bounds[handle];
+    while (direction * (currentValue - originalValue) < amount) {
+      if (!this.pushHandleOnePoint(bounds, handle, direction)) {
+        // can't push handle enough to create the needed `amount` gap, so we
+        // revert its position to the original value
+        bounds[handle] = originalValue;
+        return false;
+      }
+      currentValue = bounds[handle];
+    }
+    // the handle was pushed enough to create the needed `amount` gap
+    return true;
+  }
+
+  pushSurroundingHandles(bounds, handle, originalValue) {
+    const { pushable: threshold } = this.props;
+    const value = bounds[handle];
+
+    let direction = 0;
+    if (bounds[handle + 1] - value < threshold) {
+      direction = +1;
+    } else if (value - bounds[handle - 1] < threshold) {
+      direction = -1;
+    }
+
+    if (direction === 0) { return; }
+
+    const nextHandle = handle + direction;
+    const diffToNext = direction * (bounds[nextHandle] - value);
+    if (!this.pushHandle(bounds, nextHandle, direction, threshold - diffToNext)) {
+      // revert to original value if pushing is impossible
+      bounds[handle] = originalValue;
+    }
   }
 
   calcOffset(value) {
-    const {min, max} = this.props;
+    const { min, max } = this.props;
     const ratio = (value - min) / (max - min);
     return ratio * 100;
   }
 
   calcValue(offset) {
-    const {min, max} = this.props;
-    const ratio = offset / this.getSliderLength();
-    return ratio * (max - min) + min;
+    const { vertical, min, max } = this.props;
+    const ratio = Math.abs(offset / this.getSliderLength());
+    const value = vertical ? (1 - ratio) * (max - min) + min : ratio * (max - min) + min;
+    return value;
   }
 
   calcValueByPos(position) {
@@ -287,11 +364,11 @@ class Slider extends React.Component {
   addDocumentEvents(type) {
     if (type === 'touch') {
       // just work for chrome iOS Safari and Android Browser
-      this.onTouchMoveListener = DomUtils.addEventListener(document, 'touchmove', this.onTouchMove.bind(this));
-      this.onTouchUpListener = DomUtils.addEventListener(document, 'touchend', this.end.bind(this, 'touch'));
+      this.onTouchMoveListener = addEventListener(document, 'touchmove', this.onTouchMove.bind(this));
+      this.onTouchUpListener = addEventListener(document, 'touchend', this.end.bind(this, 'touch'));
     } else if (type === 'mouse') {
-      this.onMouseMoveListener = DomUtils.addEventListener(document, 'mousemove', this.onMouseMove.bind(this));
-      this.onMouseUpListener = DomUtils.addEventListener(document, 'mouseup', this.end.bind(this, 'mouse'));
+      this.onMouseMoveListener = addEventListener(document, 'mousemove', this.onMouseMove.bind(this));
+      this.onMouseUpListener = addEventListener(document, 'mouseup', this.end.bind(this, 'mouse'));
     }
   }
 
@@ -308,53 +385,99 @@ class Slider extends React.Component {
   end(type) {
     this.removeEvents(type);
     this.props.onAfterChange(this.getValue());
-    this.setState({handle: null});
+    this.setState({ handle: null });
   }
 
   render() {
-    const {handle, upperBound, lowerBound} = this.state;
-    const {className, prefixCls, disabled, dots, included, range, step,
-           marks, max, min, tipTransitionName, tipFormatter, children} = this.props;
+    const {
+        handle,
+        bounds,
+    } = this.state;
+    const {
+        className,
+        prefixCls,
+        disabled,
+        vertical,
+        dots,
+        included,
+        range,
+        step,
+        marks,
+        max, min,
+        tipTransitionName,
+        tipFormatter,
+        children,
+    } = this.props;
 
-    const upperOffset = this.calcOffset(upperBound);
-    const lowerOffset = this.calcOffset(lowerBound);
+    const customHandle = this.props.handle;
+
+    const offsets = bounds.map(v => this.calcOffset(v));
 
     const handleClassName = prefixCls + '-handle';
-    const isNoTip = (step === null) && !tipFormatter;
 
-    const upper = (<Handle className={handleClassName}
-                           noTip={isNoTip} tipTransitionName={tipTransitionName} tipFormatter={tipFormatter}
-                           offset={upperOffset} value={upperBound} dragging={handle === 'upperBound'} />);
+    const handlesClassNames = bounds.map((v, i) => classNames({
+      [handleClassName]: true,
+      [`${handleClassName}-${i + 1}`]: true,
+      [`${handleClassName}-lower`]: i === 0,
+      [`${handleClassName}-upper`]: i === bounds.length - 1,
+    }));
 
-    let lower = null;
-    if (range) {
-      lower = (<Handle className={handleClassName}
-                       noTip={isNoTip} tipTransitionName={tipTransitionName} tipFormatter={tipFormatter}
-                       offset={lowerOffset} value={lowerBound} dragging={handle === 'lowerBound'} />);
+    const isNoTip = (step === null) || (tipFormatter === null);
+
+    const commonHandleProps = {
+      prefixCls,
+      noTip: isNoTip,
+      tipTransitionName,
+      tipFormatter,
+      vertical,
+    };
+
+    const handles = bounds.map((v, i) => cloneElement(customHandle, {
+      ...commonHandleProps,
+      className: handlesClassNames[i],
+      value: v,
+      offset: offsets[i],
+      dragging: handle === i,
+      key: i,
+    }));
+    if (!range) { handles.shift(); }
+
+    const isIncluded = included || range;
+
+    const tracks = [];
+    for (let i = 1; i < bounds.length; ++i) {
+      const trackClassName = classNames({
+        [`${prefixCls}-track`]: true,
+        [`${prefixCls}-track-${i}`]: true,
+      });
+      tracks.push(
+          <Track className={trackClassName} vertical={vertical} included={isIncluded}
+                 offset={offsets[i - 1]} length={offsets[i] - offsets[i - 1]} key={i} />
+      );
     }
 
     const sliderClassName = classNames({
       [prefixCls]: true,
       [prefixCls + '-disabled']: disabled,
       [className]: !!className,
+      [prefixCls + '-vertical']: this.props.vertical,
     });
-    const isIncluded = included || range;
+
     return (
-      <div ref="slider" className={sliderClassName}
-           onTouchStart={disabled ? noop : this.onTouchStart.bind(this)}
-           onMouseDown={disabled ? noop : this.onMouseDown.bind(this)}>
-        {upper}
-        {lower}
-        <Track className={prefixCls + '-track'} included={isIncluded}
-               offset={lowerOffset} length={upperOffset - lowerOffset}/>
-        <Dots prefixCls={prefixCls} marks={marks} dots={dots} step={step}
-              included={isIncluded} lowerBound={lowerBound}
-              upperBound={upperBound} max={max} min={min} />
-        <Marks className={prefixCls + '-mark'} marks={marks}
-               included={isIncluded} lowerBound={lowerBound}
-               upperBound={upperBound} max={max} min={min} />
-        {children}
-      </div>
+        <div ref="slider" className={sliderClassName}
+             onTouchStart={disabled ? noop : this.onTouchStart.bind(this)}
+             onMouseDown={disabled ? noop : this.onMouseDown.bind(this)}
+        >
+          {handles}
+          {tracks}
+          <Steps prefixCls={prefixCls} vertical = {vertical} marks={marks} dots={dots} step={step}
+                 included={isIncluded} lowerBound={bounds[0]}
+                 upperBound={bounds[bounds.length - 1]} max={max} min={min} />
+          <Marks className={prefixCls + '-mark'} vertical = {vertical} marks={marks}
+                 included={isIncluded} lowerBound={bounds[0]}
+                 upperBound={bounds[bounds.length - 1]} max={max} min={min} />
+          {children}
+        </div>
     );
   }
 }
@@ -380,10 +503,20 @@ Slider.propTypes = {
   onBeforeChange: React.PropTypes.func,
   onChange: React.PropTypes.func,
   onAfterChange: React.PropTypes.func,
+  handle: React.PropTypes.element,
   tipTransitionName: React.PropTypes.string,
   tipFormatter: React.PropTypes.func,
   dots: React.PropTypes.bool,
-  range: React.PropTypes.bool,
+  range: React.PropTypes.oneOfType([
+    React.PropTypes.bool,
+    React.PropTypes.number,
+  ]),
+  vertical: React.PropTypes.bool,
+  allowCross: React.PropTypes.bool,
+  pushable: React.PropTypes.oneOfType([
+    React.PropTypes.bool,
+    React.PropTypes.number,
+  ]),
 };
 
 Slider.defaultProps = {
@@ -394,13 +527,18 @@ Slider.defaultProps = {
   max: 100,
   step: 1,
   marks: {},
+  handle: <DefaultHandle />,
   onBeforeChange: noop,
   onChange: noop,
   onAfterChange: noop,
+  tipFormatter: value => value,
   included: true,
   disabled: false,
   dots: false,
   range: false,
+  vertical: false,
+  allowCross: true,
+  pushable: false,
 };
 
 export default Slider;

src/Steps.jsx

@@ -1,21 +1,25 @@
 import React from 'react';
 import classNames from 'classnames';
+import warning from 'warning';
 
-function calcPoints(marks, dots, step, min, max) {
+function calcPoints(vertical, marks, dots, step, min, max) {
+  warning(dots ? step > 0 : true, '`Slider[step]` should be a positive number in order to make Slider[dots] work.');
   const points = Object.keys(marks).map(parseFloat);
   if (dots) {
     for (let i = min; i <= max; i = i + step) {
+      if (points.indexOf(i) >= 0) continue;
       points.push(i);
     }
   }
   return points;
 }
 
-const Dots = ({prefixCls, marks, dots, step, included, lowerBound, upperBound, max, min}) => {
+const Steps = ({ prefixCls, vertical, marks, dots, step, included,
+                lowerBound, upperBound, max, min }) => {
   const range = max - min;
-  const elements = calcPoints(marks, dots, step, min, max).map((point) => {
-    const offset = (point - min) / range * 100 + '%';
-    const style = { left: offset };
+  const elements = calcPoints(vertical, marks, dots, step, min, max).map((point) => {
+    const offset = Math.abs(point - min) / range * 100 + '%';
+    const style = vertical ? { bottom: offset } : { left: offset };
 
     const isActived = (!included && point === upperBound) ||
             (included && point <= upperBound && point >= lowerBound);
@@ -30,4 +34,4 @@ const Dots = ({prefixCls, marks, dots, step, included, lowerBound, upperBound, m
   return <div className={prefixCls + '-step'}>{elements}</div>;
 };
 
-export default Dots;
+export default Steps;

src/Track.jsx

@@ -1,11 +1,16 @@
 import React from 'react';
 
-const Track = ({className, included, offset, length}) => {
+const Track = ({ className, included, vertical, offset, length }) => {
   const style = {
-    left: offset + '%',
-    width: length + '%',
     visibility: included ? 'visible' : 'hidden',
   };
+  if (vertical) {
+    style.bottom = offset + '%';
+    style.height = length + '%';
+  } else {
+    style.left = offset + '%';
+    style.width = length + '%';
+  }
   return <div className={className} style={style} />;
 };
 

tests/index.js

@@ -0,0 +1,209 @@
+const expect = require('expect.js');
+const React = require('react');
+const ReactDOM = require('react-dom');
+const ReactTestUtils = require('react-addons-test-utils');
+const Slider = require('..');
+
+require('../assets/index.less');
+
+describe('rc-slider', function test() {
+  this.timeout(5000);
+  const div = document.createElement('div');
+  document.body.appendChild(div);
+
+  afterEach(() => {
+    ReactDOM.unmountComponentAtNode(div);
+  });
+
+  it('should render a Slider with correct DOM structure', () => {
+    const slider = ReactDOM.render(<Slider />, div);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider').length).to.be(1);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-handle').length).to.be(1);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-track').length).to.be(1);
+  });
+
+  it('should render a Slider with default value correctly', () => {
+    const sliderWithDefaultValue = ReactDOM.render(<Slider defaultValue={50} />, div);
+    expect(sliderWithDefaultValue.state.bounds[1]).to.be(50);
+    expect(ReactTestUtils
+           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[0]
+           .style.cssText)
+      .to.match(/left: 50%;/);
+
+    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);
+    expect(sliderWithValue.state.bounds[1]).to.be(50);
+    expect(ReactTestUtils
+           .scryRenderedDOMComponentsWithClass(sliderWithValue, 'rc-slider-handle')[0]
+           .style.cssText)
+      .to.match(/left: 50%;/);
+
+    const trackStyle = ReactTestUtils
+            .scryRenderedDOMComponentsWithClass(sliderWithValue, '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 Range with correct DOM structure', () => {
+    const range = ReactDOM.render(<Slider range />, div);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider').length).to.be(1);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-handle').length).to.be(2);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-track').length).to.be(1);
+  });
+
+  it('should render a Multi-Range with correct DOM structure', () => {
+    const multiRange = ReactDOM.render(<Slider range={3} />, div);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(multiRange, 'rc-slider').length).to.be(1);
+
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(multiRange, 'rc-slider-handle').length).to.be(4);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(multiRange, 'rc-slider-handle-1').length).to.be(1);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(multiRange, 'rc-slider-handle-2').length).to.be(1);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(multiRange, 'rc-slider-handle-3').length).to.be(1);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(multiRange, 'rc-slider-handle-4').length).to.be(1);
+
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(multiRange, 'rc-slider-track').length).to.be(3);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(multiRange, 'rc-slider-track-1').length).to.be(1);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(multiRange, 'rc-slider-track-2').length).to.be(1);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(multiRange, 'rc-slider-track-3').length).to.be(1);
+  });
+
+  it('should render a Range with default value correctly', () => {
+    const rangeWithDefaultValue = ReactDOM.render(<Slider range defaultValue={[0, 50]} />, div);
+    expect(rangeWithDefaultValue.state.bounds[0]).to.be(0);
+    expect(rangeWithDefaultValue.state.bounds[1]).to.be(50);
+    expect(ReactTestUtils
+      .scryRenderedDOMComponentsWithClass(rangeWithDefaultValue, 'rc-slider-handle')[0]
+      .style.cssText)
+      .to.match(/left: 0%;/);
+    expect(ReactTestUtils
+      .scryRenderedDOMComponentsWithClass(rangeWithDefaultValue, 'rc-slider-handle')[1]
+      .style.cssText)
+      .to.match(/left: 50%;/);
+
+    const trackStyle = ReactTestUtils
+      .scryRenderedDOMComponentsWithClass(rangeWithDefaultValue, '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 Multi-Range with default value correctly', () => {
+    const multiRangeWithDefaultValue = ReactDOM.render(<Slider range={3} defaultValue={[0, 25, 50, 75]} />, div);
+    expect(multiRangeWithDefaultValue.state.bounds[0]).to.be(0);
+    expect(multiRangeWithDefaultValue.state.bounds[1]).to.be(25);
+    expect(multiRangeWithDefaultValue.state.bounds[2]).to.be(50);
+    expect(multiRangeWithDefaultValue.state.bounds[3]).to.be(75);
+    expect(ReactTestUtils
+      .scryRenderedDOMComponentsWithClass(multiRangeWithDefaultValue, 'rc-slider-handle')[0]
+      .style.cssText)
+      .to.match(/left: 0%;/);
+    expect(ReactTestUtils
+      .scryRenderedDOMComponentsWithClass(multiRangeWithDefaultValue, 'rc-slider-handle')[1]
+      .style.cssText)
+      .to.match(/left: 25%;/);
+    expect(ReactTestUtils
+      .scryRenderedDOMComponentsWithClass(multiRangeWithDefaultValue, 'rc-slider-handle')[2]
+      .style.cssText)
+      .to.match(/left: 50%;/);
+    expect(ReactTestUtils
+      .scryRenderedDOMComponentsWithClass(multiRangeWithDefaultValue, 'rc-slider-handle')[3]
+      .style.cssText)
+      .to.match(/left: 75%;/);
+
+    const track1Style = ReactTestUtils
+      .scryRenderedDOMComponentsWithClass(multiRangeWithDefaultValue, 'rc-slider-track-1')[0]
+      .style.cssText;
+    expect(track1Style).to.match(/left: 0%;/);
+    expect(track1Style).to.match(/width: 25%;/);
+    expect(track1Style).to.match(/visibility: visible;/);
+
+    const track2Style = ReactTestUtils
+      .scryRenderedDOMComponentsWithClass(multiRangeWithDefaultValue, 'rc-slider-track-2')[0]
+      .style.cssText;
+    expect(track2Style).to.match(/left: 25%;/);
+    expect(track2Style).to.match(/width: 25%;/);
+    expect(track2Style).to.match(/visibility: visible;/);
+
+    const track3Style = ReactTestUtils
+      .scryRenderedDOMComponentsWithClass(multiRangeWithDefaultValue, 'rc-slider-track-3')[0]
+      .style.cssText;
+    expect(track3Style).to.match(/left: 50%;/);
+    expect(track3Style).to.match(/width: 25%;/);
+    expect(track3Style).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.bounds[0]).to.be(50);
+    expect(rangeWithValue.state.bounds[1]).to.be(100);
+    expect(ReactTestUtils
+           .scryRenderedDOMComponentsWithClass(rangeWithValue, 'rc-slider-handle')[0]
+           .style.cssText)
+      .to.match(/left: 50%;/);
+    expect(ReactTestUtils
+           .scryRenderedDOMComponentsWithClass(rangeWithValue, 'rc-slider-handle')[1]
+           .style.cssText)
+      .to.match(/left: 100%;/);
+
+    const trackStyle = ReactTestUtils
+            .scryRenderedDOMComponentsWithClass(rangeWithValue, 'rc-slider-track')[0]
+            .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`', () => {
+    const slider = ReactDOM.render(<Slider value={50} step={10} dots />, div);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-dot').length).to.be(11);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-dot-active').length).to.be(6);
+
+    const range = ReactDOM.render(<Slider range value={[20, 50]} step={10} dots />, div);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-dot').length).to.be(11);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-dot-active').length).to.be(4);
+  });
+
+  it('should render marks correctly when `marks` is not an empty object', () => {
+    const marks = { 0: '0', 30: '30', 100: '100' };
+
+    const slider = ReactDOM.render(<Slider value={30} marks={marks} />, div);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-mark-text').length).to.be(3);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-mark-text')[0].innerHTML).to.be('0');
+    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');
+
+    const range = ReactDOM.render(<Slider range value={[0, 30]} marks={marks} />, div);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-mark-text').length).to.be(3);
+  });
+
+  it('should not set value greater than `max` or smaller `min`', () => {
+    const sliderWithMin = ReactDOM.render(<Slider value={0} min={10} />, div);
+    expect(sliderWithMin.state.bounds[1]).to.be(10);
+    ReactDOM.unmountComponentAtNode(div);
+
+    const sliderWithMax = ReactDOM.render(<Slider value={100} max={90} />, div);
+    expect(sliderWithMax.state.bounds[1]).to.be(90);
+    ReactDOM.unmountComponentAtNode(div);
+
+    const range = ReactDOM.render(<Slider range value={[0, 100]} min={10} max={90} />, div);
+    expect(range.state.bounds[0]).to.be(10);
+    expect(range.state.bounds[1]).to.be(90);
+    ReactDOM.unmountComponentAtNode(div);
+  });
+
+  it('should render a vertical slider, when `vertical` is true', () => {
+    const slider = ReactDOM.render(<Slider vertical />, div);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-vertical').length).to.be(1);
+  });
+});

tests/index.spec.js

@@ -1,127 +0,0 @@
-const expect = require('expect.js');
-const React = require('react');
-const ReactDOM = require('react-dom');
-const ReactTestUtils = require('react-addons-test-utils');
-const Slider = require('..');
-
-require('../assets/index.less');
-
-describe('rc-slider', function() {
-  this.timeout(5000);
-  const div = document.createElement('div');
-  document.body.appendChild(div);
-
-  afterEach(() => {
-    ReactDOM.unmountComponentAtNode(div);
-  });
-
-  it('should render a Slider with correct DOM structure', () => {
-    const slider = ReactDOM.render(<Slider />, div);
-    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider').length).to.be(1);
-    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-handle').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', () => {
-    const sliderWithDefaultValue = ReactDOM.render(<Slider defaultValue={50} />, div);
-    expect(sliderWithDefaultValue.state.upperBound).to.be(50);
-    expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[0]
-           .style.cssText)
-      .to.be('left: 50%; ');
-    expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
-           .style.cssText)
-      .to.be('left: 0%; width: 50%; visibility: visible; ');
-
-    const sliderWithValue = ReactDOM.render(<Slider value={50} />, div);
-    expect(sliderWithValue.state.upperBound).to.be(50);
-    expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[0]
-           .style.cssText)
-      .to.be('left: 50%; ');
-    expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
-           .style.cssText)
-      .to.be('left: 0%; width: 50%; visibility: visible; ');
-  });
-
-  it('should render a Range with correct DOM structure', () => {
-    const range = ReactDOM.render(<Slider range />, div);
-    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider').length).to.be(1);
-    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-handle').length).to.be(2);
-    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-track').length).to.be(1);
-  });
-
-  it('should render a Range with correct value and CSS style', () => {
-    const sliderWithDefaultValue = ReactDOM.render(<Slider range defaultValue={[0, 50]} />, div);
-    expect(sliderWithDefaultValue.state.lowerBound).to.be(0);
-    expect(sliderWithDefaultValue.state.upperBound).to.be(50);
-    expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[0]
-           .style.cssText)
-      .to.be('left: 50%; ');
-    expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[1]
-           .style.cssText)
-      .to.be('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);
-    expect(sliderWithValue.state.lowerBound).to.be(50);
-    expect(sliderWithValue.state.upperBound).to.be(100);
-    expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[0]
-           .style.cssText)
-      .to.be('left: 100%; ');
-    expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[1]
-           .style.cssText)
-      .to.be('left: 50%; ');
-    expect(ReactTestUtils
-           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
-           .style.cssText)
-      .to.be('width: 50%; visibility: visible; left: 50%; ');
-  });
-
-  it('should render dots correctly when `dots=true`', () => {
-    const slider = ReactDOM.render(<Slider value={50} step={10} dots />, div);
-    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-dot').length).to.be(11);
-    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-dot-active').length).to.be(6);
-
-    const range = ReactDOM.render(<Slider range value={[20, 50]} step={10} dots />, div);
-    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-dot').length).to.be(11);
-    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-dot-active').length).to.be(4);
-  });
-
-  it('should render marks correctly when `marks` is not an empty object', () => {
-    const marks = {0: '0', 30: '30', 100: '100'};
-
-    const slider = ReactDOM.render(<Slider value={30} marks={marks} />, div);
-    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-mark-text').length).to.be(3);
-    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-mark-text')[0].innerHTML).to.be('0');
-    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');
-
-    const range = ReactDOM.render(<Slider range value={[0, 30]} marks={marks} />, div);
-    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-mark-text').length).to.be(3);
-  });
-
-  it('should not set value greater than `max` or smaller `min`', () => {
-    const sliderWithMin = ReactDOM.render(<Slider value={0} min={10} />, div);
-    expect(sliderWithMin.state.upperBound).to.be(10);
-    ReactDOM.unmountComponentAtNode(div);
-
-    const sliderWithMax = ReactDOM.render(<Slider value={100} max={90} />, div);
-    expect(sliderWithMax.state.upperBound).to.be(90);
-    ReactDOM.unmountComponentAtNode(div);
-
-    const range = ReactDOM.render(<Slider range value={[0, 100]} min={10} max={90} />, div);
-    expect(range.state.lowerBound).to.be(10);
-    expect(range.state.upperBound).to.be(90);
-    ReactDOM.unmountComponentAtNode(div);
-  });
-});

tests/runner.html

@@ -1 +0,0 @@
-stub