bump 5.1.0

.travis.yml

@@ -29,8 +29,8 @@ script:
 env:
   matrix:
   - TEST_TYPE=lint
-  - TEST_TYPE=browser-test
-  - TEST_TYPE=browser-test-cover
+  - TEST_TYPE=test
+  - TEST_TYPE=coverage
   - TEST_TYPE=saucelabs
   global:
   - secure: S1VwbaPzLnSH/IUT/wlJulxAX5VHRIDmSt53h/ycHcZsszUpWcLCJRQAe0fTVB2dAx5MdBbSZ+o+tr3tRwVB5TRAYm0oTCsYAkOZaWOB28RuUQtdGt3wf9xxTG1UiPiaLLUW3waX9zAaf3yqKBcJGf1op0RD8dksxbCFw/7xVbU=
@@ -39,4 +39,4 @@ env:
 
 matrix:
   allow_failures:
-  - env: "TEST_TYPE=saucelabs"
+  - env: "TEST_TYPE=saucelabs"

assets/index.less

@@ -36,7 +36,6 @@
     height: 4px;
     border-radius: @border-radius-base;
     background-color: tint(@primary-color, 60%);
-    z-index: 1;
   }
 
   &-handle {
@@ -49,7 +48,6 @@
     border-radius: 50%;
     border: solid 2px tint(@primary-color, 50%);
     background-color: #fff;
-    z-index: 2;
 
     &:hover {
       border-color: tint(@primary-color, 20%);
@@ -68,7 +66,6 @@
     left: 0;
     width: 100%;
     font-size: 12px;
-    z-index: 3;
   }
 
   &-mark-text {
@@ -89,7 +86,6 @@
     width: 100%;
     height: 4px;
     background: transparent;
-    z-index: 1;
   }
 
   &-dot {
@@ -232,11 +228,10 @@
   }
 }
 
-.rc-tooltip {
+.@{prefixClass}-tooltip {
   position: absolute;
   left: -9999px;
   top: -9999px;
-  z-index: 4;
   visibility: visible;
 
   .borderBox();
@@ -278,4 +273,4 @@
     border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
     border-top-color: @tooltip-arrow-color;
   }
-}
+}

examples/custom-handles.js

@@ -16,11 +16,10 @@ const handleStyle = {
   background: '#fff',
   fontSize: '14px',
   textAlign: 'center',
-  zIndex: 3,
 };
 
 const CustomHandle = props => {
-  const style = Object.assign({ left: props.offset + '%' }, handleStyle);
+  const style = Object.assign({ left: `${props.offset}%` }, handleStyle);
   return (
     <div style={style}>val: {props.value}</div>
   );
@@ -40,5 +39,6 @@ ReactDOM.render(
       <p>Slider with custom handle</p>
       <Slider min={0} max={20} defaultValue={3} handle={<CustomHandle />} />
     </div>
-  </div>
-  , document.getElementById('__react-content'));
+  </div>,
+  document.getElementById('__react-content')
+);

examples/range.js

@@ -81,7 +81,9 @@ const DynamicBounds = React.createClass({
         <label>Max: </label>
         <input type="number" value={this.state.max} onChange={this.onMaxChange} />
         <br /><br />
-        <Slider range defaultValue={[20, 50]} min={this.state.min} max={this.state.max} onChange={this.onSliderChange} />
+        <Slider range defaultValue={[20, 50]} min={this.state.min} max={this.state.max}
+          onChange={this.onSliderChange}
+        />
       </div>
     );
   },

examples/slider.js

