diff --git a/src/traces/waterfall/attributes.js b/src/traces/waterfall/attributes.js index a4ba4419217..b93a131fa04 100644 --- a/src/traces/waterfall/attributes.js +++ b/src/traces/waterfall/attributes.js @@ -11,6 +11,7 @@ var barAttrs = require('../bar/attributes'); var lineAttrs = require('../scatter/attributes').line; var extendFlat = require('../../lib/extend').extendFlat; +var Color = require('../../components/color'); function directionAttrs(dirTxt) { return { @@ -94,7 +95,7 @@ module.exports = { connector: { line: { - color: lineAttrs.color, + color: extendFlat({}, lineAttrs.color, {dflt: Color.defaultLine}), width: lineAttrs.width, dash: lineAttrs.dash, editType: 'plot' diff --git a/test/image/baselines/waterfall-grouping-vs-defaults.png b/test/image/baselines/waterfall-grouping-vs-defaults.png index 7c023291515..3f01e329cd8 100644 Binary files a/test/image/baselines/waterfall-grouping-vs-defaults.png and b/test/image/baselines/waterfall-grouping-vs-defaults.png differ diff --git a/test/image/baselines/waterfall-offsetgroups.png b/test/image/baselines/waterfall-offsetgroups.png index 63dd5bf28ee..fe465bb8a1b 100644 Binary files a/test/image/baselines/waterfall-offsetgroups.png and b/test/image/baselines/waterfall-offsetgroups.png differ diff --git a/test/image/baselines/waterfall_11.png b/test/image/baselines/waterfall_11.png index e0c5465c7a3..6ccb1b4fccc 100644 Binary files a/test/image/baselines/waterfall_11.png and b/test/image/baselines/waterfall_11.png differ diff --git a/test/image/baselines/waterfall_and_histogram.png b/test/image/baselines/waterfall_and_histogram.png index c0383c04e3c..089666a61ae 100644 Binary files a/test/image/baselines/waterfall_and_histogram.png and b/test/image/baselines/waterfall_and_histogram.png differ diff --git a/test/image/baselines/waterfall_cliponaxis-false.png b/test/image/baselines/waterfall_cliponaxis-false.png index 9b984b005b9..f01724f4dfc 100644 Binary files a/test/image/baselines/waterfall_cliponaxis-false.png and b/test/image/baselines/waterfall_cliponaxis-false.png differ diff --git a/test/image/baselines/waterfall_line.png b/test/image/baselines/waterfall_line.png index 7e32aaad93a..8fe9b89a280 100644 Binary files a/test/image/baselines/waterfall_line.png and b/test/image/baselines/waterfall_line.png differ diff --git a/test/image/baselines/waterfall_multicategory.png b/test/image/baselines/waterfall_multicategory.png index 1fc8d5b86de..6742ede5bb3 100644 Binary files a/test/image/baselines/waterfall_multicategory.png and b/test/image/baselines/waterfall_multicategory.png differ diff --git a/test/image/baselines/waterfall_nonnumeric_sizes.png b/test/image/baselines/waterfall_nonnumeric_sizes.png index 2ddd259f402..8fea4fcf396 100644 Binary files a/test/image/baselines/waterfall_nonnumeric_sizes.png and b/test/image/baselines/waterfall_nonnumeric_sizes.png differ diff --git a/test/jasmine/tests/waterfall_test.js b/test/jasmine/tests/waterfall_test.js index c4991efe626..25761ac46cb 100644 --- a/test/jasmine/tests/waterfall_test.js +++ b/test/jasmine/tests/waterfall_test.js @@ -202,6 +202,15 @@ describe('Waterfall.supplyDefaults', function() { expect(traceOut.xcalendar).toBe('coptic'); expect(traceOut.ycalendar).toBe('ethiopian'); }); + + it('should coerce connector line color and default to Color.defaultLine', function() { + traceIn = { + x: [1, 2, 3], + y: [1, 2, 3], + }; + supplyDefaults(traceIn, traceOut, defaultColor, {}); + expect(traceOut.connector.line.color).toBe(color.defaultLine); + }); }); describe('waterfall calc / crossTraceCalc', function() {