Merge pull request #24 from react-component/step-marks-fix

Step marks fix

.travis.yml

@@ -7,7 +7,7 @@ notifications:
   - yiminghe@gmail.com
 
 node_js:
-- 0.12
+- 4.0.0
 
 before_install:
 - |
@@ -16,7 +16,6 @@ before_install:
       echo "Only docs were updated, stopping build process."
       exit
     fi
-    npm install mocha-phantomjs -g
     phantomjs --version
 
 script:
@@ -36,3 +35,8 @@ env:
   global:
   - secure: S1VwbaPzLnSH/IUT/wlJulxAX5VHRIDmSt53h/ycHcZsszUpWcLCJRQAe0fTVB2dAx5MdBbSZ+o+tr3tRwVB5TRAYm0oTCsYAkOZaWOB28RuUQtdGt3wf9xxTG1UiPiaLLUW3waX9zAaf3yqKBcJGf1op0RD8dksxbCFw/7xVbU=
   - secure: EBEDg8k///IlEsnx0AE8X3mbFl0QE5+xGKbG4AxXlGZda12uTIPUSMKJzdZQ2hVbZXduTzf1cQl9rcu9nGoSnkL/DWnIax9cvHi+1orx5+YPlxPHNWAwWByTnHosBn2MJhfy1s5paJfHC9cUzmmEL6x4fYthWxjsPUo+irEZH6E=
+
+
+matrix:
+  allow_failures:
+  - env: "TEST_TYPE=saucelabs"

README.md

@@ -142,6 +142,12 @@ React.render(<Rcslider />, container);
           <td>''</td>
           <td>Set the animation for tooltip if it shows.</td>
         </tr>
+        <tr>
+          <td>withDots</td>
+          <td>bool</td>
+          <td>false</td>
+          <td>For linear slider, when the `step` value is greater than 1, you can set the `withDots` to  `true` if you want to render the slider bar with dots.</td>
+        </tr>
     </tbody>
 </table>
 

assets/index.less

@@ -11,14 +11,14 @@
 @ease-out-quint      : cubic-bezier(0.23, 1, 0.32, 1);
 @ease-in-quint       : cubic-bezier(0.755, 0.05, 0.855, 0.06);
 
-* {
+.borderBox() {
   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;
-  box-sizing: border-box;
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0); //  remove tap highlight color for mobile safari
+  }
 }
 
 .@{prefixClass} {
@@ -28,6 +28,8 @@
   border-radius: @border-radius-base;
   background-color: #e9e9e9;
 
+  .borderBox();
+
   &-track {
     position: absolute;
     left: 0;
@@ -119,13 +121,13 @@
       background-color: @disabledColor;
     }
 
-    .@{prefixClass}-handle {
+    .@{prefixClass}-handle, .@{prefixClass}-dot {
       border-color: @disabledColor;
       background-color: #fff;
       cursor: not-allowed;
     }
 
-    .@{prefixClass}-mark-text, .dot {
+    .@{prefixClass}-mark-text, .@{prefixClass}-dot {
       cursor: not-allowed!important;
     }
   }
@@ -138,6 +140,8 @@
     z-index: 4;
     visibility: visible;
 
+    .borderBox();
+
     &-hidden {
       display: none;
     }
@@ -212,9 +216,9 @@
     animation-timing-function: @ease-in-quint;
   }
 }
-.zoom-motion(zoom-down, zoomDown);
+.zoom-motion(rc-slider-tooltip-zoom-down, rcSliderTooltipZoomDown);
 
