bump 2.0.1

Upgrade api

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,41 +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>defaultValue</td>
+          <td>range</td>
-          <td>number</td>
+          <td>boolean</td>
-          <td>0</td>
+          <td>false</td>
-          <td>Determines the initial positions of the handles.</td>
+          <td>Determines the type of slider. If range is `true`, two handles will be rendered in order to select a range.</td>
         </tr>
-         <tr>
+        <tr>
+          <td>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>number or [number, number]</td>
           <td></td>
-          <td>Determines the current positions of the handles.</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, determine the initial positions of the handles.</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></td>
-          <td>For step or marks slider, determine current positions of the handles.</td>
+          <td>For step or marks slider, determines current position of the handle. Does not work with `range`</td>
         </tr>
         <tr>
           <td>disabled</td>
@@ -143,10 +149,10 @@ React.render(<Rcslider />, container);
           <td>Set the animation for tooltip if it shows.</td>
         </tr>
         <tr>
-          <td>withDots</td>
+          <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 `withDots` to  `true` if you want to render the slider bar with dots.</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>

examples/simple.js

@@ -2,14 +2,44 @@
 
 require('rc-slider/assets/index.less');
 
-var Slider = require('rc-slider');
 var React = require('react');
+var ReactDOM = require('react-dom');
+var Slider = require('rc-slider');
+var style = {width:400,margin:50};
 
