fix style. fixes #19

Sending new value to _start while dragging

.npmignore

@@ -1,29 +0,0 @@
-build/
-*.cfg
-nohup.out
-*.iml
-.idea/
-.ipr
-.iws
-*~
-~*
-*.diff
-*.log
-*.patch
-*.bak
-.DS_Store
-Thumbs.db
-.project
-.*proj
-.svn/
-*.swp
-out/
-.build
-node_modules
-.cache
-examples
-tests
-src
-/index.js
-.*
-assets/**/*.less

.travis.yml

@@ -1,5 +1,7 @@
 language: node_js
 
+sudo: false
+
 notifications:
   email:
   - yiminghe@gmail.com
@@ -34,3 +36,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

@@ -99,6 +99,12 @@ React.render(<Rcslider />, container);
           <td>number</td>
           <td>0</td>
           <td>Determines the initial positions of the handles.</td>
+        </tr>
+         <tr>
+          <td>value</td>
+          <td>number</td>
+          <td></td>
+          <td>Determines the current positions of the handles.</td>
         </tr>
         <tr>
           <td>marks</td>
@@ -118,12 +124,24 @@ React.render(<Rcslider />, container);
           <td>0</td>
           <td>For step or marks slider, determine the initial positions of the handles.</td>
         </tr>
+        <tr>
+          <td>index</td>
+          <td>number</td>
+          <td></td>
+          <td>For step or marks slider, determine current positions of the handles.</td>
+        </tr>
         <tr>
           <td>disabled</td>
           <td>boolean</td>
           <td>false</td>
           <td>If true the handles can't be moved.</td>
         </tr>
+        <tr>
+          <td>tipTransitionName</td>
+          <td>string</td>
+          <td>''</td>
+          <td>Set the animation for tooltip if it shows.</td>
+        </tr>
     </tbody>
 </table>
 
@@ -136,17 +154,17 @@ npm start
 
 ## Example
 
-http://localhost:8000/examples/
+http://localhost:8005/examples/
 
-online example: http://react-component.github.io/slider/examples/
+online example: http://react-component.github.io/slider/
 
 ## Test Case
 
-http://localhost:8000/tests/runner.html?coverage
+http://localhost:8005/tests/runner.html?coverage
 
 ## Coverage
 
-http://localhost:8000/node_modules/rc-server/node_modules/node-jscover/lib/front-end/jscoverage.html?w=http://localhost:8088/tests/runner.html?coverage
+http://localhost:8005/node_modules/rc-server/node_modules/node-jscover/lib/front-end/jscoverage.html?w=http://localhost:8088/tests/runner.html?coverage
 
 ## License
 

assets/index.less

@@ -8,15 +8,17 @@
 @tooltip-arrow-width: 4px;
 @tooltip-distance: @tooltip-arrow-width+4;
 @tooltip-arrow-color: @tooltip-bg;
+@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} {
@@ -26,6 +28,8 @@
   border-radius: @border-radius-base;
   background-color: #e9e9e9;
 
+  .borderBox();
+
   &-track {
     position: absolute;
     left: 0;
@@ -136,6 +140,8 @@
     z-index: 4;
     visibility: visible;
 
+    .borderBox();
+
     &-hidden {
       display: none;
     }
@@ -174,4 +180,64 @@
       border-top-color: @tooltip-arrow-color;
     }
   }
+}
+
+.motion-common() {
+  animation-duration: .3s;
+  animation-fill-mode: both;
+  display: block !important;
+}
+
+.make-motion(@className, @keyframeName) {
+  .@{className}-enter, .@{className}-appear {
+    .motion-common();
+    animation-play-state: paused;
+  }
+  .@{className}-leave {
+    .motion-common();
+    animation-play-state: paused;
+  }
+  .@{className}-enter.@{className}-enter-active, .@{className}-appear.@{className}-appear-active {
+    animation-name: ~"@{keyframeName}In";
+    animation-play-state: running;
+  }
+  .@{className}-leave.@{className}-leave-active {
+    animation-name: ~"@{keyframeName}Out";
+    animation-play-state: running;
+  }
+}
+.zoom-motion(@className, @keyframeName) {
+  .make-motion(@className, @keyframeName);
+  .@{className}-enter, .@{className}-appear {
+    transform: scale(0, 0); // need this by yiminghe
+    animation-timing-function: @ease-out-quint;
+  }
+  .@{className}-leave {
+    animation-timing-function: @ease-in-quint;
+  }
+}
+.zoom-motion(rc-slider-tooltip-zoom-down, rcSliderTooltipZoomDownOut);
+
+@keyframes rcSliderTooltipZoomDownOutIn {
+  0% {
+    opacity: 0;
+    transform-origin: 50% 100%;
+    transform: scale(0, 0);
+  }
+  100% {
+    transform-origin: 50% 100%;
+    transform: scale(1, 1);
+  }
+}
+
+@keyframes rcSliderTooltipZoomDownOutOut {
+  0% {
+    transform-origin: 50% 100%;
+    transform: scale(1, 1);
+  }
+  100% {
+    opacity: 0;
+    transform-origin: 50% 100%;
+    transform: scale(0, 0);
+  }
 }

