Skip to content

Hover on fills #673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jun 22, 2016
Merged

Hover on fills #673

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
43e8d30
hoveron=fills initial commit
alexcjohnson Jun 20, 2016
8aa4397
fix bug in heatmap + non-heatmap hover
alexcjohnson Jun 20, 2016
876bd1d
put fill hover label at the right (or left) middle.
alexcjohnson Jun 20, 2016
2018a74
prev trace changes fill hover the same way as it changes fill itself
alexcjohnson Jun 20, 2016
c7a9dd5
couple of perf and style tweaks to regular point hover
alexcjohnson Jun 20, 2016
5552c77
test hoveron=fills label position and text
alexcjohnson Jun 20, 2016
ffd56c7
fix and test hoveron=fills for scatterternary
alexcjohnson Jun 20, 2016
dddb6e1
lock test graphDiv to position 0,0 and other jasmine reliability tweaks
alexcjohnson Jun 21, 2016
1931102
test hoveron in supplyDefaults
alexcjohnson Jun 21, 2016
47d2df8
Merge branch 'master' into hoveron-fill
alexcjohnson Jun 21, 2016
025b788
more lenient test of hoveron fills label position
alexcjohnson Jun 21, 2016
1a685d4
appease eslint :cow2:
alexcjohnson Jun 21, 2016
f22fac8
give back a little more time in click_test doubleclick
alexcjohnson Jun 21, 2016
ba77f5b
copy hoveron fill testing mocks
alexcjohnson Jun 21, 2016
1d1a0f7
lib.coerce: allow flaglist with no extras
alexcjohnson Jun 21, 2016
aec4c95
make hoveron a flaglist
alexcjohnson Jun 21, 2016
1e86eb2
update scatter(ternary) supplyDefaults test for hoveron flaglist
alexcjohnson Jun 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions src/traces/scatter/hover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,16 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
// always will show up regardless of point size, but
// prioritize smaller points
var rad = Math.max(3, di.mrc || 0);
return Math.max(Math.abs(xa.c2p(di.x) - xa.c2p(xval)) - rad, 1 - 3 / rad);
return Math.max(Math.abs(xa.c2p(di.x) - xpx) - rad, 1 - 3 / rad);
},
dy = function(di) {
var rad = Math.max(3, di.mrc || 0);
return Math.max(Math.abs(ya.c2p(di.y) - ya.c2p(yval)) - rad, 1 - 3 / rad);
return Math.max(Math.abs(ya.c2p(di.y) - ypx) - rad, 1 - 3 / rad);
},
dxy = function(di) {
var rad = Math.max(3, di.mrc || 0),
dx = Math.abs(xa.c2p(di.x) - xa.c2p(xval)),
dy = Math.abs(ya.c2p(di.y) - ya.c2p(yval));
dx = xa.c2p(di.x) - xpx,
dy = ya.c2p(di.y) - ypx;
Copy link
Collaborator Author

@alexcjohnson alexcjohnson Jun 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dx, dy, and dxy are the hot path for scatter hover, this should make them a little faster.

return Math.max(Math.sqrt(dx * dx + dy * dy) - rad, 1 - 3 / rad);
},
distfn = Fx.getDistanceFunction(hovermode, dx, dy, dxy);
Expand All @@ -132,15 +132,17 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
yc = ya.c2p(di.y, true),
rad = di.mrc || 1;

pointData.color = getTraceColor(trace, di);
Lib.extendFlat(pointData, {
color: getTraceColor(trace, di),

pointData.x0 = xc - rad;
pointData.x1 = xc + rad;
pointData.xLabelVal = di.x;
x0: xc - rad,
x1: xc + rad,
xLabelVal: di.x,

pointData.y0 = yc - rad;
pointData.y1 = yc + rad;
pointData.yLabelVal = di.y;
y0: yc - rad,
y1: yc + rad,
yLabelVal: di.y
});

if(di.tx) pointData.text = di.tx;
else if(trace.text) pointData.text = trace.text;
Expand Down