Merge remote-tracking branch 'origin/master' into fix6960-hoversubplots

 - resolved conflicts in test/jasmine/tests/hover_label_test.js

Author: archmoj

draftlogs/6965_fix.md

@@ -0,0 +1 @@
+ - Fix duplicated points in splom hover when `hoversubplots` is set to "axis" [[#6965](https://github.com/plotly/plotly.js/pull/6965)]

src/traces/splom/hover.js

@@ -27,6 +27,9 @@ function hoverPoints(pointData, xval, yval, hovermode, opts) {
         for(var i = 0; i < subplotsWith.length; i++) {
             var spId = subplotsWith[i];
 
+            // do not reselect on the initial subplot
+            if(spId === (pointData.xa._id + pointData.ya._id)) continue;
+
             if(hovermodeHasY) {
                 _pointData.xa = getFromId(gd, spId, 'x');
             } else { // hovermodeHasX

test/jasmine/tests/hover_label_test.js

@@ -2666,32 +2666,25 @@ describe('splom hover on subplots when hoversubplots is set to *axis* and (x|y)
     it('splom hoversubplots: *axis*', function() {
         Lib.clearThrottle();
         Plotly.Fx.hover(gd, {x: 200, y: 200}, 'xy');
-        expect(gd._hoverdata.length).toBe(3);
-
         assertFirstPointOn(gd, 'x', 'y');
-
+        expect(gd._hoverdata.length).toBe(2);
         assertHoverLabelContent({
             nums: ['100', '100k'],
             name: ['', ''],
             axis: '100'
         });
 
         Plotly.relayout(gd, 'hovermode', 'x unified');
-
         Lib.clearThrottle();
         Plotly.Fx.hover(gd, {x: 200, y: 200}, 'xy');
-
         assertFirstPointOn(gd, 'x', 'y');
-
-        expect(gd._hoverdata.length).toBe(3);
+        expect(gd._hoverdata.length).toBe(2);
 
         Plotly.relayout(gd, 'hovermode', 'y unified');
         Lib.clearThrottle();
         Plotly.Fx.hover(gd, {x: 200, y: 200}, 'xy');
-
         assertFirstPointOn(gd, 'x', 'y');
-
-        expect(gd._hoverdata.length).toBe(3);
+        expect(gd._hoverdata.length).toBe(2);
     });
 });
 
@@ -2731,10 +2724,8 @@ describe('splom hover *axis* hoversubplots splom points on same position should
     it('splom *axis* hoversubplots', function() {
         Lib.clearThrottle();
         Plotly.Fx.hover(gd, {}, 'xy');
-        expect(gd._hoverdata.length).toBe(5);
-
         assertFirstPointOn(gd, 'x', 'y');
-
+        expect(gd._hoverdata.length).toBe(4);
         assertHoverLabelContent({
             nums: ['1', '1', '1', '1'],
             name: ['', '', '', ''],
@@ -2743,10 +2734,8 @@ describe('splom hover *axis* hoversubplots splom points on same position should
 
         Lib.clearThrottle();
         Plotly.Fx.hover(gd, {}, 'xy2');
-        expect(gd._hoverdata.length).toBe(4);
-
         assertFirstPointOn(gd, 'x', 'y2');
-
+        expect(gd._hoverdata.length).toBe(3);
         assertHoverLabelContent({
             nums: ['1', '2', '2'],
             name: ['', '', ''],
@@ -2755,10 +2744,8 @@ describe('splom hover *axis* hoversubplots splom points on same position should
 
         Lib.clearThrottle();
         Plotly.Fx.hover(gd, {}, 'xy3');
-        expect(gd._hoverdata.length).toBe(4);
-
         assertFirstPointOn(gd, 'x', 'y3');
-
+        expect(gd._hoverdata.length).toBe(3);
         assertHoverLabelContent({
             nums: ['1', '2', '2'],
             name: ['', '', ''],
@@ -2767,10 +2754,8 @@ describe('splom hover *axis* hoversubplots splom points on same position should
 
         Lib.clearThrottle();
         Plotly.Fx.hover(gd, {}, 'xy4');
-        expect(gd._hoverdata.length).toBe(5);
-
         assertFirstPointOn(gd, 'x', 'y4');
-
+        expect(gd._hoverdata.length).toBe(4);
         assertHoverLabelContent({
             nums: ['1', '3', '3', '3'],
             name: ['', '', '', ''],
@@ -2779,10 +2764,8 @@ describe('splom hover *axis* hoversubplots splom points on same position should
 
         Lib.clearThrottle();
         Plotly.Fx.hover(gd, {}, 'x2y');
-        expect(gd._hoverdata.length).toBe(5);
-
         assertFirstPointOn(gd, 'x2', 'y');
-
+        expect(gd._hoverdata.length).toBe(4);
         assertHoverLabelContent({
             nums: ['1', '3', '3', '3'],
             name: ['', '', '', ''],
@@ -2791,10 +2774,8 @@ describe('splom hover *axis* hoversubplots splom points on same position should
 
         Lib.clearThrottle();
         Plotly.Fx.hover(gd, {}, 'x3y');
-        expect(gd._hoverdata.length).toBe(5);
-
         assertFirstPointOn(gd, 'x3', 'y');
-
+        expect(gd._hoverdata.length).toBe(4);
         assertHoverLabelContent({
             nums: ['1', '3', '3', '3'],
             name: ['', '', '', ''],
@@ -2803,10 +2784,8 @@ describe('splom hover *axis* hoversubplots splom points on same position should
 
         Lib.clearThrottle();
         Plotly.Fx.hover(gd, {}, 'x4y');
-        expect(gd._hoverdata.length).toBe(5);
-
         assertFirstPointOn(gd, 'x4', 'y');
-
+        expect(gd._hoverdata.length).toBe(4);
         assertHoverLabelContent({
             nums: ['1', '3', '3', '3'],
             name: ['', '', '', ''],