Merge pull request #1289 from plotly/bar-legend-style

Fix bar marker color array legend style

Author: etpinard

src/components/legend/style.js

@@ -176,14 +176,15 @@ function styleBars(d) {
         .attr('transform', 'translate(20,0)');
     barpath.exit().remove();
     barpath.each(function(d) {
-        var w = (d.mlw + 1 || markerLine.width + 1) - 1,
-            p = d3.select(this);
+        var p = d3.select(this),
+            d0 = d[0],
+            w = (d0.mlw + 1 || markerLine.width + 1) - 1;
 
         p.style('stroke-width', w + 'px')
-            .call(Color.fill, d.mc || marker.color);
+            .call(Color.fill, d0.mc || marker.color);
 
         if(w) {
-            p.call(Color.stroke, d.mlc || markerLine.color);
+            p.call(Color.stroke, d0.mlc || markerLine.color);
         }
     });
 }
@@ -198,15 +199,15 @@ function styleBoxes(d) {
         .attr('d', 'M6,6H-6V-6H6Z')
         .attr('transform', 'translate(20,0)');
     pts.exit().remove();
-    pts.each(function(d) {
-        var w = (d.lw + 1 || trace.line.width + 1) - 1,
+    pts.each(function() {
+        var w = trace.line.width,
             p = d3.select(this);
 
         p.style('stroke-width', w + 'px')
-            .call(Color.fill, d.fc || trace.fillcolor);
+            .call(Color.fill, trace.fillcolor);
 
         if(w) {
-            p.call(Color.stroke, d.lc || trace.line.color);
+            p.call(Color.stroke, trace.line.color);
         }
     });
 }

test/image/baselines/bar_marker_array.png

@@ -19,9 +19,26 @@
           "#447adb",
           "#db5a44",
           "#447adb"
-        ]
+        ],
+        "line": {
+          "width": [
+            2,
+            3,
+            2,
+            3
+          ],
+          "color": [
+            "red",
+            "green",
+            "blue",
+            "yellow"
+          ]
+        }
       },
       "type": "bar"
     }
-  ]
+  ],
+  "layout": {
+    "showlegend": true
+  }
 }