update deps

Upgrade api

.npmignore

@@ -1,29 +0,0 @@
-build/
-*.cfg
-nohup.out
-*.iml
-.idea/
-.ipr
-.iws
-*~
-~*
-*.diff
-*.log
-*.patch
-*.bak
-.DS_Store
-Thumbs.db
-.project
-.*proj
-.svn/
-*.swp
-out/
-.build
-node_modules
-.cache
-examples
-tests
-src
-/index.js
-.*
-assets/**/*.less

.travis.yml

@@ -1,11 +1,13 @@
 language: node_js
 
+sudo: false
+
 notifications:
   email:
   - yiminghe@gmail.com
 
 node_js:
-- 0.12
+- 4.0.0
 
 before_install:
 - |
@@ -14,7 +16,6 @@ before_install:
       echo "Only docs were updated, stopping build process."
       exit
     fi
-    npm install mocha-phantomjs -g
     phantomjs --version
 
 script:
@@ -34,3 +35,8 @@ env:
   global:
   - secure: S1VwbaPzLnSH/IUT/wlJulxAX5VHRIDmSt53h/ycHcZsszUpWcLCJRQAe0fTVB2dAx5MdBbSZ+o+tr3tRwVB5TRAYm0oTCsYAkOZaWOB28RuUQtdGt3wf9xxTG1UiPiaLLUW3waX9zAaf3yqKBcJGf1op0RD8dksxbCFw/7xVbU=
   - secure: EBEDg8k///IlEsnx0AE8X3mbFl0QE5+xGKbG4AxXlGZda12uTIPUSMKJzdZQ2hVbZXduTzf1cQl9rcu9nGoSnkL/DWnIax9cvHi+1orx5+YPlxPHNWAwWByTnHosBn2MJhfy1s5paJfHC9cUzmmEL6x4fYthWxjsPUo+irEZH6E=
+
+
+matrix:
+  allow_failures:
+  - env: "TEST_TYPE=saucelabs"

README.md

@@ -4,7 +4,6 @@
 slider ui component for react
 
 [![NPM version][npm-image]][npm-url]
