Skip to content

Commit 4f7592e

Browse files
authored
Merge pull request #3788 from plotly/fix3784-waterfall-connector-line-color
Waterfall connector.line.color coerce and default fixup
2 parents 424c686 + 91e0332 commit 4f7592e

10 files changed

+11
-1
lines changed

Diff for: src/traces/waterfall/attributes.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
var barAttrs = require('../bar/attributes');
1212
var lineAttrs = require('../scatter/attributes').line;
1313
var extendFlat = require('../../lib/extend').extendFlat;
14+
var Color = require('../../components/color');
1415

1516
function directionAttrs(dirTxt) {
1617
return {
@@ -94,7 +95,7 @@ module.exports = {
9495

9596
connector: {
9697
line: {
97-
color: lineAttrs.color,
98+
color: extendFlat({}, lineAttrs.color, {dflt: Color.defaultLine}),
9899
width: lineAttrs.width,
99100
dash: lineAttrs.dash,
100101
editType: 'plot'
-4 Bytes
Loading

Diff for: test/image/baselines/waterfall-offsetgroups.png

-66 Bytes
Loading

Diff for: test/image/baselines/waterfall_11.png

-1 Bytes
Loading

Diff for: test/image/baselines/waterfall_and_histogram.png

2 Bytes
Loading

Diff for: test/image/baselines/waterfall_cliponaxis-false.png

1 Byte
Loading

Diff for: test/image/baselines/waterfall_line.png

-8 Bytes
Loading

Diff for: test/image/baselines/waterfall_multicategory.png

-3 Bytes
Loading

Diff for: test/image/baselines/waterfall_nonnumeric_sizes.png

-2 Bytes
Loading

Diff for: test/jasmine/tests/waterfall_test.js

+9
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,15 @@ describe('Waterfall.supplyDefaults', function() {
202202
expect(traceOut.xcalendar).toBe('coptic');
203203
expect(traceOut.ycalendar).toBe('ethiopian');
204204
});
205+
206+
it('should coerce connector line color and default to Color.defaultLine', function() {
207+
traceIn = {
208+
x: [1, 2, 3],
209+
y: [1, 2, 3],
210+
};
211+
supplyDefaults(traceIn, traceOut, defaultColor, {});
212+
expect(traceOut.connector.line.color).toBe(color.defaultLine);
213+
});
205214
});
206215

207216
describe('waterfall calc / crossTraceCalc', function() {

0 commit comments

Comments
 (0)