bump 3.8.1

Extend the handle classNames, and provide props so that
upper/lower handles are easily distinguishable in CSS & React.

* Use classNames() instead of string concatenation

examples/slider.js

@@ -28,8 +28,11 @@ const CustomizedSlider = React.createClass({
       value: value,
     });
   },
+  onAfterChange: function(value) {
+    console.log(value);
+  },
   render: function() {
-    return <Slider value={this.state.value} onChange={this.onSliderChange} />;
+    return <Slider value={this.state.value} onChange={this.onSliderChange} onAfterChange={this.onAfterChange} />;
   },
 });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-slider",
-  "version": "3.7.0",
+  "version": "3.8.1",
   "description": "slider ui component for react",
   "keywords": [
     "react",
@@ -42,17 +42,17 @@
     "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"
+    "react": "^15.2.1",
+    "react-addons-test-utils": "^15.2.1",
+    "react-dom": "^15.2.1"
   },
   "pre-commit": [
     "lint"
   ],
   "dependencies": {
-    "classnames": "^2.2.1",
-    "rc-tooltip": "3.x",
-    "rc-util": "3.x",
-    "warning": "^2.1.0"
+    "classnames": "^2.2.5",
+    "rc-tooltip": "^3.4.2",
+    "rc-util": "^3.2.1",
+    "warning": "^3.0.0"
   }
 }

src/Handle.jsx

