Skip to content

Commit 60a42c1

Browse files
archmojarchmoj
authored
Merge pull request #4242 from plotly/treemap-sunburst-colors-in-colorscale
use marker.colors with colorscale in treemap and sunburst plots
2 parents 713b42a + 1dff468 commit 60a42c1

37 files changed

+1600
-212
lines changed

‎src/components/colorscale/helpers.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ var Color = require('../color');
1717

1818
var isValidScale = require('./scales').isValid;
1919

20-
function hasColorscale(trace, containerStr) {
20+
function hasColorscale(trace, containerStr, colorKey) {
2121
var container = containerStr ?
2222
Lib.nestedProperty(trace, containerStr).get() || {} :
2323
trace;
24-
var color = container.color;
24+
var color = container[colorKey || 'color'];
2525

2626
var isArrayWithOneNumber = false;
2727
if(Lib.isArrayOrTypedArray(color)) {

‎src/traces/sunburst/calc.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ var Lib = require('../../lib');
1515
var makeColorScaleFn = require('../../components/colorscale').makeColorScaleFuncFromTrace;
1616
var makePullColorFn = require('../pie/calc').makePullColorFn;
1717
var generateExtendedColors = require('../pie/calc').generateExtendedColors;
18-
19-
var Colorscale = require('../../components/colorscale');
20-
var hasColorscale = Colorscale.hasColorscale;
21-
var colorscaleCalc = Colorscale.calc;
18+
var colorscaleCalc = require('../../components/colorscale').calc;
2219

2320
var sunburstExtendedColorWays = {};
2421
var treemapExtendedColorWays = {};
@@ -198,9 +195,10 @@ exports.calc = function(gd, trace) {
198195
var pullColor;
199196
var scaleColor;
200197
var colors = trace.marker.colors || [];
201-
trace._hasColorscale = hasColorscale(trace, 'marker');
198+
var hasColors = !!colors.length;
199+
202200
if(trace._hasColorscale) {
203-
if(!colors.length) {
201+
if(!hasColors) {
204202
colors = hasValues ? trace.values : trace._values;
205203
}
206204

‎src/traces/sunburst/defaults.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
4444
if(lineWidth) coerce('marker.line.color', layout.paper_bgcolor);
4545

4646
coerce('marker.colors');
47-
var withColorscale = hasColorscale(traceIn, 'marker');
47+
var withColorscale = traceOut._hasColorscale = hasColorscale(traceIn, 'marker', 'colors');
4848
if(withColorscale) {
4949
colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: 'marker.', cLetter: 'c'});
5050
}

‎src/traces/sunburst/plot.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ function plotOne(gd, cd, element, transitionOpts) {
151151
var transTextX = function(d) { return cx + d.pxmid[0] * d.transform.rCenter + (d.transform.x || 0); };
152152
var transTextY = function(d) { return cy + d.pxmid[1] * d.transform.rCenter + (d.transform.y || 0); };
153153

154-
slices = slices.data(sliceData, function(pt) { return helpers.getPtId(pt); });
154+
slices = slices.data(sliceData, helpers.getPtId);
155155

156156
slices.enter().append('g')
157157
.classed('slice', true);

‎src/traces/treemap/attributes.js‎

Lines changed: 11 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -139,29 +139,20 @@ module.exports = {
139139

140140
colors: sunburstAttrs.marker.colors,
141141

142-
opacitybase: {
143-
valType: 'number',
142+
depthfade: {
143+
valType: 'enumerated',
144+
values: [true, false, 'reversed'],
144145
editType: 'style',
145146
role: 'style',
146-
min: 0,
147-
max: 1,
148-
dflt: 0.5,
149147
description: [
150-
'Sets the base opacity of the headers based on the depth from the entry.',
151-
'This options is not available when having a `colorscale`.'
152-
].join(' ')
153-
},
154-
155-
opacitystep: {
156-
valType: 'number',
157-
editType: 'style',
158-
role: 'style',
159-
min: 0,
160-
max: 1,
161-
dflt: 0.5,
162-
description: [
163-
'Sets the increment for opacity of the headers based on the depth from the entry.',
164-
'This options is not available when having a `colorscale`.'
148+
'Determines if the sector colors are faded towards',
149+
'the background from the leaves up to the headers.',
150+
'This option is unavailable when a `colorscale` is present,',
151+
'defaults to false when `marker.colors` is set,',
152+
'but otherwise defaults to true.',
153+
'When set to *reversed*, the fading direction is inverted,',
154+
'that is the top elements within hierarchy are drawn with fully saturated colors',
155+
'while the leaves are faded towards the background color.'
165156
].join(' ')
166157
},
167158

@@ -231,18 +222,6 @@ module.exports = {
231222
].join(' ')
232223
},
233224

234-
opacity: {
235-
valType: 'number',
236-
editType: 'style',
237-
role: 'style',
238-
min: 0,
239-
dflt: 0.5,
240-
description: [
241-
'Sets the opacity of the pathbar',
242-
'This options is not available when having a `colorscale`.'
243-
].join(' ')
244-
},
245-
246225
textfont: extendFlat({}, pieAttrs.textfont, {
247226
description: 'Sets the font used inside `pathbar`.'
248227
}),

‎src/traces/treemap/defaults.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,13 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
7272
var lineWidth = coerce('marker.line.width');
7373
if(lineWidth) coerce('marker.line.color', layout.paper_bgcolor);
7474

75-
coerce('marker.colors');
76-
var withColorscale = hasColorscale(traceIn, 'marker');
75+
var colors = coerce('marker.colors');
76+
var withColorscale = traceOut._hasColorscale = hasColorscale(traceIn, 'marker', 'colors');
77+
if(withColorscale) {
78+
colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: 'marker.', cLetter: 'c'});
79+
} else {
80+
coerce('marker.depthfade', !(colors || []).length);
81+
}
7782

7883
var headerSize = traceOut.textfont.size * 2;
7984

@@ -84,15 +89,10 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
8489

8590
if(withColorscale) {
8691
colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: 'marker.', cLetter: 'c'});
87-
} else {
88-
coerce('marker.opacitybase');
89-
coerce('marker.opacitystep');
90-
coerce('pathbar.opacity');
9192
}
9293

9394
traceOut._hovered = {
9495
marker: {
95-
opacity: 1,
9696
line: {
9797
width: 2,
9898
color: Color.contrast(layout.paper_bgcolor)

‎src/traces/treemap/draw_ancestors.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
7373

7474
sliceData.reverse();
7575

76-
slices = slices.data(sliceData, function(pt) { return helpers.getPtId(pt); });
76+
slices = slices.data(sliceData, helpers.getPtId);
7777

7878
slices.enter().append('g')
7979
.classed('pathbar', true);

‎src/traces/treemap/draw_descendants.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,24 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
6565

6666
var sliceData = allData.descendants();
6767

68-
slices = slices.data(sliceData, function(pt) {
69-
// hide slices that won't show up on graph
70-
if(pt.depth >= trace._maxDepth) {
68+
var minVisibleDepth = Infinity;
69+
var maxVisibleDepth = -Infinity;
70+
sliceData.forEach(function(pt) {
71+
var depth = pt.depth;
72+
if(depth >= trace._maxDepth) {
73+
// hide slices that won't show up on graph
7174
pt.x0 = pt.x1 = (pt.x0 + pt.x1) / 2;
7275
pt.y0 = pt.y1 = (pt.y0 + pt.y1) / 2;
76+
} else {
77+
minVisibleDepth = Math.min(minVisibleDepth, depth);
78+
maxVisibleDepth = Math.max(maxVisibleDepth, depth);
7379
}
74-
75-
return helpers.getPtId(pt);
7680
});
7781

82+
slices = slices.data(sliceData, helpers.getPtId);
83+
84+
trace._maxVisibleLayers = isFinite(maxVisibleDepth) ? maxVisibleDepth - minVisibleDepth + 1 : 0;
85+
7886
slices.enter().append('g')
7987
.classed('slice', true);
8088

@@ -185,14 +193,6 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
185193
isHeader: isHeader
186194
});
187195

188-
if(helpers.isOutsideText(trace, pt)) {
189-
// consider in/out diff font sizes
190-
pt.transform.targetY -= (
191-
helpers.getOutsideTextFontKey('size', trace, pt, fullLayout.font) -
192-
helpers.getInsideTextFontKey('size', trace, pt, fullLayout.font)
193-
);
194-
}
195-
196196
if(hasTransition) {
197197
sliceText.transition().attrTween('transform', function(pt2) {
198198
var interp = makeUpdateTextInterpolator(pt2, onPathbar, getRefRect(), [width, height]);

‎src/traces/treemap/plot.js‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ function plotOne(gd, cd, element, transitionOpts) {
8484
var hierarchy = cd0.hierarchy;
8585
var hasTransition = helpers.hasTransition(transitionOpts);
8686
var entry = helpers.findEntryWithLevel(hierarchy, trace.level);
87+
var isRoot = helpers.isHierarchyRoot(entry);
88+
8789
var maxDepth = helpers.getMaxDepth(trace);
8890
var hasVisibleDepth = function(pt) {
8991
return pt.data.depth - entry.data.depth < maxDepth;
@@ -146,18 +148,15 @@ function plotOne(gd, cd, element, transitionOpts) {
146148
return {};
147149
};
148150

149-
var isRoot = helpers.isHierarchyRoot(entry);
150-
151-
trace._entryDepth = entry.data.depth;
152-
if(isRoot) {
153-
trace._entryDepth++;
154-
}
155-
156151
// N.B. handle multiple-root special case
157152
if(cd0.hasMultipleRoots && isRoot) {
158153
maxDepth++;
159154
}
155+
160156
trace._maxDepth = maxDepth;
157+
trace._backgroundColor = fullLayout.paper_bgcolor;
158+
trace._entryDepth = entry.data.depth;
159+
trace._atRootLevel = isRoot;
161160

162161
var cenX = -vpw / 2 + gs.l + gs.w * (domain.x[1] + domain.x[0]) / 2;
163162
var cenY = -vph / 2 + gs.t + gs.h * (1 - (domain.y[1] + domain.y[0]) / 2);

‎src/traces/treemap/style.js‎

Lines changed: 37 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,37 +35,57 @@ function styleOne(s, pt, trace, opts) {
3535
var ptNumber = cdi.i;
3636
var lineColor;
3737
var lineWidth;
38-
var opacity;
39-
40-
var depthFade = function(n) {
41-
var base = trace.marker.opacitybase;
42-
var step = trace.marker.opacitystep;
43-
44-
return n === 0 ? base :
45-
Math.max(0, Math.min(1, n * step));
46-
};
38+
var fillColor = cdi.color;
39+
var isRoot = helpers.isHierarchyRoot(pt);
40+
var opacity = 1;
4741

4842
if(hovered) {
4943
lineColor = trace._hovered.marker.line.color;
5044
lineWidth = trace._hovered.marker.line.width;
51-
opacity = trace._hovered.marker.opacity;
5245
} else {
53-
if(helpers.isHierarchyRoot(pt)) {
46+
if(isRoot && fillColor === 'rgba(0,0,0,0)') {
47+
opacity = 0;
5448
lineColor = 'rgba(0,0,0,0)';
5549
lineWidth = 0;
5650
} else {
5751
lineColor = Lib.castOption(trace, ptNumber, 'marker.line.color') || Color.defaultLine;
5852
lineWidth = Lib.castOption(trace, ptNumber, 'marker.line.width') || 0;
59-
}
6053

61-
opacity =
62-
trace._hasColorscale || helpers.isLeaf(pt) ? 1 :
63-
pt.onPathbar ? trace.pathbar.opacity :
64-
depthFade(pt.data.depth - trace._entryDepth);
54+
if(!trace._hasColorscale && !pt.onPathbar) {
55+
var depthfade = trace.marker.depthfade;
56+
if(depthfade) {
57+
var fadedColor = Color.combine(Color.addOpacity(trace._backgroundColor, 0.75), fillColor);
58+
var n;
59+
60+
if(depthfade === true) {
61+
var maxDepth = helpers.getMaxDepth(trace);
62+
if(isFinite(maxDepth)) {
63+
if(helpers.isLeaf(pt)) {
64+
n = 0;
65+
} else {
66+
n = (trace._maxVisibleLayers) - (pt.data.depth - trace._entryDepth);
67+
}
68+
} else {
69+
n = pt.data.height + 1;
70+
}
71+
} else { // i.e. case of depthfade === 'reversed'
72+
n = pt.data.depth - trace._entryDepth;
73+
if(!trace._atRootLevel) n++;
74+
}
75+
76+
if(n > 0) {
77+
for(var i = 0; i < n; i++) {
78+
var ratio = 0.5 * i / n;
79+
fillColor = Color.combine(Color.addOpacity(fadedColor, ratio), fillColor);
80+
}
81+
}
82+
}
83+
}
84+
}
6585
}
6686

6787
s.style('stroke-width', lineWidth)
68-
.call(Color.fill, cdi.color)
88+
.call(Color.fill, fillColor)
6989
.call(Color.stroke, lineColor)
7090
.style('opacity', opacity);
7191
}

0 commit comments

Comments
 (0)