fix for histogram and bar charts

plotly · Jan 5, 2019 · 6b956cc · 6b956cc
1 parent 4b07210
commit 6b956cc
Show file tree

Hide file tree

Showing 10 changed files with 159 additions and 6 deletions.
diff --git a/src/traces/bar/defaults.js b/src/traces/bar/defaults.js
@@ -70,10 +70,13 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 
     handleStyleDefaults(traceIn, traceOut, coerce, defaultColor, layout);
 
+    var lineColor = (traceOut.marker.line || {}).color;
+    var markerColor = (traceOut.marker || {}).color;
+
     // override defaultColor for error bars with defaultLine
     var errorBarsSupplyDefaults = Registry.getComponentMethod('errorbars', 'supplyDefaults');
-    errorBarsSupplyDefaults(traceIn, traceOut, Color.defaultLine, {axis: 'y'});
-    errorBarsSupplyDefaults(traceIn, traceOut, Color.defaultLine, {axis: 'x', inherit: 'y'});
+    errorBarsSupplyDefaults(traceIn, traceOut, lineColor || markerColor || Color.defaultLine, {axis: 'y'});
+    errorBarsSupplyDefaults(traceIn, traceOut, lineColor || markerColor || Color.defaultLine, {axis: 'x', inherit: 'y'});
 
     Lib.coerceSelectionMarkerOpacity(traceOut, coerce);
 };
diff --git a/src/traces/histogram/defaults.js b/src/traces/histogram/defaults.js
@@ -62,10 +62,13 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 
     handleStyleDefaults(traceIn, traceOut, coerce, defaultColor, layout);
 
+    Lib.coerceSelectionMarkerOpacity(traceOut, coerce);
+
+    var lineColor = (traceOut.marker.line || {}).color;
+    var markerColor = (traceOut.marker || {}).color;
+
     // override defaultColor for error bars with defaultLine
     var errorBarsSupplyDefaults = Registry.getComponentMethod('errorbars', 'supplyDefaults');
-    errorBarsSupplyDefaults(traceIn, traceOut, Color.defaultLine, {axis: 'y'});
-    errorBarsSupplyDefaults(traceIn, traceOut, Color.defaultLine, {axis: 'x', inherit: 'y'});
-
-    Lib.coerceSelectionMarkerOpacity(traceOut, coerce);
+    errorBarsSupplyDefaults(traceIn, traceOut, lineColor || markerColor || Color.defaultLine, {axis: 'y'});
+    errorBarsSupplyDefaults(traceIn, traceOut, lineColor || markerColor || Color.defaultLine, {axis: 'x', inherit: 'y'});
 };
diff --git a/test/image/baselines/gl2d_scatter_error_bars_inherit_color.png b/test/image/baselines/gl2d_scatter_error_bars_inherit_color.png
diff --git a/test/image/baselines/gl2d_scattergl_error_bars_inherit_color.png b/test/image/baselines/gl2d_scattergl_error_bars_inherit_color.png
diff --git a/test/image/baselines/gl3d_scatter3d_error_bars_inherit_color.png b/test/image/baselines/gl3d_scatter3d_error_bars_inherit_color.png
diff --git a/test/image/mocks/gl2d_errorbars-inherit_color-bar.json b/test/image/mocks/gl2d_errorbars-inherit_color-bar.json
@@ -0,0 +1,76 @@
+{
+  "data": [
+    {
+      "x": [0, 1, 2, 3, 4],
+      "y": [0, 100, 500, 600, 0],
+      "type": "bar",
+      "barmode": "group",
+      "error_y": {
+        "type": "sqrt"
+      }
+    },
+    {
+      "x": [0, 1, 2, 3, 4],
+      "y": [100, 200, 600, 700, 100],
+      "type": "bar",
+      "barmode": "group",
+      "marker": {
+        "line": {
+          "width": 2,
+          "color": "gray"
+        }
+      },
+      "error_y": {
+        "type": "sqrt"
+      }
+    },
+    {
+      "x": [0, 1, 2, 3, 4],
+      "y": [200, 300, 700, 800, 200],
+      "type": "bar",
+      "barmode": "group",
+      "marker": {
+        "color": "red"
+      },
+      "error_y": {
+        "type": "sqrt"
+      }
+    },
+    {
+      "x": [0, 1, 2, 3, 4],
+      "y": [300, 400, 800, 900, 300],
+      "type": "bar",
+      "barmode": "group",
+      "marker": {
+        "line": {
+            "color": "green"
+        }
+      },
+      "error_y": {
+        "type": "sqrt"
+      }
+    },
+    {
+      "x": [0, 1, 2, 3, 4],
+      "y": [400, 500, 900, 1000, 400],
+      "type": "bar",
+      "barmode": "group",
+      "marker": {
+        "line": {
+            "color": "blue"
+          },
+        "color": "black"
+      },
+      "error_y": {
+        "type": "sqrt"
+      }
+    }
+  ],
+  "layout": {
+      "width": 600,
+      "heigh": 600,
+      "title": {
+          "text": "Bar chart error bars inherit color from marker.line or marker"
+      }
+  }
+}
diff --git a/test/image/mocks/gl2d_errorbars-inherit_color-histogram.json b/test/image/mocks/gl2d_errorbars-inherit_color-histogram.json
@@ -0,0 +1,71 @@
+{
+  "data": [
+    {
+      "x": [0, 1, 5, 6, 0],
+      "type": "histogram",
+      "barmode": "stack",
+      "error_y": {
+        "type": "sqrt"
+      }
+    },
+    {
+      "x": [1, 2, 6, 7, 1],
+      "type": "histogram",
+      "barmode": "stack",
+      "marker": {
+        "line": {
+          "width": 2,
+          "color": "gray"
+        }
+      },
+      "error_y": {
+        "type": "sqrt"
+      }
+    },
+    {
+      "x": [2, 3, 7, 8, 2],
+      "type": "histogram",
+      "barmode": "stack",
+      "marker": {
+        "color": "red"
+      },
+      "error_y": {
+        "type": "sqrt"
+      }
+    },
+    {
+      "x": [3, 4, 8, 9, 3],
+      "type": "histogram",
+      "barmode": "stack",
+      "marker": {
+        "line": {
+            "color": "green"
+        }
+      },
+      "error_y": {
+        "type": "sqrt"
+      }
+    },
+    {
+      "x": [4, 5, 9, 10, 4],
+      "type": "histogram",
+      "barmode": "stack",
+      "marker": {
+        "line": {
+            "color": "blue"
+          },
+        "color": "black"
+      },
+      "error_y": {
+        "type": "sqrt"
+      }
+    }
+  ],
+  "layout": {
+      "width": 600,
+      "heigh": 600,
+      "title": {
+          "text": "Histogram error bars inherit color from marker.line or marker"
+      }
+  }
+}
diff --git a/...l2d_scatter_error_bars_inherit_color.json → ...gl2d_errorbars-inherit_color-scatter.json b/...l2d_scatter_error_bars_inherit_color.json → ...gl2d_errorbars-inherit_color-scatter.json
diff --git a/...d_scattergl_error_bars_inherit_color.json → ...2d_errorbars-inherit_color-scattergl.json b/...d_scattergl_error_bars_inherit_color.json → ...2d_errorbars-inherit_color-scattergl.json
diff --git a/...d_scatter3d_error_bars_inherit_color.json → ...3d_errorbars-inherit_color-scatter3d.json b/...d_scatter3d_error_bars_inherit_color.json → ...3d_errorbars-inherit_color-scatter3d.json