Merge pull request #79 from eddydg/bugfix/overlapping-events

Prevent overlapping mouse down events

Author: mblomdahl

README.md

@@ -191,6 +191,7 @@ Returns **{sw: {lat: [number](https://developer.mozilla.org/docs/Web/JavaScript/
 ### v. 1.6.7
 
 -   `optionalDependencies` removed from `package.json`, making this package easier to depend on ([#82](https://github.com/smithmicro/mapbox-gl-circle/issues/82))
+-   Bug fix for overlapping mouse-down events, causing the edit handle to lock until the user performs a full page refresh ([#80](https://github.com/smithmicro/mapbox-gl-circle/issues/80))
 
 ### v. 1.6.6
 

lib/main.js

@@ -501,6 +501,9 @@ class MapboxCircle {
      * @private
      */
     _onCenterHandleMouseDown() {
+        if (this._getCursorStyle() !== 'move') {
+            /* Only trigger center edit event if the user expects it. */ return;
+        }
         this._centerDragActive = true;
         this._mapOnDebounced('mousemove', this._onCenterHandleMouseMove);
         this.map.addLayer(this._getCenterHandleStrokeLayer(), this._circleCenterHandleId);
@@ -640,6 +643,9 @@ class MapboxCircle {
      * @private
      */
     _onRadiusHandlesMouseDown(event) {
+        if (!this._getCursorStyle().endsWith('-resize')) {
+            /* Only trigger radius edit event if the user expects it. */ return;
+        }
         this._radiusDragActive = true;
         this._mapOnDebounced('mousemove', this._onRadiusHandlesMouseMove);
         this.map.addLayer(this._getRadiusHandlesStrokeLayer(), this._circleRadiusHandlesId);
@@ -1115,6 +1121,14 @@ class MapboxCircle {
         };
     }
 
+    /**
+     * @return {string} Current cursor style
+     * @private
+     */
+    _getCursorStyle() {
+        return this.map.getCanvas().style.cursor;
+    }
+
     /**
      * Subscribe to circle event.
      * @param {string} event Event name; `click`, `contextmenu`, `centerchanged` or `radiuschanged`