bump 3.8.1

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

* Use classNames() instead of string concatenation

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>
@@ -112,6 +112,12 @@ ReactDOM.render(<Rcslider />, container);
           <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>
@@ -124,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>

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

@@ -7,11 +7,16 @@ const Slider = require('rc-slider');
 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',
   50: '50°C',
-  100: '100°C',
+  100: {
+    style: {
+      color: 'red',
+    },
+    label: <strong>100°C</strong>,
+  },
 };
 
 function log(value) {

examples/range.js

@@ -14,17 +14,41 @@ function 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 <Slider range value={this.state.value} onChange={this.onSliderChange} />;
+    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>
+    );
   },
 });
 
@@ -71,7 +95,7 @@ ReactDOM.render(
     </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>

examples/slider.js

@@ -28,8 +28,11 @@ const CustomizedSlider = React.createClass({
       value: value,
     });
   },
+  onAfterChange: function(value) {
+    console.log(value);
+  },
   render: function() {
-    return <Slider value={this.state.value} onChange={this.onSliderChange} />;
+    return <Slider value={this.state.value} onChange={this.onSliderChange} onAfterChange={this.onAfterChange} />;
   },
 });
 

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.3.1",
+  "version": "3.8.1",
   "description": "slider ui component for react",
   "keywords": [
     "react",
@@ -42,17 +42,17 @@
     "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"
+    "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"
+    "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(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) {
@@ -34,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;
@@ -47,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';
     }
@@ -81,11 +75,11 @@ class Slider extends React.Component {
         lowerBound: nextLowerBound,
       });
       if (this.isValueOutOfBounds(upperBound, nextProps) ||
-          this.isValueOutOfBounds(lowerBound, nextProps)) {
+        this.isValueOutOfBounds(lowerBound, nextProps)) {
         this.props.onChange([nextLowerBound, nextUpperBound]);
       }
     } else {
-      const value = 'value' in nextProps ? nextProps.value : upperBound;
+      const value = nextProps.value !== undefined ? nextProps.value : upperBound;
       const nextValue = this.trimAlignValue(value, nextProps);
       if (nextValue === upperBound && lowerBound === nextProps.min) return;
 
@@ -108,13 +102,13 @@ class Slider extends React.Component {
       this.setState({handle: state.handle});
     }
 
-    const data = objectAssign({}, this.state, state);
+    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);
   }
 
@@ -124,7 +118,7 @@ class Slider extends React.Component {
       return;
     }
 
-    const position = getTouchPosition(e);
+    const position = getTouchPosition(this.props.vertical, e);
     this.onMove(e, position);
   }
 
@@ -133,7 +127,8 @@ 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);
@@ -165,14 +160,15 @@ class Slider extends React.Component {
   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);
@@ -230,19 +226,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;
@@ -257,7 +252,7 @@ class Slider extends React.Component {
   trimAlignValue(v, nextProps) {
     const state = this.state || {};
     const {handle, lowerBound, upperBound} = state;
-    const {marks, step, min, max, allowCross} = objectAssign({}, this.props, nextProps || {});
+    const {marks, step, min, max, allowCross} = {...this.props, ...(nextProps || {})};
 
     let val = v;
     if (val <= min) {
@@ -275,14 +270,14 @@ class Slider extends React.Component {
 
     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;
   }
 
   calcOffset(value) {
@@ -292,9 +287,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) {
@@ -306,11 +302,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'));
     }
   }
 
@@ -331,47 +327,95 @@ 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 {
+      handle,
+      upperBound,
+      lowerBound,
+    } = this.state;
+    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 upperClassName = classNames({
+      [handleClassName]: true,
+      [handleClassName + '-upper']: true,
+    });
+
+    const lowerClassName = classNames({
+      [handleClassName]: true,
+      [handleClassName + '-lower']: true,
+    });
+
     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 commonHandleProps = {
+      prefixCls,
+      noTip: isNoTip,
+      tipTransitionName,
+      tipFormatter,
+      vertical,
+    };
+
+    const upper = cloneElement(customHandle, {
+      ...commonHandleProps,
+      className: upperClassName,
+      value: upperBound,
+      offset: upperOffset,
+      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, {
+        ...commonHandleProps,
+        className: lowerClassName,
+        value: lowerBound,
+        offset: lowerOffset,
+        dragging: handle === 'lowerBound',
+      });
     }
 
     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)}>
+        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} />
+        <Track className={prefixCls + '-track'} vertical = {vertical} included={isIncluded}
+          offset={lowerOffset} length={upperOffset - lowerOffset} />
+        <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'} vertical = {vertical} marks={marks}
+          included={isIncluded} lowerBound={lowerBound}
+          upperBound={upperBound} max={max} min={min} />
         {children}
       </div>
     );
@@ -399,10 +443,12 @@ 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,
 };
 
@@ -414,6 +460,7 @@ Slider.defaultProps = {
   max: 100,
   step: 1,
   marks: {},
+  handle: <DefaultHandle />,
   onBeforeChange: noop,
   onChange: noop,
   onAfterChange: noop,
@@ -422,6 +469,7 @@ Slider.defaultProps = {
   disabled: false,
   dots: false,
   range: false,
+  vertical: false,
   allowCross: true,
 };
 

src/Steps.jsx

@@ -1,7 +1,9 @@
 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) {
@@ -12,11 +14,12 @@ function calcPoints(marks, dots, step, min, max) {
   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);
@@ -31,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.spec.js

@@ -6,7 +6,7 @@ const Slider = require('..');
 
 require('../assets/index.less');
 
-describe('rc-slider', function() {
+describe('rc-slider', function test() {
   this.timeout(5000);
   const div = document.createElement('div');
   document.body.appendChild(div);
@@ -140,4 +140,9 @@ describe('rc-slider', function() {
     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);
+  });
 });