-[![SPM version](http://spmjs.io/badge/rc-slider)](http://spmjs.io/package/rc-slider)
 [![build status][travis-image]][travis-url]
 [![Test coverage][coveralls-image]][coveralls-url]
 [![gemnasium deps][gemnasium-image]][gemnasium-url]
@@ -51,9 +50,10 @@ slider ui component for react
 ## Usage
 
 ```js
-var Rcslider = require('rc-slider');
 var React = require('react');
-React.render(<Rcslider />, container);
+var ReactDOM = require('react-dom');
+var Rcslider = require('rc-slider');
+ReactDOM.render(<Rcslider />, container);
 ```
 
 ## API
@@ -74,7 +74,7 @@ React.render(<Rcslider />, container);
           <td>className</td>
           <td>String</td>
           <td>rc-slider</td>
-          <td>additional css class of root dom node</td>
+          <td>Additional css class for the root dom node</td>
         </tr>
         <tr>
           <td>min</td>
@@ -94,29 +94,47 @@ React.render(<Rcslider />, container);
           <td>1</td>
           <td>Value to be added or subtracted on each step the slider makes. Must be greater than zero. max - min should be evenly divisible by the step value.</td>
         </tr>
-         <tr>
+        <tr>
+          <td>range</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>
+        </tr>
+        <tr>
+          <td>defaultValue</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>
+        </tr>
+        <tr>
           <td>value</td>
-          <td>number</td>
-          <td>0</td>
-          <td>Determines the initial positions of the handles.</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>
         </tr>
         <tr>
           <td>marks</td>
           <td>array</td>
           <td>[]</td>
-          <td>mark every step for the slider, it will ignore the `step` parameter if it has been defined</td>
+          <td>Mark every step for the slider, it will ignore the `step` parameter if it has been defined. Does not work with `range`</td>
         </tr>
         <tr>
-          <td>isIncluded</td>
+          <td>included</td>
           <td>boolean</td>
           <td>true</td>
-          <td>if the value is true, it means a continuous value interval, otherwise, it is a independent value.</td>
+          <td>If the value is `true`, it means a continuous value interval, otherwise, it is a independent value.</td>
+        </tr>
+        <tr>
+          <td>defaultIndex</td>
+          <td>number</td>
+          <td>0</td>
+          <td>For step or marks slider, determines the initial position of the handle. Does not work with `range`</td>
         </tr>
         <tr>
           <td>index</td>
           <td>number</td>
-          <td>0</td>
-          <td>For step or marks slider, determine the initial positions of the handles.</td>
+          <td></td>
+          <td>For step or marks slider, determines current position of the handle. Does not work with `range`</td>
         </tr>
         <tr>
           <td>disabled</td>
@@ -124,6 +142,18 @@ React.render(<Rcslider />, container);
           <td>false</td>
           <td>If true the handles can't be moved.</td>
         </tr>
+        <tr>
+          <td>tipTransitionName</td>
+          <td>string</td>
+          <td>''</td>
+          <td>Set the animation for tooltip if it shows.</td>
+        </tr>
+        <tr>
+          <td>dots</td>
+          <td>bool</td>
+          <td>false</td>
+          <td>For linear slider, when the `step` value is greater than 1, you can set the `dots` to  `true` if you want to render the slider bar with dots.</td>
+        </tr>
     </tbody>
 </table>
 
@@ -136,17 +166,17 @@ npm start
 
 ## Example
 
-http://localhost:8000/examples/
+http://localhost:8005/examples/
 
-online example: http://react-component.github.io/slider/examples/
+online example: http://react-component.github.io/slider/
 
 ## Test Case
 
-http://localhost:8000/tests/runner.html?coverage
+http://localhost:8005/tests/runner.html?coverage
 
 ## Coverage
 
-http://localhost:8000/node_modules/rc-server/node_modules/node-jscover/lib/front-end/jscoverage.html?w=http://localhost:8088/tests/runner.html?coverage
+http://localhost:8005/node_modules/rc-server/node_modules/node-jscover/lib/front-end/jscoverage.html?w=http://localhost:8088/tests/runner.html?coverage
 
 ## License
 

assets/index.less

@@ -8,15 +8,17 @@
 @tooltip-arrow-width: 4px;
 @tooltip-distance: @tooltip-arrow-width+4;
 @tooltip-arrow-color: @tooltip-bg;
+@ease-out-quint      : cubic-bezier(0.23, 1, 0.32, 1);
+@ease-in-quint       : cubic-bezier(0.755, 0.05, 0.855, 0.06);
 
-* {
+.borderBox() {
   box-sizing: border-box;
   -webkit-tap-highlight-color: rgba(0, 0, 0, 0); //  remove tap highlight color for mobile safari
-}
 
-*:before,
-*:after {
-  box-sizing: border-box;
+  * {
+    box-sizing: border-box;
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0); //  remove tap highlight color for mobile safari
+  }
 }
 
 .@{prefixClass} {
@@ -26,6 +28,8 @@
   border-radius: @border-radius-base;
   background-color: #e9e9e9;
 
+  .borderBox();
+
   &-track {
     position: absolute;
     left: 0;
@@ -117,13 +121,13 @@
       background-color: @disabledColor;
     }
 
-    .@{prefixClass}-handle {
+    .@{prefixClass}-handle, .@{prefixClass}-dot {
       border-color: @disabledColor;
       background-color: #fff;
       cursor: not-allowed;
     }
 
-    .@{prefixClass}-mark-text, .dot {
+    .@{prefixClass}-mark-text, .@{prefixClass}-dot {
       cursor: not-allowed!important;
     }
   }
@@ -136,11 +140,13 @@
     z-index: 4;
     visibility: visible;
 
+    .borderBox();
+
     &-hidden {
       display: none;
     }
 
-    &-placement-top { 
+    &-placement-top {
       padding: @tooltip-arrow-width 0 @tooltip-distance 0;
     }
 
@@ -174,4 +180,64 @@
       border-top-color: @tooltip-arrow-color;
     }
   }
-}
+}
+
+.motion-common() {
+  animation-duration: .3s;
+  animation-fill-mode: both;
+  display: block !important;
+}
+
+.make-motion(@className, @keyframeName) {
+  .@{className}-enter, .@{className}-appear {
+    .motion-common();
+    animation-play-state: paused;
+  }
+  .@{className}-leave {
+    .motion-common();
+    animation-play-state: paused;
+  }
+  .@{className}-enter.@{className}-enter-active, .@{className}-appear.@{className}-appear-active {
+    animation-name: ~"@{keyframeName}In";
+    animation-play-state: running;
+  }
+  .@{className}-leave.@{className}-leave-active {
+    animation-name: ~"@{keyframeName}Out";
+    animation-play-state: running;
+  }
+}
+.zoom-motion(@className, @keyframeName) {
+  .make-motion(@className, @keyframeName);
+  .@{className}-enter, .@{className}-appear {
+    transform: scale(0, 0); // need this by yiminghe
+    animation-timing-function: @ease-out-quint;
+  }
+  .@{className}-leave {
+    animation-timing-function: @ease-in-quint;
+  }
+}
+.zoom-motion(rc-slider-tooltip-zoom-down, rcSliderTooltipZoomDown);
+
+@keyframes rcSliderTooltipZoomDownIn {
+  0% {
+    opacity: 0;
+    transform-origin: 50% 100%;
+    transform: scale(0, 0);
+  }
+  100% {
+    transform-origin: 50% 100%;
+    transform: scale(1, 1);
+  }
+}
+
+@keyframes rcSliderTooltipZoomDownOut {
+  0% {
+    transform-origin: 50% 100%;
+    transform: scale(1, 1);
+  }
+  100% {
+    opacity: 0;
+    transform-origin: 50% 100%;
+    transform: scale(0, 0);
+  }
+}

examples/simple.js

@@ -1,9 +1,45 @@
 'use strict';
 
-require('rc-slider/assets/index.css');
+require('rc-slider/assets/index.less');
 
-var Slider = require('rc-slider');
 var React = require('react');
-// React.render(<Slider marks={["一","二","三","四","五"]} index={3}/>, document.getElementById('__react-content'));
-// React.render(<Slider className='rc-slider' step={20}/>, document.getElementById('__react-content'));
-React.render(<Slider />, document.getElementById('__react-content'));
+var ReactDOM = require('react-dom');
+var Slider = require('rc-slider');
+var style = {width:400,margin:50};
+
+function onChange(v) {
+  console.log(v);
+}
+
+ReactDOM.render(
+  <div>
+    <div style={style}>
+      <p>基础滑块</p>
+      <Slider onChange={onChange} tipTransitionName='rc-slider-tooltip-zoom-down' />
+    </div>
+    <div style={style}>
+      <p>基础滑块，step=20</p>
+      <Slider step={20} />
+    </div>
+    <div style={style}>
+      <p>基础滑块，step=20 带原点</p>
+      <Slider dots step={20} />
+    </div>
+    <div style={style}>
+      <p>双滑块</p>
+      <Slider range min={10} max={90} defaultValue={[0, 30]} onChange={onChange} />
+    </div>
+    <div style={style}>
+      <p>双滑块，step=20 </p>
+      <Slider range dots step={20} defaultValue={[0, 30]} onChange={onChange} included={false} />
+    </div>
+    <div style={style}>
+      <p>分段式滑块（包含关系）</p>
+      <Slider marks={["状态1","状态2","状态3","状态4"]} defaultIndex={1} />
+    </div>
+    <div style={style}>
+      <p>分段式滑块（并列关系）</p>
+      <Slider marks={["状态1","状态2","状态3","状态4"]} included={false} defaultIndex={1} />
+    </div>
+  </div>
+  , document.getElementById('__react-content'));

index.js

@@ -1,3 +1,2 @@
-'use strict';
 
 module.exports = require('./src/');

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-slider",
-  "version": "1.2.10",
+  "version": "2.1.0",
   "description": "slider ui component for react",
   "keywords": [
     "react",
@@ -17,38 +17,41 @@
   "bugs": {
     "url": "http://github.com/react-component/slider/issues"
   },
+  "files": [
+    "assets/*.css",
+    "lib"
+  ],
   "licenses": "MIT",
   "main": "./lib/index.js",
   "config": {
-    "port": 8000
+    "port": 8005
   },
   "scripts": {
     "build": "rc-tools run build",
-    "precommit": "rc-tools run precommit",
-    "less": "rc-tools run less",
     "gh-pages": "rc-tools run gh-pages",
-    "history": "rc-tools run history",
-    "start": "node --harmony node_modules/.bin/rc-server",
-    "publish": "rc-tools run tag",
+    "start": "rc-server",
+    "pub": "rc-tools run pub",
     "lint": "rc-tools run lint",
-    "saucelabs": "node --harmony node_modules/.bin/rc-tools run saucelabs",
-    "browser-test": "node --harmony node_modules/.bin/rc-tools run browser-test",
-    "browser-test-cover": "node --harmony node_modules/.bin/rc-tools run browser-test-cover"
+    "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"
   },
   "devDependencies": {
     "expect.js": "0.3.x",
-    "precommit-hook": "^1.0.7",
+    "jquery": "^1.11.2",
+    "pre-commit": "1.x",
     "rc-server": "3.x",
-    "rc-tools": "3.x",
-    "react": "^0.13.x",
-    "node-dev": "2.x",
-    "jquery": "^1.11.2"
+    "rc-tools": "4.x",
+    "react": "~0.14.0",
+    "react-addons-test-utils": "^0.14.0",
+    "react-dom": "~0.14.0"
   },
-  "precommit": [
-    "precommit"
+  "pre-commit": [
+    "lint"
   ],
   "dependencies": {
-    "rc-tooltip": "^2.4.0",
-    "rc-util": "^2.0.2"
+    "rc-tooltip": "3.x",
+    "rc-util": "3.x"
   }
 }

src/Handle.jsx

@@ -0,0 +1,60 @@
+import React from 'react';
+import Tooltip from 'rc-tooltip';
+
+export default class Handle extends React.Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      isTooltipVisible: false,
+    };
+  }
+
+  showTooltip() {
+    this.setState({
+      isTooltipVisible: true,
+    });
+  }
+
+  hideTooltip() {
+    this.setState({
+      isTooltipVisible: false,
+    });
+  }
+
+  render() {
+    const props = this.props;
+    const {className, tipTransitionName, offset, value} = props;
+    const {dragging, noTip} = 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)}/>);
+
+    if (noTip) {
+      return handle;
+    }
+
+    const isTooltipVisible = dragging || this.state.isTooltipVisible;
+    return (<Tooltip
+              prefixCls={className.replace('handle', 'tooltip')}
+              placement="top"
+              visible={isTooltipVisible}
+              overlay={<span>{value}</span>}
+              delay={0}
+              transitionName={tipTransitionName}>
+              {handle}
+            </Tooltip>);
+  }
+}
+
+Handle.propTypes = {
+  className: React.PropTypes.string,
+  offset: React.PropTypes.number,
+  tipTransitionName: React.PropTypes.string,
+  value: React.PropTypes.number,
+  dragging: React.PropTypes.bool,
+  noTip: React.PropTypes.bool,
+};

