support value/index

change value to defaultValue

README.md

@@ -95,7 +95,7 @@ React.render(<Rcslider />, container);
           <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>
-          <td>value</td>
+          <td>defaultValue</td>
           <td>number</td>
           <td>0</td>
           <td>Determines the initial positions of the handles.</td>
@@ -113,7 +113,7 @@ React.render(<Rcslider />, container);
           <td>if the value is true, it means a continuous value interval, otherwise, it is a independent value.</td>
         </tr>
         <tr>
-          <td>index</td>
+          <td>defaultIndex</td>
           <td>number</td>
           <td>0</td>
           <td>For step or marks slider, determine the initial positions of the handles.</td>
@@ -138,7 +138,7 @@ npm start
 
 http://localhost:8000/examples/
 
-online example: http://react-component.github.io/slider/build/examples/
+online example: http://react-component.github.io/slider/examples/
 
 ## Test Case
 

assets/index.less

@@ -3,6 +3,11 @@
 @disabledColor: #ccc;
 @border-radius-base: 6px;
 @primary-color: #2db7f5;
+@tooltip-color: #fff;
+@tooltip-bg: tint(#666, 4%);
+@tooltip-arrow-width: 4px;
+@tooltip-distance: @tooltip-arrow-width+4;
+@tooltip-arrow-color: @tooltip-bg;
 
 * {
   box-sizing: border-box;
@@ -106,7 +111,7 @@
   }
 
   &-disabled {
-    background-color: @disabledColor;
+    background-color: #e9e9e9;
 
     .@{prefixClass}-track {
       background-color: @disabledColor;
@@ -122,4 +127,51 @@
       cursor: not-allowed!important;
     }
   }
+
+  // slider tooltip style
+  &-tooltip {
+    position: absolute;
+    left: -9999px;
+    top: -9999px;
+    z-index: 4;
+    visibility: visible;
+
+    &-hidden {
+      display: none;
+    }
+
+    &-placement-top { 
+      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-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/simple.js

@@ -1,9 +1,14 @@
 'use strict';
 
 require('rc-slider/assets/index.css');
-require('rc-tooltip/assets/bootstrap.css');
+
 var Slider = require('rc-slider');
 var React = require('react');
+
+function onChange(v){
+  console.log(v);
+}
+
 // 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'));
+React.render(<div style={{width:400,margin:100}}><Slider onChange={onChange}/></div>, document.getElementById('__react-content'));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-slider",
-  "version": "1.2.5",
+  "version": "1.3.1",
   "description": "slider ui component for react",
   "keywords": [
     "react",

src/Slider.jsx

@@ -2,9 +2,15 @@
 
 var React = require('react');
 var Tooltip = require('rc-tooltip');
-var DomUtils = require('rc-util').Dom;
+var rcUtil = require('rc-util');
+var DomUtils = rcUtil.Dom;
+
+function noop() {
+}
 
 function pauseEvent(e) {
+  e.cancelBubble = true;
+  e.returnValue = false;
   if (e.stopPropagation) {
     e.stopPropagation();
   }
@@ -20,11 +26,29 @@ function prefixClsFn(prefixCls) {
   }).join(' ');
 }
 
+function getValueFromIndex(props) {
+  var value;
+  var marksLen = props.marks.length;
+  var index;
+  if ('index' in props) {
+    index = props.index;
+  } else {
+    index = props.defaultIndex;
+  }
+  if (marksLen > 0) {
+    value = ((props.max - props.min) / (marksLen - 1)) * (index);
+    value = value.toFixed(5);
+  }
+  return value;
+}
+
 var 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,
@@ -36,68 +60,62 @@ var Slider = React.createClass({
     onAfterChange: React.PropTypes.func
   },
 
-  getDefaultProps: function() {
+  getDefaultProps() {
     return {
       min: 0,
       max: 100,
       step: 1,
-      value: 0,
+      defaultValue: 0,
       marks: [],
       isIncluded: true,
-      className: 'rc-slider',
+      className: '',
+      prefixCls: 'rc-slider',
       disabled: false,
-      index: 0
+      defaultIndex: 0
     };
   },
 
-  getInitialState: function() {
+  getInitialState() {
     var props = this.props;
-    var value = this._trimAlignValue(props.value);
+    var value = props.defaultValue;
+    if ('value' in props) {
+      value = props.value;
+    }
+    value = this._trimAlignValue(value);
     var marksLen = props.marks.length;
     if (marksLen > 0) {
-      value = ((props.max - props.min) / (marksLen - 1)) * (props.index);
-      value = value.toFixed(5);
+      value = getValueFromIndex(props);
     }
-
     return {
-      upperBound: 0,
-      sliderLength: 0,
-      value: value,
-      active: props.disabled ? '' : ((value > props.min || props.index > 0) ? 'active' : '')
+      value: value
     };
   },
 
-  componentWillReceiveProps: function(newProps) {
-    var value = newProps.value;
-    this.state.value = this._trimAlignValue(value, newProps);
-  },
-
-  componentDidMount: function() {
-    this._onHandleResizeListener = DomUtils.addEventListener(window, 'resize', this.handleResize);
-    this.handleResize();
-  },
-
-  componentWillUnmount: function() {
-    if (this._onHandleResizeListener) {
-      this._onHandleResizeListener.remove();
+  componentWillReceiveProps(nextProps) {
+    if ('value' in nextProps) {
+      this.setState({
+        value: nextProps.value
+      });
+    } else if ('index' in nextProps) {
+      this.setState({
+        value: getValueFromIndex(nextProps)
+      });
     }
   },
 
-  getValue: function() {
-    return this.state.value;
-  },
-
-  getIndex: function() {
+  getIndex() {
     var props = this.props;
-    if (props.marks.length === 0) {
-      return 0;
-    }
     var value = this.state.value;
-    var unit = ((props.max - props.min) / (props.marks.length - 1)).toFixed(5);
-    return Math.floor(value / unit);
+
+    if (props.marks.length === 0) {
+      return Math.floor((value - props.min) / props.step);
+    } else {
+      var unit = ((props.max - props.min) / (props.marks.length - 1)).toFixed(5);
+      return Math.round(value / unit);
+    }
   },
 
-  _trimAlignValue: function(val, props) {
+  _trimAlignValue(val, props) {
     props = props || this.props;
 
     var step = props.marks.length > 0 ? (props.max - props.min) / (props.marks.length - 1) : props.step;
@@ -119,35 +137,34 @@ var Slider = React.createClass({
     return parseFloat(alignValue.toFixed(5));
   },
 
-  _calcOffset: function(value) {
+  _calcOffset(value) {
     var ratio = (value - this.props.min) / (this.props.max - this.props.min);
-    return ratio * this.state.upperBound;
+    return ratio * 100 + '%';
   },
 
-  _calcValue: function(offset) {
-    var ratio = offset / this.state.upperBound;
+  _calcValue(offset) {
+    var ratio = offset / this.getSliderLength();
     return ratio * (this.props.max - this.props.min) + this.props.min;
   },
 
-  _calValueByPos: function (position, callback) {
+  _calValueByPos(position) {
     var pixelOffset = position - this.getSliderStart();
     // pixelOffset -= (this.state.handleSize / 2);
-
     var nextValue = this._trimAlignValue(this._calcValue(pixelOffset));
-
-    this.setState({value: nextValue, active: 'active'}, callback);
+    // do not use setState
+    this.state.value = nextValue;
+    this.setState({
+      value: nextValue
+    });
+    return nextValue;
   },
 
-  _getMousePosition: function(e) {
-    return e.pageX || (e.clientX + document.documentElement.scrollLeft);
-  },
-
-  _getTouchPosition: function (e) {
+  _getTouchPosition(e) {
     var touch = e.touches[0];
     return touch.pageX;
   },
 
-  _triggerEvents: function(event) {
+  _triggerEvents(event) {
     var props = this.props;
     var hasMarks = props.marks && props.marks.length > 0;
     if (props[event]) {
@@ -155,64 +172,54 @@ var Slider = React.createClass({
     }
   },
 
-  _addEventHandles: function(type) {
+  _addEventHandles(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);
-    }
-
-    if (type === 'mouse') {
+    } else if (type === 'mouse') {
       this._onMouseMoveListener = DomUtils.addEventListener(document, 'mousemove', this._onMouseMove);
       this._onMouseUpListener = DomUtils.addEventListener(document, 'mouseup', this._onMouseUp);
     }
   },
 
-  _removeEventHandles: function (type) {
+  _removeEventHandles(type) {
     if (type === 'touch') {
       this._onTouchMoveListener.remove();
       this._onTouchUpListener.remove();
-    }
-
-    if (type === 'mouse') {
+    } else if (type === 'mouse') {
       this._onMouseMoveListener.remove();
       this._onMouseUpListener.remove();
     }
   },
 
-  _start: function(position) {
-    if (document.activeElement) {
-      document.activeElement.blur();
-    }
-
+  _start(position) {
     this._triggerEvents('onBeforeChange');
-
-    this.setState({
-      startValue: this.state.value,
-      startPosition: position
-    });
+    this.startValue = this.state.value;
+    this.startPosition = position;
   },
 
-  _end: function(type) {
+  _end(type) {
     this._removeEventHandles(type);
-    this.setState(this._triggerEvents.bind(this, 'onAfterChange'));
+    this._triggerEvents('onAfterChange');
   },
 
-  _onMouseUp: function() {
+  _onMouseUp() {
     this._end('mouse');
   },
 
-  _onTouchUp: function() {
+  _onTouchUp() {
     this._end('touch');
   },
 
-  _onMouseMove: function(e) {
-    var position = this._getMousePosition(e);
+  _onMouseMove(e) {
+    var position = e.pageX;
     this._handleMove(e, position);
   },
 
-  _onTouchMove: function(e) {
+  _onTouchMove(e) {
     if (e.touches.length > 1 || (e.type === 'touchend' && e.touches.length > 0)) {
+      this._end('touch');
       return;
     }
 
@@ -221,105 +228,83 @@ var Slider = React.createClass({
     this._handleMove(e, position);
   },
 
-  _handleMove: function(e, position) {
+  _handleMove(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 diffPosition = position - this.startPosition;
 
-    var diffValue = diffPosition / (state.sliderLength) * (props.max - props.min);
-    var newValue = this._trimAlignValue(state.startValue + diffValue);
+    var diffValue = diffPosition / this.getSliderLength() * (props.max - props.min);
+    var newValue = this._trimAlignValue(this.startValue + diffValue);
 
     value = newValue;
 
     if (newValue !== oldValue) {
-      this.setState({value: value, active: 'active'}, this._triggerEvents.bind(this, 'onChange'));
+      this.setState({value: value});
+      this._triggerEvents('onChange');
     }
   },
 
-  handleResize: function() {
-    var slider = this.refs.slider.getDOMNode();
-    var rect = slider.getBoundingClientRect();
+  getSliderLength() {
+    var slider = this.refs.slider;
+    if (!slider) {
+      return 0;
+    }
 
-    var sliderMin = rect.left;
-    var sliderMax = rect.right;
-
-    this.setState({
-      upperBound: slider.clientWidth,
-      sliderLength: Math.abs(sliderMax - sliderMin)
-    });
+    return slider.getDOMNode().clientWidth;
   },
 
-  getSliderStart: function() {
+  getSliderStart() {
     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)) {
+  handleTouchStart(e) {
+    if (e.touches.length > 1 || (e.type.toLowerCase() === 'touchend' && e.touches.length > 0)) {
       return;
     }
 
     var position = this._getTouchPosition(e);
-    this.startPosition = position;
+    this._calValueByPos(position);
+    this._triggerEvents('onChange');
     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');
-      }
-    );
-
+  handleSliderMouseDown(e) {
+    var position = e.pageX;
+    this._calValueByPos(position);
+    this._triggerEvents('onChange');
+    this._start(position);
+    this._addEventHandles('mouse');
     pauseEvent(e);
   },
 
-  renderSteps: function() {
+  renderSteps() {
     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 = this.state.sliderLength / (stepNum - 1);
+    var unit = 100 / (stepNum - 1);
 
-    var prefixCls = props.className;
+    var prefixCls = props.prefixCls;
     var stepClassName = prefixClsFn(prefixCls, 'step');
 
     var elements = [];
     for (var i = 0; i < stepNum; i++) {
-      var offset = unit * i;
+      var offset = unit * i + '%';
       var style = {
-        left: offset.toFixed(5)
+        left: offset
       };
       var className = prefixClsFn(prefixCls, 'dot');
       if (props.isIncluded) {
-        if (i <= this.getIndex() || (this._calcValue(offset) <= this.getValue())) {
+        if (i <= this.getIndex()) {
           className = prefixClsFn(prefixCls, 'dot', 'dot-active');
         }
       } else {
@@ -338,23 +323,23 @@ var Slider = React.createClass({
     );
   },
 
-  renderMark: function(i) {
+  renderMark(i) {
     var marks = this.props.marks;
     var marksLen = marks.length;
-    var unit = this.state.sliderLength / (marksLen - 1);
+    var unit = 100 / (marksLen - 1);
     var offset = unit * i;
 
     var style = {
-      width: (unit / 2).toFixed(5)
+      width: unit / 2 + '%'
     };
 
     if (i === marksLen - 1) {
-      style.right = -(style.width / 2).toFixed(5);
+      style.right = -unit / 4 + '%';
     } else {
-      style.left = i > 0 ? (offset - unit / 4).toFixed(5) : -(style.width / 2).toFixed(5);
+      style.left = i > 0 ? offset - unit / 4 + '%' : -unit / 4 + '%';
     }
 
-    var prefixCls = this.props.className;
+    var prefixCls = this.props.prefixCls;
     var className = prefixClsFn(prefixCls, 'mark-text');
 
     if (this.props.isIncluded) {
@@ -370,7 +355,7 @@ var Slider = React.createClass({
     );
   },
 
-  renderMarks: function() {
+  renderMarks() {
     var marks = this.props.marks;
     var marksLen = marks.length;
     var elements = [];
@@ -378,7 +363,7 @@ var Slider = React.createClass({
       elements[i] = this.renderMark(i);
     }
 
-    var prefixCls = this.props.className;
+    var prefixCls = this.props.prefixCls;
     var className = prefixClsFn(prefixCls, 'mark');
 
     return (
@@ -388,42 +373,39 @@ var Slider = React.createClass({
     );
   },
 
-  renderHandle: function(offset) {
+  renderHandle(offset) {
     var handleStyle = {
       left: offset
     };
 
-    var prefixCls = this.props.className;
+    var prefixCls = this.props.prefixCls;
     var className = prefixClsFn(prefixCls, 'handle');
 
-    if (this.state.active) {
-      className =  prefixClsFn(prefixCls, 'handle', 'handle-active');
-    }
-
-    var handle =  <a className={className}
-        ref = "handle"
-        style = {handleStyle}
-        href = "#"
-        onMouseDown = {this.handleMouseDown}
-        onTouchStart = {this.handleTouchStart}></a>;
+    var handle = <div className={className}
+      ref = "handle"
+      style = {handleStyle}></div>;
 
     if (this.props.marks.length > 0) {
       return handle;
     } else {
       return (
-        <Tooltip placement="top" overlay={<span>{this.state.value}</span>} delay={0} >
+        <Tooltip
+          placement="top"
+          overlay={<span>{this.state.value}</span>}
+          delay={0}
+          prefixCls={prefixClsFn(prefixCls, 'tooltip')}>
           {handle}
         </Tooltip>
       );
     }
   },
 
-  renderTrack: function(offset) {
+  renderTrack(offset) {
     var style = {
       width: offset
     };
 
-    var prefixCls = this.props.className;
+    var prefixCls = this.props.prefixCls;
     var trackClassName = prefixClsFn(prefixCls, 'track');
 
     return (
@@ -431,7 +413,7 @@ var Slider = React.createClass({
     );
   },
 
-  render: function() {
+  render() {
     var state = this.state;
     var props = this.props;
 
@@ -443,11 +425,18 @@ var Slider = React.createClass({
     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 ? prefixClsFn(prefixCls, 'disabled') : prefixCls;
+    var prefixCls = props.prefixCls;
+    var disabled = props.disabled;
+    var sliderClassName = {
+      [prefixCls]: 1,
+      [props.className]: !!props.className,
+      [`${prefixCls}-disabled`]: disabled
+    };
 
     return (
-      <div className={sliderClassName} ref="slider" onMouseDown={this.handleSliderMouseDown}>
+      <div className={rcUtil.classSet(sliderClassName)} ref="slider"
+        onTouchStart={disabled ? noop : this.handleTouchStart}
+        onMouseDown={disabled ? noop : this.handleSliderMouseDown}>
         {track}
         {handles}
         {steps}

tests/index.spec.js

@@ -18,14 +18,14 @@ describe('rc-slider', function () {
 
   it('should render a simple slider with value correctly!', function () {
     var slider = React.render(
-      <Slider className='rc-slider' value={40}/>,
+      <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.value).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);
   });
@@ -40,12 +40,12 @@ describe('rc-slider', function () {
     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.value).to.be(0);
   });
 
   it('should render a slider with marks correctly!', function () {
     var slider = React.render(
-      <Slider marks={["一","二","三","四","五"]} index={3} />,
+      <Slider marks={["一","二","三","四","五"]} defaultIndex={3} />,
       div
     );
     var node = $(div);
@@ -58,19 +58,19 @@ describe('rc-slider', function () {
     expect(slider.getIndex()).to.be(3);
   });
 
-  it('should mouseDown works!', function (done) {
-    var slider = React.render(
-      <Slider marks={["一","二","三","四","五"]} />,
-      div
-    );
-    var selectedStep = slider.refs.step3.getDOMNode();
+  // it('should mouseDown works!', function (done) {
+  //   var slider = React.render(
+  //     <Slider marks={["一","二","三","四","五"]} />,
+  //     div
+  //   );
+  //   var selectedStep = slider.refs.step3.getDOMNode();
     
-    Simulate.mouseDown(selectedStep);
+  //   Simulate.mouseDown(selectedStep);
 
-    setTimeout( function() {
-      expect(slider.state.active).to.be('active');
-      done();
-    }, 200);
-  });
+  //   setTimeout( function() {
+  //     expect(slider.state.active).to.be('active');
+  //     done();
+  //   }, 200);
+  // });
 
 });