bump 3.7.4

fix: should ignore right button on mousedown

LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+Copyright (c) 2015-present Alipay.com, https://www.alipay.com/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -130,6 +130,12 @@ ReactDOM.render(<Rcslider />, container);
           <td></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>handle</td>
+          <td>Component</td>
+          <td></td>
+          <td>Provide a custom Handle to use in the slider by passing a component. This component will have a `value` and `offset` props used to define custom styling/content.</td>
+        </tr>
         <tr>
           <td>included</td>
           <td>boolean</td>

examples/custom-handles.html

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

examples/custom-handles.js

@@ -0,0 +1,44 @@
+require('rc-slider/assets/index.less');
+
+const React = require('react');
+const ReactDOM = require('react-dom');
+const Slider = require('rc-slider');
+
+const wrapperStyle = {width: 400, margin: 50};
+
+const handleStyle = {
+  position: 'absolute',
+  transform: 'translate(-50%, -50%)',
+  cursor: 'pointer',
+  padding: '2px',
+  border: '2px solid #abe2fb',
+  borderRadius: '3px',
+  background: '#fff',
+  fontSize: '14px',
+  textAlign: 'center',
+  zIndex: 3,
+};
+
+const CustomHandle = props => {
+  const style = Object.assign({left: props.offset + '%'}, handleStyle);
+  return (
+    <div style={style}>val: {props.value}</div>
+  );
+};
+CustomHandle.propTypes = {
+  value: React.PropTypes.any,
+  offset: React.PropTypes.number,
+};
+
+ReactDOM.render(
+  <div>
+    <div style={wrapperStyle}>
+      <p>Default slider</p>
+      <Slider min={0} max={20} defaultValue={3} />
+    </div>
+    <div style={wrapperStyle}>
+      <p>Slider with custom handle</p>
+      <Slider min={0} max={20} defaultValue={3} handle={<CustomHandle />} />
+    </div>
+  </div>
+  , document.getElementById('__react-content'));

examples/range.js

@@ -95,7 +95,7 @@ ReactDOM.render(
     </div>
     <div style={style}>
       <p>Basic Range，`step=20` </p>
-      <Slider range step={20} defaultValue={[20, 40]} onBeforeChange={log} />
+      <Slider range step={20} defaultValue={[20, 20]} onBeforeChange={log} />
     </div>
     <div style={style}>
       <p>Basic Range，`step=20, dots` </p>

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.6.0",
+  "version": "3.7.4",
   "description": "slider ui component for react",
   "keywords": [
     "react",
@@ -42,16 +42,17 @@
     "pre-commit": "1.x",
     "rc-server": "3.x",
     "rc-tools": "4.x",
-    "react": "~0.14.0",
+    "react": "^15.2.1",
-    "react-addons-test-utils": "^0.14.0",
+    "react-addons-test-utils": "^15.2.1",
-    "react-dom": "~0.14.0"
+    "react-dom": "^15.2.1"
   },
   "pre-commit": [
     "lint"
   ],
   "dependencies": {
-    "classnames": "^2.2.1",
+    "classnames": "^2.2.5",
-    "rc-tooltip": "3.x",
+    "rc-tooltip": "^3.4.2",
-    "rc-util": "3.x"
+    "rc-util": "^3.2.1",
+    "warning": "^3.0.0"
   }
 }

src/Slider.jsx

@@ -1,8 +1,8 @@
-import React from 'react';
+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 Handle from './Handle';
+import DefaultHandle from './Handle';
 import Steps from './Steps';
 import Marks from './Marks';
 