examples/simple.js

@@ -1,6 +1,6 @@
 'use strict';
 
-require('rc-slider/assets/index.css');
+require('rc-slider/assets/index.less');
 
 var Slider = require('rc-slider');
 var React = require('react');
@@ -9,6 +9,6 @@ function onChange(v){
   console.log(v);
 }
 
-// React.render(<Slider marks={["一","二","三","四","五"]} index={3}/>, document.getElementById('__react-content'));
+// React.render(<div style={{width:400,margin:100}}><Slider marks={["一","二","三","四","五"]} defaultIndex={2} /></div>, document.getElementById('__react-content'));
-// React.render(<Slider className='rc-slider' step={20}/>, 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}/></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.0",
+  "version": "1.5.0",
   "description": "slider ui component for react",
   "keywords": [
     "react",
@@ -24,18 +24,18 @@
   "licenses": "MIT",
   "main": "./lib/index.js",
   "config": {
-    "port": 8000
+    "port": 8005
   },
   "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

@@ -33,7 +33,7 @@ function getValueFromIndex(props) {
   }
   if (marksLen > 0) {
     value = ((props.max - props.min) / (marksLen - 1)) * (index);
-    value = value.toFixed(5);
+    value = value.toFixed(5) / 1;
   }
   return value;
 }
@@ -56,6 +56,7 @@ const Slider = React.createClass({
     onBeforeChange: React.PropTypes.func,
     onChange: React.PropTypes.func,
     onAfterChange: React.PropTypes.func,
+    tipTransitionName: React.PropTypes.string,
   },
 
   getDefaultProps() {
@@ -70,6 +71,7 @@ const Slider = React.createClass({
       prefixCls: 'rc-slider',
       disabled: false,
       defaultIndex: 0,
+      tipTransitionName: '',
     };
   },
 
@@ -103,8 +105,14 @@ const Slider = React.createClass({
     }
   },
 
-  onMouseUp() {
+  onMouseUp(e) {
-    this._end('mouse');
+    const m = e.target;
+    const handleDom = React.findDOMNode(this.refs.handle);
+    let showToolTip = false;
+    if (m === handleDom) {
+      showToolTip = true;
+    }
+    this._end('mouse', showToolTip);
   },
 
   onTouchUp() {
@@ -112,7 +120,7 @@ const Slider = React.createClass({
   },
 
   onMouseMove(e) {
-    const position = e.pageX;
+    const position = e.pageX || (e.clientX + document.documentElement.scrollLeft); // to compat ie8
     this.onMove(e, position);
   },
 
@@ -156,16 +164,16 @@ 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);
   },
 
   onSliderMouseDown(e) {
-    const position = e.pageX;
+    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);
   },
@@ -299,6 +307,7 @@ const Slider = React.createClass({
       tooltipVisible = true;
     } else {
       events = {
+        onClick: this.showTooltip.bind(this, true),
         onMouseEnter: this.showTooltip.bind(this, true),
         onMouseLeave: this.showTooltip.bind(this, false),
       };
@@ -307,8 +316,8 @@ const Slider = React.createClass({
 
     const handle = (<div className={className}
       {...events}
-                          ref="handle"
+      ref="handle"
-                          style={onStyle}></div>);
+      style={onStyle}></div>);
 
     if (this.props.marks.length > 0) {
       return handle;
@@ -319,6 +328,7 @@ const Slider = React.createClass({
         visible={tooltipVisible}
         overlay={<span>{this.state.value}</span>}
         delay={0}
+        transitionName={this.props.tipTransitionName}
         prefixCls={prefixClsFn(prefixCls, 'tooltip')}>
         {handle}
       </Tooltip>
@@ -357,8 +367,8 @@ const Slider = React.createClass({
 
     return (
       <div className={rcUtil.classSet(sliderClassName)} ref="slider"
-           onTouchStart={disabled ? noop : this.onTouchStart}
+        onTouchStart={disabled ? noop : this.onTouchStart}
-           onMouseDown={disabled ? noop : this.onSliderMouseDown}>
+        onMouseDown={disabled ? noop : this.onSliderMouseDown}>
         {track}
         {ons}
         {steps}
@@ -458,21 +468,21 @@ 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,
     });
   },
 
-  _end(type) {
+  _end(type, showToolTip) {
     this._removeEventons(type);
     this._triggerEvents('onAfterChange');
     this.setState({
       dragging: false,
-      showTooltip: false,
+      showTooltip: !!showToolTip,
     });
   },
 });

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');