Merge branch 'master' into period-positioning

Author: archmoj

package-lock.json

@@ -134,7 +134,7 @@
     "derequire": "^2.1.1",
     "ecstatic": "^4.1.4",
     "elliptic": "^6.5.3",
-    "eslint": "^7.7.0",
+    "eslint": "^7.9.0",
     "espree": "^7.3.0",
     "falafel": "^2.2.4",
     "fs-extra": "^9.0.1",
@@ -144,7 +144,7 @@
     "into-stream": "^6.0.0",
     "jasmine-core": "^3.5.0",
     "jsdom": "^16.4.0",
-    "karma": "^5.1.1",
+    "karma": "^5.2.2",
     "karma-browserify": "^7.0.0",
     "karma-chrome-launcher": "^3.1.0",
     "karma-firefox-launcher": "^1.3.0",
@@ -155,7 +155,7 @@
     "karma-verbose-reporter": "0.0.6",
     "karma-viewport": "^1.0.6",
     "lodash": "^4.17.20",
-    "madge": "^3.9.2",
+    "madge": "^3.10.0",
     "minify-stream": "^2.1.0",
     "mkdirp": "^1.0.4",
     "node-sass": "^4.14.1",

package.json

@@ -1103,16 +1103,21 @@ function createHoverText(hoverData, opts, gd) {
     hoverLabels.each(function(d) {
         var g = d3.select(this).attr('transform', '');
 
+        var dColor = d.color;
+        if(Array.isArray(dColor)) {
+            dColor = dColor[d.eventData[0].pointNumber];
+        }
+
         // combine possible non-opaque trace color with bgColor
-        var color0 = d.bgcolor || d.color;
+        var color0 = d.bgcolor || dColor;
         // color for 'nums' part of the label
         var numsColor = Color.combine(
             Color.opacity(color0) ? color0 : Color.defaultLine,
             bgColor
         );
         // color for 'name' part of the label
         var nameColor = Color.combine(
-            Color.opacity(d.color) ? d.color : Color.defaultLine,
+            Color.opacity(dColor) ? dColor : Color.defaultLine,
             bgColor
         );
         // find a contrasting color for border and text

src/components/fx/hover.js

@@ -708,7 +708,7 @@ function computeLegendDimensions(gd, groups, traces, opts) {
                 var w = textGap + d[0].width;
                 var next = (oneRowLegend ? w : maxItemWidth) + itemGap;
 
-                if((next + bw + offsetX) > opts._maxWidth) {
+                if((next + bw + offsetX - itemGap) >= opts._maxWidth) {
                     maxRowWidth = Math.max(maxRowWidth, rowWidth);
                     offsetX = 0;
                     offsetY += maxItemHeightInRow;