Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[Enhancement] Slider: use clientX to calculate delta to support windows IE and Tableau kepler.gl (#431)
Shan Hea780602489ae
diff --git a/src/components/common/slider/mouse-event.js b/src/components/common/slider/mouse-event.jsnew file mode 100644index 000000000..0c4991501--- /dev/null+++ b/src/components/common/slider/mouse-event.js@@ -0,0 +1,27 @@+// Copyright (c) 2019 Uber Technologies, Inc.+//+// Permission is hereby granted, free of charge, to any person obtaining a copy+// of this software and associated documentation files (the "Software"), to deal+// in the Software without restriction, including without limitation the rights+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell+// copies of the Software, and to permit persons to whom the Software is+// furnished to do so, subject to the following conditions:+//+// The above copyright notice and this permission notice shall be included in+// all copies or substantial portions of the Software.+//+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN+// THE SOFTWARE.++export function getMouseDeltaX(e, prevX) {++ // movementX might not be supported in some browser+ // https://stackoverflow.com/questions/41774726/mouseevent-movementx-property-apparently-not-supported-in-internet-explorer+ const deltaX = e.movementX === 0 ? e.clientX - prevX : e.movementX;+ return {deltaX, prevX: e.clientX};+}diff --git a/src/components/common/slider/slider-bar-handle.js b/src/components/common/slider/slider-bar-handle.jsindex c9750c333..c9a93b1ed 100644--- a/src/components/common/slider/slider-bar-handle.js+++ b/src/components/common/slider/slider-bar-handle.js@@ -23,6 +23,7 @@ import React, {Component} from 'react';import PropTypes from 'prop-types';import classnames from 'classnames';import styled from 'styled-components';+import {getMouseDeltaX} from './mouse-event';const StyledSlider = styled.div`position: relative;@@ -62,9 +63,10 @@ export default class SliderHandle extends Component {state = {mouseOver: false};prevX = 0;- handleMouseDown = () => {+ handleMouseDown = (e) => {document.addEventListener('mouseup', this.mouseup);document.addEventListener('mousemove', this.mousemove);+ this.prevX = e.clientX;this.setState({mouseOver: true});};@@ -76,7 +78,10 @@ export default class SliderHandle extends Component {mousemove = e => {e.preventDefault();- this.props.sliderBarListener(e.movementX);++ const {deltaX, prevX} = getMouseDeltaX(e, this.prevX);+ this.props.sliderBarListener(deltaX);+ this.prevX = prevX;};handleTouchStart = e => {diff --git a/src/components/common/slider/slider-handle.js b/src/components/common/slider/slider-handle.jsindex 61ec516c4..7402001b8 100644--- a/src/components/common/slider/slider-handle.js+++ b/src/components/common/slider/slider-handle.js@@ -23,6 +23,7 @@ import React, {Component} from 'react';import PropTypes from 'prop-types';import classnames from 'classnames';import styled from 'styled-components';+import {getMouseDeltaX} from './mouse-event';const StyledSliderHandle = styled.span`position: absolute;@@ -80,9 +81,10 @@ export default class SliderHandle extends Component {state = {mouseOver: false};prevX = 0;- handleMouseDown = () => {+ handleMouseDown = (e) => {document.addEventListener('mouseup', this.mouseup);document.addEventListener('mousemove', this.mousemove);+ this.prevX = e.clientX;this.setState({mouseOver: true});};@@ -94,7 +96,10 @@ export default class SliderHandle extends Component {mousemove = e => {e.preventDefault();- this.props.valueListener(e.movementX);++ const {deltaX, prevX} = getMouseDeltaX(e, this.prevX);+ this.props.valueListener(deltaX);+ this.prevX = prevX;};handleTouchStart = e => {