Skip to content

Commit 3511eb4

Browse files
committed
test showing shapes in groups
1 parent 2f1f812 commit 3511eb4

File tree

3 files changed

+35
-9
lines changed

3 files changed

+35
-9
lines changed

src/components/legend/defaults.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ function groupDefaults(legendId, layoutIn, layoutOut, fullData) {
4141
var legendReallyHasATrace = false;
4242
var defaultOrder = 'normal';
4343

44-
var allLegendItems = fullData.filter(function(d) {
44+
var shapes = (layoutOut.shapes || []).filter(function(d) { return d.showlegend; });
45+
46+
var allLegendItems = fullData.concat(shapes).filter(function(d) {
4547
return legendId === (d.legend || 'legend');
4648
});
4749

105 Bytes
Loading

test/image/mocks/text_on_shapes_basic.json

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,38 @@
1212
"margin": {"l":20,"r":20,"pad":0},
1313
"showlegend": true,
1414
"shapes":[
15-
{"showlegend": true, "label":{"text":"angle zero", "textangle":0, "textposition": "end", "padding": 20},"xref":"paper","yref":"paper","x0":0.6,"x1":0.8,"y0":0.3,"y1":0.6, "type": "line"},
16-
{"showlegend": true, "label":{"text":"top right, xanchor right, <br>angle 45", "xanchor":"right", "textangle":45, "textposition": "top right", "padding": 20}, "layer":"below","xref":"paper","yref":"paper","x0":0.5,"x1":0.6,"y0":0.4,"y1":0.6},
17-
{"showlegend": true, "label":{"text":"top right", "textposition": "top right"}, "xref":"paper","yref":"paper","type":"circle","x0":0.3,"x1":0.35,"y0":0.2,"y1":0.4},
18-
{"showlegend": true, "label":{"text":"xanchor right, position not set<br> two lines", "xanchor":"right", "padding": 10, "font": {"family":"Courier New, monospace", "size":20}}, "xref":"paper","yref":"paper","type":"line","x0":0.8,"x1":0.9,"y0":0.8,"y1":0.9},
19-
{"showlegend": true, "label":{"text":"position auto, xanchor center, angle -30", "xanchor":"center", "textangle":-30}, "layer":"below","x0":2,"x1":3,"y0":7,"y1":9.5,"opacity":0.5,"fillcolor":"#05e","line":{"width":3,"color":"#025","dash":"dashdot"}},
20-
{"showlegend": true, "label":{"text":"position auto, yanchor top", "yanchor": "top"}, "yref":"paper","type":"line","x0":1.1,"x1":2.4,"y0":0.1,"y1":0.4,"line":{"color":"#039","dash":"dot","width":2}},
21-
{"showlegend": true, "label":{"text":"position auto, xanchor center", "xanchor":"center"}, "xref":"paper","x0":0.8,"x1":0.9,"y0":1,"y1":3,"fillcolor":"#ccc"},
22-
{"showlegend": true, "label":{"text":"position end", "textposition": "end"}, "yref":"paper","type":"line","x0":4.1,"x1":6.4,"y0":0.2,"y1":0.0,"line":{"color":"#339","width":3}}
15+
{
16+
"showlegend": true,
17+
"label":{"text":"angle zero", "textangle":0, "textposition": "end", "padding": 20},"xref":"paper","yref":"paper","x0":0.6,"x1":0.8,"y0":0.3,"y1":0.6, "type": "line"
18+
},
19+
{
20+
"showlegend": true,
21+
"label":{"text":"top right, xanchor right, <br>angle 45", "xanchor":"right", "textangle":45, "textposition": "top right", "padding": 20}, "layer":"below","xref":"paper","yref":"paper","x0":0.5,"x1":0.6,"y0":0.4,"y1":0.6
22+
},
23+
{
24+
"showlegend": true,
25+
"label":{"text":"top right", "textposition": "top right"}, "xref":"paper","yref":"paper","type":"circle","x0":0.3,"x1":0.35,"y0":0.2,"y1":0.4
26+
},
27+
{
28+
"showlegend": true, "legendgroup":"g1",
29+
"label":{"text":"xanchor right, position not set<br> two lines", "xanchor":"right", "padding": 10, "font": {"family":"Courier New, monospace", "size":20}}, "xref":"paper","yref":"paper","type":"line","x0":0.8,"x1":0.9,"y0":0.8,"y1":0.9
30+
},
31+
{
32+
"showlegend": true, "legendgroup":"g1",
33+
"label":{"text":"position auto, xanchor center, angle -30", "xanchor":"center", "textangle":-30}, "layer":"below","x0":2,"x1":3,"y0":7,"y1":9.5,"opacity":0.5,"fillcolor":"#05e","line":{"width":3,"color":"#025","dash":"dashdot"}
34+
},
35+
{
36+
"showlegend": true, "legendgroup":"g2",
37+
"label":{"text":"position auto, yanchor top", "yanchor": "top"}, "yref":"paper","type":"line","x0":1.1,"x1":2.4,"y0":0.1,"y1":0.4,"line":{"color":"#039","dash":"dot","width":2}
38+
},
39+
{
40+
"showlegend": true, "legendgroup":"g2",
41+
"label":{"text":"position auto, xanchor center", "xanchor":"center"}, "xref":"paper","x0":0.8,"x1":0.9,"y0":1,"y1":3,"fillcolor":"#ccc"
42+
},
43+
{
44+
"showlegend": true, "legendgroup":"g2",
45+
"label":{"text":"position end", "textposition": "end"}, "yref":"paper","type":"line","x0":4.1,"x1":6.4,"y0":0.2,"y1":0.0,"line":{"color":"#339","width":3}
46+
}
2347
],
2448
"newshape": {
2549
"line": {

0 commit comments

Comments
 (0)