@@ -13,7 +13,7 @@ function log(value) {
 
 
 function percentFormatter(v) {
-  return v + ' %';
+  return `${v} %`;
 }
 
 const CustomizedSlider = React.createClass({
@@ -32,7 +32,11 @@ const CustomizedSlider = React.createClass({
     console.log(value);
   },
   render() {
-    return <Slider value={this.state.value} onChange={this.onSliderChange} onAfterChange={this.onAfterChange} />;
+    return (
+      <Slider value={this.state.value}
+        onChange={this.onSliderChange} onAfterChange={this.onAfterChange}
+      />
+    );
   },
 });
 
@@ -65,7 +69,9 @@ const DynamicBounds = React.createClass({
         <label>Max: </label>
         <input type="number" value={this.state.max} onChange={this.onMaxChange} />
         <br /><br />
-        <Slider defaultValue={50} min={this.state.min} max={this.state.max} onChange={this.onSliderChange} />
+        <Slider defaultValue={50} min={this.state.min} max={this.state.max}
+          onChange={this.onSliderChange}
+        />
       </div>
     );
   },
@@ -87,7 +93,9 @@ ReactDOM.render(
     </div>
     <div style={style}>
       <p>Basic Slider with `tipFormatter`</p>
-      <Slider tipFormatter={percentFormatter} tipTransitionName="rc-slider-tooltip-zoom-down" onChange={log} />
+      <Slider tipFormatter={percentFormatter}
+        tipTransitionName="rc-slider-tooltip-zoom-down" onChange={log}
+      />
     </div>
     <div style={style}>
       <p>Basic Slider without tooltip</p>

examples/v-marks.js

@@ -49,7 +49,9 @@ ReactDOM.render(
     </div>
     <div style={style}>
       <p>Range with marks and steps</p>
-      <Slider vertical min={-10} range marks={marks} step={10} onChange={log} defaultValue={[20, 40]} />
+      <Slider vertical min={-10} range marks={marks} step={10}
+        onChange={log} defaultValue={[20, 40]}
+      />
     </div>
   </div>
   , document.getElementById('__react-content'));

examples/v-range.js

@@ -39,7 +39,9 @@ const CustomizedRange = React.createClass({
   render() {
     return (
       <div style={style}>
-        <Slider range vertical allowCross={false} value={this.state.value} onChange={this.onSliderChange} />
+        <Slider range vertical allowCross={false} value={this.state.value}
+          onChange={this.onSliderChange}
+        />
         <label>LowerBound: </label>
         <input type="number" value={this.state.lowerBound} onChange={this.onLowerBoundChange} />
         <br />
@@ -75,7 +77,9 @@ const DynamicBounds = React.createClass({
   render() {
     return (
       <div style={style}>
-        <Slider range vertical defaultValue={[20, 50]} min={this.state.min} max={this.state.max} onChange={this.onSliderChange} />
+        <Slider range vertical defaultValue={[20, 50]} min={this.state.min} max={this.state.max}
+          onChange={this.onSliderChange}
+        />
         <label>Min: </label>
         <input type="number" value={this.state.min} onChange={this.onMinChange} />
         <br />

examples/v-slider.js

@@ -14,7 +14,7 @@ function log(value) {
 
 
 function percentFormatter(v) {
-  return v + ' %';
+  return `${v} %`;
 }
 
 const CustomizedSlider = React.createClass({
@@ -58,7 +58,9 @@ const DynamicBounds = React.createClass({
     return (
       <div style={style}>
         <p>Slider with dynamic `min` `max`</p>
-        <Slider vertical defaultValue={50} min={this.state.min} max={this.state.max} onChange={this.onSliderChange} />
+        <Slider vertical defaultValue={50} min={this.state.min} max={this.state.max}
+          onChange={this.onSliderChange}
+        />
         <label>Min: </label>
         <input type="number" value={this.state.min} onChange={this.onMinChange} />
         <br />
@@ -85,7 +87,9 @@ ReactDOM.render(
     </div>
     <div style={style}>
       <p>Basic Slider with `tipFormatter`</p>
-      <Slider vertical tipFormatter={percentFormatter} tipTransitionName="rc-slider-tooltip-zoom-down" onChange={log} />
+      <Slider vertical tipFormatter={percentFormatter}
+        tipTransitionName="rc-slider-tooltip-zoom-down" onChange={log}
+      />
     </div>
     <div style={style}>
       <p>Basic Slider without tooltip</p>

package.json

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

src/Handle.jsx

@@ -25,6 +25,7 @@ export default class Handle extends React.Component {
   render() {
     const {
       prefixCls,
+      tooltipPrefixCls,
       className,
       tipTransitionName,
       tipFormatter,
@@ -35,7 +36,7 @@ export default class Handle extends React.Component {
       noTip,
     } = this.props;
 
-    const style = vertical ? { bottom: offset + '%' } : { left: offset + '%' };
+    const style = vertical ? { bottom: `${offset}%` } : { left: `${offset}%` };
     const handle = (
       <div className={className} style={style}
         onMouseUp={this.showTooltip.bind(this)}
@@ -51,7 +52,7 @@ export default class Handle extends React.Component {
     const isTooltipVisible = dragging || this.state.isTooltipVisible;
     return (
       <Tooltip
-        prefixCls={prefixCls.replace('slider', 'tooltip')}
+        prefixCls={tooltipPrefixCls || `${prefixCls}-tooltip`}
         placement="top"
         visible={isTooltipVisible}
         overlay={<span>{tipFormatter(value)}</span>}
@@ -66,6 +67,7 @@ export default class Handle extends React.Component {
 
 Handle.propTypes = {
   prefixCls: React.PropTypes.string,
+  tooltipPrefixCls: React.PropTypes.string,
   className: React.PropTypes.string,
   vertical: React.PropTypes.bool,
   offset: React.PropTypes.number,

src/Marks.jsx

@@ -12,20 +12,20 @@ const Marks = ({ className, vertical, marks, included, upperBound, lowerBound, m
     const isActived = (!included && point === upperBound) ||
             (included && point <= upperBound && point >= lowerBound);
     const markClassName = classNames({
-      [className + '-text']: true,
-      [className + '-text-active']: isActived,
+      [`${className}-text`]: true,
+      [`${className}-text-active`]: isActived,
     });
 
     const bottomStyle = {
       // height: markWidth + '%',
-      marginBottom: '-200' + '%',
-      bottom: (point - min) / range * 100 + '%',
+      marginBottom: '-200%',
+      bottom: `${(point - min) / range * 100}%`,
     };
 
     const leftStyle = {
-      width: markWidth + '%',
-      marginLeft: -markWidth / 2 + '%',
-      left: (point - min) / range * 100 + '%',
+      width: `${markWidth}%`,
+      marginLeft: `${-markWidth / 2}%`,
+      left: `${(point - min) / range * 100}%`,
     };
 
     const style = vertical ? bottomStyle : leftStyle;

src/Slider.jsx

@@ -5,6 +5,7 @@ import Track from './Track';
 import DefaultHandle from './Handle';
 import Steps from './Steps';
 import Marks from './Marks';
+import warning from 'warning';
 
 function noop() {
 }
@@ -30,7 +31,7 @@ class Slider extends React.Component {
   constructor(props) {
     super(props);
 
-    const { range, min, max } = props;
+    const { range, min, max, step } = props;
     const initialValue = range ? Array.apply(null, Array(range + 1)).map(() => min) : min;
     const defaultValue = ('defaultValue' in props ? props.defaultValue : initialValue);
     const value = (props.value !== undefined ? props.value : defaultValue);
@@ -44,6 +45,15 @@ class Slider extends React.Component {
       recent = bounds.length - 1;
     }
 
+    if (process.env.NODE_ENV !== 'production' && (max - min) % step !== 0) {
+      warning(
+        false,
+        'Slider[max] - Slider[min] (%s) should be a multiple of Slider[step] (%s)',
+        max - min,
+        step
+      );
+    }
+
     this.state = {
       handle: null,
       recent,
@@ -115,7 +125,7 @@ class Slider extends React.Component {
     const diffValue = diffPosition / this.getSliderLength() * (props.max - props.min);
 
     const value = this.trimAlignValue(this.startValue + diffValue);
-    const oldValue = state[state.handle];
+    const oldValue = state.bounds[state.handle];
     if (value === oldValue) return;
 
     const nextBounds = [...state.bounds];
@@ -364,11 +374,15 @@ class Slider extends React.Component {
   addDocumentEvents(type) {
     if (type === 'touch') {
       // just work for chrome iOS Safari and Android Browser
-      this.onTouchMoveListener = addEventListener(document, 'touchmove', this.onTouchMove.bind(this));
-      this.onTouchUpListener = 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 = addEventListener(document, 'mousemove', this.onMouseMove.bind(this));
-      this.onMouseUpListener = 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'));
     }
   }
 
@@ -396,6 +410,7 @@ class Slider extends React.Component {
     const {
         className,
         prefixCls,
+        tooltipPrefixCls,
         disabled,
         vertical,
         dots,
@@ -413,7 +428,7 @@ class Slider extends React.Component {
 
     const offsets = bounds.map(v => this.calcOffset(v));
 
-    const handleClassName = prefixCls + '-handle';
+    const handleClassName = `${prefixCls}-handle`;
 
     const handlesClassNames = bounds.map((v, i) => classNames({
       [handleClassName]: true,
@@ -426,6 +441,7 @@ class Slider extends React.Component {
 
     const commonHandleProps = {
       prefixCls,
+      tooltipPrefixCls,
       noTip: isNoTip,
       tipTransitionName,
       tipFormatter,
@@ -451,33 +467,36 @@ class Slider extends React.Component {
         [`${prefixCls}-track-${i}`]: true,
       });
       tracks.push(
-          <Track className={trackClassName} vertical={vertical} included={isIncluded}
-                 offset={offsets[i - 1]} length={offsets[i] - offsets[i - 1]} key={i} />
+        <Track className={trackClassName} vertical={vertical} included={isIncluded}
+          offset={offsets[i - 1]} length={offsets[i] - offsets[i - 1]} key={i}
+        />
       );
     }
 
     const sliderClassName = classNames({
       [prefixCls]: true,
-      [prefixCls + '-disabled']: disabled,
+      [`${prefixCls}-disabled`]: disabled,
       [className]: !!className,
-      [prefixCls + '-vertical']: this.props.vertical,
+      [`${prefixCls}-vertical`]: this.props.vertical,
     });
 
     return (
-        <div ref="slider" className={sliderClassName}
-             onTouchStart={disabled ? noop : this.onTouchStart.bind(this)}
-             onMouseDown={disabled ? noop : this.onMouseDown.bind(this)}
-        >
-          {handles}
-          {tracks}
-          <Steps prefixCls={prefixCls} vertical = {vertical} marks={marks} dots={dots} step={step}
-                 included={isIncluded} lowerBound={bounds[0]}
-                 upperBound={bounds[bounds.length - 1]} max={max} min={min} />
-          <Marks className={prefixCls + '-mark'} vertical = {vertical} marks={marks}
-                 included={isIncluded} lowerBound={bounds[0]}
-                 upperBound={bounds[bounds.length - 1]} max={max} min={min} />
-          {children}
-        </div>
+      <div ref="slider" className={sliderClassName}
+        onTouchStart={disabled ? noop : this.onTouchStart.bind(this)}
+        onMouseDown={disabled ? noop : this.onMouseDown.bind(this)}
+      >
+        {tracks}
+        <Steps prefixCls={prefixCls} vertical = {vertical} marks={marks} dots={dots} step={step}
+          included={isIncluded} lowerBound={bounds[0]}
+          upperBound={bounds[bounds.length - 1]} max={max} min={min}
+        />
+        {handles}
+        <Marks className={`${prefixCls}-mark`} vertical = {vertical} marks={marks}
+          included={isIncluded} lowerBound={bounds[0]}
+          upperBound={bounds[bounds.length - 1]} max={max} min={min}
+        />
+        {children}
+      </div>
     );
   }
 }
@@ -498,6 +517,7 @@ Slider.propTypes = {
   included: React.PropTypes.bool,
   className: React.PropTypes.string,
   prefixCls: React.PropTypes.string,
+  tooltipPrefixCls: React.PropTypes.string,
   disabled: React.PropTypes.bool,
   children: React.PropTypes.any,
   onBeforeChange: React.PropTypes.func,

src/Steps.jsx

@@ -3,7 +3,10 @@ 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.');
+  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) {
@@ -18,20 +21,20 @@ const Steps = ({ prefixCls, vertical, marks, dots, step, included,
                 lowerBound, upperBound, max, min }) => {
   const range = max - min;
   const elements = calcPoints(vertical, marks, dots, step, min, max).map((point) => {
-    const offset = Math.abs(point - min) / range * 100 + '%';
+    const offset = `${Math.abs(point - min) / range * 100}%`;
     const style = vertical ? { bottom: offset } : { left: offset };
 
     const isActived = (!included && point === upperBound) ||
             (included && point <= upperBound && point >= lowerBound);
     const pointClassName = classNames({
-      [prefixCls + '-dot']: true,
-      [prefixCls + '-dot-active']: isActived,
+      [`${prefixCls}-dot`]: true,
+      [`${prefixCls}-dot-active`]: isActived,
     });
 
     return <span className={pointClassName} style={style} key={point} />;
   });
 
-  return <div className={prefixCls + '-step'}>{elements}</div>;
+  return <div className={`${prefixCls}-step`}>{elements}</div>;
 };
 
 export default Steps;

src/Track.jsx

@@ -5,11 +5,11 @@ const Track = ({ className, included, vertical, offset, length }) => {
     visibility: included ? 'visible' : 'hidden',
   };
   if (vertical) {
-    style.bottom = offset + '%';
-    style.height = length + '%';
+    style.bottom = `${offset}%`;
+    style.height = `${length}%`;
   } else {
-    style.left = offset + '%';
-    style.width = length + '%';
+    style.left = `${offset}%`;
+    style.width = `${length}%`;
   }
   return <div className={className} style={style} />;
 };

tests/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable max-len */
 const expect = require('expect.js');
 const React = require('react');
 const ReactDOM = require('react-dom');
@@ -206,4 +207,29 @@ describe('rc-slider', function test() {
     const slider = ReactDOM.render(<Slider vertical />, div);
     expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-vertical').length).to.be(1);
   });
+
+  it('should not call onChange when value is the same', () => {
+    const values = [];
+    const handler = (e) => {
+      values.push(e);
+    };
+
+    ReactDOM.render(<Slider onChange={handler}/>, div);
+    const handle = div.querySelector('.rc-slider-handle');
+
+    const down = document.createEvent('MouseEvent');
+    down.initEvent('mousedown', true, true);
+
+    const move = document.createEvent('MouseEvent');
+    move.initEvent('mousemove', true, true);
+
+    const up = document.createEvent('MouseEvent');
+    up.initEvent('mouseup', true, true);
+
+    handle.dispatchEvent(down);
+    handle.dispatchEvent(move);
+    handle.dispatchEvent(up);
+
+    expect(values.length).to.be(0);
+  });
 });