From 06e31235fa07cbf1f99e29ff10859c4cbc3315c6 Mon Sep 17 00:00:00 2001
From: Xiaoji Chen <Pessimistress@users.noreply.github.com>
Date: Sun, 9 Oct 2016 10:35:56 -0700
Subject: [PATCH] Fix bug where onClickFeatures is fired after dragging (#133)

* Fix bug where onClickFeatures is fired after panning and rotating
* Rename dragged to didDrag
---
 src/map-interactions.react.js | 17 +++++++++++++++--
 src/map.react.js              |  9 +++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/map-interactions.react.js b/src/map-interactions.react.js
index 91925e2a..5e890827 100644
--- a/src/map-interactions.react.js
+++ b/src/map-interactions.react.js
@@ -64,10 +64,12 @@ const PROP_TYPES = {
   onMouseRotate: PropTypes.func,
   onMouseUp: PropTypes.func,
   onMouseMove: PropTypes.func,
+  onMouseClick: PropTypes.func,
   onTouchStart: PropTypes.func,
   onTouchDrag: PropTypes.func,
   onTouchRotate: PropTypes.func,
   onTouchEnd: PropTypes.func,
+  onTouchTap: PropTypes.func,
   onZoom: PropTypes.func,
   onZoomEnd: PropTypes.func
 };
@@ -78,10 +80,12 @@ const DEFAULT_PROPS = {
   onMouseRotate: noop,
   onMouseUp: noop,
   onMouseMove: noop,
+  onMouseClick: noop,
   onTouchStart: noop,
   onTouchDrag: noop,
   onTouchRotate: noop,
   onTouchEnd: noop,
+  onTouchTap: noop,
   onZoom: noop,
   onZoomEnd: noop
 };
@@ -91,6 +95,7 @@ export default class MapInteractions extends Component {
   constructor(props) {
     super(props);
     this.state = {
+      didDrag: false,
       startPos: null,
       pos: null,
       mouseWheelPos: null
@@ -113,6 +118,7 @@ export default class MapInteractions extends Component {
   _onMouseDown(event) {
     const pos = this._getMousePos(event);
     this.setState({
+      didDrag: false,
       startPos: pos,
       pos,
       metaKey: Boolean(event.metaKey)
@@ -126,6 +132,7 @@ export default class MapInteractions extends Component {
   _onTouchStart(event) {
     const pos = this._getTouchPos(event);
     this.setState({
+      didDrag: false,
       startPos: pos,
       pos,
       metaKey: Boolean(event.metaKey)
@@ -138,7 +145,7 @@ export default class MapInteractions extends Component {
   @autobind
   _onMouseDrag(event) {
     const pos = this._getMousePos(event);
-    this.setState({pos});
+    this.setState({pos, didDrag: true});
     if (this.state.metaKey) {
       const {startPos} = this.state;
       this.props.onMouseRotate({pos, startPos});
@@ -150,7 +157,7 @@ export default class MapInteractions extends Component {
   @autobind
   _onTouchDrag(event) {
     const pos = this._getTouchPos(event);
-    this.setState({pos});
+    this.setState({pos, didDrag: true});
     if (this.state.metaKey) {
       const {startPos} = this.state;
       this.props.onTouchRotate({pos, startPos});
@@ -167,6 +174,9 @@ export default class MapInteractions extends Component {
     const pos = this._getMousePos(event);
     this.setState({pos});
     this.props.onMouseUp({pos});
+    if (!this.state.didDrag) {
+      this.props.onMouseClick({pos});
+    }
   }
 
   @autobind
@@ -176,6 +186,9 @@ export default class MapInteractions extends Component {
     const pos = this._getTouchPos(event);
     this.setState({pos});
     this.props.onTouchEnd({pos});
+    if (!this.state.didDrag) {
+      this.props.onTouchTap({pos});
+    }
   }
 
   @autobind
diff --git a/src/map.react.js b/src/map.react.js
index 8bbb54d8..464234ab 100644
--- a/src/map.react.js
+++ b/src/map.react.js
@@ -582,6 +582,10 @@ export default class MapGL extends Component {
     this._onMouseUp(opt);
   }
 
+  @autobind _onTouchTap(opt) {
+    this._onMouseClick(opt);
+  }
+
   @autobind _onMouseUp(opt) {
     const map = this._getMap();
     this._callOnChangeViewport(map.transform, {
@@ -590,11 +594,14 @@ export default class MapGL extends Component {
       startBearing: null,
       startPitch: null
     });
+  }
 
+  @autobind _onMouseClick(opt) {
     if (!this.props.onClickFeatures) {
       return;
     }
 
+    const map = this._getMap();
     const pos = opt.pos;
 
     // Radius enables point features, like marker symbols, to be clicked.
@@ -651,10 +658,12 @@ export default class MapGL extends Component {
           onMouseRotate ={ this._onMouseRotate }
           onMouseUp ={ this._onMouseUp }
           onMouseMove ={ this._onMouseMove }
+          onMouseClick = { this._onMouseClick }
           onTouchStart ={ this._onTouchStart }
           onTouchDrag ={ this._onTouchDrag }
           onTouchRotate ={ this._onTouchRotate }
           onTouchEnd ={ this._onTouchEnd }
+          onTouchTap = { this._onTouchTap }
           onZoom ={ this._onZoom }
           onZoomEnd ={ this._onZoomEnd }
           width ={ this.props.width }