Merge pull request #10 from benjycui/master

修复 Slider 初始 `upperBound` 与 `sliderLength` 错误的 Bug。

.jscsrc

@@ -1,27 +0,0 @@
-{
-    "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
-    "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
-    "requireSpacesInFunctionExpression": {
-        "beforeOpeningCurlyBrace": true
-    },
-    "disallowSpacesInsideArrayBrackets": true,
-    "disallowSpacesInsideObjectBrackets": true,
-    "disallowSpacesInsideParentheses": true,
-    "disallowQuotedKeysInObjects": "allButReserved",
-    "disallowSpaceAfterObjectKeys": true,
-    "requireSpaceBeforeBinaryOperators": ["-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<=" ],
-    "requireSpacesInConditionalExpression": {
-        "afterTest": true,
-        "beforeConsequent": true,
-        "afterConsequent": true,
-        "beforeAlternate": true
-    },
-    "requireSpaceAfterBinaryOperators": ["/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
-    "disallowKeywords": [ "with" ],
-    "disallowSpaceAfterPrefixUnaryOperators": [ "!" , "++", "--", "+", "-", "~"],
-    "disallowSpaceBeforePostfixUnaryOperators": ["++", "--", ","],
-    "disallowMultipleLineBreaks": true,
-    "disallowKeywordsOnNewLine": ["else"],
-    "safeContextKeyword": "self",
-    "excludeFiles": ["lib/**/parser.js"]
-}

.jshintrc

@@ -1,28 +0,0 @@
-{
-    "camelcase": true,
-    "curly": true,
-    "eqeqeq": true,
-    "freeze": true,
-    "indent": 4,
-    "latedef": "nofunc",
-    "quotmark": "false",
-    "nonew": true,
-    "newcap": false,
-    "immed": true,
-    "noarg": true,
-    "eqnull": true,
-    "trailing": true,
-    "undef": true,
-    "unused": true,
-    "browser": true,
-    "node": true,
-    "esnext": true,
-    "globals": {
-        "describe": false,
-        "expect": false,
-        "beforeEach": false,
-        "afterEach": false,
-        "modulex": false,
-        "it": false
-    }
-}

HISTORY.md

@@ -0,0 +1,9 @@
+# History
+----
+
+
+## 1.2.5 / 2015-07-13
+
+[#8](https://github.com/react-component/slider/issues/8) add `isIncluded` props   ([@simaQ](https://github.com/simaQ))
+
+[#7](https://github.com/react-component/slider/issues/7) add tooltip for handler when slider has no `marks` props   ([@simaQ](https://github.com/simaQ))

README.md

@@ -106,6 +106,12 @@ React.render(<Rcslider />, container);
           <td>[]</td>
           <td>mark every step for the slider, it will ignore the `step` parameter if it has been defined</td>
         </tr>
+        <tr>
+          <td>isIncluded</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>
+        </tr>
         <tr>
           <td>index</td>
           <td>number</td>

assets/index.less

@@ -1,22 +1,37 @@
 @prefixClass: rc-slider;
 
-// color
+@disabledColor: #ccc;
-@disabledColor: #e7eaec;
+@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;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0); //  remove tap highlight color for mobile safari
+}
+
+*:before,
+*:after {
+  box-sizing: border-box;
+}
 
 .@{prefixClass} {
   position: relative;
-  margin: 6px;
   height: 4px;
   width: 100%;
-  border-radius: 2px;
+  border-radius: @border-radius-base;
   background-color: #e9e9e9;
 
   &-track {
     position: absolute;
     left: 0;
     height: 4px;
-    border-radius: 2px;
+    border-radius: @border-radius-base;
-    background-color: #b2e9fd;
+    background-color: tint(@primary-color, 60%);
     z-index: 1;
   }
 
@@ -24,26 +39,21 @@
     position: absolute;
     margin-left: -7px;
     margin-top: -5px;
-    width: 10px;
+    width: 14px;
-    height: 10px;
+    height: 14px;
-    cursor: default;
+    cursor: pointer;
     border-radius: 50%;
-    border: solid 2px #d9d9d9;
+    border: solid 2px tint(@primary-color, 50%);
     background-color: #fff;
     z-index: 2;
 
     &:hover {
-      border-color: #999;
+      border-color: tint(@primary-color, 20%);
     }
     &-active {
-      border-color: #8cddfc;
       &:active {
-        border-color: #2db7f5;
+        border-color: tint(@primary-color, 20%);
-        background-color: #2db7f5;
+        box-shadow: 0 0 5px tint(@primary-color, 20%);
-        box-shadow: 0 0 3px rgba(45, 183, 245, .75);
-      }
-      &:hover {
-        border-color: #23c0fa;
       }
     }
   }
@@ -51,9 +61,8 @@
   &-mark {
     position: absolute;
     top: 10px;
-    left: 0px;
+    left: 0;
     width: 100%;
-    height: 20px;
     font-size: 12px;
     z-index: 3;
   }
@@ -61,17 +70,13 @@
   &-mark-text {
     position: absolute;
     display: inline-block;
-    line-height: 1.5;
-    height: 20px;
     vertical-align: middle;
     text-align: center;
     cursor: pointer;
-    color: #ccc;
+    color: #999;
-    &:first-child {
+
-      text-align: left;
-    }
     &-active {
-      color: #999;
+      color: #666;
     }
   }
 
@@ -87,26 +92,26 @@
     position: absolute;
     top: -2px;
     margin-left: -4px;
-    width: 4px;
+    width: 8px;
-    height: 4px;
+    height: 8px;
-    border: 2px solid #fff;
+    border: 2px solid #e9e9e9;
-    background-color: #bcbcbc;
+    background-color: #fff;
     cursor: pointer;
     border-radius: 50%;
     vertical-align: middle;
     &:first-child {
-      margin-left: -2px;
+      margin-left: -4px;
     }
     &:last-child {
-      margin-left: -6px;
+      margin-left: -4px;
     }
     &-active {
-      background-color: #8cddfc;
+      border-color: tint(@primary-color, 50%);
     }
   }
 
   &-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,5 +1,7 @@