@@ -46,12 +46,7 @@ class Slider extends React.Component {
 
     let recent;
     if (props.range && upperBound === lowerBound) {
-      if (lowerBound === max) {
+      recent = lowerBound === max ? 'lowerBound' : 'upperBound';
-        recent = 'lowerBound';
-      }
-      if (upperBound === min) {
-        recent = 'upperBound';
-      }
     } else {
       recent = 'upperBound';
     }
@@ -172,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');
@@ -240,9 +236,8 @@ class Slider extends React.Component {
     return this.props.vertical ? rect.top : rect.left;
   }
 
-  getPrecision() {
+  getPrecision(step) {
-    const props = this.props;
+    const stepString = step.toString();
-    const stepString = props.step.toString();
     let precision = 0;
     if (stepString.indexOf('.') >= 0) {
       precision = stepString.length - stepString.indexOf('.') - 1;
@@ -275,14 +270,14 @@ 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);
     }
 
     const diffs = points.map((point) => Math.abs(val - point));
     const closestPoint = points[diffs.indexOf(Math.min.apply(Math, diffs))];
 
-    return step !== null ? parseFloat(closestPoint.toFixed(this.getPrecision())) : closestPoint;
+    return step !== null ? parseFloat(closestPoint.toFixed(this.getPrecision(step))) : closestPoint;
   }
 
   calcOffset(value) {
@@ -307,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.onTouchMoveListener = addEventListener(document, 'touchmove', this.onTouchMove.bind(this));
-      this.onTouchUpListener = DomUtils.addEventListener(document, 'touchend', this.end.bind(this, 'touch'));
+      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.onMouseMoveListener = addEventListener(document, 'mousemove', this.onMouseMove.bind(this));
-      this.onMouseUpListener = DomUtils.addEventListener(document, 'mouseup', this.end.bind(this, 'mouse'));
+      this.onMouseUpListener = addEventListener(document, 'mouseup', this.end.bind(this, 'mouse'));
     }
   }
 
@@ -336,21 +331,23 @@ class Slider extends React.Component {
     const {className, prefixCls, disabled, vertical, dots, included, range, step,
       marks, max, min, tipTransitionName, tipFormatter, children} = this.props;
 
+    const customHandle = this.props.handle;
+
     const upperOffset = this.calcOffset(upperBound);
     const lowerOffset = this.calcOffset(lowerBound);
 
     const handleClassName = prefixCls + '-handle';
     const isNoTip = (step === null) || (tipFormatter === null);
 
-    const upper = (<Handle className={handleClassName}
+    const upper = cloneElement(customHandle, { className: handleClassName,
-                           noTip={isNoTip} tipTransitionName={tipTransitionName} tipFormatter={tipFormatter}
+        noTip: isNoTip, tipTransitionName: tipTransitionName, tipFormatter: tipFormatter,
-                           vertical = {vertical} offset={upperOffset} value={upperBound} dragging={handle === 'upperBound'}/>);
+        vertical: vertical, offset: upperOffset, value: upperBound, dragging: handle === 'upperBound' });
 
     let lower = null;
     if (range) {
-      lower = (<Handle className={handleClassName}
+      lower = cloneElement(customHandle, { className: handleClassName,
-                       noTip={isNoTip} tipTransitionName={tipTransitionName} tipFormatter={tipFormatter}
+        noTip: isNoTip, tipTransitionName: tipTransitionName, tipFormatter: tipFormatter,
-                       vertical = {vertical} offset={lowerOffset} value={lowerBound} dragging={handle === 'lowerBound'}/>);
+        vertical: vertical, offset: lowerOffset, value: lowerBound, dragging: handle === 'lowerBound' });
     }
 
     const sliderClassName = classNames({
@@ -401,6 +398,7 @@ Slider.propTypes = {
   onBeforeChange: React.PropTypes.func,
   onChange: React.PropTypes.func,
   onAfterChange: React.PropTypes.func,
+  handle: React.PropTypes.element,
   tipTransitionName: React.PropTypes.string,
   tipFormatter: React.PropTypes.func,
   dots: React.PropTypes.bool,
@@ -417,6 +415,7 @@ Slider.defaultProps = {
   max: 100,
   step: 1,
   marks: {},
+  handle: <DefaultHandle />,
   onBeforeChange: noop,
   onChange: noop,
   onAfterChange: noop,

src/Steps.jsx

@@ -1,7 +1,9 @@
 import React from 'react';
 import classNames from 'classnames';
+import warning from 'warning';
 
 function calcPoints(vertical, marks, dots, step, min, max) {
+  warning(dots ? step > 0 : true, '`Slider[step]` should be a positive number in order to make Slider[dots] work.');
   const points = Object.keys(marks).map(parseFloat);
   if (dots) {
     for (let i = min; i <= max; i = i + step) {