@@ -23,34 +23,49 @@ export default class Handle extends React.Component {
   }
 
   render() {
-    const props = this.props;
-    const {className, tipTransitionName, tipFormatter, vertical, offset, value} = props;
-    const {dragging, noTip} = props;
+    const {
+      prefixCls,
+      className,
+      tipTransitionName,
+      tipFormatter,
+      vertical,
+      offset,
+      value,
+      dragging,
+      noTip,
+    } = this.props;
 
     const style = vertical ? { bottom: offset + '%' } : { left: offset + '%' };
-    const handle = (<div className={className} style={style}
-                      onMouseUp={this.showTooltip.bind(this)}
-                      onMouseEnter={this.showTooltip.bind(this)}
-                      onMouseLeave={this.hideTooltip.bind(this)}/>);
+    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('slider-handle', 'tooltip')}
-              placement="top"
-              visible={isTooltipVisible}
-              overlay={<span>{tipFormatter(value)}</span>}
-              delay={0}
-              transitionName={tipTransitionName}>
-              {handle}
-            </Tooltip>);
+    return (
+      <Tooltip
+        prefixCls={prefixCls.replace('slider', 'tooltip')}
+        placement="top"
+        visible={isTooltipVisible}
+        overlay={<span>{tipFormatter(value)}</span>}
+        delay={0}
+        transitionName={tipTransitionName}
+      >
+        {handle}
+      </Tooltip>
+    );
   }
 }
 
 Handle.propTypes = {
+  prefixCls: React.PropTypes.string,
   className: React.PropTypes.string,
   vertical: React.PropTypes.bool,
   offset: React.PropTypes.number,

src/Slider.jsx

@@ -1,5 +1,5 @@
 import React, { cloneElement } from 'react';
-import {Dom as DomUtils} from 'rc-util';
+import addEventListener from 'rc-util/lib/Dom/addEventListener';
 import classNames from 'classnames';
 import Track from './Track';
 import DefaultHandle from './Handle';
@@ -167,6 +167,7 @@ class Slider extends React.Component {
   }
 
   onMouseDown(e) {
+    if (e.button !== 0) { return; }
     const position = getMousePosition(this.props.vertical, e);
     this.onStart(position);
     this.addDocumentEvents('mouse');
@@ -269,7 +270,7 @@ class Slider extends React.Component {
 
     const points = Object.keys(marks).map(parseFloat);
     if (step !== null) {
-      const closestStep = Math.round(val / step) * step;
+      const closestStep = (Math.round((val - min) / step) * step) + min;
       points.push(closestStep);
     }
 
@@ -301,11 +302,11 @@ class Slider extends React.Component {
   addDocumentEvents(type) {
     if (type === 'touch') {
       // just work for chrome iOS Safari and Android Browser
-      this.onTouchMoveListener = DomUtils.addEventListener(document, 'touchmove', this.onTouchMove.bind(this));
-      this.onTouchUpListener = DomUtils.addEventListener(document, 'touchend', this.end.bind(this, 'touch'));
+      this.onTouchMoveListener = addEventListener(document, 'touchmove', this.onTouchMove.bind(this));
+      this.onTouchUpListener = addEventListener(document, 'touchend', this.end.bind(this, 'touch'));
     } else if (type === 'mouse') {
-      this.onMouseMoveListener = DomUtils.addEventListener(document, 'mousemove', this.onMouseMove.bind(this));
-      this.onMouseUpListener = DomUtils.addEventListener(document, 'mouseup', this.end.bind(this, 'mouse'));
+      this.onMouseMoveListener = addEventListener(document, 'mousemove', this.onMouseMove.bind(this));
+      this.onMouseUpListener = addEventListener(document, 'mouseup', this.end.bind(this, 'mouse'));
     }
   }
 
@@ -326,9 +327,26 @@ class Slider extends React.Component {
   }
 
   render() {
-    const {handle, upperBound, lowerBound} = this.state;
-    const {className, prefixCls, disabled, vertical, dots, included, range, step,
-      marks, max, min, tipTransitionName, tipFormatter, children} = this.props;
+    const {
+      handle,
+      upperBound,
+      lowerBound,
+    } = this.state;
+    const {
+      className,
+      prefixCls,
+      disabled,
+      vertical,
+      dots,
+      included,
+      range,
+      step,
+      marks,
+      max, min,
+      tipTransitionName,
+      tipFormatter,
+      children,
+    } = this.props;
 
     const customHandle = this.props.handle;
 
@@ -336,17 +354,44 @@ class Slider extends React.Component {
     const lowerOffset = this.calcOffset(lowerBound);
 
     const handleClassName = prefixCls + '-handle';
+
+    const upperClassName = classNames({
+      [handleClassName]: true,
+      [handleClassName + '-upper']: true,
+    });
+
+    const lowerClassName = classNames({
+      [handleClassName]: true,
+      [handleClassName + '-lower']: true,
+    });
+
     const isNoTip = (step === null) || (tipFormatter === null);
 
-    const upper = cloneElement(customHandle, { className: handleClassName,
-        noTip: isNoTip, tipTransitionName: tipTransitionName, tipFormatter: tipFormatter,
-        vertical: vertical, offset: upperOffset, value: upperBound, dragging: handle === 'upperBound' });
+    const commonHandleProps = {
+      prefixCls,
+      noTip: isNoTip,
+      tipTransitionName,
+      tipFormatter,
+      vertical,
+    };
+
+    const upper = cloneElement(customHandle, {
+      ...commonHandleProps,
+      className: upperClassName,
+      value: upperBound,
+      offset: upperOffset,
+      dragging: handle === 'upperBound',
+    });
 
     let lower = null;
     if (range) {
-      lower = cloneElement(customHandle, { className: handleClassName,
-        noTip: isNoTip, tipTransitionName: tipTransitionName, tipFormatter: tipFormatter,
-        vertical: vertical, offset: lowerOffset, value: lowerBound, dragging: handle === 'lowerBound' });
+      lower = cloneElement(customHandle, {
+        ...commonHandleProps,
+        className: lowerClassName,
+        value: lowerBound,
+        offset: lowerOffset,
+        dragging: handle === 'lowerBound',
+      });
     }
 
     const sliderClassName = classNames({
@@ -358,18 +403,19 @@ class Slider extends React.Component {
     const isIncluded = included || range;
     return (
       <div ref="slider" className={sliderClassName}
-           onTouchStart={disabled ? noop : this.onTouchStart.bind(this)}
-           onMouseDown={disabled ? noop : this.onMouseDown.bind(this)}>
+        onTouchStart={disabled ? noop : this.onTouchStart.bind(this)}
+        onMouseDown={disabled ? noop : this.onMouseDown.bind(this)}
+      >
         {upper}
         {lower}
         <Track className={prefixCls + '-track'} vertical = {vertical} included={isIncluded}
-               offset={lowerOffset} length={upperOffset - lowerOffset}/>
+          offset={lowerOffset} length={upperOffset - lowerOffset} />
         <Steps prefixCls={prefixCls} vertical = {vertical} marks={marks} dots={dots} step={step}
-              included={isIncluded} lowerBound={lowerBound}
-              upperBound={upperBound} max={max} min={min}/>
+          included={isIncluded} lowerBound={lowerBound}
+          upperBound={upperBound} max={max} min={min} />
         <Marks className={prefixCls + '-mark'} vertical = {vertical} marks={marks}
-               included={isIncluded} lowerBound={lowerBound}
-               upperBound={upperBound} max={max} min={min}/>
+          included={isIncluded} lowerBound={lowerBound}
+          upperBound={upperBound} max={max} min={min} />
         {children}
       </div>
     );