bump 3.7.0

Allow to pass custom handle components

HISTORY.md

@@ -1,6 +1,11 @@
 # History
 ----
 
+## 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

@@ -90,9 +90,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>
@@ -106,6 +106,18 @@ ReactDOM.render(<Rcslider />, container);
           <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>
         </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>
+          <td>vertical</td>
+          <td>boolean</td>
+          <td>false</td>
+          <td>If vertical is `true`, the slider will be vertical.</td>
+        </tr>
         <tr>
           <td>defaultValue</td>
           <td>number or [number, number]</td>
@@ -118,6 +130,12 @@ ReactDOM.render(<Rcslider />, container);
           <td></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>
           <td>boolean</td>
@@ -138,9 +156,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>
@@ -148,6 +166,18 @@ ReactDOM.render(<Rcslider />, container);
           <td>false</td>
           <td>When the `step` value is greater than 1, you can set the `dots` to  `true` if you want to render the slider with dots.</td>
         </tr>
+        <tr>
+          <td>onChange</td>
+          <td>function</td>
+          <td>NOOP</td>
+          <td>`onChange` will be triggered while the value of Slider changing.</td>
+        </tr>
+        <tr>
+          <td>onAfterChange</td>
+          <td>function</td>
+          <td>NOOP</td>
+          <td>`onAfterChange` will be triggered when `ontouchend` or `onmouseup` is triggered.</td>
+        </tr>
     </tbody>
 </table>
 

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

@@ -1,23 +1,27 @@
-'use strict';
-
 require('rc-slider/assets/index.less');
 
-var React = require('react');
-var ReactDOM = require('react-dom');
-var Slider = require('rc-slider');
+const React = require('react');
+const ReactDOM = require('react-dom');
+const Slider = require('rc-slider');
 
-var style = {width: 400, margin: 50};
-var marks = {
+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>,
+  },
 };
 
