Merge pull request #42 from react-component/3.0.0-beta

bump 3.0.0

README.md

@@ -148,6 +148,12 @@ ReactDOM.render(<Rcslider />, container);
           <td>''</td>
           <td>Set the animation for tooltip if it shows.</td>
         </tr>
+        <tr>
+          <td>tipFormatter</td>
+          <td>func</td>
+          <td></td>
+          <td>Format the value of the tooltip if it shows.</td>
+        </tr>
         <tr>
           <td>dots</td>
           <td>bool</td>

assets/index.less

@@ -131,55 +131,6 @@
       cursor: not-allowed!important;
     }
   }
-
-  // slider tooltip style
-  &-tooltip {
-    position: absolute;
-    left: -9999px;
-    top: -9999px;
-    z-index: 4;
-    visibility: visible;
-
-    .borderBox();
-
-    &-hidden {
-      display: none;
-    }
-
-    &-placement-points-bc-tc {
-      padding: @tooltip-arrow-width 0 @tooltip-distance 0;
-    }
-
-    &-inner {
-      padding: 6px 0;
-      width: 24px;
-      height: 24px;
-      font-size: 12px;
-      line-height: 1;
-      color: @tooltip-color;
-      text-align: center;
-      text-decoration: none;
-      background-color: @tooltip-bg;
-      border-radius: @border-radius-base;
-      box-shadow: 0 0 4px #d9d9d9;
-    }
-
-    &-arrow {
-      position: absolute;
-      width: 0;
-      height: 0;
-      border-color: transparent;
-      border-style: solid;
-    }
-
-    &-placement-points-bc-tc &-arrow {
-      bottom: @tooltip-distance - @tooltip-arrow-width;
-      left: 50%;
-      margin-left: -@tooltip-arrow-width;
-      border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
-      border-top-color: @tooltip-arrow-color;
-    }
-  }
 }
 
 .motion-common() {
@@ -241,3 +192,51 @@
     transform: scale(0, 0);
   }
 }
+
+.rc-tooltip {
+  position: absolute;
+  left: -9999px;
+  top: -9999px;
+  z-index: 4;
+  visibility: visible;
+
+  .borderBox();
+
+  &-hidden {
+    display: none;
+  }
+
+  &-placement-top {
+    padding: @tooltip-arrow-width 0 @tooltip-distance 0;
+  }
+
+  &-inner {
+    padding: 6px 2px;
+    min-width: 24px;
+    height: 24px;
+    font-size: 12px;
+    line-height: 1;
+    color: @tooltip-color;
+    text-align: center;
+    text-decoration: none;
+    background-color: @tooltip-bg;
+    border-radius: @border-radius-base;
+    box-shadow: 0 0 4px #d9d9d9;
+  }
+
+  &-arrow {
+    position: absolute;
+    width: 0;
+    height: 0;
+    border-color: transparent;
+    border-style: solid;
+  }
+
+  &-placement-top &-arrow {
+    bottom: @tooltip-distance - @tooltip-arrow-width;
+    left: 50%;
+    margin-left: -@tooltip-arrow-width;
+    border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
+    border-top-color: @tooltip-arrow-color;
+  }
+}

examples/marks.html

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

examples/marks.js

