Skip to content

Some refactor before fixing zorder bug #7148

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 2 commits into from
Sep 10, 2024
Merged

Some refactor before fixing zorder bug #7148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d8dc0a
refactor - rename zindex which is not zorder
archmoj Sep 10, 2024
9cf7b7c
remove subtitles from mock
archmoj Sep 10, 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
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 @@ -244,7 +244,7 @@ function plotOne(gd, plotinfo, cdSubplot, transitionOpts, makeOnCompleteCallback
if(cdModule.length) {
layerData.push({
i: traceLayerClasses.indexOf(classBaseName),
zorder: z,
zindex: z,
className: className,
plotMethod: plotMethod,
cdModule: cdModule
Expand All @@ -257,10 +257,10 @@ function plotOne(gd, plotinfo, cdSubplot, transitionOpts, makeOnCompleteCallback
}
}
}
// Sort the layers primarily by z, then by i
// Sort the layers primarily by zindex, then by i
layerData.sort(function(a, b) {
return (
(a.zorder || 0) - (b.zorder || 0) ||
(a.zindex || 0) - (b.zindex || 0) ||
(a.i - b.i)
);
});
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.
Binary file modified test/image/baselines/zorder-overlayed-subplots-multiple-traces-main-subplot2.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.
5 changes: 1 addition & 4 deletions test/image/mocks/zorder-overlayed-subplots-multiple-traces-main-subplot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,7 @@
"layout": {
"showlegend": true,
"title": {
"text": "zorder overlayed subplots - multiple on the same subplot",
"subtitle": {
"text": "Orange trace is displayed on top!"
}
"text": "zorder overlayed subplots - multiple on the same subplot"
},
"width": 600,
"height": 400,
Expand Down
5 changes: 1 addition & 4 deletions test/image/mocks/zorder-overlayed-subplots-multiple-traces-main-subplot2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,7 @@
"layout": {
"showlegend": true,
"title": {
"text": "zorder overlayed subplots - multiple on the same subplot",
"subtitle": {
"text": "Orange trace is displayed on top!"
}
"text": "zorder overlayed subplots - multiple on the same subplot"
},
"width": 600,
"height": 400,
Expand Down