Manually trigger rehover behavior

Author: rreusser

src/plot_api/plot_api.js

@@ -343,7 +343,7 @@ Plotly.plot = function(gd, data, layout, config) {
         gd.emit('plotly_afterplot');
     }
 
-    Lib.syncOrAsync([
+    var seq = [
         Plots.previousPromises,
         addFrames,
         drawFramework,
@@ -353,8 +353,14 @@ Plotly.plot = function(gd, data, layout, config) {
         subroutines.layoutStyles,
         drawAxes,
         drawData,
-        finalDraw
-    ], gd, cleanUp);
+        finalDraw,
+    ];
+
+    if(gd._fullLayout._rehover) {
+        seq.push(function() { Plots.rehover(gd); });
+    }
+
+    Lib.syncOrAsync(seq, gd, cleanUp);
 
     // even if everything we did was synchronous, return a promise
     // so that the caller doesn't care which route we took
@@ -1206,8 +1212,7 @@ Plotly.restyle = function restyle(gd, astr, val, traces) {
 
     if(flags.fullReplot) {
         seq.push(Plotly.plot);
-    }
-    else {
+    } else {
         seq.push(Plots.previousPromises);
 
         Plots.supplyDefaults(gd);
@@ -1216,6 +1221,10 @@ Plotly.restyle = function restyle(gd, astr, val, traces) {
         if(flags.docolorbars) seq.push(subroutines.doColorBars);
     }
 
+    if(gd._fullLayout._rehover) {
+        seq.push(function() { Plots.rehover(gd); });
+    }
+
     Queue.add(gd,
         restyle, [gd, specs.undoit, specs.traces],
         restyle, [gd, specs.redoit, specs.traces]
@@ -1696,9 +1705,11 @@ Plotly.relayout = function relayout(gd, astr, val) {
     }
 
     var aobj = {};
-    if(typeof astr === 'string') aobj[astr] = val;
-    else if(Lib.isPlainObject(astr)) aobj = astr;
-    else {
+    if(typeof astr === 'string') {
+        aobj[astr] = val;
+    } else if(Lib.isPlainObject(astr)) {
+        aobj = astr;
+    } else {
         Lib.warn('Relayout fail.', astr, val);
         return Promise.reject();
     }
@@ -1716,8 +1727,7 @@ Plotly.relayout = function relayout(gd, astr, val) {
 
     if(flags.layoutReplot) {
         seq.push(subroutines.layoutReplot);
-    }
-    else if(Object.keys(aobj).length) {
+    } else if(Object.keys(aobj).length) {
         seq.push(Plots.previousPromises);
         Plots.supplyDefaults(gd);
 
@@ -1727,6 +1737,10 @@ Plotly.relayout = function relayout(gd, astr, val) {
         if(flags.domodebar) seq.push(subroutines.doModeBar);
     }
 
+    if(gd._fullLayout._rehover) {
+        seq.push(function() { Plots.rehover(gd); });
+    }
+
     Queue.add(gd,
         relayout, [gd, specs.undoit],
         relayout, [gd, specs.redoit]
@@ -2122,6 +2136,10 @@ Plotly.update = function update(gd, traceUpdate, layoutUpdate, traces) {
         if(relayoutFlags.domodebar) seq.push(subroutines.doModeBar);
     }
 
+    if(gd._fullLayout._rehover) {
+        seq.push(function() { Plots.rehover(gd); });
+    }
+
     Queue.add(gd,
         update, [gd, restyleSpecs.undoit, relayoutSpecs.undoit, restyleSpecs.traces],
         update, [gd, restyleSpecs.redoit, relayoutSpecs.redoit, restyleSpecs.traces]

src/plots/cartesian/graph_interact.js

@@ -118,9 +118,19 @@ fx.init = function(gd) {
                 // This is on `gd._fullLayout`, *not* fullLayout because the reference
                 // changes by the time this is called again.
                 gd._fullLayout._rehover = function() {
-                    fx.hover(gd, evt, subplot);
+                    if(gd._fullLayout._hoversubplot === plotinfo.id) {
+                        fx.hover(gd, evt, subplot);
+                    }
                 };
+
+                // Track the hovered subplot. This prevents rehover from accidetally
+                // reapplying a hover label after the mouse has left the plot or if
+                // the mouse has entered another subplot.
+                gd._fullLayout._hoversubplot = plotinfo.id;
+
                 gd._fullLayout._rehover();
+
+                fx.hover(gd, evt, subplot);
                 fullLayout._lasthover = maindrag;
                 fullLayout._hoversubplot = subplot;
             };
@@ -135,6 +145,11 @@ fx.init = function(gd) {
             maindrag.onmouseout = function(evt) {
                 if(gd._dragging) return;
 
+                // When the mouse leaves this maindrag, unset the hovered subplot.
+                // This may cause problems if it leaves the subplot directly *onto*
+                // another subplot, but that's a tiny corner case at the moment.
+                gd._fullLayout._hoversubplot = null;
+
                 dragElement.unhover(gd, evt);
             };
 

src/plots/plots.js

@@ -1905,7 +1905,11 @@ plots.transition = function(gd, data, layout, traces, frameOpts, transitionOpts)
         }
     }
 
-    var seq = [plots.previousPromises, interruptPreviousTransitions, prepareTransitions, executeTransitions];
+    function rehover() {
+        plots.rehover(gd);
+    }
+
+    var seq = [plots.previousPromises, interruptPreviousTransitions, prepareTransitions, rehover, executeTransitions];
 
     var transitionStarting = Lib.syncOrAsync(seq, gd);
 
@@ -2026,6 +2030,10 @@ plots.doCalcdata = function(gd, traces) {
 
         calcdata[i] = cd;
     }
+};
 
-    if(gd._fullLayout._rehover) gd._fullLayout._rehover();
+plots.rehover = function(gd) {
+    if(gd._fullLayout._rehover) {
+        gd._fullLayout._rehover();
+    }
 };