Skip to content

Fix lower zorder traces behing some gridlines on overlayed suplots #7171

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 10 commits into from
Oct 16, 2024
Merged

Fix lower zorder traces behing some gridlines on overlayed suplots #7171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
653fe77
draw grids only in the mainplot
archmoj Sep 24, 2024
d390d04
fix issue 7144
archmoj Sep 24, 2024
da926dd
Revert "fix issue 7144"
archmoj Sep 26, 2024
001457c
Revert "draw grids only in the mainplot"
archmoj Sep 26, 2024
b0a2053
ensure grid lines are drawn on main subplot
emilykl Sep 26, 2024
8886e45
correct baseline
archmoj Sep 26, 2024
85934e4
refactor variables
archmoj Sep 26, 2024
4b6a1fd
move block inside
archmoj Sep 26, 2024
5df22a3
simplify if
archmoj Sep 26, 2024
9ede030
set grid layers once
archmoj Sep 26, 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
18 changes: 13 additions & 5 deletions src/plots/cartesian/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,10 @@ function makeSubplotLayer(gd, plotinfo) {
var yLayer = constants.layerValue2layerClass[plotinfo.yaxis.layer];
var hasOnlyLargeSploms = fullLayout._hasOnlyLargeSploms;

if(!plotinfo.mainplot || fullLayout._zindices.length > 1) {
var hasMultipleZ = fullLayout._zindices.length > 1;
var mainplotinfo = plotinfo.mainplotinfo;

if(!plotinfo.mainplot || hasMultipleZ) {
if(hasOnlyLargeSploms) {
// TODO could do even better
// - we don't need plot (but we would have to mock it in lsInner
Expand All @@ -585,9 +588,15 @@ function makeSubplotLayer(gd, plotinfo) {
plotinfo.shapelayer = ensureSingle(backLayer, 'g', 'shapelayer');
plotinfo.imagelayer = ensureSingle(backLayer, 'g', 'imagelayer');

plotinfo.minorGridlayer = ensureSingle(plotgroup, 'g', 'minor-gridlayer');
plotinfo.gridlayer = ensureSingle(plotgroup, 'g', 'gridlayer');
plotinfo.zerolinelayer = ensureSingle(plotgroup, 'g', 'zerolinelayer');
if(mainplotinfo && hasMultipleZ) {
plotinfo.minorGridlayer = mainplotinfo.minorGridlayer;
plotinfo.gridlayer = mainplotinfo.gridlayer;
plotinfo.zerolinelayer = mainplotinfo.zerolinelayer;
} else {
plotinfo.minorGridlayer = ensureSingle(plotgroup, 'g', 'minor-gridlayer');
plotinfo.gridlayer = ensureSingle(plotgroup, 'g', 'gridlayer');
plotinfo.zerolinelayer = ensureSingle(plotgroup, 'g', 'zerolinelayer');
}

var betweenLayer = ensureSingle(plotgroup, 'g', 'layer-between');
plotinfo.shapelayerBetween = ensureSingle(betweenLayer, 'g', 'shapelayer');
Expand Down Expand Up @@ -622,7 +631,6 @@ function makeSubplotLayer(gd, plotinfo) {
}
}
} else {
var mainplotinfo = plotinfo.mainplotinfo;
var mainplotgroup = mainplotinfo.plotgroup;
var xId = id + '-x';
var yId = id + '-y';
Expand Down
Binary file modified test/image/baselines/zorder-overlayed-subplots-multiple-traces-main-subplot.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.