handle splom

archmoj · archmoj · commit 680d8bdc6729 · 2024-04-05T11:51:41.000-04:00
diff --git a/src/components/fx/hover.js b/src/components/fx/hover.js
@@ -566,7 +566,11 @@ function _hover(gd, evt, subplot, noHoverEvent, eventTarget) {
                 if(trace._module && trace._module.hoverPoints) {
                     var newPoints = trace._module.hoverPoints(pointData, xval, yval, _mode, {
                         finiteRange: true,
-                        hoverLayer: fullLayout._hoverlayer
+                        hoverLayer: fullLayout._hoverlayer,
+
+                        // options for splom when hovering on same axis
+                        hoversameaxis: hoversameaxis,
+                        gd: gd
                     });
 
                     if(newPoints) {
diff --git a/src/traces/splom/hover.js b/src/traces/splom/hover.js
@@ -2,16 +2,64 @@
 
 var helpers = require('./helpers');
 var calcHover = require('../scattergl/hover').calcHover;
+var getFromId = require('../../plots/cartesian/axes').getFromId;
+var extendFlat = require('../../lib/extend').extendFlat;
 
-function hoverPoints(pointData, xval, yval) {
+function hoverPoints(pointData, xval, yval, hovermode, opts) {
+    if(!opts) opts = {};
+
+    var hovermodeHasX = (hovermode || '').charAt(0) === 'x';
+    var hovermodeHasY = (hovermode || '').charAt(0) === 'y';
+
+    var xpx = pointData.xa.c2p(xval);
+    var ypx = pointData.ya.c2p(yval);
+
+    var points = _hoverPoints(pointData, xpx, ypx);
+
+    if(opts.hoversameaxis && (hovermodeHasX || hovermodeHasY)) {
+        var _xpx = points[0]._xpx;
+        var _ypx = points[0]._ypx;
+
+        if(
+            (hovermodeHasX && _xpx !== undefined) ||
+            (hovermodeHasY && _ypx !== undefined)
+        ) {
+            var subplotsWith = (
+                hovermodeHasX ?
+                pointData.xa :
+                pointData.ya
+            )._subplotsWith;
+
+            var gd = opts.gd;
+
+            var _pointData = extendFlat({}, pointData);
+
+            for(var i = 0; i < subplotsWith.length; i++) {
+                var spId = subplotsWith[i];
+
+                if(hovermodeHasY) {
+                    _pointData.xa = getFromId(gd, spId, 'x');
+                } else { // hovermodeHasX
+                    _pointData.ya = getFromId(gd, spId, 'y');
+                }
+
+                var newPoints = _hoverPoints(_pointData, _xpx, _ypx, hovermodeHasX, hovermodeHasY);
+
+                points = points.concat(newPoints);
+            }
+        }
+    }
+
+    return points;
+}
+
+function _hoverPoints(pointData, xpx, ypx, hoversameaxisX, hoversameaxisY) {
     var cd = pointData.cd;
     var trace = cd[0].trace;
     var scene = pointData.scene;
     var cdata = scene.matrixOptions.cdata;
     var xa = pointData.xa;
     var ya = pointData.ya;
-    var xpx = xa.c2p(xval);
-    var ypx = ya.c2p(yval);
     var maxDistance = pointData.distance;
 
     var xi = helpers.getDimIndex(trace, xa);
@@ -21,19 +69,34 @@ function hoverPoints(pointData, xval, yval) {
     var x = cdata[xi];
     var y = cdata[yi];
 
-    var id, dxy;
+    var id, dxy, _xpx, _ypx;
     var minDist = maxDistance;
 
     for(var i = 0; i < x.length; i++) {
         var ptx = x[i];
         var pty = y[i];
-        var dx = xa.c2p(ptx) - xpx;
-        var dy = ya.c2p(pty) - ypx;
-        var dist = Math.sqrt(dx * dx + dy * dy);
+        var thisXpx = xa.c2p(ptx);
+        var thisYpx = ya.c2p(pty);
+
+        var dx = thisXpx - xpx;
+        var dy = thisYpx - ypx;
+        var dist = 0;
+
+        var pick = false;
+        if(hoversameaxisX) {
+            if(dx === 0) pick = true;
+        } else if(hoversameaxisY) {
+            if(dy === 0) pick = true;
+        } else {
+            dist = Math.sqrt(dx * dx + dy * dy);
+            if(dist < minDist) pick = true;
+        }
 
-        if(dist < minDist) {
+        if(pick) {
             minDist = dxy = dist;
             id = i;
+            _xpx = thisXpx;
+            _ypx = thisYpx;
         }
     }
 
@@ -43,7 +106,10 @@ function hoverPoints(pointData, xval, yval) {
 
     if(id === undefined) return [pointData];
 
-    return [calcHover(pointData, x, y, trace)];
+    var out = calcHover(pointData, x, y, trace);
+    out._xpx = _xpx;
+    out._ypx = _ypx;
+    return [out];
 }
 
 module.exports = {