@@ -0,0 +1,50 @@
+'use strict';
+
+require('rc-slider/assets/index.less');
+
+var React = require('react');
+var ReactDOM = require('react-dom');
+var Slider = require('rc-slider');
+
+var style = {width: 400, margin: 50};
+var marks = {
+  0: '0°C',
+  26: '26°C',
+  37: '37°C',
+  100: '100°C'
+};
+
+var log = function(value) {
+  console.log(value);
+};
+
+ReactDOM.render(
+  <div>
+    <div style={style}>
+      <p>Slider with marks, `included=true`</p>
+      <Slider marks={marks} onChange={log} defaultValue={20} />
+    </div>
+    <div style={style}>
+      <p>Slider with marks and steps, `included=true`</p>
+      <Slider marks={marks} step={10} onChange={log} defaultValue={20} />
+    </div>
+
+    <div style={style}>
+      <p>Slider with marks, `included=false`</p>
+      <Slider marks={marks} included={false} defaultValue={20} />
+    </div>
+    <div style={style}>
+      <p>Slider with marks and steps, `included=false`</p>
+      <Slider marks={marks} step={10} included={false} defaultValue={20} />
+    </div>
+
+    <div style={style}>
+      <p>Range with marks</p>
+    <Slider range marks={marks} onChange={log} defaultValue={[20, 40]} />
+    </div>
+    <div style={style}>
+      <p>Range with marks and steps</p>
+      <Slider range marks={marks} step={10} onChange={log} defaultValue={[20, 40]} />
+    </div>
+  </div>
+  , document.getElementById('__react-content'));

examples/range.html

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

examples/range.js

@@ -0,0 +1,54 @@
+'use strict';
+
+require('rc-slider/assets/index.less');
+
+var React = require('react');
+var ReactDOM = require('react-dom');
+var Slider = require('rc-slider');
+
+var style = {width: 400, margin: 50};
+var log = function(value) {
+  console.log(value);
+};
+
+var CustomizedRange = React.createClass({
+  getInitialState: function() {
+    return {
+      value: [20, 40]
+    }
+  },
+  onChange: function(value) {
+    log(value);
+    this.setState({
+      value: value
+    });
+  },
+  render: function() {
+    return <Slider range value={this.state.value} onChange={this.onChange} />;
+  }
+});
+
+ReactDOM.render(
+  <div>
+    <div style={style}>
+      <p>Basic Range</p>
+      <Slider range defaultValue={[0, 20]} onChange={log} />
+    </div>
+    <div style={style}>
+      <p>Basic Range，`step=20` </p>
+      <Slider range step={20} defaultValue={[20, 40]} onBeforeChange={log} />
+    </div>
+    <div style={style}>
+      <p>Basic Range，`step=20, dots` </p>
+      <Slider range dots step={20} defaultValue={[20, 40]} onAfterChange={log} />
+    </div>
+    <div style={style}>
+      <p>Controlled Range</p>
+      <Slider range value={[20, 40]} />
+    </div>
+    <div style={style}>
+      <p>Customized Range</p>
+      <CustomizedRange />
+    </div>
+  </div>
+  , document.getElementById('__react-content'));

examples/simple.js

@@ -1,45 +0,0 @@
-'use strict';
-
-require('rc-slider/assets/index.less');
-
-var React = require('react');
-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'));

examples/slider.js