-// use jsx to render html, do not modify simple.html
+'use strict';
+
 require('rc-slider/assets/index.css');
+
 var Slider = require('rc-slider');
 var React = require('react');
 // React.render(<Slider marks={["一","二","三","四","五"]} index={3}/>, document.getElementById('__react-content'));

index.js

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-slider",
-  "version": "1.1.1",
+  "version": "1.2.5",
   "description": "slider ui component for react",
   "keywords": [
     "react",
@@ -18,11 +18,7 @@
     "url": "http://github.com/react-component/slider/issues"
   },
   "licenses": "MIT",
-  "spm": {
+  "main": "./lib/index.js",
-    "dependencies": {
-      "react": "*"
-    }
-  },
   "config": {
     "port": 8000
   },
@@ -46,13 +42,13 @@
     "rc-tools": "3.x",
     "react": "^0.13.x",
     "node-dev": "2.x",
-    "jquery": "^1.11.2",
+    "jquery": "^1.11.2"
-    "css-loader": "^0.9.1"
   },
   "precommit": [
     "precommit"
   ],
   "dependencies": {
+    "rc-tooltip": "^2.4.0",
     "rc-util": "^2.0.2"
   }
 }

src/Slider.jsx

@@ -1,6 +1,7 @@
 'use strict';
 
 var React = require('react');
