Skip to content

Commit

Permalink
fix(Range): Prevent right-button dragging
Browse files Browse the repository at this point in the history
  • Loading branch information
guanpu committed Nov 13, 2018
1 parent 04f9466 commit 24b6769
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
14 changes: 8 additions & 6 deletions src/range/view/range.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -343,12 +343,14 @@ export default class Range extends React.Component {
}

_onMouseDown(e) {
this.setState({
hasMovingClass: true
});
this._start(e.pageX);
this._addDocumentEvents();
pauseEvent(e);
if(e.button === 0) {
this.setState({
hasMovingClass: true
});
this._start(e.pageX);
this._addDocumentEvents();
pauseEvent(e);
}
}

_start(position) {
Expand Down
10 changes: 5 additions & 5 deletions test/range/index-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ describe('Range ', () => {
</Range>);

const RangeInstance = wrapper.find('Range').at(0).instance();
RangeInstance._onMouseDown({pageX: 10, stopPropagation: () => {}, preventDefault: () => {} });
RangeInstance._onMouseDown({button: 0, pageX: 10, stopPropagation: () => {}, preventDefault: () => {} });
RangeInstance._move({pageX: 20, stopPropagation: () => {}, preventDefault: () => {}});
RangeInstance._end();

Expand Down Expand Up @@ -204,14 +204,14 @@ describe('Range ', () => {
</Range>);

const RangeInstance = wrapper.find('Range').at(0).instance();
RangeInstance._onMouseDown({pageX: 10, stopPropagation: () => {}, preventDefault: () => {} });
RangeInstance._onMouseDown({button: 0, pageX: 10, stopPropagation: () => {}, preventDefault: () => {} });
RangeInstance._move({pageX: 30, stopPropagation: () => {}, preventDefault: () => {}});
RangeInstance._end();

assert(changeValue[0] === 20);
assert(changeValue[1] === 30);

RangeInstance._onMouseDown({pageX: 30, stopPropagation: () => {}, preventDefault: () => {} });
RangeInstance._onMouseDown({button: 0, pageX: 30, stopPropagation: () => {}, preventDefault: () => {} });
RangeInstance._move({pageX: 0, stopPropagation: () => {}, preventDefault: () => {}});
RangeInstance._end();

Expand Down Expand Up @@ -275,7 +275,7 @@ describe('Range ', () => {

const RangeInstance = wrapper.find('Range').at(0).instance();

RangeInstance._onMouseDown({pageX: 10, stopPropagation: () => {}, preventDefault: () => {} });
RangeInstance._onMouseDown({button: 0, pageX: 10, stopPropagation: () => {}, preventDefault: () => {} });
assert(RangeInstance.dom.querySelector('.next-range-active') !== null);
});

Expand All @@ -293,7 +293,7 @@ describe('Range ', () => {

assert(document.querySelector('.next-balloon-tooltip') === null);
// wrapper.find('.next-range-frag').simulate('mousedown');
ReactTestUtils.Simulate.mouseDown(document.querySelectorAll('.next-range-frag')[0]);
ReactTestUtils.Simulate.mouseDown(document.querySelectorAll('.next-range-frag')[0], {button: 0});
assert(document.querySelector('.next-balloon-tooltip') !== null);
simulateEvent.simulate(document, 'mouseup');

Expand Down

0 comments on commit 24b6769

Please sign in to comment.