-var log = function(value) {
+function log(value) {
   console.log(value);
-};
+}
 
 ReactDOM.render(
   <div>
@@ -27,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,42 +1,101 @@
-'use strict';
-
+/* eslint react/no-multi-comp: 0 */
 require('rc-slider/assets/index.less');
 
-var React = require('react');
-var ReactDOM = require('react-dom');
-var Slider = require('rc-slider');
+const React = require('react');
+const ReactDOM = require('react-dom');
+const Slider = require('rc-slider');
 
-var style = {width: 400, margin: 50};
-var log = function(value) {
+const style = {width: 400, margin: 50};
+
+function log(value) {
   console.log(value);
-};
+}
 
-var CustomizedRange = React.createClass({
+const CustomizedRange = React.createClass({
   getInitialState: function() {
     return {
-      value: [20, 40]
-    }
+      lowerBound: 20,
+      upperBound: 40,
+      value: [20, 40],
+    };
   },
-  onChange: function(value) {
+  onLowerBoundChange: function(e) {
+    this.setState({ lowerBound: +e.target.value });
+  },
+  onUpperBoundChange: function(e) {
+    this.setState({ upperBound: +e.target.value });
+  },
+  onSliderChange: function(value) {
     log(value);
     this.setState({
-      value: value
+      value: value,
+    });
+  },
+  handleApply: function() {
+    const { lowerBound, upperBound } = this.state;
+    this.setState({ value: [lowerBound, upperBound]});
+  },
+  render: function() {
+    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: 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 <Slider range value={this.state.value} onChange={this.onChange} />;
-  }
+    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(
   <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>
@@ -50,5 +109,9 @@ ReactDOM.render(
       <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,43 +1,78 @@
-'use strict';
-
+/* eslint react/no-multi-comp: 0 */
 require('rc-slider/assets/index.less');
 
-var React = require('react');
-var ReactDOM = require('react-dom');
-var Slider = require('rc-slider');
+const React = require('react');
+const ReactDOM = require('react-dom');
+const Slider = require('rc-slider');
 
-var style = {width: 400, margin: 50};
-var log = function(value) {
+const style = {width: 400, margin: 50};
+
+function log(value) {
   console.log(value);
-};
+}
 
 
 function percentFormatter(v) {
   return v + ' %';
 }
 
-var CustomizedSlider = React.createClass({
+const CustomizedSlider = React.createClass({
   getInitialState: function() {
     return {
-      value: 50
-    }
+      value: 50,
+    };
   },
-  onChange: function(value) {
+  onSliderChange: function(value) {
     log(value);
     this.setState({
-      value: value
+      value: value,
     });
   },
   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>
+    );
+  },
 });
 
 ReactDOM.render(
   <div>
     <div style={style}>
       <p>Basic Slider</p>
-      <Slider tipTransitionName='rc-slider-tooltip-zoom-down' onChange={log} />
+      <Slider tipTransitionName="rc-slider-tooltip-zoom-down" onChange={log} />
     </div>
     <div style={style}>
       <p>Basic Slider，`step=20`</p>
@@ -49,7 +84,11 @@ ReactDOM.render(
     </div>
     <div style={style}>
       <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 style={style}>
+      <p>Basic Slider without tooltip</p>
+      <Slider tipFormatter={null} onChange={log} />
     </div>
     <div style={style}>
       <p>Controlled Slider</p>
@@ -59,5 +98,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: function() {
+    return {
+      lowerBound: 20,
+      upperBound: 40,
+      value: [20, 40],
+    };
+  },
+  onLowerBoundChange: function(e) {
+    this.setState({ lowerBound: +e.target.value });
+  },
+  onUpperBoundChange: function(e) {
+    this.setState({ upperBound: +e.target.value });
+  },
+  onSliderChange: function(value) {
+    log(value);
+    this.setState({
+      value: value,
+    });
+  },
+  handleApply: function() {
+    const { lowerBound, upperBound } = this.state;
+    this.setState({ value: [lowerBound, upperBound]});
+  },
+  render: function() {
+    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: 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 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: function() {
+    return {
+      value: 50,
+    };
+  },
+  onSliderChange: function(value) {
+    log(value);
+    this.setState({
+      value: value,
+    });
+  },
+  render: function() {
+    return <Slider vertical 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 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.2",
+  "version": "3.7.0",
   "description": "slider ui component for react",
   "keywords": [
     "react",
@@ -39,7 +39,6 @@
   },
   "devDependencies": {
     "expect.js": "0.3.x",
-    "jquery": "^1.11.2",
     "pre-commit": "1.x",
     "rc-server": "3.x",
     "rc-tools": "4.x",
@@ -51,7 +50,9 @@
     "lint"
   ],
   "dependencies": {
+    "classnames": "^2.2.1",
     "rc-tooltip": "3.x",
-    "rc-util": "3.x"
+    "rc-util": "3.x",
+    "warning": "^2.1.0"
   }
 }

src/Dots.jsx

@@ -1,33 +0,0 @@
-import React from 'react';
-import { classSet } from 'rc-util';
-
-function calcPoints(marks, dots, step, min, max) {
-  const points = Object.keys(marks).map(parseFloat);
-  if (dots) {
-    for (let i = min; i <= max; i = i + step) {
-      points.push(i);
-    }
-  }
-  return points;
-}
-
-const Dots = ({prefixCls, 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 isActived = (!included && point === upperBound) ||
-            (included && point <= upperBound && point >= lowerBound);
-    const pointClassName = classSet({
-      [prefixCls + '-dot']: true,
-      [prefixCls + '-dot-active']: isActived,
-    });
-
-    return <span className={pointClassName} style={style} key={point} />;
-  });
-
-  return <div className={prefixCls + '-step'}>{elements}</div>;
-};
-
-export default Dots;

src/Handle.jsx

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

src/Marks.jsx

@@ -1,26 +1,43 @@
 import React from 'react';
-import rcUtil from 'rc-util';
+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 = rcUtil.classSet({
+    const markClassName = classNames({
       [className + '-text']: true,
       [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,8 +1,9 @@
-import React from 'react';
-import {Dom as DomUtils, classSet} from 'rc-util';
+import React, { cloneElement } from 'react';
+import {Dom as DomUtils} from 'rc-util';
+import classNames from 'classnames';
 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() {
@@ -12,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) {
@@ -32,7 +33,7 @@ class Slider extends React.Component {
     const {range, min, max} = props;
     const initialValue = range ? [min, 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;
@@ -45,12 +46,7 @@ class Slider extends React.Component {
 
     let recent;
     if (props.range && upperBound === lowerBound) {
-      if (lowerBound === max) {
-        recent = 'lowerBound';
-      }
-      if (upperBound === min) {
-        recent = 'upperBound';
-      }
+      recent = lowerBound === max ? 'lowerBound' : 'upperBound';
     } else {
       recent = 'upperBound';
     }
@@ -65,40 +61,54 @@ class Slider extends React.Component {
   }
 
   componentWillReceiveProps(nextProps) {
+    if (!('value' in nextProps || 'min' in nextProps || 'max' in nextProps)) return;
+
+    const {lowerBound, upperBound} = this.state;
     if (nextProps.range) {
-      const value = nextProps.value;
-      if (value) {
-        this.setState({
-          upperBound: value[1],
-          lowerBound: value[0],
-        });
-      }
-    } else if ('value' in nextProps) {
+      const value = nextProps.value || [lowerBound, upperBound];
+      const nextUpperBound = this.trimAlignValue(value[1], nextProps);
+      const nextLowerBound = this.trimAlignValue(value[0], nextProps);
+      if (nextLowerBound === lowerBound && nextUpperBound === upperBound) return;
+
       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 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 data = {...this.state, ...state};
     const changedValue = props.range ? [data.lowerBound, data.upperBound] : data.upperBound;
     props.onChange(changedValue);
   }
 
   onMouseMove(e) {
-    const position = getMousePosition(e);
+    const position = getMousePosition(this.props.vertical, e);
     this.onMove(e, position);
   }
 
@@ -108,7 +118,7 @@ class Slider extends React.Component {
       return;
     }
 
-    const position = getTouchPosition(e);
+    const position = getTouchPosition(this.props.vertical, e);
     this.onMove(e, position);
   }
 
@@ -117,27 +127,47 @@ 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);
+    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) {
     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);
+    const position = getMousePosition(this.props.vertical, e);
     this.onStart(position);
     this.addDocumentEvents('mouse');
     pauseEvent(e);
@@ -179,7 +209,9 @@ class Slider extends React.Component {
     const oldValue = state[valueNeedChanging];
     if (value === oldValue) return;
 
-    this.onChange(valueNeedChanging, value);
+    this.onChange({
+      [valueNeedChanging]: value,
+    });
   }
 
   getValue() {
@@ -193,19 +225,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;
@@ -213,10 +244,14 @@ class Slider extends React.Component {
     return precision;
   }
 
-  trimAlignValue(v) {
+  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} = this.props;
+    const {marks, step, min, max, allowCross} = {...this.props, ...(nextProps || {})};
 
     let val = v;
     if (val <= min) {
@@ -225,10 +260,10 @@ class Slider extends React.Component {
     if (val >= max) {
       val = max;
     }
-    if (handle === 'upperBound' && val <= lowerBound) {
+    if (!allowCross && handle === 'upperBound' && val <= lowerBound) {
       val = lowerBound;
     }
-    if (handle === 'lowerBound' && val >= upperBound) {
+    if (!allowCross && handle === 'lowerBound' && val >= upperBound) {
       val = upperBound;
     }
 
@@ -241,7 +276,7 @@ class Slider extends React.Component {
     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;
   }
 
   calcOffset(value) {
@@ -251,9 +286,10 @@ class Slider extends React.Component {
   }
 
   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) {
@@ -291,30 +327,33 @@ class Slider extends React.Component {
 
   render() {
     const {handle, upperBound, lowerBound} = this.state;
-    const {className, prefixCls, disabled, dots, included, range, step,
-           marks, max, min, tipTransitionName, tipFormatter, children} = this.props;
+    const {className, prefixCls, disabled, vertical, dots, included, range, step,
+      marks, max, min, tipTransitionName, tipFormatter, children} = this.props;
+
+    const customHandle = this.props.handle;
 
     const upperOffset = this.calcOffset(upperBound);
     const lowerOffset = this.calcOffset(lowerBound);
 
     const handleClassName = prefixCls + '-handle';
-    const isNoTip = (step === null) && !tipFormatter;
+    const isNoTip = (step === null) || (tipFormatter === null);
 
-    const upper = (<Handle className={handleClassName}
-                           noTip={isNoTip} tipTransitionName={tipTransitionName} tipFormatter={tipFormatter}
-                           offset={upperOffset} value={upperBound} dragging={handle === 'upperBound'} />);
+    const upper = cloneElement(customHandle, { className: handleClassName,
+        noTip: isNoTip, tipTransitionName: tipTransitionName, tipFormatter: tipFormatter,
+        vertical: vertical, offset: upperOffset, value: upperBound, dragging: handle === 'upperBound' });
 
     let lower = null;
     if (range) {
-      lower = (<Handle className={handleClassName}
-                       noTip={isNoTip} tipTransitionName={tipTransitionName} tipFormatter={tipFormatter}
-                       offset={lowerOffset} value={lowerBound} dragging={handle === 'lowerBound'} />);
+      lower = cloneElement(customHandle, { className: handleClassName,
+        noTip: isNoTip, tipTransitionName: tipTransitionName, tipFormatter: tipFormatter,
+        vertical: vertical, offset: lowerOffset, value: lowerBound, dragging: handle === 'lowerBound' });
     }
 
-    const sliderClassName = classSet({
+    const sliderClassName = classNames({
       [prefixCls]: true,
       [prefixCls + '-disabled']: disabled,
       [className]: !!className,
+      [prefixCls + '-vertical']: this.props.vertical,
     });
     const isIncluded = included || range;
     return (
@@ -323,14 +362,14 @@ class Slider extends React.Component {
            onMouseDown={disabled ? noop : this.onMouseDown.bind(this)}>
         {upper}
         {lower}
-        <Track className={prefixCls + '-track'} included={isIncluded}
+        <Track className={prefixCls + '-track'} vertical = {vertical} included={isIncluded}
                offset={lowerOffset} length={upperOffset - lowerOffset}/>
-        <Dots prefixCls={prefixCls} marks={marks} dots={dots} step={step}
+        <Steps prefixCls={prefixCls} vertical = {vertical} marks={marks} dots={dots} step={step}
               included={isIncluded} lowerBound={lowerBound}
-              upperBound={upperBound} max={max} min={min} />
-        <Marks className={prefixCls + '-mark'} marks={marks}
+              upperBound={upperBound} max={max} min={min}/>
+        <Marks className={prefixCls + '-mark'} vertical = {vertical} marks={marks}
                included={isIncluded} lowerBound={lowerBound}
-               upperBound={upperBound} max={max} min={min} />
+               upperBound={upperBound} max={max} min={min}/>
         {children}
       </div>
     );
@@ -358,10 +397,13 @@ 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,
+  vertical: React.PropTypes.bool,
+  allowCross: React.PropTypes.bool,
 };
 
 Slider.defaultProps = {
@@ -372,13 +414,17 @@ 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,
 };
 
 export default Slider;

src/Steps.jsx

@@ -0,0 +1,37 @@
+import React from 'react';
+import classNames from 'classnames';
+import warning from 'warning';
+
+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 Steps = ({prefixCls, vertical, marks, dots, step, included,
+                lowerBound, upperBound, max, min}) => {
+  const range = max - min;
+  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);
+    const pointClassName = classNames({
+      [prefixCls + '-dot']: true,
+      [prefixCls + '-dot-active']: isActived,
+    });
+
+    return <span className={pointClassName} style={style} key={point} />;
+  });
+
+  return <div className={prefixCls + '-step'}>{elements}</div>;
+};
+
+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.spec.js

@@ -1,83 +1,148 @@
+const expect = require('expect.js');
+const React = require('react');
+const ReactDOM = require('react-dom');
+const ReactTestUtils = require('react-addons-test-utils');
+const Slider = require('..');
 
-var expect = require('expect.js');
-var Slider = require('../index.js');
-var React = require('react');
-var ReactDOM = require('react-dom');
-var TestUtils = require('react-addons-test-utils');
-var Simulate = TestUtils.Simulate;
-var $ = require('jquery');
 require('../assets/index.less');
 
-describe('rc-slider', function () {
+describe('rc-slider', function test() {
   this.timeout(5000);
-  var div = document.createElement('div');
+  const div = document.createElement('div');
   document.body.appendChild(div);
 
-  afterEach(function () {
+  afterEach(() => {
     ReactDOM.unmountComponentAtNode(div);
   });
 
-  it('should render a simple slider with value correctly!', function () {
-    var slider = ReactDOM.render(
-      <Slider className='rc-slider' defaultValue={40}/>,
-      div
-    );
-    var node = $(div);
-    expect(node.find('.rc-slider').length).to.be(1);
-    expect(node.find('.rc-slider-handle').length).to.be(1);
-    expect(node.find('.rc-slider-track').length).to.be(1);
-    expect(slider.state.upperBound).to.be(40);
-    var trackWidth = node.find('.rc-slider-track')[0].style.width;
-    expect(trackWidth).to.eql(node.find('.rc-slider-handle')[0].style.left);
+  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 numbers of step!', function () {
-    var slider = ReactDOM.render(
-      <Slider className='rc-slider' step={20}/>,
-      div
-    );
-    var node = $(div);
-    expect(node.find('.rc-slider').length).to.be(1);
-    expect(node.find('.rc-slider-handle').length).to.be(1);
-    expect(node.find('.rc-slider-track').length).to.be(1);
-    expect(slider.state.upperBound).to.be(0);
+  it('should render a Slider with default value correctly', () => {
+    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.match(/left: 50%;/);
 
-    var sliderWithDots = ReactDOM.render(
-      <Slider className='rc-slider' step={20} dots/>,
-      div
-    );
-    var node1 = $(div);
-    expect(node1.find('.rc-slider-dot').length).to.be(6);
+    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 marks correctly!', function () {
-    var slider = ReactDOM.render(
-      <Slider marks={{0: "一", 20: "二", 40: "三", 60: "四", 100: "五"}} defaultValue={40} />,
-      div
-    );
-    var node = $(div);
-    expect(node.find('.rc-slider').length).to.be(1);
-    expect(node.find('.rc-slider-handle').length).to.be(1);
-    expect(node.find('.rc-slider-track').length).to.be(1);
-    expect(node.find('.rc-slider-dot').length).to.be(Object.keys(slider.props.marks).length);
-    expect(node.find('.rc-slider-mark').length).to.be(1);
-    expect(node.find('.rc-slider-mark-text').length).to.be(Object.keys(slider.props.marks).length);
-    expect(slider.state.upperBound).to.be(40);
+  it('should render a Slider with value corrently', () => {
+    const sliderWithValue = ReactDOM.render(<Slider value={50} />, div);
+    expect(sliderWithValue.state.upperBound).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 mouseDown works!', function (done) {
-  //   var slider = ReactDOM.render(
-  //     <Slider marks={["一","二","三","四","五"]} />,
-  //     div
-  //   );
-  //   var selectedStep = slider.refs.step3.getDOMNode();
+  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);
+  });
 
-  //   Simulate.mouseDown(selectedStep);
+  it('should render a Range with default value correctly', () => {
+    const rangeWithDefaultValue = ReactDOM.render(<Slider range defaultValue={[0, 50]} />, div);
+    expect(rangeWithDefaultValue.state.lowerBound).to.be(0);
+    expect(rangeWithDefaultValue.state.upperBound).to.be(50);
+    expect(ReactTestUtils
+           .scryRenderedDOMComponentsWithClass(rangeWithDefaultValue, 'rc-slider-handle')[0]
+           .style.cssText)
+      .to.match(/left: 50%;/);
+    expect(ReactTestUtils
+           .scryRenderedDOMComponentsWithClass(rangeWithDefaultValue, 'rc-slider-handle')[1]
+           .style.cssText)
+      .to.match(/left: 0%;/);
 
-  //   setTimeout( function() {
-  //     expect(slider.state.active).to.be('active');
-  //     done();
-  //   }, 200);
-  // });
+    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 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
+           .scryRenderedDOMComponentsWithClass(rangeWithValue, 'rc-slider-handle')[0]
+           .style.cssText)
+      .to.match(/left: 100%;/);
+    expect(ReactTestUtils
+           .scryRenderedDOMComponentsWithClass(rangeWithValue, 'rc-slider-handle')[1]
+           .style.cssText)
+      .to.match(/left: 50%;/);
+
+    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.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);
+  });
+
+  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);
+  });
 });