Fix: Honor zoom.mode (xy/x/y) when applying zoom.threshold

Enhances #317
chartjs · May 7, 2020 · 2fd819f · 2fd819f
1 parent 9fa7036
commit 2fd819f
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/plugin.js b/src/plugin.js
@@ -482,20 +482,24 @@ var zoomPlugin = {
 			chartInstance.$zoom._dragZoomStart = null;
 			chartInstance.$zoom._dragZoomEnd = null;
 
+			var zoomOptions = chartInstance.$zoom._options.zoom;
+			var xEnabled = directionEnabled(zoomOptions.mode, 'x', chartInstance);
+			var yEnabled = directionEnabled(zoomOptions.mode, 'y', chartInstance);
+
 			var zoomThreshold = options.zoom && options.zoom.threshold || 0;
-			if (dragDistanceX <= zoomThreshold && dragDistanceY <= zoomThreshold) {
+			if (xEnabled && dragDistanceX <= zoomThreshold) {
+				return;
+			}
+			if (yEnabled && dragDistanceY <= zoomThreshold) {
 				return;
 			}
 
 			var chartArea = chartInstance.chartArea;
 
-			var zoomOptions = chartInstance.$zoom._options.zoom;
 			var chartDistanceX = chartArea.right - chartArea.left;
-			var xEnabled = directionEnabled(zoomOptions.mode, 'x', chartInstance);
 			var zoomX = xEnabled && dragDistanceX ? 1 + ((chartDistanceX - dragDistanceX) / chartDistanceX) : 1;
 
 			var chartDistanceY = chartArea.bottom - chartArea.top;
-			var yEnabled = directionEnabled(zoomOptions.mode, 'y', chartInstance);
 			var zoomY = yEnabled && dragDistanceY ? 1 + ((chartDistanceY - dragDistanceY) / chartDistanceY) : 1;
 
 			doZoom(chartInstance, zoomX, zoomY, {