Merge pull mapbox#1216 - avoid interfering with dragPan

axekan · Jun 24, 2024 · f433c3e · f433c3e
1 parent d876e82
commit f433c3e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/modes/direct_select.js b/src/modes/direct_select.js
@@ -28,13 +28,18 @@ DirectSelect.fireActionable = function(state) {
 };
 
 DirectSelect.startDragging = function(state, e) {
+  state.initialDragPanState = this.map.dragPan.isEnabled();
+
   this.map.dragPan.disable();
   state.canDragMove = true;
   state.dragMoveLocation = e.lngLat;
 };
 
 DirectSelect.stopDragging = function(state) {
-  this.map.dragPan.enable();
+  if (state.canDragMove && state.initialDragPanState === true) {
+    this.map.dragPan.enable();
+  }
+
   state.dragMoving = false;
   state.canDragMove = false;
   state.dragMoveLocation = null;

diff --git a/src/modes/simple_select.js b/src/modes/simple_select.js
@@ -18,6 +18,7 @@ SimpleSelect.onSetup = function(opts) {
     canBoxSelect: false,
     dragMoving: false,
     canDragMove: false,
+    initialDragPanState: this.map.dragPan.isEnabled(),
     initiallySelectedFeatureIds: opts.featureIds || []
   };
 
@@ -85,7 +86,9 @@ SimpleSelect.stopExtendedInteractions = function(state) {
     state.boxSelectElement = null;
   }
 
-  this.map.dragPan.enable();
+  if ((state.canDragMove || state.canBoxSelect) && state.initialDragPanState === true) {
+    this.map.dragPan.enable();
+  }
 
   state.boxSelecting = false;
   state.canBoxSelect = false;
@@ -164,7 +167,6 @@ SimpleSelect.startOnActiveFeature = function(state, e) {
 };
 
 SimpleSelect.clickOnFeature = function(state, e) {
-  if (e.defaultPrevented) return;
   // Stop everything
   doubleClickZoom.disable(this);
   this.stopExtendedInteractions(state);
@@ -208,6 +210,7 @@ SimpleSelect.clickOnFeature = function(state, e) {
 };
 
 SimpleSelect.onMouseDown = function(state, e) {
+  state.initialDragPanState = this.map.dragPan.isEnabled();
   if (CommonSelectors.isActiveFeature(e)) return this.startOnActiveFeature(state, e);
   if (this.drawConfig.boxSelect && CommonSelectors.isShiftMousedown(e)) return this.startBoxSelect(state, e);
 };

diff --git a/src/setup.js b/src/setup.js
@@ -66,10 +66,14 @@ export default function(ctx) {
       if (ctx.options.boxSelect) {
         ctx.boxZoomInitial = map.boxZoom.isEnabled();
         map.boxZoom.disable();
+        const dragPanIsEnabled = map.dragPan.isEnabled();
         // Need to toggle dragPan on and off or else first
         // dragPan disable attempt in simple_select doesn't work
         map.dragPan.disable();
         map.dragPan.enable();
+        if (!dragPanIsEnabled) {
+          map.dragPan.disable();
+        }
       }
 
       if (map.loaded()) {