Skip to content

Commit b63ef4e

Browse files
committed
Cross browser improvement (Firefox) for mouse hover events
1 parent 4a76522 commit b63ef4e

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

src/traces/parcoords/parcoords.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,10 @@ module.exports = function(root, svg, styledData, layout, callbacks) {
315315
var event = d3.event;
316316
var cw = this.width;
317317
var ch = this.height;
318-
var x = event.layerX + c.overdrag - d.model.translateX;
319-
var y = event.layerY - d.model.translateY;
318+
var pointer = d3.mouse(this);
319+
var x = pointer[0];
320+
var y = pointer[1];
321+
320322
if(x < 0 || y < 0 || x >= cw || y >= ch) {
321323
return;
322324
}

test/jasmine/tests/parcoords_test.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -668,15 +668,16 @@ describe('parcoords', function() {
668668

669669
expect(tester.get()).toBe(false);
670670

671-
mouseEvent('mousemove', 916, 267);
672-
mouseEvent('mouseover', 916, 267);
671+
mouseEvent('mousemove', 324, 216);
672+
mouseEvent('mouseover', 324, 216);
673673

674674
window.setTimeout(function() {
675675

676-
expect(tester.get().hover && tester.get().hover.curveNumber).toBe(4);
676+
expect(tester.get().hover && tester.get().hover.curveNumber).not.toBe(null);
677+
expect(tester.get().hover && tester.get().hover.curveNumber).not.toBe(undefined);
677678

678-
mouseEvent('mousemove', 800, 240);
679-
mouseEvent('mouseover', 800, 240);
679+
mouseEvent('mousemove', 329, 153);
680+
mouseEvent('mouseover', 329, 153);
680681

681682
window.setTimeout(function() {
682683

0 commit comments

Comments
 (0)