-@keyframes zoomDownIn {
+@keyframes rcSliderTooltipZoomDownIn {
   0% {
     opacity: 0;
     transform-origin: 50% 100%;
@@ -226,7 +230,7 @@
   }
 }
 
-@keyframes zoomDownOut {
+@keyframes rcSliderTooltipZoomDownOut {
   0% {
     transform-origin: 50% 100%;
     transform: scale(1, 1);

examples/simple.js

@@ -10,5 +10,6 @@ function onChange(v){
 }
 
 // React.render(<div style={{width:400,margin:100}}><Slider marks={["一","二","三","四","五"]} defaultIndex={2} /></div>, document.getElementById('__react-content'));
+// React.render(<div style={{width:400,margin:100}}><Slider withDots className='rc-slider' step={20}/></div>, document.getElementById('__react-content'));
 // React.render(<div style={{width:400,margin:100}}><Slider className='rc-slider' step={20}/></div>, document.getElementById('__react-content'));
-React.render(<div style={{width:400,margin:100}}><Slider onChange={onChange}  tipTransitionName='zoom-down'/></div>, document.getElementById('__react-content'));
+React.render(<div style={{width:400,margin:100}}><Slider onChange={onChange}  tipTransitionName='rc-slider-tooltip-zoom-down'/></div>, document.getElementById('__react-content'));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-slider",
-  "version": "1.4.4",
+  "version": "1.5.1",
   "description": "slider ui component for react",
   "keywords": [
     "react",
@@ -29,13 +29,13 @@
   "scripts": {
     "build": "rc-tools run build",
     "gh-pages": "rc-tools run gh-pages",
-    "start": "node --harmony node_modules/.bin/rc-server",
+    "start": "rc-server",
     "pub": "rc-tools run pub",
     "lint": "rc-tools run lint",
     "karma": "rc-tools run karma",
-    "saucelabs": "node --harmony node_modules/.bin/rc-tools run saucelabs",
+    "saucelabs": "rc-tools run saucelabs",
-    "browser-test": "node --harmony node_modules/.bin/rc-tools run browser-test",
+    "browser-test": "rc-tools run browser-test",
-    "browser-test-cover": "node --harmony node_modules/.bin/rc-tools run browser-test-cover"
+    "browser-test-cover": "rc-tools run browser-test-cover"
   },
   "devDependencies": {
     "expect.js": "0.3.x",
@@ -43,7 +43,6 @@
     "rc-server": "3.x",
     "rc-tools": "4.x",
     "react": "^0.13.x",
-    "node-dev": "2.x",
     "jquery": "^1.11.2"
   },
   "precommit": [

src/Slider.jsx

@@ -57,6 +57,7 @@ const Slider = React.createClass({
     onChange: React.PropTypes.func,
     onAfterChange: React.PropTypes.func,
     tipTransitionName: React.PropTypes.string,
+    withDots: React.PropTypes.bool,
   },
 
   getDefaultProps() {
@@ -72,6 +73,7 @@ const Slider = React.createClass({
       disabled: false,
       defaultIndex: 0,
       tipTransitionName: '',
+      withDots: false,
     };
   },
 
@@ -164,7 +166,7 @@ const Slider = React.createClass({
     const position = this._getTouchPosition(e);
     const value = this._calValueByPos(position);
     this._triggerEvents('onChange', value);
-    this._start(position);
+    this._start(position, value);
     this._addDocumentEvents('touch');
     pauseEvent(e);
   },
@@ -173,7 +175,7 @@ const Slider = React.createClass({
     const position = e.pageX || (e.clientX + document.documentElement.scrollLeft); // to compat ie8
     const value = this._calValueByPos(position);
     this._triggerEvents('onChange', value);
-    this._start(position);
+    this._start(position, value);
     this._addDocumentEvents('mouse');
     pauseEvent(e);
   },
@@ -208,37 +210,43 @@ const Slider = React.createClass({
   renderSteps() {
     const props = this.props;
     const marksLen = props.marks.length;
-    const stepNum = marksLen > 0 ? marksLen : Math.floor((props.max - props.min) / props.step) + 1;
+    const withDots = props.withDots;
-    const unit = 100 / (stepNum - 1);
 
-    const prefixCls = props.prefixCls;
+    if (marksLen || withDots) {
-    const stepClassName = prefixClsFn(prefixCls, 'step');
+      const stepNum = marksLen ? marksLen : Math.floor((props.max - props.min) / props.step) + 1;
+      const unit = 100 / (stepNum - 1);
 
-    const elements = [];
+      const prefixCls = props.prefixCls;
-    for (let i = 0; i < stepNum; i++) {
+      const stepClassName = prefixClsFn(prefixCls, 'step');
-      const offset = unit * i + '%';
+
-      const style = {
+      const elements = [];
-        left: offset,
+      for (let i = 0; i < stepNum; i++) {
-      };
+        const offset = unit * i + '%';
-      let className = prefixClsFn(prefixCls, 'dot');
+        const style = {
-      if (props.isIncluded) {
+          left: offset,
-        if (i <= this.getIndex()) {
+        };
-          className = prefixClsFn(prefixCls, 'dot', 'dot-active');
+        let className = prefixClsFn(prefixCls, 'dot');
+        if (props.isIncluded) {
+          if (i <= this.getIndex()) {
+            className = prefixClsFn(prefixCls, 'dot', 'dot-active');
+          }
+        } else {
+          className = (i === this.getIndex()) ? prefixClsFn(prefixCls, 'dot', 'dot-active') : className;
         }
-      } else {
+
-        className = (i === this.getIndex()) ? prefixClsFn(prefixCls, 'dot', 'dot-active') : className;
+        elements[i] = (
+          <span className={className} style={style} ref={'step' + i} key={'step' + i}></span>
+        );
       }
 
-      elements[i] = (
+      return (
-        <span className={className} style={style} ref={'step' + i} key={'step' + i}></span>
+        <div className={stepClassName}>
+          {elements}
+        </div>
       );
     }
 
-    return (
+    return null;
-      <div className={stepClassName}>
-        {elements}
-      </div>
-    );
   },
 
   renderMark(i) {
@@ -468,9 +476,9 @@ const Slider = React.createClass({
     }
   },
 
-  _start(position) {
+  _start(position, value) {
     this._triggerEvents('onBeforeChange');
-    this.startValue = this.state.value;
+    this.startValue = value;
     this.startPosition = position;
     this.setState({
       dragging: true,

tests/index.spec.js

@@ -1,7 +1,7 @@
 
 var expect = require('expect.js');
 var Slider = require('../index.js');
-var React = require('react');
+var React = require('react/addons');
 var TestUtils = React.addons.TestUtils;
 var Simulate = TestUtils.Simulate;
 var $ = require('jquery');
@@ -39,8 +39,14 @@ describe('rc-slider', function () {
     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(6);
     expect(slider.state.value).to.be(0);
+
+    var sliderWithDots = React.render(
+      <Slider className='rc-slider' step={20} withDots/>,
+      div
+    );
+    var node1 = $(div);
+    expect(node1.find('.rc-slider-dot').length).to.be(6);
   });
 
   it('should render a slider with marks correctly!', function () {