src/Marks.jsx

@@ -0,0 +1,35 @@
+import React from 'react';
+import rcUtil from 'rc-util';
+
+const Marks = ({className, marks, index, included}) => {
+  const marksLen = marks.length;
+  const unit = 100 / (marksLen - 1);
+  const markWidth = unit / 2 + '%';
+
+  const elements = [];
+  for (let i = 0; i < marksLen; i++) {
+    const isActived = (included && i <= index) || (!included && i === index);
+    const markClassName = rcUtil.classSet({
+      [className + '-text']: true,
+      [className + '-text-active']: isActived,
+    });
+
+    const style = { width: markWidth };
+    const offset = unit * i;
+    if (i === marksLen - 1) {
+      style.right = -unit / 4 + '%';
+    } else {
+      style.left = (i > 0 ? offset - unit / 4 : -unit / 4) + '%';
+    }
+
+    elements.push(<span className={markClassName} style={style} key={i}>
+                    {marks[i]}
+                  </span>);
+  }
+
+  return (<div className={className}>
+            {elements}
+          </div>);
+};
+
+export default Marks;

src/Slider.jsx

@@ -1,449 +1,438 @@
-'use strict';
+import React from 'react';
+import {Dom as DomUtils, classSet} from 'rc-util';
+import Track from './Track';
+import Handle from './Handle';
+import Steps from './Steps';
+import Marks from './Marks';
 
-var React = require('react');
-var Tooltip = require('rc-tooltip');
-var DomUtils = require('rc-util').Dom;
+function noop() {
+}
+
+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 getMousePosition(e) {
+  return e.pageX;
+}
 
 function pauseEvent(e) {
-  if (e.stopPropagation) {
-    e.stopPropagation();
-  }
-  if (e.preventDefault) {
-    e.preventDefault();
-  }
+  e.stopPropagation();
+  e.preventDefault();
 }
 
