Skip to content

Commit 7ef3235

Browse files
authored
Merge pull request #1204 from plotly/legend-line-opacity
Apply trace opacity to 'mode: 'lines' legend items
2 parents 6ebf221 + bc15f67 commit 7ef3235

File tree

8 files changed

+27
-7
lines changed

8 files changed

+27
-7
lines changed

src/components/legend/style.js

+9-4
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,29 @@ module.exports = function style(s) {
2424
s.each(function(d) {
2525
var traceGroup = d3.select(this);
2626

27-
var fill = traceGroup
27+
var layers = traceGroup.selectAll('g.layers')
28+
.data([0]);
29+
layers.enter().append('g')
30+
.classed('layers', true);
31+
layers.style('opacity', d[0].trace.opacity);
32+
33+
var fill = layers
2834
.selectAll('g.legendfill')
2935
.data([d]);
3036
fill.enter().append('g')
3137
.classed('legendfill', true);
3238

33-
var line = traceGroup
39+
var line = layers
3440
.selectAll('g.legendlines')
3541
.data([d]);
3642
line.enter().append('g')
3743
.classed('legendlines', true);
3844

39-
var symbol = traceGroup
45+
var symbol = layers
4046
.selectAll('g.legendsymbols')
4147
.data([d]);
4248
symbol.enter().append('g')
4349
.classed('legendsymbols', true);
44-
symbol.style('opacity', d[0].trace.opacity);
4550

4651
symbol.selectAll('g.legendpoints')
4752
.data([d])

test/image/baselines/17.png

-10 Bytes
Loading

test/image/baselines/28.png

380 Bytes
Loading

test/image/baselines/gl2d_17.png

-10 Bytes
Loading
-12 Bytes
Loading

test/image/baselines/gl3d_cube.png

-39 Bytes
Loading

test/image/baselines/line_scatter.png

-1.35 KB
Loading

test/image/mocks/line_scatter.json

+18-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
17
1515
],
1616
"mode": "markers",
17-
"type": "scatter"
17+
"type": "scatter",
18+
"marker": {
19+
"opacity": 0.5
20+
}
1821
},
1922
{
2023
"x": [
@@ -30,7 +33,8 @@
3033
9
3134
],
3235
"mode": "lines",
33-
"type": "scatter"
36+
"type": "scatter",
37+
"opacity": 0.5
3438
},
3539
{
3640
"x": [
@@ -46,7 +50,18 @@
4650
12
4751
],
4852
"mode": "lines+markers",
49-
"type": "scatter"
53+
"type": "scatter",
54+
"opacity": 0.707,
55+
"marker": {
56+
"opacity": 0.707
57+
}
58+
},
59+
{
60+
"x": [1, 2, 3],
61+
"y": [1, 2, 3],
62+
"opacity": 0.2,
63+
"line": { "width": 10, "color": "red"},
64+
"marker": { "size": 20, "color": "blue"}
5065
}
5166
]
5267
}

0 commit comments

Comments
 (0)