fix 3392 scatter errorbars inherit color

Author: archmoj

src/traces/scatter/defaults.js

@@ -71,14 +71,17 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         if(!subTypes.hasLines(traceOut)) handleLineShapeDefaults(traceIn, traceOut, coerce);
     }
 
+    var lineColor = (traceOut.line || {}).color;
+    var markerColor = (traceOut.marker || {}).color;
+
     if(traceOut.fill === 'tonext' || traceOut.fill === 'toself') {
         dfltHoverOn.push('fills');
     }
     coerce('hoveron', dfltHoverOn.join('+') || 'points');
     if(traceOut.hoveron !== 'fills') coerce('hovertemplate');
     var errorBarsSupplyDefaults = Registry.getComponentMethod('errorbars', 'supplyDefaults');
-    errorBarsSupplyDefaults(traceIn, traceOut, defaultColor, {axis: 'y'});
-    errorBarsSupplyDefaults(traceIn, traceOut, defaultColor, {axis: 'x', inherit: 'y'});
+    errorBarsSupplyDefaults(traceIn, traceOut, lineColor || markerColor || defaultColor, {axis: 'y'});
+    errorBarsSupplyDefaults(traceIn, traceOut, lineColor || markerColor || defaultColor, {axis: 'x', inherit: 'y'});
 
     Lib.coerceSelectionMarkerOpacity(traceOut, coerce);
 };

src/traces/scatter3d/defaults.js

@@ -62,9 +62,9 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     }
 
     var errorBarsSupplyDefaults = Registry.getComponentMethod('errorbars', 'supplyDefaults');
-    errorBarsSupplyDefaults(traceIn, traceOut, defaultColor, {axis: 'z'});
-    errorBarsSupplyDefaults(traceIn, traceOut, defaultColor, {axis: 'y', inherit: 'z'});
-    errorBarsSupplyDefaults(traceIn, traceOut, defaultColor, {axis: 'x', inherit: 'z'});
+    errorBarsSupplyDefaults(traceIn, traceOut, lineColor || markerColor || defaultColor, {axis: 'z'});
+    errorBarsSupplyDefaults(traceIn, traceOut, lineColor || markerColor || defaultColor, {axis: 'y', inherit: 'z'});
+    errorBarsSupplyDefaults(traceIn, traceOut, lineColor || markerColor || defaultColor, {axis: 'x', inherit: 'z'});
 };
 
 function handleXYZDefaults(traceIn, traceOut, coerce, layout) {

test/image/mocks/gl2d_scatter_error_bars_inherit_color.json

@@ -0,0 +1,44 @@
+{
+  "data": [
+    {
+      "x": [0, 1, 2, 3, 4],
+      "y": [100, 200, 400, 600, 700],
+      "type": "scatter",
+      "mode": "markers+lines",
+      "error_y": {
+        "type": "sqrt"
+      }
+    },
+    {
+      "x": [0, 1, 2, 3, 4],
+      "y": [0, 100, 300, 500, 600],
+      "type": "scatter",
+      "mode": "markers+lines",
+      "marker": {
+        "color": "green"
+      },
+      "error_y": {
+        "type": "sqrt"
+      }
+    },
+    {
+      "x": [0, 1, 2, 3, 4],
+      "y": [200, 300, 500, 700, 800],
+      "type": "scatter",
+      "mode": "markers+lines",
+      "line": {
+        "color": "red"
+      },
+      "error_y": {
+        "type": "sqrt"
+      }
+    }
+  ],
+  "layout": {
+      "width": 600,
+      "heigh": 600,
+      "title": {
+          "text": "Scatter error bars inherit color from line or marker"
+      }
+  }
+}

test/image/mocks/gl3d_scatter3d_error_bars_inherit_color.json

@@ -0,0 +1,47 @@
+{
+    "data": [
+      {
+        "x": [0, 1, 2, 3, 4],
+        "y": [-5, -10, -20, -30, -35],
+        "z": [0, 0, 0, 0, 0],
+        "type": "scatter3d",
+        "mode": "markers+lines",
+        "error_y": {
+          "type": "sqrt"
+        }
+      },
+      {
+        "x": [0, 1, 2, 3, 4],
+        "y": [0, -5, -15, -25, -30],
+        "z": [1, 1, 1, 1, 1],
+        "type": "scatter3d",
+        "mode": "markers+lines",
+        "marker": {
+          "color": "green"
+        },
+        "error_y": {
+          "type": "sqrt"
+        }
+      },
+      {
+        "x": [0, 1, 2, 3, 4],
+        "y": [-10, -15, -25, -35, -40],
+        "z": [2, 2, 2, 2, 2],
+        "type": "scatter3d",
+        "mode": "markers+lines",
+        "line": {
+          "color": "red"
+        },
+        "error_y": {
+          "type": "sqrt"
+        }
+      }
+    ],
+    "layout": {
+        "width": 600,
+        "heigh": 600,
+        "title": {
+            "text": "Scatter3d error bars inherit color from line or marker"
+        }
+    }
+}