fix y auto-scaling bug with adaptive-unidirectional zooming

leeoniya · May 15, 2020 · 0895041 · 0895041
1 parent 188e521
commit 0895041
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 17 deletions.
diff --git a/dist/uPlot.cjs.js b/dist/uPlot.cjs.js
@@ -2085,6 +2085,8 @@ function uPlot(opts, data, then) {
 
 	var drag =  cursor.drag;
 
+	var dragX =  drag.x;
+	var dragY =  drag.y;
 	if ( cursor.show) {
 		var c = "cursor-";
 
@@ -2355,8 +2357,9 @@ function uPlot(opts, data, then) {
 		if (mouseLeft1 >= 0 && select.show && dragging) {
 			// setSelect should not be triggered on move events
 
-			var dragX = drag.x;
-			var dragY = drag.y;
+			dragX = drag.x;
+			dragY = drag.y;
+
 			var uni = drag.uni;
 
 			if (uni != null) {
@@ -2511,14 +2514,14 @@ function uPlot(opts, data, then) {
 
 				if (drag.setScale) {
 					batch(function () {
-						if (drag.x) {
+						if (dragX) {
 							_setScale(xScaleKey,
 								scaleValueAtPos(select[LEFT], xScaleKey),
 								scaleValueAtPos(select[LEFT] + select[WIDTH], xScaleKey)
 							);
 						}
 
-						if (drag.y) {
+						if (dragY) {
 							for (var k in scales) {
 								var sc = scales[k];
 

diff --git a/dist/uPlot.esm.js b/dist/uPlot.esm.js
@@ -2077,6 +2077,8 @@ function uPlot(opts, data, then) {
 
 	const drag =  cursor.drag;
 
+	let dragX =  drag.x;
+	let dragY =  drag.y;
 	if ( cursor.show) {
 		let c = "cursor-";
 
@@ -2347,8 +2349,9 @@ function uPlot(opts, data, then) {
 		if (mouseLeft1 >= 0 && select.show && dragging) {
 			// setSelect should not be triggered on move events
 
-			let dragX = drag.x;
-			let dragY = drag.y;
+			dragX = drag.x;
+			dragY = drag.y;
+
 			let uni = drag.uni;
 
 			if (uni != null) {
@@ -2503,14 +2506,14 @@ function uPlot(opts, data, then) {
 
 				if (drag.setScale) {
 					batch(() => {
-						if (drag.x) {
+						if (dragX) {
 							_setScale(xScaleKey,
 								scaleValueAtPos(select[LEFT], xScaleKey),
 								scaleValueAtPos(select[LEFT] + select[WIDTH], xScaleKey),
 							);
 						}
 
-						if (drag.y) {
+						if (dragY) {
 							for (let k in scales) {
 								let sc = scales[k];
 

diff --git a/dist/uPlot.iife.js b/dist/uPlot.iife.js
@@ -2086,6 +2086,8 @@ var uPlot = (function () {
 
 		var drag =  cursor.drag;
 
+		var dragX =  drag.x;
+		var dragY =  drag.y;
 		if ( cursor.show) {
 			var c = "cursor-";
 
@@ -2356,8 +2358,9 @@ var uPlot = (function () {
 			if (mouseLeft1 >= 0 && select.show && dragging) {
 				// setSelect should not be triggered on move events
 
-				var dragX = drag.x;
-				var dragY = drag.y;
+				dragX = drag.x;
+				dragY = drag.y;
+
 				var uni = drag.uni;
 
 				if (uni != null) {
@@ -2512,14 +2515,14 @@ var uPlot = (function () {
 
 					if (drag.setScale) {
 						batch(function () {
-							if (drag.x) {
+							if (dragX) {
 								_setScale(xScaleKey,
 									scaleValueAtPos(select[LEFT], xScaleKey),
 									scaleValueAtPos(select[LEFT] + select[WIDTH], xScaleKey)
 								);
 							}
 
-							if (drag.y) {
+							if (dragY) {
 								for (var k in scales) {
 									var sc = scales[k];