-function onChange(v){
+function onChange(v) {
   console.log(v);
 }
 
-// React.render(<div style={{width:400,margin:100}}><Slider marks={["一","二","三","四","五"]} defaultIndex={2} /></div>, document.getElementById('__react-content'));
+ReactDOM.render(
-// React.render(<div style={{width:400,margin:100}}><Slider withDots className='rc-slider' step={20}/></div>, document.getElementById('__react-content'));
+  <div>
-// React.render(<div style={{width:400,margin:100}}><Slider className='rc-slider' step={20}/></div>, document.getElementById('__react-content'));
+    <div style={style}>
-React.render(<div style={{width:400,margin:100}}><Slider onChange={onChange}  tipTransitionName='rc-slider-tooltip-zoom-down'/></div>, document.getElementById('__react-content'));
+      <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'));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-slider",
-  "version": "1.5.1",
+  "version": "2.0.1",
   "description": "slider ui component for react",
   "keywords": [
     "react",
@@ -39,17 +39,19 @@
   },
   "devDependencies": {
     "expect.js": "0.3.x",
+    "jquery": "^1.11.2",
     "precommit-hook": "^1.0.7",
     "rc-server": "3.x",
     "rc-tools": "4.x",
-    "react": "^0.13.x",
+    "react": "~0.14.0",
-    "jquery": "^1.11.2"
+    "react-addons-test-utils": "^0.14.0",
+    "react-dom": "~0.14.0"
   },
   "precommit": [
     "lint"
   ],
   "dependencies": {
-    "rc-tooltip": "2.x",
+    "rc-tooltip": "~3.0.4",
     "rc-util": "2.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={{points: ['bc', 'tc']}}
+              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,8 +1,22 @@
 import React from 'react';
-import Tooltip from 'rc-tooltip';
 import rcUtil, {Dom as DomUtils} from 'rc-util';
+import Track from './Track';
+import Handle from './Handle';
+import Steps from './Steps';
+import Marks from './Marks';
 
-function noop() {
+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 || (e.clientX + document.documentElement.scrollLeft); // to compat ie8
 }
 
 function pauseEvent(e) {
@@ -16,180 +30,184 @@ function pauseEvent(e) {
   }
 }
 
-function prefixClsFn(prefixCls, ...args) {
+class Slider extends React.Component {
-  return args.map((s)=> {
+  constructor(props) {
-    return prefixCls + '-' + s;
+    super(props);
-  }).join(' ');
-}
 
-function getValueFromIndex(props) {
+    let upperBound;
-  let value;
+    let lowerBound;
-  const marksLen = props.marks.length;
+    if (props.range) {
-  let index;
+      const value = (props.value || props.defaultValue || [0, 0]);
-  if ('index' in props) {
+      upperBound = this.trimAlignValue(value[1]);
-    index = props.index;
+      lowerBound = this.trimAlignValue(value[0]);
-  } else {
+    } else if (props.marks.length > 0) {
-    index = props.defaultIndex;
+      upperBound = this.calcValueFromProps(props);
-  }
+    } else {
-  if (marksLen > 0) {
+      // Note: Maybe `value` is `0`.
-    value = ((props.max - props.min) / (marksLen - 1)) * (index);
+      //       So, check the existence of `value` with `in`.
-    value = value.toFixed(5) / 1;
+      const defaultValue = ('defaultValue' in props ? props.defaultValue : 0);
-  }
+      const value = ('value' in props ? props.value : defaultValue);
-  return value;
+      upperBound = this.trimAlignValue(value);
-}
-
-const Slider = React.createClass({
-  propTypes: {
-    min: React.PropTypes.number,
-    max: React.PropTypes.number,
-    step: React.PropTypes.number,
-    defaultValue: React.PropTypes.number,
-    defaultIndex: React.PropTypes.number,
-    value: React.PropTypes.number,
-    index: React.PropTypes.number,
-    marks: React.PropTypes.array,
-    isIncluded: 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,
-  },
-
-  getDefaultProps() {
-    return {
-      min: 0,
-      max: 100,
-      step: 1,
-      defaultValue: 0,
-      marks: [],
-      isIncluded: true,
-      className: '',
-      prefixCls: 'rc-slider',
-      disabled: false,
-      defaultIndex: 0,
-      tipTransitionName: '',
-      withDots: false,
-    };
-  },
-
-  getInitialState() {
-    const props = this.props;
-    let value = props.defaultValue;
-    if ('value' in props) {
-      value = props.value;
     }
-    value = this._trimAlignValue(value);
+
-    const marksLen = props.marks.length;
+    let recent;
-    if (marksLen > 0) {
+    if (props.range && upperBound === lowerBound) {
-      value = getValueFromIndex(props);
+      if (lowerBound === props.max) {
+        recent = 'lowerBound';
+      }
+      if (upperBound === props.min) {
+        recent = 'upperBound';
+      }
+    } else {
+      recent = 'upperBound';
     }
-    return {
+
-      dragging: false,
+    this.state = {
-      showTooltip: false,
+      handle: null,
-      value: value,
+      recent: recent,
+      upperBound: upperBound,
+      // If Slider is not range, set `lowerBound` equal to `min`.
+      lowerBound: (lowerBound || props.min),
     };
-  },
+  }
 
   componentWillReceiveProps(nextProps) {
-    if ('value' in 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({
-        value: nextProps.value,
+        upperBound: nextProps.value,
       });
     } else if ('index' in nextProps) {
       this.setState({
-        value: getValueFromIndex(nextProps),
+        upperBound: this.calcValueFromProps(nextProps),
       });
     }
-  },
+  }
-
-  onMouseUp(e) {
-    const m = e.target;
-    const handleDom = React.findDOMNode(this.refs.handle);
-    let showToolTip = false;
-    if (m === handleDom) {
-      showToolTip = true;
-    }
-    this._end('mouse', showToolTip);
-  },
-
-  onTouchUp() {
-    this._end('touch');
-  },
 
   onMouseMove(e) {
-    const position = e.pageX || (e.clientX + document.documentElement.scrollLeft); // to compat ie8
+    const position = getMousePosition(e);
     this.onMove(e, position);
-  },
+  }
 
   onTouchMove(e) {
-    if (e.touches.length > 1 || (e.type === 'touchend' && e.touches.length > 0)) {
+    if (isNotTouchEvent(e)) {
-      this._end('touch');
+      this.end('touch');
       return;
     }
 
-    const position = this._getTouchPosition(e);
+    const position = getTouchPosition(e);
-
     this.onMove(e, position);
-  },
+  }
 
   onMove(e, position) {
     pauseEvent(e);
     const props = this.props;
     const state = this.state;
 
-    let value = state.value;
-    const oldValue = value;
-
     const diffPosition = position - this.startPosition;
-
     const diffValue = diffPosition / this.getSliderLength() * (props.max - props.min);
-    value = this._trimAlignValue(this.startValue + diffValue);
 
-    if (value !== oldValue && !('value' in props) && !('index' in props)) {
+    const value = this.trimAlignValue(this.startValue + diffValue);
-      this.setState({value: value});
+    const oldValue = state[state.handle];
+    if (value === oldValue) return;
+
+    if (!('value' in props) && !('index' in props)) {
+      this.setState({[state.handle]: value});
     }
-    if (value !== oldValue) {
+
-      this._triggerEvents('onChange', 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 (e.touches.length > 1 || (e.type.toLowerCase() === 'touchend' && e.touches.length > 0)) {
+    if (isNotTouchEvent(e)) return;
-      return;
-    }
 
-    const position = this._getTouchPosition(e);
+    const position = getTouchPosition(e);
-    const value = this._calValueByPos(position);
+    this.onStart(position);
-    this._triggerEvents('onChange', value);
+    this.addDocumentEvents('touch');
-    this._start(position, value);
-    this._addDocumentEvents('touch');
     pauseEvent(e);
-  },
+  }
 
   onSliderMouseDown(e) {
-    const position = e.pageX || (e.clientX + document.documentElement.scrollLeft); // to compat ie8
+    const position = getMousePosition(e);
-    const value = this._calValueByPos(position);
+    this.onStart(position);
-    this._triggerEvents('onChange', value);
+    this.addDocumentEvents('mouse');
-    this._start(position, value);
-    this._addDocumentEvents('mouse');
     pauseEvent(e);
-  },
+  }
 
-  getIndex(v) {
+  onStart(position) {
-    const props = this.props;
+    this.triggerEvents('onBeforeChange');
-    const value = v === undefined ? this.state.value : v;
 
-    if (props.marks.length === 0) {
+    const value = this.calcValueByPos(position);
-      return Math.floor((value - props.min) / props.step);
+    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';
+      }
     }
-    const unit = ((props.max - props.min) / (props.marks.length - 1)).toFixed(5);
+
+    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;
@@ -197,214 +215,37 @@ const Slider = React.createClass({
       return 0;
     }
 
-    return slider.getDOMNode().clientWidth;
+    return slider.clientWidth;
-  },
+  }
 
   getSliderStart() {
-    const slider = this.refs.slider.getDOMNode();
+    const slider = this.refs.slider;
     const rect = slider.getBoundingClientRect();
 
     return rect.left;
-  },
+  }
 
-  renderSteps() {
+  trimAlignValue(v) {
+    const state = this.state || {};
     const props = this.props;
-    const marksLen = props.marks.length;
+    const {marks, min, max} = props;
-    const withDots = props.withDots;
+    const step = marks.length > 0 ? (max - min) / (marks.length - 1) : props.step;
 
-    if (marksLen || withDots) {
-      const stepNum = marksLen ? marksLen : Math.floor((props.max - props.min) / props.step) + 1;
-      const unit = 100 / (stepNum - 1);
-
-      const prefixCls = props.prefixCls;
-      const stepClassName = prefixClsFn(prefixCls, 'step');
-
-      const elements = [];
-      for (let i = 0; i < stepNum; i++) {
-        const offset = unit * i + '%';
-        const style = {
-          left: offset,
-        };
-        let 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} key={'step' + i}></span>
-        );
-      }
-
-      return (
-        <div className={stepClassName}>
-          {elements}
-        </div>
-      );
-    }
-
-    return null;
-  },
-
-  renderMark(i) {
-    const marks = this.props.marks;
-    const marksLen = marks.length;
-    const unit = 100 / (marksLen - 1);
-    const offset = unit * i;
-
-    const style = {
-      width: unit / 2 + '%',
-    };
-
-    if (i === marksLen - 1) {
-      style.right = -unit / 4 + '%';
-    } else {
-      style.left = i > 0 ? offset - unit / 4 + '%' : -unit / 4 + '%';
-    }
-
-    const prefixCls = this.props.prefixCls;
-    let 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} key={i}>{this.props.marks[i]}</span>
-    );
-  },
-
-  renderMarks() {
-    const marks = this.props.marks;
-    const marksLen = marks.length;
-    const elements = [];
-    for (let i = 0; i < marksLen; i++) {
-      elements[i] = this.renderMark(i);
-    }
-
-    const prefixCls = this.props.prefixCls;
-    const className = prefixClsFn(prefixCls, 'mark');
-
-    return (
-      <div className={className}>
-        {elements}
-      </div>
-    );
-  },
-
-  renderHandler(offset) {
-    const onStyle = {
-      left: offset,
-    };
-
-    const prefixCls = this.props.prefixCls;
-    const className = prefixClsFn(prefixCls, 'handle');
-
-    let events = {};
-
-    let tooltipVisible;
-
-    if (this.state.dragging) {
-      tooltipVisible = true;
-    } else {
-      events = {
-        onClick: this.showTooltip.bind(this, true),
-        onMouseEnter: this.showTooltip.bind(this, true),
-        onMouseLeave: this.showTooltip.bind(this, false),
-      };
-      tooltipVisible = this.state.showTooltip;
-    }
-
-    const handle = (<div className={className}
-      {...events}
-      ref="handle"
-      style={onStyle}></div>);
-
-    if (this.props.marks.length > 0) {
-      return handle;
-    }
-    return (
-      <Tooltip
-        placement={{points: ['bc', 'tc']}}
-        visible={tooltipVisible}
-        overlay={<span>{this.state.value}</span>}
-        delay={0}
-        transitionName={this.props.tipTransitionName}
-        prefixCls={prefixClsFn(prefixCls, 'tooltip')}>
-        {handle}
-      </Tooltip>
-    );
-  },
-
-  renderTrack(offset) {
-    const style = {
-      width: offset,
-    };
-
-    const prefixCls = this.props.prefixCls;
-    const trackClassName = prefixClsFn(prefixCls, 'track');
-
-    return (
-      <div className={trackClassName} ref="track" style={style}></div>
-    );
-  },
-
-  render() {
-    const state = this.state;
-    const props = this.props;
-    const value = state.value;
-    const offset = this._calcOffset(value);
-    const track = this.props.isIncluded ? this.renderTrack(offset) : null;
-    const ons = this.renderHandler(offset);
-    const steps = (props.step > 1 || props.marks.length > 0) ? this.renderSteps() : null;
-    const sliderMarks = (props.marks.length > 0) ? this.renderMarks() : null;
-    const prefixCls = props.prefixCls;
-    const disabled = props.disabled;
-    const sliderClassName = {
-      [prefixCls]: 1,
-      [props.className]: !!props.className,
-      [`${prefixCls}-disabled`]: disabled,
-    };
-
-    return (
-      <div className={rcUtil.classSet(sliderClassName)} ref="slider"
-        onTouchStart={disabled ? noop : this.onTouchStart}
-        onMouseDown={disabled ? noop : this.onSliderMouseDown}>
-        {track}
-        {ons}
-        {steps}
-        {sliderMarks}
-        {this.props.children}
-      </div>
-    );
-  },
-
-  showTooltip(show) {
-    this.setState({
-      showTooltip: show,
-    });
-  },
-
-  _trimAlignValue(v, propsArg) {
     let val = v;
-    const props = propsArg || this.props;
+    if (val <= min) {
-    const step = props.marks.length > 0 ? (props.max - props.min) / (props.marks.length - 1) : props.step;
+      val = min;
-
-    if (val <= props.min) {
-      val = props.min;
     }
-    if (val >= props.max) {
+    if (val >= max) {
-      val = props.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 - props.min) % step;
+    const valModStep = (val - min) % step;
     let alignValue = val - valModStep;
 
     if (Math.abs(valModStep) * 2 >= step) {
@@ -412,36 +253,40 @@ const Slider = React.createClass({
     }
 
     return parseFloat(alignValue.toFixed(5));
-  },
+  }
 
-  _calcOffset(value) {
+  calcOffset(value) {
-    const ratio = (value - this.props.min) / (this.props.max - this.props.min);
+    const {min, max} = this.props;
-    return ratio * 100 + '%';
+    const ratio = (value - min) / (max - min);
-  },
+    return ratio * 100;
+  }
 
-  _calcValue(offset) {
+  calcValue(offset) {
+    const {min, max} = this.props;
     const ratio = offset / this.getSliderLength();
-    return ratio * (this.props.max - this.props.min) + this.props.min;
+    return ratio * (max - min) + min;
-  },
+  }
 
-  _calValueByPos(position) {
+  calcValueByPos(position) {
     const pixelOffset = position - this.getSliderStart();
-    // pixelOffset -= (this.state.onSize / 2);
+    const nextValue = this.trimAlignValue(this.calcValue(pixelOffset));
-    const nextValue = this._trimAlignValue(this._calcValue(pixelOffset));
-    this.setState({
-      value: nextValue,
-    });
     return nextValue;
-  },
+  }
 
-  _getTouchPosition(e) {
+  calcValueFromProps(props) {
-    const touch = e.touches[0];
+    const marksLen = props.marks.length;
-    return touch.pageX;
+    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);
+  }
 
-  _triggerEvents(event, v) {
+  triggerEvents(event, v) {
     const props = this.props;
-    const hasMarks = props.marks && props.marks.length > 0;
+    const hasMarks = (props.marks.length > 0);
     if (props[event]) {
       let data;
       if (hasMarks) {
@@ -453,20 +298,20 @@ const Slider = React.createClass({
       }
       props[event](data);
     }
-  },
+  }
 
-  _addDocumentEvents(type) {
+  addDocumentEvents(type) {
     if (type === 'touch') {
       // just work for chrome iOS Safari and Android Browser
-      this.onTouchMoveListener = DomUtils.addEventListener(document, 'touchmove', this.onTouchMove);
+      this.onTouchMoveListener = DomUtils.addEventListener(document, 'touchmove', this.onTouchMove.bind(this));
-      this.onTouchUpListener = DomUtils.addEventListener(document, 'touchend', this.onTouchUp);
+      this.onTouchUpListener = DomUtils.addEventListener(document, 'touchend', this.end.bind(this, 'touch'));
     } else if (type === 'mouse') {
-      this.onMouseMoveListener = DomUtils.addEventListener(document, 'mousemove', this.onMouseMove);
+      this.onMouseMoveListener = DomUtils.addEventListener(document, 'mousemove', this.onMouseMove.bind(this));
-      this.onMouseUpListener = DomUtils.addEventListener(document, 'mouseup', this.onMouseUp);
+      this.onMouseUpListener = DomUtils.addEventListener(document, 'mouseup', this.end.bind(this, 'mouse'));
     }
-  },
+  }
 
-  _removeEventons(type) {
+  removeEventons(type) {
     if (type === 'touch') {
       this.onTouchMoveListener.remove();
       this.onTouchUpListener.remove();
@@ -474,25 +319,125 @@ const Slider = React.createClass({
       this.onMouseMoveListener.remove();
       this.onMouseUpListener.remove();
     }
-  },
+  }
 
-  _start(position, value) {
+  end(type) {
-    this._triggerEvents('onBeforeChange');
+    this.removeEventons(type);
-    this.startValue = value;
+    this.triggerEvents('onAfterChange');
-    this.startPosition = position;
+    this.setState({ handle: null });
-    this.setState({
+  }
-      dragging: true,
-    });
-  },
 
-  _end(type, showToolTip) {
+  render() {
-    this._removeEventons(type);
+    const {handle, upperBound, lowerBound} = this.state;
-    this._triggerEvents('onAfterChange');
+    const props = this.props;
-    this.setState({
+    const {className, prefixCls, disabled, included, isIncluded, dots, withDots, range} = props;
-      dragging: false,
+    const {marks, step, max, min, tipTransitionName, children} = props;
-      showTooltip: !!showToolTip,
+    const marksLen = marks.length;
+
+    const sliderClassName = rcUtil.classSet({
+      [prefixCls]: true,
+      [prefixCls + '-disabled']: disabled,
+      [className]: !!className,
     });
-  },
+
-});
+    const upperOffset = this.calcOffset(upperBound);
+    const lowerOffset = this.calcOffset(lowerBound);
+
+    let track = null;
+    if ((included && isIncluded) || range) {
+      const trackClassName = prefixCls + '-track';
+      track = <Track className={trackClassName} offset={lowerOffset} length={upperOffset - lowerOffset} />;
+    }
+
+    const handleClassName = prefixCls + '-handle';
+    const isNoTip = marksLen > 0;
+    const upper = (<Handle className={handleClassName} tipTransitionName={tipTransitionName} noTip={isNoTip}
+                     offset={upperOffset} value={upperBound} dragging={handle === 'upperBound'} />);
+
+    let lower = null;
+    if (range) {
+      lower = (<Handle className={handleClassName} tipTransitionName={tipTransitionName} noTip={isNoTip}
+                 offset={lowerOffset} value={lowerBound} dragging={handle === 'lowerBound'} />);
+    }
+
+    const upperIndex = this.getIndex(upperBound);
+
+    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} />);
+    }
+
+    let mark = null;
+    if (marksLen > 0) {
+      const markClassName = prefixCls + '-mark';
+      mark = (<Marks className={markClassName} marks={marks}
+                index={upperIndex} included={(included && isIncluded)} />);
+    }
+
+    return (
+      <div ref="slider" className={sliderClassName}
+        onTouchStart={disabled ? noop : this.onTouchStart.bind(this)}
+        onMouseDown={disabled ? noop : this.onSliderMouseDown.bind(this)}>
+        {track}
+        {upper}
+        {lower}
+        {steps}
+        {mark}
+        {children}
+      </div>
+    );
+  }
+}
+
+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;

tests/index.spec.js

@@ -1,8 +1,9 @@
 
 var expect = require('expect.js');
 var Slider = require('../index.js');
-var React = require('react/addons');
+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');
@@ -17,7 +18,7 @@ describe('rc-slider', function () {
   });
 
   it('should render a simple slider with value correctly!', function () {
-    var slider = React.render(
+    var slider = ReactDOM.render(
       <Slider className='rc-slider' defaultValue={40}/>,
       div
     );
@@ -25,13 +26,13 @@ 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(slider.state.value).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,10 +40,10 @@ 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(slider.state.value).to.be(0);
+    expect(slider.state.upperBound).to.be(0);
 
-    var sliderWithDots = React.render(
+    var sliderWithDots = ReactDOM.render(
-      <Slider className='rc-slider' step={20} withDots/>,
+      <Slider className='rc-slider' step={20} dots/>,
       div
     );
     var node1 = $(div);
@@ -50,7 +51,7 @@ describe('rc-slider', function () {
   });
 
   it('should render a slider with marks correctly!', function () {
-    var slider = React.render(
+    var slider = ReactDOM.render(
       <Slider marks={["一","二","三","四","五"]} defaultIndex={3} />,
       div
     );
@@ -61,11 +62,11 @@ 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
   //   );