bump 3.1.3

refactor: improve performance

README.md

@@ -148,6 +148,18 @@ ReactDOM.render(<Rcslider />, container);
           <td>false</td>
           <td>When the `step` value is greater than 1, you can set the `dots` to  `true` if you want to render the slider with dots.</td>
         </tr>
+        <tr>
+          <td>onChange</td>
+          <td>function</td>
+          <td>NOOP</td>
+          <td>`onChange` will be triggered while the value of Slider changing.</td>
+        </tr>
+        <tr>
+          <td>onAfterChange</td>
+          <td>function</td>
+          <td>NOOP</td>
+          <td>`onAfterChange` will be triggered when `ontouchend` or `onmouseup` is triggered.</td>
+        </tr>
     </tbody>
 </table>
 

examples/marks.js

@@ -1,23 +1,21 @@
-'use strict';
-
 require('rc-slider/assets/index.less');
 
-var React = require('react');
+const React = require('react');
-var ReactDOM = require('react-dom');
+const ReactDOM = require('react-dom');
-var Slider = require('rc-slider');
+const Slider = require('rc-slider');
 
-var style = {width: 400, margin: 50};
+const style = {width: 400, margin: 50};
-var marks = {
+const marks = {
   '-10': '-10°C',
   0: '0°C',
   26: '26°C',
   37: '37°C',
-  100: '100°C'
+  100: '100°C',
 };
 
-var log = function(value) {
+function log(value) {
   console.log(value);
-};
+}
 
 ReactDOM.render(
   <div>

examples/range.js

@@ -1,31 +1,30 @@
-'use strict';
-
 require('rc-slider/assets/index.less');
 
-var React = require('react');
+const React = require('react');
-var ReactDOM = require('react-dom');
+const ReactDOM = require('react-dom');
-var Slider = require('rc-slider');
+const Slider = require('rc-slider');
 
-var style = {width: 400, margin: 50};
+const style = {width: 400, margin: 50};
-var log = function(value) {
+
+function log(value) {
   console.log(value);
-};
+}
 
-var CustomizedRange = React.createClass({
+const CustomizedRange = React.createClass({
   getInitialState: function() {
     return {
-      value: [20, 40]
+      value: [20, 40],
-    }
+    };
   },
   onChange: function(value) {
     log(value);
     this.setState({
-      value: value
+      value: value,
     });
   },
   render: function() {
     return <Slider range value={this.state.value} onChange={this.onChange} />;
-  }
+  },
 });
 
 ReactDOM.render(

examples/slider.js

@@ -1,43 +1,42 @@
-'use strict';
-
 require('rc-slider/assets/index.less');
 
-var React = require('react');
+const React = require('react');
-var ReactDOM = require('react-dom');
+const ReactDOM = require('react-dom');
-var Slider = require('rc-slider');
+const Slider = require('rc-slider');
 
-var style = {width: 400, margin: 50};
+const style = {width: 400, margin: 50};
-var log = function(value) {
+
+function log(value) {
   console.log(value);
-};
+}
 
 
 function percentFormatter(v) {
   return v + ' %';
 }
 
-var CustomizedSlider = React.createClass({
+const CustomizedSlider = React.createClass({
   getInitialState: function() {
     return {
-      value: 50
+      value: 50,
-    }
+    };
   },
   onChange: function(value) {
     log(value);
     this.setState({
-      value: value
+      value: value,
     });
   },
   render: function() {
     return <Slider value={this.state.value} onChange={this.onChange} />;
-  }
+  },
 });
 
 ReactDOM.render(
   <div>
     <div style={style}>
       <p>Basic Slider</p>
-      <Slider tipTransitionName='rc-slider-tooltip-zoom-down' onChange={log} />
+      <Slider tipTransitionName="rc-slider-tooltip-zoom-down" onChange={log} />
     </div>
     <div style={style}>
       <p>Basic Slider，`step=20`</p>
@@ -49,7 +48,7 @@ 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>Controlled Slider</p>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-slider",
-  "version": "3.1.0",
+  "version": "3.1.3",
   "description": "slider ui component for react",
   "keywords": [
     "react",
@@ -39,7 +39,6 @@
   },
   "devDependencies": {
     "expect.js": "0.3.x",
-    "jquery": "^1.11.2",
     "pre-commit": "1.x",
     "rc-server": "3.x",
     "rc-tools": "4.x",
@@ -51,6 +50,7 @@
     "lint"
   ],
   "dependencies": {
+    "classnames": "^2.2.1",
     "rc-tooltip": "3.x",
     "rc-util": "3.x"
   }

src/Dots.jsx

@@ -0,0 +1,33 @@
+import React from 'react';
+import classNames from 'classnames';
+
+function calcPoints(marks, dots, step, min, max) {
+  const points = Object.keys(marks).map(parseFloat);
+  if (dots) {
+    for (let i = min; i <= max; i = i + step) {
+      points.push(i);
+    }
+  }
+  return points;
+}
+
+const Dots = ({prefixCls, marks, dots, step, included, lowerBound, upperBound, max, min}) => {
+  const range = max - min;
+  const elements = calcPoints(marks, dots, step, min, max).map((point) => {
+    const offset = (point - min) / range * 100 + '%';
+    const style = { left: offset };
+
+    const isActived = (!included && point === upperBound) ||
+            (included && point <= upperBound && point >= lowerBound);
+    const pointClassName = classNames({
+      [prefixCls + '-dot']: true,
+      [prefixCls + '-dot-active']: isActived,
+    });
+
+    return <span className={pointClassName} style={style} key={point} />;
+  });
+
+  return <div className={prefixCls + '-step'}>{elements}</div>;
+};
+
+export default Dots;

src/Marks.jsx

@@ -1,23 +1,23 @@
 import React from 'react';
-import rcUtil from 'rc-util';
+import classNames from 'classnames';
 
 const Marks = ({className, marks, included, upperBound, lowerBound, max, min}) => {
   const marksKeys = Object.keys(marks);
   const marksCount = marksKeys.length;
   const unit = 100 / (marksCount - 1);
-  const markWidth = unit / 2 + '%';
+  const markWidth = unit * 0.9;
 
   const range = max - min;
   const elements = marksKeys.map(parseFloat).map((point) => {
     const isActived = (!included && point === upperBound) ||
             (included && point <= upperBound && point >= lowerBound);
-    const markClassName = rcUtil.classSet({
+    const markClassName = classNames({
       [className + '-text']: true,
       [className + '-text-active']: isActived,
     });
 
-    const style = { width: markWidth };
+    const style = { width: markWidth + '%' };
-    style.left = (point - min) / range * 100 - unit / 4 + '%';
+    style.left = (point - min) / range * 100 - markWidth / 2 + '%';
 
     return (<span className={markClassName} style={style} key={point}>
              {marks[point]}

src/Slider.jsx

@@ -1,8 +1,9 @@
 import React from 'react';
-import {Dom as DomUtils, classSet} from 'rc-util';
+import {Dom as DomUtils} from 'rc-util';
+import classNames from 'classnames';
 import Track from './Track';
 import Handle from './Handle';
-import Steps from './Steps';
+import Dots from './Dots';
 import Marks from './Marks';
 
 function noop() {
@@ -187,17 +188,6 @@ class Slider extends React.Component {
     return this.props.range ? [lowerBound, upperBound] : upperBound;
   }
 
-  getPoints() {
-    const {marks, step, min, max} = this.props;
-    const points = Object.keys(marks);
-    if (step !== null) {
-      for (let i = min; i <= max; i = i + step) {
-        points.push(i);
-      }
-    }
-    return points;
-  }
-
   getSliderLength() {
     const slider = this.refs.slider;
     if (!slider) {
@@ -214,10 +204,20 @@ class Slider extends React.Component {
     return rect.left;
   }
 
+  getPrecision() {
+    const props = this.props;
+    const stepString = props.step.toString();
+    let precision = 0;
+    if (stepString.indexOf('.') >= 0) {
+      precision = stepString.length - stepString.indexOf('.') - 1;
+    }
+    return precision;
+  }
+
   trimAlignValue(v) {
     const state = this.state || {};
     const {handle, lowerBound, upperBound} = state;
-    const {min, max} = this.props;
+    const {marks, step, min, max} = this.props;
 
     let val = v;
     if (val <= min) {
@@ -233,11 +233,16 @@ class Slider extends React.Component {
       val = upperBound;
     }
 
-    const points = this.getPoints().map(parseFloat);
+    const points = Object.keys(marks).map(parseFloat);
+    if (step !== null) {
+      const closestStep = Math.round(val / step) * step;
+      points.push(closestStep);
+    }
+
     const diffs = points.map((point) => Math.abs(val - point));
     const closestPoint = points[diffs.indexOf(Math.min.apply(Math, diffs))];
 
-    return closestPoint;
+    return step !== null ? parseFloat(closestPoint.toFixed(this.getPrecision())) : closestPoint;
   }
 
   calcOffset(value) {
@@ -269,7 +274,7 @@ class Slider extends React.Component {
     }
   }
 
-  removeEventons(type) {
+  removeEvents(type) {
     if (type === 'touch') {
       this.onTouchMoveListener.remove();
       this.onTouchUpListener.remove();
@@ -280,7 +285,7 @@ class Slider extends React.Component {
   }
 
   end(type) {
-    this.removeEventons(type);
+    this.removeEvents(type);
     this.props.onAfterChange(this.getValue());
     this.setState({handle: null});
   }
@@ -290,43 +295,40 @@ class Slider extends React.Component {
     const {className, prefixCls, disabled, dots, included, range, step,
            marks, max, min, tipTransitionName, tipFormatter, children} = this.props;
 
-    const sliderClassName = classSet({
+    const upperOffset = this.calcOffset(upperBound);
+    const lowerOffset = this.calcOffset(lowerBound);
+
+    const handleClassName = prefixCls + '-handle';
+    const isNoTip = (step === null) && !tipFormatter;
+
+    const upper = (<Handle className={handleClassName}
+                           noTip={isNoTip} tipTransitionName={tipTransitionName} tipFormatter={tipFormatter}
+                           offset={upperOffset} value={upperBound} dragging={handle === 'upperBound'} />);
+
+    let lower = null;
+    if (range) {
+      lower = (<Handle className={handleClassName}
+                       noTip={isNoTip} tipTransitionName={tipTransitionName} tipFormatter={tipFormatter}
+                       offset={lowerOffset} value={lowerBound} dragging={handle === 'lowerBound'} />);
+    }
+
+    const sliderClassName = classNames({
       [prefixCls]: true,
       [prefixCls + '-disabled']: disabled,
       [className]: !!className,
     });
-
-    const upperOffset = this.calcOffset(upperBound);
-    const lowerOffset = this.calcOffset(lowerBound);
-
-    let track = null;
-    if (included || range) {
-      const trackClassName = prefixCls + '-track';
-      track = <Track className={trackClassName} offset={lowerOffset} length={upperOffset - lowerOffset}/>;
-    }
-
-    const handleClassName = prefixCls + '-handle';
-    const isNoTip = (step === null) && !tipFormatter;
-    const upper = (<Handle className={handleClassName} tipTransitionName={tipTransitionName} noTip={isNoTip} tipFormatter={tipFormatter}
-                     offset={upperOffset} value={upperBound} dragging={handle === 'upperBound'} />);
-
-    let lower = null;
-    if (range) {
-      lower = (<Handle className={handleClassName} tipTransitionName={tipTransitionName} noTip={isNoTip} tipFormatter={tipFormatter}
-                 offset={lowerOffset} value={lowerBound} dragging={handle === 'lowerBound'} />);
-    }
-
     const isIncluded = included || range;
     return (
       <div ref="slider" className={sliderClassName}
            onTouchStart={disabled ? noop : this.onTouchStart.bind(this)}
            onMouseDown={disabled ? noop : this.onMouseDown.bind(this)}>
-        {track}
         {upper}
         {lower}
-        <Steps prefixCls={prefixCls} points={this.getPoints()} dots={dots}
+        <Track className={prefixCls + '-track'} included={isIncluded}
-               included={isIncluded} lowerBound={lowerBound}
+               offset={lowerOffset} length={upperOffset - lowerOffset}/>
-               upperBound={upperBound} max={max} min={min} />
+        <Dots prefixCls={prefixCls} marks={marks} dots={dots} step={step}
+              included={isIncluded} lowerBound={lowerBound}
+              upperBound={upperBound} max={max} min={min} />
         <Marks className={prefixCls + '-mark'} marks={marks}
                included={isIncluded} lowerBound={lowerBound}
                upperBound={upperBound} max={max} min={min} />

src/Steps.jsx

@@ -1,24 +0,0 @@
-import React from 'react';
-import { classSet } from 'rc-util';
-
-const Steps = ({prefixCls, points, dots, included, lowerBound, upperBound, max, min}) => {
-  const range = max - min;
-  const elements = points.filter((point) => typeof point === 'string' || dots).map(parseFloat)
-          .map((point) => {
-            const offset = (point - min) / range * 100 + '%';
-            const style = { left: offset };
-
-            const isActived = (!included && point === upperBound) ||
-                    (included && point <= upperBound && point >= lowerBound);
-            const pointClassName = classSet({
-              [prefixCls + '-dot']: true,
-              [prefixCls + '-dot-active']: isActived,
-            });
-
-            return <span className={pointClassName} style={style} key={point} />;
-          });
-
-  return <div className={prefixCls + '-step'}>{elements}</div>;
-};
-
-export default Steps;

src/Track.jsx

@@ -1,9 +1,10 @@
 import React from 'react';
 
-const Track = ({className, offset, length}) => {
+const Track = ({className, included, offset, length}) => {
   const style = {
     left: offset + '%',
     width: length + '%',
+    visibility: included ? 'visible' : 'hidden',
   };
   return <div className={className} style={style} />;
 };

tests/index.spec.js

@@ -1,83 +1,127 @@
+const expect = require('expect.js');
+const React = require('react');
+const ReactDOM = require('react-dom');
+const ReactTestUtils = require('react-addons-test-utils');
+const Slider = require('..');
 
-var expect = require('expect.js');
-var Slider = require('../index.js');
-var React = require('react');
-var ReactDOM = require('react-dom');
-var TestUtils = require('react-addons-test-utils');
-var Simulate = TestUtils.Simulate;
-var $ = require('jquery');
 require('../assets/index.less');
 
-describe('rc-slider', function () {
+describe('rc-slider', function() {
   this.timeout(5000);
-  var div = document.createElement('div');
+  const div = document.createElement('div');
   document.body.appendChild(div);
 
-  afterEach(function () {
+  afterEach(() => {
     ReactDOM.unmountComponentAtNode(div);
   });
 
-  it('should render a simple slider with value correctly!', function () {
+  it('should render a Slider with correct DOM structure', () => {
-    var slider = ReactDOM.render(
+    const slider = ReactDOM.render(<Slider />, div);
-      <Slider className='rc-slider' defaultValue={40}/>,
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider').length).to.be(1);
-      div
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-handle').length).to.be(1);
-    );
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-track').length).to.be(1);
-    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.state.upperBound).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);
   });
 
-  it('should render a slider with correct numbers of step!', function () {
+  it('should render a Slider with correct value and CSS style', () => {
-    var slider = ReactDOM.render(
+    const sliderWithDefaultValue = ReactDOM.render(<Slider defaultValue={50} />, div);
-      <Slider className='rc-slider' step={20}/>,
+    expect(sliderWithDefaultValue.state.upperBound).to.be(50);
-      div
+    expect(ReactTestUtils
-    );
+           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[0]
-    var node = $(div);
+           .style.cssText)
-    expect(node.find('.rc-slider').length).to.be(1);
+      .to.be('left: 50%; ');
-    expect(node.find('.rc-slider-handle').length).to.be(1);
+    expect(ReactTestUtils
-    expect(node.find('.rc-slider-track').length).to.be(1);
+           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
-    expect(slider.state.upperBound).to.be(0);
+           .style.cssText)
+      .to.be('left: 0%; width: 50%; visibility: visible; ');
 
-    var sliderWithDots = ReactDOM.render(
+    const sliderWithValue = ReactDOM.render(<Slider value={50} />, div);
-      <Slider className='rc-slider' step={20} dots/>,
+    expect(sliderWithValue.state.upperBound).to.be(50);
-      div
+    expect(ReactTestUtils
-    );
+           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[0]
-    var node1 = $(div);
+           .style.cssText)
-    expect(node1.find('.rc-slider-dot').length).to.be(6);
+      .to.be('left: 50%; ');
+    expect(ReactTestUtils
+           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
+           .style.cssText)
+      .to.be('left: 0%; width: 50%; visibility: visible; ');
   });
 
-  it('should render a slider with marks correctly!', function () {
+  it('should render a Range with correct DOM structure', () => {
-    var slider = ReactDOM.render(
+    const range = ReactDOM.render(<Slider range />, div);
-      <Slider marks={{0: "一", 20: "二", 40: "三", 60: "四", 100: "五"}} defaultValue={40} />,
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider').length).to.be(1);
-      div
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-handle').length).to.be(2);
-    );
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-track').length).to.be(1);
-    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(node.find('.rc-slider-dot').length).to.be(Object.keys(slider.props.marks).length);
-    expect(node.find('.rc-slider-mark').length).to.be(1);
-    expect(node.find('.rc-slider-mark-text').length).to.be(Object.keys(slider.props.marks).length);
-    expect(slider.state.upperBound).to.be(40);
   });
 
-  // it('should mouseDown works!', function (done) {
+  it('should render a Range with correct value and CSS style', () => {
-  //   var slider = ReactDOM.render(
+    const sliderWithDefaultValue = ReactDOM.render(<Slider range defaultValue={[0, 50]} />, div);
-  //     <Slider marks={["一","二","三","四","五"]} />,
+    expect(sliderWithDefaultValue.state.lowerBound).to.be(0);
-  //     div
+    expect(sliderWithDefaultValue.state.upperBound).to.be(50);
-  //   );
+    expect(ReactTestUtils
-  //   var selectedStep = slider.refs.step3.getDOMNode();
+           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[0]
+           .style.cssText)
+      .to.be('left: 50%; ');
+    expect(ReactTestUtils
+           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[1]
+           .style.cssText)
+      .to.be('left: 0%; ');
+    expect(ReactTestUtils
+           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
+           .style.cssText)
+      .to.be('left: 0%; width: 50%; visibility: visible; ');
 
-  //   Simulate.mouseDown(selectedStep);
+    const sliderWithValue = ReactDOM.render(<Slider range value={[50, 100]} />, div);
+    expect(sliderWithValue.state.lowerBound).to.be(50);
+    expect(sliderWithValue.state.upperBound).to.be(100);
+    expect(ReactTestUtils
+           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[0]
+           .style.cssText)
+      .to.be('left: 100%; ');
+    expect(ReactTestUtils
+           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-handle')[1]
+           .style.cssText)
+      .to.be('left: 50%; ');
+    expect(ReactTestUtils
+           .scryRenderedDOMComponentsWithClass(sliderWithDefaultValue, 'rc-slider-track')[0]
+           .style.cssText)
+      .to.be('width: 50%; visibility: visible; left: 50%; ');
+  });
 
-  //   setTimeout( function() {
+  it('should render dots correctly when `dots=true`', () => {
-  //     expect(slider.state.active).to.be('active');
+    const slider = ReactDOM.render(<Slider value={50} step={10} dots />, div);
-  //     done();
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-dot').length).to.be(11);
-  //   }, 200);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-dot-active').length).to.be(6);
-  // });
 
+    const range = ReactDOM.render(<Slider range value={[20, 50]} step={10} dots />, div);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-dot').length).to.be(11);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-dot-active').length).to.be(4);
+  });
+
+  it('should render marks correctly when `marks` is not an empty object', () => {
+    const marks = {0: '0', 30: '30', 100: '100'};
+
+    const slider = ReactDOM.render(<Slider value={30} marks={marks} />, div);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-mark-text').length).to.be(3);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-mark-text')[0].innerHTML).to.be('0');
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-mark-text')[1].innerHTML).to.be('30');
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(slider, 'rc-slider-mark-text')[2].innerHTML).to.be('100');
+
+    const range = ReactDOM.render(<Slider range value={30} marks={marks} />, div);
+    expect(ReactTestUtils.scryRenderedDOMComponentsWithClass(range, 'rc-slider-mark-text').length).to.be(3);
+  });
+
+  it('should not set value greater than `max` or smaller `min`', () => {
+    const sliderWithMin = ReactDOM.render(<Slider value={0} min={10} />, div);
+    expect(sliderWithMin.state.upperBound).to.be(10);
+    ReactDOM.unmountComponentAtNode(div);
+
+    const sliderWithMax = ReactDOM.render(<Slider value={100} max={90} />, div);
+    expect(sliderWithMax.state.upperBound).to.be(90);
+    ReactDOM.unmountComponentAtNode(div);
+
+    const range = ReactDOM.render(<Slider range value={[0, 100]} min={10} max={90} />, div);
+    expect(range.state.lowerBound).to.be(10);
+    expect(range.state.upperBound).to.be(90);
+    ReactDOM.unmountComponentAtNode(div);
+  });
 });