change the handle argv and testcase for clear logic

react-component · Feb 6, 2018 · b0ffcc3 · b0ffcc3
1 parent 7c263a7
commit b0ffcc3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/Range.jsx b/src/Range.jsx
@@ -263,7 +263,7 @@ class Range extends React.Component {
     return true;
   }
 
-  trimAlignValue(v, handle = this.state.handle, nextProps = {}) {
+  trimAlignValue(v, handle, nextProps = {}) {
     const mergedProps = { ...this.props, ...nextProps };
     const valInRange = utils.ensureValueInRange(v, mergedProps);
     const valNotConflict = this.ensureValueNotConflict(handle, valInRange, mergedProps);
@@ -273,6 +273,7 @@ class Range extends React.Component {
   ensureValueNotConflict(handle, val, { allowCross, pushable: thershold }) {
     const state = this.state || {};
     const { bounds } = state;
+    handle = handle === undefined ? state.handle : handle;
     thershold = Number(thershold);
     /* eslint-disable eqeqeq */
     if (!allowCross && handle != null && bounds !== undefined) {

diff --git a/tests/Range.test.js b/tests/Range.test.js
@@ -155,7 +155,7 @@ describe('Range', () => {
 
     const mockRect = (wrapper) => {
       wrapper.instance().getSlider().sliderRef.getBoundingClientRect = () => ({
-        left: 10,
+        left: 0,
         width: 100,
       });
     };
@@ -169,16 +169,16 @@ describe('Range', () => {
     expect(wrapper.instance().getSlider().state.bounds[0]).toBe(20);
     expect(wrapper.instance().getSlider().state.bounds[1]).toBe(40);
 
-    wrapper.find('.rc-slider').simulate('mouseDown', { button: 0, pageX: 10, pageY: 0 });
-    map.mousemove({ type: 'mousemove', pageX: 40, pageY: 0 });
-    map.mouseup({ type: 'mouseup', pageX: 40, pageY: 0 });
+    wrapper.find('.rc-slider').simulate('mouseDown', { button: 0, pageX: 0, pageY: 0 });
+    map.mousemove({ type: 'mousemove', pageX: 30, pageY: 0 });
+    map.mouseup({ type: 'mouseup', pageX: 30, pageY: 0 });
 
     expect(wrapper.instance().getSlider().state.bounds[0]).toBe(30);
     expect(wrapper.instance().getSlider().state.bounds[1]).toBe(40);
 
-    wrapper.find('.rc-slider').simulate('mouseDown', { button: 0, pageX: 10, pageY: 0 });
-    map.mousemove({ type: 'mousemove', pageX: 60, pageY: 0 });
-    map.mouseup({ type: 'mouseup', pageX: 60, pageY: 0 });
+    wrapper.find('.rc-slider').simulate('mouseDown', { button: 0, pageX: 0, pageY: 0 });
+    map.mousemove({ type: 'mousemove', pageX: 50, pageY: 0 });
+    map.mouseup({ type: 'mouseup', pageX: 50, pageY: 0 });
     expect(wrapper.instance().getSlider().state.bounds[0]).toBe(39);
     expect(wrapper.instance().getSlider().state.bounds[1]).toBe(40);
   });