@@ -0,0 +1,63 @@
+'use strict';
+
+require('rc-slider/assets/index.less');
+
+var React = require('react');
+var ReactDOM = require('react-dom');
+var Slider = require('rc-slider');
+
+var style = {width: 400, margin: 50};
+var log = function(value) {
+  console.log(value);
+};
+
+
+function percentFormatter(v) {
+  return v + ' %';
+}
+
+var CustomizedSlider = React.createClass({
+  getInitialState: function() {
+    return {
+      value: 50
+    }
+  },
+  onChange: function(value) {
+    log(value);
+    this.setState({
+      value: value
+    });
+  },
+  render: function() {
+    return <Slider value={this.state.value} onChange={this.onChange} />;
+  }
+});
+
+ReactDOM.render(
+  <div>
+    <div style={style}>
+      <p>Basic Slider</p>
+      <Slider tipTransitionName='rc-slider-tooltip-zoom-down' onChange={log} />
+    </div>
+    <div style={style}>
+      <p>Basic Slider，`step=20`</p>
+      <Slider step={20} defaultValue={50} onBeforeChange={log} />
+    </div>
+    <div style={style}>
+      <p>Basic Slider，`step=20, dots`</p>
+      <Slider dots step={20} defaultValue={100} onAfterChange={log} />
+    </div>
+    <div style={style}>
+      <p>Basic Slider with `tipFormatter`</p>
+      <Slider tipFormatter={percentFormatter} tipTransitionName='rc-slider-tooltip-zoom-down' onChange={log} />
+    </div>
+    <div style={style}>
+      <p>Controlled Slider</p>
+      <Slider value={50} />
+    </div>
+    <div style={style}>
+      <p>Customized Slider</p>
+      <CustomizedSlider />
+    </div>
+  </div>
+  , document.getElementById('__react-content'));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-slider",
-  "version": "2.0.1",
+  "version": "3.0.0",
   "description": "slider ui component for react",
   "keywords": [
     "react",
@@ -40,18 +40,18 @@
   "devDependencies": {
     "expect.js": "0.3.x",
     "jquery": "^1.11.2",
-    "precommit-hook": "^1.0.7",
+    "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"
   },
-  "precommit": [
+  "pre-commit": [
     "lint"
   ],
   "dependencies": {
-    "rc-tooltip": "~3.0.4",
+    "rc-tooltip": "3.x",
-    "rc-util": "2.x"
+    "rc-util": "3.x"
   }
 }

src/Handle.jsx

@@ -24,7 +24,7 @@ export default class Handle extends React.Component {
 
   render() {
     const props = this.props;
-    const {className, tipTransitionName, offset, value} = props;
+    const {className, tipTransitionName, tipFormatter, offset, value} = props;
     const {dragging, noTip} = props;
 
     const style = { left: offset + '%' };
@@ -39,10 +39,10 @@ export default class Handle extends React.Component {
 
     const isTooltipVisible = dragging || this.state.isTooltipVisible;
     return (<Tooltip
-              prefixCls={className.replace('handle', 'tooltip')}
+              prefixCls={className.replace('slider-handle', 'tooltip')}
-              placement={{points: ['bc', 'tc']}}
+              placement="top"
               visible={isTooltipVisible}
-              overlay={<span>{value}</span>}
+              overlay={<span>{tipFormatter ? tipFormatter(value) : value}</span>}
               delay={0}
               transitionName={tipTransitionName}>
               {handle}
@@ -54,6 +54,7 @@ Handle.propTypes = {
   className: React.PropTypes.string,
   offset: React.PropTypes.number,
   tipTransitionName: React.PropTypes.string,
+  tipFormatter: React.PropTypes.func,
   value: React.PropTypes.number,
   dragging: React.PropTypes.bool,
   noTip: React.PropTypes.bool,

src/Marks.jsx

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

src/Slider.jsx

@@ -1,11 +1,12 @@
 import React from 'react';
-import rcUtil, {Dom as DomUtils} from 'rc-util';
+import {Dom as DomUtils, classSet} 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);
@@ -16,46 +17,42 @@ function getTouchPosition(e) {
 }
 
 function getMousePosition(e) {
-  return e.pageX || (e.clientX + document.documentElement.scrollLeft); // to compat ie8
+  return e.pageX;
 }
 
 function pauseEvent(e) {
-  e.cancelBubble = true;
+  e.stopPropagation();
-  e.returnValue = false;
+  e.preventDefault();
-  if (e.stopPropagation) {
+}
-    e.stopPropagation();
+
-  }
+function isEmpty(collection) {
-  if (e.preventDefault) {
+  return Object.keys(collection).length === 0;
-    e.preventDefault();
-  }
 }
 
 class Slider extends React.Component {
   constructor(props) {
     super(props);
 
+    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);
+
     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.trimAlignValue(value[1]);
-      upperBound = this.calcValueFromProps(props);
     } else {
-      // 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);
     }
 
     let recent;
     if (props.range && upperBound === lowerBound) {
-      if (lowerBound === props.max) {
+      if (lowerBound === max) {
         recent = 'lowerBound';
       }
-      if (upperBound === props.min) {
+      if (upperBound === min) {
         recent = 'upperBound';
       }
     } else {
@@ -67,7 +64,7 @@ class Slider extends React.Component {
       recent: recent,
       upperBound: upperBound,
       // If Slider is not range, set `lowerBound` equal to `min`.
-      lowerBound: (lowerBound || props.min),
+      lowerBound: (lowerBound || min),
     };
   }
 
@@ -84,13 +81,26 @@ class Slider extends React.Component {
       this.setState({
         upperBound: nextProps.value,
       });
-    } else if ('index' in nextProps) {
-      this.setState({
-        upperBound: this.calcValueFromProps(nextProps),
-      });
     }
   }
 
+  onChange(handle, value) {
+    const props = this.props;
+    const isNotControlled = !('value' in props);
+    if (isNotControlled) {
+      this.setState({[handle]: value});
+    }
+
+    const state = this.state;
+    const data = {
+      upperBound: state.upperBound,
+      lowerBound: state.lowerBound,
+    };
+    data[handle] = value;
+    const changedValue = props.range ? [data.lowerBound, data.upperBound] : data.upperBound;
+    props.onChange(changedValue);
+  }
+
   onMouseMove(e) {
     const position = getMousePosition(e);
     this.onMove(e, position);
@@ -118,23 +128,7 @@ class Slider extends React.Component {
     const oldValue = state[state.handle];
     if (value === oldValue) return;
 
-    if (!('value' in props) && !('index' in props)) {
+    this.onChange(state.handle, value);
-      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) {
@@ -146,7 +140,7 @@ class Slider extends React.Component {
     pauseEvent(e);
   }
 
-  onSliderMouseDown(e) {
+  onMouseDown(e) {
     const position = getMousePosition(e);
     this.onStart(position);
     this.addDocumentEvents('mouse');
@@ -154,7 +148,8 @@ class Slider extends React.Component {
   }
 
   onStart(position) {
-    this.triggerEvents('onBeforeChange');
+    const props = this.props;
+    props.onBeforeChange(this.getValue());
 
     const value = this.calcValueByPos(position);
     this.startValue = value;
@@ -183,30 +178,28 @@ class Slider extends React.Component {
     this.setState({
       handle: valueNeedChanging,
       recent: valueNeedChanging,
-      [valueNeedChanging]: value,
     });
 
-    if (this.props.range) {
+    const oldValue = state[valueNeedChanging];
-      // const data = Object.assign({}, state, {[valueNeedChanging]: value});
+    if (value === oldValue) return;
-      const data = {
+
-        upperBound: state.upperBound,
+    this.onChange(valueNeedChanging, value);
-        lowerBound: state.lowerBound,
-      };
-      data[valueNeedChanging] = value;
-      this.triggerEvents('onChange', [data.lowerBound, data.upperBound]);
-    } else {
-      this.triggerEvents('onChange', value);
-    }
   }
 
-  getIndex(value) {
+  getValue() {
-    const {marks, min, max, step} = this.props;
+    const {lowerBound, upperBound} = this.state;
+    return this.props.range ? [lowerBound, upperBound] : upperBound;
+  }
 
-    if (marks.length === 0) {
+  getPoints() {
-      return Math.floor((value - min) / step);
+    const {marks, step, min, max} = this.props;
+    const points = Object.keys(marks);
+    if (isEmpty(marks) || step > 1) {
+      for (let i = min; i <= max; i = i + step) {
+        points.push(i);
+      }
     }
-    const unit = ((max - min) / (marks.length - 1)).toFixed(5);
+    return points;
-    return Math.round(value / unit);
   }
 
   getSliderLength() {
@@ -227,9 +220,8 @@ class Slider extends React.Component {
 
   trimAlignValue(v) {
     const state = this.state || {};
-    const props = this.props;
+    const {handle, lowerBound, upperBound} = state;
-    const {marks, min, max} = props;
+    const {min, max} = this.props;
-    const step = marks.length > 0 ? (max - min) / (marks.length - 1) : props.step;
 
     let val = v;
     if (val <= min) {
@@ -238,21 +230,18 @@ class Slider extends React.Component {
     if (val >= max) {
       val = max;
     }
-    if (state.handle === 'upperBound' && val <= state.lowerBound) {
+    if (handle === 'upperBound' && val <= lowerBound) {
-      val = state.lowerBound;
+      val = lowerBound;
     }
-    if (state.handle === 'lowerBound' && val >= state.upperBound) {
+    if (handle === 'lowerBound' && val >= upperBound) {
-      val = state.upperBound;
+      val = upperBound;
     }
 
-    const valModStep = (val - min) % step;
+    const points = this.getPoints().map(parseFloat);
-    let alignValue = val - valModStep;
+    const diffs = points.map((point) => Math.abs(val - point));
+    const closestPoint = points[diffs.indexOf(Math.min.apply(Math, diffs))];
 
-    if (Math.abs(valModStep) * 2 >= step) {
+    return closestPoint;
-      alignValue += (valModStep > 0) ? step : (-step);
-    }
-
-    return parseFloat(alignValue.toFixed(5));
   }
 
   calcOffset(value) {
@@ -273,33 +262,6 @@ class Slider extends React.Component {
     return nextValue;
   }
 
-  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);
-  }
-
-  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
@@ -323,18 +285,17 @@ class Slider extends React.Component {
 
   end(type) {
     this.removeEventons(type);
-    this.triggerEvents('onAfterChange');
+    this.props.onAfterChange(this.getValue());
-    this.setState({ handle: null });
+    this.setState({handle: null});
   }
 
   render() {
     const {handle, upperBound, lowerBound} = this.state;
-    const props = this.props;
+    const {className, prefixCls, disabled, dots, included, range,
-    const {className, prefixCls, disabled, included, isIncluded, dots, withDots, range} = props;
+           marks, max, min, tipTransitionName, tipFormatter, children} = this.props;
-    const {marks, step, max, min, tipTransitionName, children} = props;
+    const marksCount = Object.keys(marks).length;
-    const marksLen = marks.length;
 
-    const sliderClassName = rcUtil.classSet({
+    const sliderClassName = classSet({
       [prefixCls]: true,
       [prefixCls + '-disabled']: disabled,
       [className]: !!className,
@@ -344,49 +305,36 @@ class Slider extends React.Component {
     const lowerOffset = this.calcOffset(lowerBound);
 
     let track = null;
-    if ((included && isIncluded) || range) {
+    if (included || range) {
       const trackClassName = prefixCls + '-track';
-      track = <Track className={trackClassName} offset={lowerOffset} length={upperOffset - lowerOffset} />;
+      track = <Track className={trackClassName} offset={lowerOffset} length={upperOffset - lowerOffset}/>;
     }
 
     const handleClassName = prefixCls + '-handle';
-    const isNoTip = marksLen > 0;
+    const isNoTip = (marksCount > 0) && !tipFormatter;
-    const upper = (<Handle className={handleClassName} tipTransitionName={tipTransitionName} noTip={isNoTip}
+    const upper = (<Handle className={handleClassName} tipTransitionName={tipTransitionName} noTip={isNoTip} tipFormatter={tipFormatter}
                      offset={upperOffset} value={upperBound} dragging={handle === 'upperBound'} />);
 
     let lower = null;
     if (range) {
-      lower = (<Handle className={handleClassName} tipTransitionName={tipTransitionName} noTip={isNoTip}
+      lower = (<Handle className={handleClassName} tipTransitionName={tipTransitionName} noTip={isNoTip} tipFormatter={tipFormatter}
                  offset={lowerOffset} value={lowerBound} dragging={handle === 'lowerBound'} />);
     }
 
-    const upperIndex = this.getIndex(upperBound);
+    const isIncluded = included || range;
-
-    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)}
+           onTouchStart={disabled ? noop : this.onTouchStart.bind(this)}
-        onMouseDown={disabled ? noop : this.onSliderMouseDown.bind(this)}>
+           onMouseDown={disabled ? noop : this.onMouseDown.bind(this)}>
         {track}
         {upper}
         {lower}
-        {steps}
+        <Steps prefixCls={prefixCls} points={this.getPoints()} dots={dots}
-        {mark}
+               included={isIncluded} lowerBound={lowerBound}
+               upperBound={upperBound} max={max} min={min} />
+        <Marks className={prefixCls + '-mark'} marks={marks}
+               included={isIncluded} lowerBound={lowerBound}
+               upperBound={upperBound} max={max} min={min} />
         {children}
       </div>
     );
@@ -401,14 +349,11 @@ Slider.propTypes = {
     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.object,
-  marks: React.PropTypes.array,
-  isIncluded: React.PropTypes.bool, // @Deprecated
   included: React.PropTypes.bool,
   className: React.PropTypes.string,
   prefixCls: React.PropTypes.string,
@@ -418,24 +363,24 @@ Slider.propTypes = {
   onChange: React.PropTypes.func,
   onAfterChange: React.PropTypes.func,
   tipTransitionName: React.PropTypes.string,
-  withDots: React.PropTypes.bool, // @Deprecated
+  tipFormatter: React.PropTypes.func,
   dots: React.PropTypes.bool,
   range: React.PropTypes.bool,
 };
 
 Slider.defaultProps = {
+  prefixCls: 'rc-slider',
+  className: '',
+  tipTransitionName: '',
   min: 0,
   max: 100,
   step: 1,
-  defaultIndex: 0,
+  marks: {},
-  marks: [],
+  onBeforeChange: noop,
-  isIncluded: true, // @Deprecated
+  onChange: noop,
+  onAfterChange: noop,
   included: true,
-  className: '',
-  prefixCls: 'rc-slider',
   disabled: false,
-  tipTransitionName: '',
-  withDots: false, // @Deprecated
   dots: false,
   range: false,
 };

src/Steps.jsx

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

tests/index.spec.js

@@ -14,7 +14,7 @@ describe('rc-slider', function () {
   document.body.appendChild(div);
 
   afterEach(function () {
-    React.unmountComponentAtNode(div);
+    ReactDOM.unmountComponentAtNode(div);
   });
 
   it('should render a simple slider with value correctly!', function () {
@@ -52,17 +52,17 @@ describe('rc-slider', function () {
 
   it('should render a slider with marks correctly!', function () {
     var slider = ReactDOM.render(
-      <Slider marks={["一","二","三","四","五"]} defaultIndex={3} />,
+      <Slider marks={{0: "一", 20: "二", 40: "三", 60: "四", 100: "五"}} defaultValue={40} />,
       div
     );
     var node = $(div);
     expect(node.find('.rc-slider').length).to.be(1);
     expect(node.find('.rc-slider-handle').length).to.be(1);
     expect(node.find('.rc-slider-track').length).to.be(1);
-    expect(node.find('.rc-slider-dot').length).to.be(slider.props.marks.length);
+    expect(node.find('.rc-slider-dot').length).to.be(Object.keys(slider.props.marks).length);
     expect(node.find('.rc-slider-mark').length).to.be(1);
-    expect(node.find('.rc-slider-mark-text').length).to.be(slider.props.marks.length);
+    expect(node.find('.rc-slider-mark-text').length).to.be(Object.keys(slider.props.marks).length);
-    expect(slider.getIndex(slider.state.upperBound)).to.be(3);
+    expect(slider.state.upperBound).to.be(40);
   });
 
   // it('should mouseDown works!', function (done) {