pfacto
diff --git a/‎src/components/fx/hover.js
Lines changed: 5 additions & 3 deletions b/‎src/components/fx/hover.js
Lines changed: 5 additions & 3 deletions
diff --git a/‎src/components/legend/draw.js
Lines changed: 21 additions & 6 deletions b/‎src/components/legend/draw.js
Lines changed: 21 additions & 6 deletions
@@ -934,7 +934,9 @@ function createHoverText(hoverData, opts, gd) {
             var texts = getHoverLabelText(hoverData[j], true, hovermode, fullLayout, t0);
             var text = texts[0];
             var name = texts[1];
-            legendOpts.entries.push({d: hoverData[j], text: text, name: name});
+            hoverData[j].text = text;
+            hoverData[j].name = name;
+            legendOpts.entries.push([hoverData[j]]);
         }
 
         // Draw unified hover label
@@ -945,8 +947,8 @@ function createHoverText(hoverData, opts, gd) {
         var lx = Lib.mean(hoverData.map(function(c) {return (c.x0 + c.x1) / 2;}));
         var legendContainer = container.select('g.legend');
         var tbb = legendContainer.node().getBoundingClientRect();
-        lx += tbb.width;
-        ly += tbb.height;
+        lx += xa._offset;
+        ly += ya._offset - tbb.height / 2;
         legendContainer.attr('transform', 'translate(' + lx + ',' + ly + ')');
 
         return legendContainer;
 
@@ -44,7 +44,13 @@ module.exports = function draw(gd, layer, opts) {
         main = true;
         opts = fullLayout.legend;
     }
-    var legendData = (!main || fullLayout.showlegend) && getLegendData(gd.calcdata, opts);
+    var legendData;
+    if(main) {
+        legendData = fullLayout.showlegend && getLegendData(gd.calcdata, opts);
+    } else {
+        legendData = opts.entries && [opts.entries];
+    }
+
     var hiddenSlices = fullLayout.hiddenlabels || [];
 
     if(main && (!fullLayout.showlegend || !legendData.length)) {
@@ -372,16 +378,25 @@ function clickOrDoubleClick(gd, legend, legendItem, numClicks, evt) {
 function drawTexts(g, gd, opts) {
     var legendItem = g.data()[0][0];
     var fullLayout = gd._fullLayout;
-    if(!opts) opts = fullLayout.legend;
+    var main;
+    if(!opts) {
+        main = true;
+        opts = fullLayout.legend;
+    }
     var trace = legendItem.trace;
     var isPieLike = Registry.traceIs(trace, 'pie-like');
     var traceIndex = trace.index;
-    var isEditable = gd._context.edits.legendText && !isPieLike;
+    var isEditable = main && gd._context.edits.legendText && !isPieLike;
     var maxNameLength = opts._maxNameLength;
 
-    var name = isPieLike ? legendItem.label : trace.name;
-    if(trace._meta) {
-        name = Lib.templateString(name, trace._meta);
+    var name;
+    if(main) {
+        name = isPieLike ? legendItem.label : trace.name;
+        if(trace._meta) {
+            name = Lib.templateString(name, trace._meta);
+        }
+    } else {
+        name = legendItem.text;
     }
 
     var textEl = Lib.ensureSingle(g, 'text', 'legendtext');