expose cursor.idx, remove all args but self from cursormove event

leeoniya · Dec 8, 2019 · 5716304 · 5716304
1 parent ccef896
commit 5716304
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/demos/tooltips.html b/demos/tooltips.html
@@ -79,7 +79,9 @@
 					},
 					events: {
 						cursormove: [
-							(u, left, top, idx) => {
+							u => {
+								const {left, top, idx} = u.cursor;
+
 								u.cursortt.style.left = left + "px";
 								u.cursortt.style.top = top + "px";
 								u.cursortt.textContent = "(" + u.valAt(left, "x").toFixed(2) + ", " + u.valAt(top, "y").toFixed(2) + ")";

diff --git a/dist/uPlot.cjs.js b/dist/uPlot.cjs.js
@@ -854,6 +854,7 @@ function Line(opts, data) {
 		locked: false,
 		left: -10,
 		top: -10,
+		idx: null,
 	}, opts.cursor);
 
 	var focus = cursor.focus;		// focus: {alpha, prox}
@@ -1721,7 +1722,9 @@ function Line(opts, data) {
 			}
 		}
 
-		fire("cursormove", cursorLeft, cursorTop, idx);
+		cursor.idx = idx;
+
+		fire("cursormove");
 
 		if (pub !== false) {
 			sync.pub(mousemove, self, cursorLeft, cursorTop, canCssWidth, canCssHeight, idx);

diff --git a/dist/uPlot.iife.js b/dist/uPlot.iife.js
@@ -855,6 +855,7 @@ var uPlot = (function (exports) {
 			locked: false,
 			left: -10,
 			top: -10,
+			idx: null,
 		}, opts.cursor);
 
 		var focus = cursor.focus;		// focus: {alpha, prox}
@@ -1722,7 +1723,9 @@ var uPlot = (function (exports) {
 				}
 			}
 
-			fire("cursormove", cursorLeft, cursorTop, idx);
+			cursor.idx = idx;
+
+			fire("cursormove");
 
 			if (pub !== false) {
 				sync.pub(mousemove, self, cursorLeft, cursorTop, canCssWidth, canCssHeight, idx);

diff --git a/dist/uPlot.iife.min.js b/dist/uPlot.iife.min.js
diff --git a/src/Line.js b/src/Line.js
@@ -242,6 +242,7 @@ export function Line(opts, data) {
 		locked: false,
 		left: -10,
 		top: -10,
+		idx: null,
 	}, opts.cursor);
 
 	const focus = cursor.focus;		// focus: {alpha, prox}
@@ -1104,7 +1105,9 @@ export function Line(opts, data) {
 			}
 		}
 
-		fire("cursormove", cursorLeft, cursorTop, idx);
+		cursor.idx = idx;
+
+		fire("cursormove");
 
 		if (pub !== false) {
 			sync.pub(mousemove, self, cursorLeft, cursorTop, canCssWidth, canCssHeight, idx);