-function prefixClsFn(prefixCls) {
-  var args = Array.prototype.slice.call(arguments, 1);
-  return args.map((s)=> {
-    return prefixCls + '-' + s;
-  }).join(' ');
-}
+class Slider extends React.Component {
+  constructor(props) {
+    super(props);
 
-var Slider = React.createClass({
-  propTypes: {
-    min: React.PropTypes.number,
-    max: React.PropTypes.number,
-    step: React.PropTypes.number,
-    value: React.PropTypes.number,
-    index: React.PropTypes.number,
-    marks: React.PropTypes.array,
-    isIncluded: React.PropTypes.bool,
-    className: React.PropTypes.string,
-    disabled: React.PropTypes.bool,
-    onBeforeChange: React.PropTypes.func,
-    onChange: React.PropTypes.func,
-    onAfterChange: React.PropTypes.func
-  },
-
-  getDefaultProps: function() {
-    return {
-      min: 0,
-      max: 100,
-      step: 1,
-      value: 0,
-      marks: [],
-      isIncluded: true,
-      className: 'rc-slider',
-      disabled: false,
-      index: 0
-    };
-  },
-
-  getInitialState: function() {
-    var props = this.props;
-    var value = this._trimAlignValue(props.value);
-    var marksLen = props.marks.length;
-    if (marksLen > 0) {
-      value = ((props.max - props.min) / (marksLen - 1)) * (props.index);
-      value = value.toFixed(5);
-    }
-
-    return {
-      value: value,
-      active: props.disabled ? '' : ((value > props.min || props.index > 0) ? 'active' : '')
-    };
-  },
-
-  componentWillReceiveProps: function(newProps) {
-    var value = newProps.value;
-    this.state.value = this._trimAlignValue(value, newProps);
-  },
-
-  getValue: function() {
-    return this.state.value;
-  },
-
-  getIndex: function() {
-    var props = this.props;
-    var value = this.state.value;
-
-    if (props.marks.length === 0) {
-      return Math.floor((value - props.min) / props.step);
+    let upperBound;
+    let lowerBound;
+    if (props.range) {
+      const value = (props.value || props.defaultValue || [0, 0]);
+      upperBound = this.trimAlignValue(value[1]);
+      lowerBound = this.trimAlignValue(value[0]);
+    } else if (props.marks.length > 0) {
+      upperBound = this.calcValueFromProps(props);
     } else {
-      var unit = ((props.max - props.min) / (props.marks.length - 1)).toFixed(5);
-      return Math.round(value / unit);
-    }
-  },
-
-  _trimAlignValue: function(val, props) {
-    props = props || this.props;
-
-    var step = props.marks.length > 0 ? (props.max - props.min) / (props.marks.length - 1) : props.step;
-
-    if (val <= props.min) {
-      val = props.min;
-    }
-    if (val >= props.max) {
-      val = props.max;
+      // Note: Maybe `value` is `0`.
+      //       So, check the existence of `value` with `in`.
+      const defaultValue = ('defaultValue' in props ? props.defaultValue : 0);
+      const value = ('value' in props ? props.value : defaultValue);
+      upperBound = this.trimAlignValue(value);
     }
 
-    var valModStep = (val - props.min) % step;
-    var alignValue = val - valModStep;
+    let recent;
+    if (props.range && upperBound === lowerBound) {
+      if (lowerBound === props.max) {
+        recent = 'lowerBound';
+      }
+      if (upperBound === props.min) {
+        recent = 'upperBound';
+      }
+    } else {
+      recent = 'upperBound';
+    }
+
+    this.state = {
+      handle: null,
+      recent: recent,
+      upperBound: upperBound,
+      // If Slider is not range, set `lowerBound` equal to `min`.
+      lowerBound: (lowerBound || props.min),
+    };
+  }
+
+  componentWillReceiveProps(nextProps) {
+    if (nextProps.range) {
+      const value = nextProps.value;
+      if (value) {
+        this.setState({
+          upperBound: value[1],
+          lowerBound: value[0],
+        });
+      }
+    } else if ('value' in nextProps) {
+      this.setState({
+        upperBound: nextProps.value,
+      });
+    } else if ('index' in nextProps) {
+      this.setState({
+        upperBound: this.calcValueFromProps(nextProps),
+      });
+    }
+  }
+
+  onMouseMove(e) {
+    const position = getMousePosition(e);
+    this.onMove(e, position);
+  }
+
+  onTouchMove(e) {
+    if (isNotTouchEvent(e)) {
+      this.end('touch');
+      return;
+    }
+
+    const position = getTouchPosition(e);
+    this.onMove(e, position);
+  }
+
+  onMove(e, position) {
+    pauseEvent(e);
+    const props = this.props;
+    const state = this.state;
+
+    const diffPosition = position - this.startPosition;
+    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;
+
+    if (!('value' in props) && !('index' in props)) {
+      this.setState({[state.handle]: value});
+    }
+
+    if (props.range) {
+      // `this.state` will not be updated immediately after `this.setState`.
+      // So, create a similar object.
+      // const data = Object.assign({}, state, {[state.handle]: value});
+      const data = {
+        upperBound: state.upperBound,
+        lowerBound: state.lowerBound,
+      };
+      data[state.handle] = value;
+      this.triggerEvents('onChange', [data.lowerBound, data.upperBound]);
+    } else {
+      this.triggerEvents('onChange', value);
+    }
+  }
+
+  onTouchStart(e) {
+    if (isNotTouchEvent(e)) return;
+
+    const position = getTouchPosition(e);
+    this.onStart(position);
+    this.addDocumentEvents('touch');
+    pauseEvent(e);
+  }
+
+  onSliderMouseDown(e) {
+    const position = getMousePosition(e);
+    this.onStart(position);
+    this.addDocumentEvents('mouse');
+    pauseEvent(e);
+  }
+
+  onStart(position) {
+    this.triggerEvents('onBeforeChange');
+
+    const value = this.calcValueByPos(position);
+    this.startValue = value;
+    this.startPosition = position;
+
+    const state = this.state;
+    const {upperBound, lowerBound} = state;
+
+    let valueNeedChanging = 'upperBound';
+    if (this.props.range) {
+      const isLowerBoundCloser = Math.abs(upperBound - value) > Math.abs(lowerBound - value);
+      if (isLowerBoundCloser) {
+        valueNeedChanging = 'lowerBound';
+      }
+
+      const isAtTheSamePoint = (upperBound === lowerBound);
+      if (isAtTheSamePoint) {
+        valueNeedChanging = state.recent;
+      }
+
+      if (isAtTheSamePoint && (value !== upperBound)) {
+        valueNeedChanging = value < upperBound ? 'lowerBound' : 'upperBound';
+      }
+    }
+
+    this.setState({
+      handle: valueNeedChanging,
+      recent: valueNeedChanging,
+      [valueNeedChanging]: value,
+    });
+
+    if (this.props.range) {
+      // const data = Object.assign({}, state, {[valueNeedChanging]: value});
+      const data = {
+        upperBound: state.upperBound,
+        lowerBound: state.lowerBound,
+      };
+      data[valueNeedChanging] = value;
+      this.triggerEvents('onChange', [data.lowerBound, data.upperBound]);
+    } else {
+      this.triggerEvents('onChange', value);
+    }
+  }
+
+  getIndex(value) {
+    const {marks, min, max, step} = this.props;
+
+    if (marks.length === 0) {
+      return Math.floor((value - min) / step);
+    }
+    const unit = ((max - min) / (marks.length - 1)).toFixed(5);
+    return Math.round(value / unit);
+  }
+
+  getSliderLength() {
+    const slider = this.refs.slider;
+    if (!slider) {
+      return 0;
+    }
+
+    return slider.clientWidth;
+  }
+
+  getSliderStart() {
+    const slider = this.refs.slider;
+    const rect = slider.getBoundingClientRect();
+
+    return rect.left;
+  }
+
+  trimAlignValue(v) {
+    const state = this.state || {};
+    const props = this.props;
+    const {marks, min, max} = props;
+    const step = marks.length > 0 ? (max - min) / (marks.length - 1) : props.step;
+
+    let val = v;
+    if (val <= min) {
+      val = min;
+    }
+    if (val >= max) {
+      val = max;
+    }
+    if (state.handle === 'upperBound' && val <= state.lowerBound) {
+      val = state.lowerBound;
+    }
+    if (state.handle === 'lowerBound' && val >= state.upperBound) {
+      val = state.upperBound;
+    }
+
+    const valModStep = (val - min) % step;
+    let alignValue = val - valModStep;
 
     if (Math.abs(valModStep) * 2 >= step) {
       alignValue += (valModStep > 0) ? step : (-step);
     }
 
     return parseFloat(alignValue.toFixed(5));
-  },
+  }
 
-  _calcOffset: function(value) {
-    var ratio = (value - this.props.min) / (this.props.max - this.props.min);
-    return ratio * 100 + '%';
-  },
+  calcOffset(value) {
+    const {min, max} = this.props;
+    const ratio = (value - min) / (max - min);
+    return ratio * 100;
+  }
 
-  _calcValue: function(offset) {
-    var ratio = offset / this.getSliderLength();
-    return ratio * (this.props.max - this.props.min) + this.props.min;
-  },
+  calcValue(offset) {
+    const {min, max} = this.props;
+    const ratio = offset / this.getSliderLength();
+    return ratio * (max - min) + min;
+  }
 
-  _calValueByPos: function (position, callback) {
-    var pixelOffset = position - this.getSliderStart();
-    // pixelOffset -= (this.state.handleSize / 2);
-    var nextValue = this._trimAlignValue(this._calcValue(pixelOffset));
+  calcValueByPos(position) {
+    const pixelOffset = position - this.getSliderStart();
+    const nextValue = this.trimAlignValue(this.calcValue(pixelOffset));
+    return nextValue;
+  }
 
-    this.setState({value: nextValue, active: 'active'}, callback);
-  },
-
-  _getMousePosition: function(e) {
-    return e.pageX || (e.clientX + document.documentElement.scrollLeft);
-  },
-
-  _getTouchPosition: function (e) {
-    var touch = e.touches[0];
-    return touch.pageX;
-  },
-
-  _triggerEvents: function(event) {
-    var props = this.props;
-    var hasMarks = props.marks && props.marks.length > 0;
-    if (props[event]) {
-      props[event](hasMarks ? this.getIndex() : this.state.value);
+  calcValueFromProps(props) {
+    const marksLen = props.marks.length;
+    if (marksLen > 0) {
+      const index = ('index' in props ? props.index : props.defaultIndex);
+      const value = ((props.max - props.min) / (marksLen - 1)) * (index);
+      // `'1' / 1 => 1`, to make sure that the returned value is a `Number`.
+      return value.toFixed(5) / 1;
     }
-  },
+    return ('value' in props ? props.value : props.defaultValue);
+  }
 
-  _addEventHandles: function(type) {
+  triggerEvents(event, v) {
+    const props = this.props;
+    const hasMarks = (props.marks.length > 0);
+    if (props[event]) {
+      let data;
+      if (hasMarks) {
+        data = this.getIndex(v);
+      } else if (v === undefined) {
+        data = this.state.value;
+      } else {
+        data = v;
+      }
+      props[event](data);
+    }
+  }
+
+  addDocumentEvents(type) {
     if (type === 'touch') {
       // just work for chrome iOS Safari and Android Browser
-      this._onTouchMoveListener = DomUtils.addEventListener(document, 'touchmove', this._onTouchMove);
-      this._onTouchUpListener = DomUtils.addEventListener(document, 'touchend', this._onTouchUp);
+      this.onTouchMoveListener = DomUtils.addEventListener(document, 'touchmove', this.onTouchMove.bind(this));
+      this.onTouchUpListener = DomUtils.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'));
     }
+  }
 
-    if (type === 'mouse') {
-      this._onMouseMoveListener = DomUtils.addEventListener(document, 'mousemove', this._onMouseMove);
-      this._onMouseUpListener = DomUtils.addEventListener(document, 'mouseup', this._onMouseUp);
-    }
-  },
-
-  _removeEventHandles: function (type) {
+  removeEventons(type) {
     if (type === 'touch') {
-      this._onTouchMoveListener.remove();
-      this._onTouchUpListener.remove();
+      this.onTouchMoveListener.remove();
+      this.onTouchUpListener.remove();
+    } else if (type === 'mouse') {
+      this.onMouseMoveListener.remove();
+      this.onMouseUpListener.remove();
     }
+  }
 
-    if (type === 'mouse') {
-      this._onMouseMoveListener.remove();
-      this._onMouseUpListener.remove();
-    }
-  },
+  end(type) {
+    this.removeEventons(type);
+    this.triggerEvents('onAfterChange');
+    this.setState({handle: null});
+  }
 
-  _start: function(position) {
-    if (document.activeElement) {
-      document.activeElement.blur();
-    }
+  render() {
+    const {handle, upperBound, lowerBound} = this.state;
+    const props = this.props;
+    const {className, prefixCls, disabled, included, isIncluded, dots, withDots, range} = props;
+    const {marks, step, max, min, tipTransitionName, children} = props;
+    const marksLen = marks.length;
 
-    this._triggerEvents('onBeforeChange');
-
-    this.setState({
-      startValue: this.state.value,
-      startPosition: position
+    const sliderClassName = classSet({
+      [prefixCls]: true,
+      [prefixCls + '-disabled']: disabled,
+      [className]: !!className,
     });
-  },
 
-  _end: function(type) {
-    this._removeEventHandles(type);
-    this.setState(this._triggerEvents.bind(this, 'onAfterChange'));
-  },
+    const upperOffset = this.calcOffset(upperBound);
+    const lowerOffset = this.calcOffset(lowerBound);
 
-  _onMouseUp: function() {
-    this._end('mouse');
-  },
-
-  _onTouchUp: function() {
-    this._end('touch');
-  },
-
-  _onMouseMove: function(e) {
-    var position = this._getMousePosition(e);
-    this._handleMove(e, position);
-  },
-
-  _onTouchMove: function(e) {
-    if (e.touches.length > 1 || (e.type === 'touchend' && e.touches.length > 0)) {
-      return;
+    let track = null;
+    if ((included && isIncluded) || range) {
+      const trackClassName = prefixCls + '-track';
+      track = <Track className={trackClassName} offset={lowerOffset} length={upperOffset - lowerOffset}/>;
     }
 
-    var position = this._getTouchPosition(e);
+    const handleClassName = prefixCls + '-handle';
+    const isNoTip = marksLen > 0;
+    const upper = (<Handle className={handleClassName} tipTransitionName={tipTransitionName} noTip={isNoTip}
+                           offset={upperOffset} value={upperBound} dragging={handle === 'upperBound'}/>);
 
-    this._handleMove(e, position);
-  },
-
-  _handleMove: function(e, position) {
-    pauseEvent(e);
-    // var position = this._getMousePosition(e);
-    var props = this.props;
-    var state = this.state;
-
-    var value = state.value;
-    var oldValue = value;
-
-    var diffPosition = position - state.startPosition;
-
-    var diffValue = diffPosition / this.getSliderLength() * (props.max - props.min);
-    var newValue = this._trimAlignValue(state.startValue + diffValue);
-
-    value = newValue;
-
-    if (newValue !== oldValue) {
-      this.setState({value: value, active: 'active'}, this._triggerEvents.bind(this, 'onChange'));
-    }
-  },
-
-  getSliderLength: function() {
-    var slider = this.refs.slider;
-    if (!slider) {
-      return 0;
+    let lower = null;
+    if (range) {
+      lower = (<Handle className={handleClassName} tipTransitionName={tipTransitionName} noTip={isNoTip}
+                       offset={lowerOffset} value={lowerBound} dragging={handle === 'lowerBound'}/>);
     }
 
-    return slider.getDOMNode().clientWidth;
-  },
+    const upperIndex = this.getIndex(upperBound);
 
-  getSliderStart: function() {
-    var slider = this.refs.slider.getDOMNode();
-    var rect = slider.getBoundingClientRect();
-
-    return rect.left;
-  },
-
-  handleTouchStart: function(e) {
-    if (this.props.disabled || e.touches.length > 1 || (e.type === 'touchend' && e.touches.length > 0)) {
-      return;
+    let steps = null;
+    if (marksLen > 0 || (step > 1 && (dots || withDots))) {
+      const stepsClassName = prefixCls + '-step';
+      const stepNum = marksLen > 0 ? marksLen : Math.floor((max - min) / step) + 1;
+      steps = (<Steps className={stepsClassName} stepNum={stepNum}
+                      lowerIndex={this.getIndex(lowerBound)} upperIndex={upperIndex}
+                      included={(included && isIncluded) || range}/>);
     }
 
-    var position = this._getTouchPosition(e);
-    this.startPosition = position;
-    this._start(position);
-    this._addEventHandles('touch');
-    pauseEvent(e);
-  },
-
-  handleMouseDown: function() {
-    return (e) => {
-      if (this.props.disabled) {
-        return;
-      }
-      var position = this._getMousePosition(e);
-      this._start(position);
-      this._addEventHandles('mouse');
-      pauseEvent(e);
-    };
-  },
-
-  handleSliderMouseDown: function(e) {
-    if (this.props.disabled) {
-      return;
-    }
-    var position = this._getMousePosition(e);
-    this._calValueByPos(position,
-      () => {
-        this._triggerEvents('onChange');
-        this._start(position);
-        this._addEventHandles('mouse');
-      }
-    );
-
-    pauseEvent(e);
-  },
-
-  renderSteps: function() {
-    var props = this.props;
-    var marksLen = props.marks.length;
-    var stepNum = marksLen > 0 ? marksLen : Math.floor((props.max - props.min) / props.step) + 1;
-    var unit = 100 / (stepNum - 1);
-
-    var prefixCls = props.className;
-    var stepClassName = prefixClsFn(prefixCls, 'step');
-
-    var elements = [];
-    for (var i = 0; i < stepNum; i++) {
-      var offset = unit * i + '%';
-      var style = {
-        left: offset
-      };
-      var className = prefixClsFn(prefixCls, 'dot');
-      if (props.isIncluded) {
-        if (i <= this.getIndex()) {
-          className = prefixClsFn(prefixCls, 'dot', 'dot-active');
-        }
-      } else {
-        className = (i === this.getIndex()) ? prefixClsFn(prefixCls, 'dot', 'dot-active') : className;
-      }
-
-      elements[i] = (
-        <span className={className} style={style} ref={'step' + i}></span>
-      );
+    let mark = null;
+    if (marksLen > 0) {
+      const markClassName = prefixCls + '-mark';
+      mark = (<Marks className={markClassName} marks={marks}
+                     index={upperIndex} included={(included && isIncluded)}/>);
     }
 
     return (
-      <div className={stepClassName}>
-        {elements}
-      </div>
-    );
-  },
-
-  renderMark: function(i) {
-    var marks = this.props.marks;
-    var marksLen = marks.length;
-    var unit = 100 / (marksLen - 1);
-    var offset = unit * i;
-
-    var style = {
-      width: unit / 2 + '%'
-    };
-
-    if (i === marksLen - 1) {
-      style.right = -unit / 4 + '%';
-    } else {
-      style.left = i > 0 ? offset - unit / 4 + '%' : -unit / 4 + '%';
-    }
-
-    var prefixCls = this.props.className;
-    var className = prefixClsFn(prefixCls, 'mark-text');
-
-    if (this.props.isIncluded) {
-      if (i <= this.getIndex()) {
-        className = prefixClsFn(prefixCls, 'mark-text', 'mark-text-active');
-      }
-    } else {
-      className = (i === this.getIndex()) ? prefixClsFn(prefixCls, 'mark-text', 'mark-text-active') : className;
-    }
-
-    return (
-      <span className={className} style={style}>{this.props.marks[i]}</span>
-    );
-  },
-
-  renderMarks: function() {
-    var marks = this.props.marks;
-    var marksLen = marks.length;
-    var elements = [];
-    for (var i = 0; i < marksLen; i++) {
-      elements[i] = this.renderMark(i);
-    }
-
-    var prefixCls = this.props.className;
-    var className = prefixClsFn(prefixCls, 'mark');
-
-    return (
-      <div className={className}>
-        {elements}
-      </div>
-    );
-  },
-
-  renderHandle: function(offset) {
-    var handleStyle = {
-      left: offset
-    };
-
-    var prefixCls = this.props.className;
-    var className = prefixClsFn(prefixCls, 'handle');
-
-    if (this.state.active) {
-      className =  prefixClsFn(prefixCls, 'handle', 'handle-active');
-    }
-
-    var handle =  <div className={className}
-        ref = "handle"
-        style = {handleStyle}
-        href = "#"
-        onMouseDown = {this.handleMouseDown}
-        onTouchStart = {this.handleTouchStart}></div>;
-
-    if (this.props.marks.length > 0) {
-      return handle;
-    } else {
-      return (
-        <Tooltip
-          placement="top"
-          overlay={<span>{this.state.value}</span>}
-          delay={0}
-          prefixCls={prefixClsFn(prefixCls, 'tooltip')}>
-          {handle}
-        </Tooltip>
-      );
-    }
-  },
-
-  renderTrack: function(offset) {
-    var style = {
-      width: offset
-    };
-
-    var prefixCls = this.props.className;
-    var trackClassName = prefixClsFn(prefixCls, 'track');
-
-    return (
-      <div className={trackClassName} ref="track" style={style}></div>
-    );
-  },
-
-  render: function() {
-    var state = this.state;
-    var props = this.props;
-
-    var value = state.value;
-    var offset = this._calcOffset(value);
-
-    var track = this.props.isIncluded ? this.renderTrack(offset) : null;
-    var handles = this.renderHandle(offset);
-    var steps = (props.step > 1 || props.marks.length > 0) ? this.renderSteps() : null;
-    var sliderMarks = (props.marks.length > 0) ? this.renderMarks() : null;
-
-    var prefixCls = props.className;
-    var sliderClassName = props.disabled ? prefixCls + ' ' + prefixClsFn(prefixCls, 'disabled') : prefixCls;
-
-    return (
-      <div className={sliderClassName} ref="slider" onMouseDown={this.handleSliderMouseDown}>
+      <div ref="slider" className={sliderClassName}
+           onTouchStart={disabled ? noop : this.onTouchStart.bind(this)}
+           onMouseDown={disabled ? noop : this.onSliderMouseDown.bind(this)}>
         {track}
-        {handles}
+        {upper}
+        {lower}
         {steps}
-        {sliderMarks}
-        {this.props.children}
+        {mark}
+        {children}
       </div>
     );
   }
-});
+}
 
-module.exports = Slider;
+Slider.propTypes = {
+  min: React.PropTypes.number,
+  max: React.PropTypes.number,
+  step: React.PropTypes.number,
+  defaultValue: React.PropTypes.oneOfType([
+    React.PropTypes.number,
+    React.PropTypes.arrayOf(React.PropTypes.number),
+  ]),
+  defaultIndex: React.PropTypes.number,
+  value: React.PropTypes.oneOfType([
+    React.PropTypes.number,
+    React.PropTypes.arrayOf(React.PropTypes.number),
+  ]),
+  index: React.PropTypes.number,
+  marks: React.PropTypes.array,
+  isIncluded: React.PropTypes.bool, // @Deprecated
+  included: React.PropTypes.bool,
+  className: React.PropTypes.string,
+  prefixCls: React.PropTypes.string,
+  disabled: React.PropTypes.bool,
+  children: React.PropTypes.any,
+  onBeforeChange: React.PropTypes.func,
+  onChange: React.PropTypes.func,
+  onAfterChange: React.PropTypes.func,
+  tipTransitionName: React.PropTypes.string,
+  withDots: React.PropTypes.bool, // @Deprecated
+  dots: React.PropTypes.bool,
+  range: React.PropTypes.bool,
+};
+
+Slider.defaultProps = {
+  min: 0,
+  max: 100,
+  step: 1,
+  defaultIndex: 0,
+  marks: [],
+  isIncluded: true, // @Deprecated
+  included: true,
+  className: '',
+  prefixCls: 'rc-slider',
+  disabled: false,
+  tipTransitionName: '',
+  withDots: false, // @Deprecated
+  dots: false,
+  range: false,
+};
+
+export default Slider;

src/Steps.jsx

@@ -0,0 +1,28 @@
+import React from 'react';
+import rcUtil from 'rc-util';
+
+const Steps = ({className, stepNum, included, lowerIndex, upperIndex}) => {
+  const dotClassName = className.replace('step', 'dot');
+  const unit = 100 / (stepNum - 1);
+
+  const elements = [];
+  for (let i = 0; i < stepNum; i++) {
+    const offset = unit * i + '%';
+    const style = { left: offset };
+
+    const isActived = (included && i <= upperIndex && i >= lowerIndex ) ||
+            (!included && i === upperIndex);
+    const stepClassName = rcUtil.classSet({
+      [dotClassName]: true,
+      [dotClassName + '-active']: isActived,
+    });
+
+    elements.push(<span className={stepClassName} style={style} key={i} />);
+  }
+
+  return (<div className={className}>
+            {elements}
+          </div>);
+};
+
+export default Steps;

src/Track.jsx

@@ -0,0 +1,11 @@
+import React from 'react';
+
+const Track = ({className, offset, length}) => {
+  const style = {
+    left: offset + '%',
+    width: length + '%',
+  };
+  return <div className={className} style={style} />;
+};
+
+export default Track;

src/index.js

@@ -1,3 +1,2 @@
-'use strict';
 
 module.exports = require('./Slider');

tests/index.spec.js

@@ -1,11 +1,12 @@
-'use strict';
 
 var expect = require('expect.js');
 var Slider = require('../index.js');
 var React = require('react');
-var TestUtils = React.addons.TestUtils;
+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 () {
   this.timeout(5000);
@@ -17,21 +18,21 @@ describe('rc-slider', function () {
   });
 
   it('should render a simple slider with value correctly!', function () {
-    var slider = React.render(
-      <Slider className='rc-slider' value={40}/>,
+    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.getValue()).to.be(40);
+    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 numbers of step!', function () {
-    var slider = React.render(
+    var slider = ReactDOM.render(
       <Slider className='rc-slider' step={20}/>,
       div
     );
@@ -39,13 +40,19 @@ describe('rc-slider', function () {
     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(6);
-    expect(slider.getValue()).to.be(0);
+    expect(slider.state.upperBound).to.be(0);
+
+    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);
   });
 
   it('should render a slider with marks correctly!', function () {
-    var slider = React.render(
-      <Slider marks={["一","二","三","四","五"]} index={3} />,
+    var slider = ReactDOM.render(
+      <Slider marks={["一","二","三","四","五"]} defaultIndex={3} />,
       div
     );
     var node = $(div);
@@ -55,16 +62,16 @@ describe('rc-slider', function () {
     expect(node.find('.rc-slider-dot').length).to.be(slider.props.marks.length);
     expect(node.find('.rc-slider-mark').length).to.be(1);
     expect(node.find('.rc-slider-mark-text').length).to.be(slider.props.marks.length);
-    expect(slider.getIndex()).to.be(3);
+    expect(slider.getIndex(slider.state.upperBound)).to.be(3);
   });
 
   // it('should mouseDown works!', function (done) {
-  //   var slider = React.render(
+  //   var slider = ReactDOM.render(
   //     <Slider marks={["一","二","三","四","五"]} />,
   //     div
   //   );
   //   var selectedStep = slider.refs.step3.getDOMNode();
-    
+
   //   Simulate.mouseDown(selectedStep);
 
   //   setTimeout( function() {