8000 Add shapes.layer "between" for drawing between gridlines and traces by my-tien · Pull Request #6927 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

Add shapes.layer "between" for drawing between gridlines and traces #6927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Mar 28, 2024
Merged

Add shapes.layer "between" for drawing between gridlines and traces #6927

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9bcf7e6
Add shapes.layer value "belowtraces" for drawing shapes in between gr…
my-tien Mar 15, 2024
0f9da5a
Add draftlog
my-tien Mar 15, 2024
267867b
Add baseline image for shapes_layer_below_traces.json
my-tien Mar 15, 2024
b25862d
Make sure new test images run last
my-tien Mar 15, 2024
7a7e57f
Update splom_test's innerSubplotNodeCnt and index of xaxislayer-above
my-tien Mar 15, 2024
2b398d3
Rename "belowtraces" to "between"
my-tien Mar 18, 2024
70ebe72
Add "between to newshape.layer as well.
my-tien Mar 18, 2024
11e05a1
Fix descriptions for shapes.layer and newshape.layer
my-tien Mar 19, 2024
ff7ca7a
Test more cases in shapes_layer_below_traces mock
my-tien Mar 25, 2024
410f7cf
Updated baseline image for changed shapes_layer_below_traces mock
my-tien Mar 25, 2024
65a49a2
shapes_layer_below_traces mock: Make y and y2 gridlines visually dist…
my-tien Mar 27, 2024
4b86efd
updated baseline image after changing shapes_layer_below_traces mock
my-tien Mar 27, 2024
fb7f228
Update draftlogs/6927_add.md
archmoj Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename "belowtraces" to "between"
  • Loading branch information
@my-tien
my-tien committed Mar 21, 2024
commit 2b398d31ca42e7c025ca4bd16da13c6f184dcad4
2 changes: 1 addition & 1 deletion draftlogs/6927_add.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
- Add `belowtraces` shape layer [[#6927](https://github.com/plotly/plotly.js/pull/6927)]
- Add `between` shape layer [[#6927](https://github.com/plotly/plotly.js/pull/6927)]
4 changes: 2 additions & 2 deletions src/components/shapes/attributes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,10 @@ module.exports = templatedArray('shape', {

layer: {
valType: 'enumerated',
values: ['below', 'above', 'belowtraces'],
values: ['below', 'above', 'between'],
8000
dflt: 'above',
editType: 'arraydraw',
description: 'Specifies whether shapes are drawn below gridlines (*below*), between gridlines and traces (*belowtraces*) or above traces (*above*).'
description: 'Specifies whether shapes are drawn below gridlines (*below*), between gridlines and traces (*between*) or above traces (*above*).'
},

xref: extendFlat({}, annAttrs.xref, {
Expand Down
4 changes: 2 additions & 2 deletions src/components/shapes/draw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ function drawOne(gd, index) {
drawShape(gd._fullLayout._shapeUpperLayer);
} else if(options.xref === 'paper' || options.yref === 'paper') {
drawShape(gd._fullLayout._shapeLowerLayer);
} else if(options.layer === 'belowtraces') {
drawShape(plotinfo.shapelayerBelowTraces);
} else if(options.layer === 'between') {
drawShape(plotinfo.shapelayerBetween);
} else {
if(plotinfo._hadPlotinfo) {
var mainPlot = plotinfo.mainplotinfo || plotinfo;
Expand Down
6 changes: 3 additions & 3 deletions src/plots/cartesian/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,9 +465,9 @@ function makeSubplotLayer(gd, plotinfo) {
plotinfo.gridlayer = ensureSingle(plotgroup, 'g', 'gridlayer');
plotinfo.zerolinelayer = ensureSingle(plotgroup, 'g', 'zerolinelayer');

var belowTracesLayer = ensureSingle(plotgroup, 'g', 'layer-below-traces');
plotinfo.shapelayerBelowTraces = ensureSingle(belowTracesLayer, 'g', 'shapelayer');
plotinfo.imagelayerBelowTraces = ensureSingle(belowTracesLayer, 'g', 'imagelayer');
var betweenLayer = ensureSingle(plotgroup, 'g', 'layer-between');
plotinfo.shapelayerBetween = ensureSingle(betweenLayer, 'g', 'shapelayer');
plotinfo.imagelayerBetween = ensureSingle(betweenLayer, 'g', 'imagelayer');

ensureSingle(plotgroup, 'path', 'xlines-below');
ensureSingle(plotgroup, 'path', 'ylines-below');
Expand Down
4 changes: 2 additions & 2 deletions test/image/mocks/zz-shapes_layer_below_traces.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
{
"name": "blue rect",
"fillcolor": "rgba(108,173,225,0.8)",
"layer": "belowtraces",
"layer": "between",
"line": {
"color": "rgba(108,173,225,0.8)"
},
Expand Down Expand Up @@ -102,7 +102,7 @@
{
"name": "dashed rect",
"fillcolor": "rgba(130,143,198,1)",
"layer": "belowtraces",
"layer": "between",
"line": {
"color": "rgba(0,0,0,1)",
"dash": "dash",
Expand Down
4 changes: 2 additions & 2 deletions test/plot-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7708,14 +7708,14 @@
}
},
"layer": {
"description": "Specifies whether shapes are drawn below gridlines (*below*), between gridlines and traces (*belowtraces*) or above traces (*above*).",
"description": "Specifies whether shapes are drawn below gridlines (*below*), between gridlines and traces (*between*) or above traces (*above*).",
"dflt": "above",
"editType": "arraydraw",
"valType": "enumerated",
"values": [
"below",
"above",
"belowtraces"
"between"
]
},
"legend": {
Expand Down
0