unified hover: simplify legend.draw signature

antoinerg · antoinerg · commit a87107bf14c6 · 2020-03-04T16:19:10.000-05:00
diff --git a/src/components/fx/hover.js b/src/components/fx/hover.js
@@ -950,9 +950,10 @@ function createHoverText(hoverData, opts, gd) {
             hoverData[j].name = name;
             legendOpts.entries.push([hoverData[j]]);
         }
+        legendOpts.layer = container;
 
         // Draw unified hover label
-        legend.draw(gd, container, legendOpts);
+        legend.draw(gd, legendOpts);
 
         // Position the hover
         var ly = Lib.mean(hoverData.map(function(c) {return (c.y0 + c.y1) / 2;}));
diff --git a/src/components/legend/draw.js b/src/components/legend/draw.js
@@ -30,25 +30,26 @@ var getLegendData = require('./get_legend_data');
 var style = require('./style');
 var helpers = require('./helpers');
 
-module.exports = function draw(gd, layer, opts) {
+module.exports = function draw(gd, opts) {
     var fullLayout = gd._fullLayout;
     var clipId = 'legend' + fullLayout._uid;
+    var layer;
 
     // Check whether this is the main legend (ie. called without any opts)
     var main;
     if(!opts) {
         main = true;
         opts = fullLayout.legend;
+        layer = fullLayout._infolayer;
     } else {
+        layer = opts.layer;
         clipId += '-hover';
     }
 
-    if(!layer) layer = fullLayout._infolayer;
     if(!layer) return;
 
     if(!gd._legendMouseDownTime) gd._legendMouseDownTime = 0;
 
-
     var legendData;
     if(main) {
         if(!gd.calcdata) return;
