Skip to content

fixup waterfall connectors on date axes #3791

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 1 commit into from
Apr 18, 2019
Merged

fixup waterfall connectors on date axes #3791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions src/traces/waterfall/cross_trace_calc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ module.exports = function crossTraceCalc(gd, plotinfo) {
if(di.isSum === false) {
di.s0 += (j === 0) ? 0 : cd[j - 1].s;
}

if(j + 1 < cd.length) {
cd[j].nextP0 = cd[j + 1].p0;
cd[j].nextS0 = cd[j + 1].s0;
}
}
}
};
13 changes: 4 additions & 9 deletions src/traces/waterfall/plot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@ function plotConnectors(gd, plotinfo, cdModule, traceLayer) {
var x2, y2;
var x3, y3;

var delta = 0;
if(i + 1 < len && Array.isArray(trace.offset)) {
delta -= trace.offset[i + 1] - trace.offset[i];
Copy link
Contributor

@etpinard etpinard Apr 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. Where is offset taken in consideration? Do we have a mock with arrayOk trace.offset settings?

Copy link
Contributor Author

@archmoj archmoj Apr 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes we have: https://github.com/plotly/plotly.js/blob/master/test/image/mocks/waterfall_custom.json

Also here is a codepen using this branch.

Copy link
Contributor

@etpinard etpinard Apr 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome!

}

if(isHorizontal) {
x0 = xa.c2p(di.s1, true);
y0 = ya.c2p(di.p1, true);
Expand All @@ -76,8 +71,8 @@ function plotConnectors(gd, plotinfo, cdModule, traceLayer) {
y2 = ya.c2p(di.p1, true);

if(i + 1 < len) {
x3 = xa.c2p(di.s0 + 1 - delta, true);
y3 = ya.c2p(di.p0 + 1 - delta, true);
x3 = xa.c2p(di.nextS0, true);
y3 = ya.c2p(di.nextP0, true);
}
} else {
x0 = xa.c2p(di.p1, true);
Expand All @@ -90,8 +85,8 @@ function plotConnectors(gd, plotinfo, cdModule, traceLayer) {
y2 = ya.c2p(di.s1, true);

if(i + 1 < len) {
x3 = xa.c2p(di.p0 + 1 - delta, true);
y3 = ya.c2p(di.s0 + 1 - delta, true);
x3 = xa.c2p(di.nextP0, true);
y3 = ya.c2p(di.nextS0, true);
}
}

Expand Down
Binary file added test/image/baselines/waterfall_date-axes.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.
28 changes: 28 additions & 0 deletions test/image/mocks/waterfall_date-axes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"data": [{
"type": "waterfall",
"x": [
"2010-01-01",
"2010-07-01",
"2011-01-01",
"2012-01-01"
],
"y": [
1,
-2,
3,
0
],
"measure": [
"absolute",
"relative",
"relative",
"total"
]

}],
"layout": {
"width": 500,
"height": 250
}
}