+var Tooltip = require('rc-tooltip');
 var DomUtils = require('rc-util').Dom;
 
 function pauseEvent(e) {
@@ -10,9 +11,6 @@ function pauseEvent(e) {
   if (e.preventDefault) {
     e.preventDefault();
   }
-  e.cancelBubble = true;
-  e.returnValue = false;
-  return false;
 }
 
 function prefixClsFn(prefixCls) {
@@ -30,6 +28,7 @@ var Slider = React.createClass({
     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,
@@ -44,6 +43,7 @@ var Slider = React.createClass({
       step: 1,
       value: 0,
       marks: [],
+      isIncluded: true,
       className: 'rc-slider',
       disabled: false,
       index: 0
@@ -74,7 +74,7 @@ var Slider = React.createClass({
 
   componentDidMount: function() {
     this._onHandleResizeListener = DomUtils.addEventListener(window, 'resize', this.handleResize);
-    this.handleResize();
+    setTimeout(this.handleResize, 0);
   },
 
   componentWillUnmount: function() {
@@ -93,7 +93,7 @@ var Slider = React.createClass({
       return 0;
     }
     var value = this.state.value;
-    var unit = (props.max - props.min) / (props.marks.length - 1);
+    var unit = ((props.max - props.min) / (props.marks.length - 1)).toFixed(5);
     return Math.floor(value / unit);
   },
 
@@ -130,7 +130,7 @@ var Slider = React.createClass({
   },
 
   _calValueByPos: function (position, callback) {
-    var pixelOffset = position - this.state.sliderStart;
+    var pixelOffset = position - this.getSliderStart();
     // pixelOffset -= (this.state.handleSize / 2);
 
     var nextValue = this._trimAlignValue(this._calcValue(pixelOffset));
@@ -142,6 +142,11 @@ var Slider = React.createClass({
     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;
@@ -150,17 +155,27 @@ var Slider = React.createClass({
     }
   },
 
-  _addEventHandles: function() {
+  _addEventHandles: function(type) {
-    this._onMouseMoveListener = DomUtils.addEventListener(document, 'mousemove', this._onMouseMove);
+    if (type === 'touch') {
-    this._onMouseUpListener = DomUtils.addEventListener(document, 'mouseup', this._onMouseUp);
+      // 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);
-  _removeEventHandles: function () {
-    if (this._onMouseMoveListener) {
-      this._onMouseMoveListener.remove();
     }
 
-    if (this._onMouseUpListener) {
+    if (type === 'mouse') {
+      this._onMouseMoveListener = DomUtils.addEventListener(document, 'mousemove', this._onMouseMove);
+      this._onMouseUpListener = DomUtils.addEventListener(document, 'mouseup', this._onMouseUp);
+    }
+  },
+
+  _removeEventHandles: function (type) {
+    if (type === 'touch') {
+      this._onTouchMoveListener.remove();
+      this._onTouchUpListener.remove();
+    }
+
+    if (type === 'mouse') {
+      this._onMouseMoveListener.remove();
       this._onMouseUpListener.remove();
     }
   },
@@ -178,18 +193,37 @@ var Slider = React.createClass({
     });
   },
 
-  _end: function() {
+  _end: function(type) {
-    this._removeEventHandles();
+    this._removeEventHandles(type);
     this.setState(this._triggerEvents.bind(this, 'onAfterChange'));
   },
 
   _onMouseUp: function() {
-    this._end();
+    this._end('mouse');
+  },
+
+  _onTouchUp: function() {
+    this._end('touch');
   },
 
   _onMouseMove: function(e) {
-    pauseEvent(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;
+    }
+
+    var position = this._getTouchPosition(e);
+
+    this._handleMove(e, position);
+  },
+
+  _handleMove: function(e, position) {
+    pauseEvent(e);
+    // var position = this._getMousePosition(e);
     var props = this.props;
     var state = this.state;
 
@@ -217,11 +251,29 @@ var Slider = React.createClass({
 
     this.setState({
       upperBound: slider.clientWidth,
-      sliderLength: Math.abs(sliderMax - sliderMin),
+      sliderLength: Math.abs(sliderMax - sliderMin)
-      sliderStart: sliderMin
     });
   },
 
+  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;
+    }
+
+    var position = this._getTouchPosition(e);
+    this.startPosition = position;
+    this._start(position);
+    this._addEventHandles('touch');
+    pauseEvent(e);
+  },
+
   handleMouseDown: function() {
     return (e) => {
       if (this.props.disabled) {
@@ -229,7 +281,7 @@ var Slider = React.createClass({
       }
       var position = this._getMousePosition(e);
       this._start(position);
-      this._addEventHandles();
+      this._addEventHandles('mouse');
       pauseEvent(e);
     };
   },
@@ -243,9 +295,10 @@ var Slider = React.createClass({
       () => {
         this._triggerEvents('onChange');
         this._start(position);
-        this._addEventHandles();
+        this._addEventHandles('mouse');
       }
     );
+
     pauseEvent(e);
   },
 
@@ -265,9 +318,14 @@ var Slider = React.createClass({
         left: offset.toFixed(5)
       };
       var className = prefixClsFn(prefixCls, 'dot');
-      if (i <= this.getIndex() || (this._calcValue(offset) <= this.getValue())) {
+      if (props.isIncluded) {
-        className = prefixClsFn(prefixCls, 'dot', 'dot-active');
+        if (i <= this.getIndex() || (this._calcValue(offset) <= this.getValue())) {
+          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>
       );
@@ -290,18 +348,21 @@ var Slider = React.createClass({
       width: (unit / 2).toFixed(5)
     };
 
-    if (i === (marksLen - 1)) {
+    if (i === marksLen - 1) {
-      style.right = '0';
+      style.right = -(style.width / 2).toFixed(5);
-      style.width = 'auto';
+    } else {
-    }else {
+      style.left = i > 0 ? (offset - unit / 4).toFixed(5) : -(style.width / 2).toFixed(5);
-      style.left = (i > 0 ? (offset - (unit / 4)).toFixed(5) : offset);
     }
 
     var prefixCls = this.props.className;
     var className = prefixClsFn(prefixCls, 'mark-text');
 
-    if (i <= this.getIndex()) {
+    if (this.props.isIncluded) {
-      className = prefixClsFn(prefixCls, 'mark-text', 'mark-text-active');
+      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 (
@@ -339,13 +400,26 @@ var Slider = React.createClass({
       className =  prefixClsFn(prefixCls, 'handle', 'handle-active');
     }
 
-    return (
+    var handle =  <a className={className}
-      <a className={className}
         ref = "handle"
         style = {handleStyle}
         href = "#"
-        onMouseDown={this.handleMouseDown}></a>
+        onMouseDown = {this.handleMouseDown}
-    );
+        onTouchStart = {this.handleTouchStart}></a>;
+
+    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) {
@@ -368,13 +442,13 @@ var Slider = React.createClass({
     var value = state.value;
     var offset = this._calcOffset(value);
 
-    var track = this.renderTrack(offset);
+    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 ? prefixClsFn(prefixCls, 'disabled') : prefixCls;
+    var sliderClassName = props.disabled ? prefixCls + ' ' + prefixClsFn(prefixCls, 'disabled') : prefixCls;
 
     return (
       <div className={sliderClassName} ref="slider" onMouseDown={this.handleSliderMouseDown}>
@@ -382,6 +456,7 @@ var Slider = React.createClass({
         {handles}
         {steps}
         {sliderMarks}
+        {this.props.children}
       </div>
     );
   }

src/index.js

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

tests/index.spec.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var expect = require('expect.js');
 var Slider = require('../index.js');
 var React = require('react');