Skip to content
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.

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

Fix stacked fill with lines over multiple scales #9767

Merged
merged 1 commit into from Oct 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/plugins/plugin.filler.js
Expand Up @@ -206,11 +206,11 @@ function pointsFromSegments(boundary, line) {
* @return {LineElement}
*/
function buildStackLine(source) {
const {chart, scale, index, line} = source;
const {scale, index, line} = source;
const points = [];
const segments = line.segments;
const sourcePoints = line.points;
const linesBelow = getLinesBelow(chart, index);
const linesBelow = getLinesBelow(scale, index);
linesBelow.push(createBoundaryLine({x: null, y: scale.bottom}, line));

for (let i = 0; i < segments.length; i++) {
Expand All @@ -222,23 +222,21 @@ function buildStackLine(source) {
return new LineElement({points, options: {}});
}

const isLineAndNotInHideAnimation = (meta) => meta.type === 'line' && !meta.hidden;

/**
* @param {Chart} chart
* @param {Scale} scale
* @param {number} index
* @return {LineElement[]}
*/
function getLinesBelow(chart, index) {
function getLinesBelow(scale, index) {
const below = [];
const metas = chart.getSortedVisibleDatasetMetas();
const metas = scale.getMatchingVisibleMetas('line');

for (let i = 0; i < metas.length; i++) {
const meta = metas[i];
if (meta.index === index) {
break;
}
if (isLineAndNotInHideAnimation(meta)) {
if (!meta.hidden) {
below.unshift(meta.dataset);
}
}
Expand Down
76 changes: 76 additions & 0 deletions test/fixtures/plugin.filler/line/stack-multiple-scales.js
@@ -0,0 +1,76 @@
module.exports = {
config: {
type: 'line',
data: {
labels: ['0', '1', '2', '3'],
datasets: [{
backgroundColor: 'rgba(255, 0, 0, 0.5)',
data: [null, 1, 1, 1],
fill: 'stack'
}, {
backgroundColor: 'rgba(0, 255, 0, 0.5)',
data: [null, 2, 2, 2],
fill: 'stack'
}, {
backgroundColor: 'rgba(0, 0, 255, 0.5)',
data: [null, 3, 3, 3],
fill: 'stack'
}, {
backgroundColor: 'rgba(255, 0, 255, 0.5)',
data: [0.5, 0.5, 0.5, null],
fill: 'stack',
yAxisID: 'y2'
}, {
backgroundColor: 'rgba(0, 0, 0, 0.5)',
data: [1.5, 1.5, 1.5, null],
fill: 'stack',
yAxisID: 'y2'
}, {
backgroundColor: 'rgba(255, 255, 0, 0.5)',
data: [2.5, 2.5, 2.5, null],
fill: 'stack',
yAxisID: 'y2'
}]
},
options: {
responsive: false,
spanGaps: false,
scales: {
x: {
display: false
},
y: {
position: 'right',
stacked: true,
min: 0
},
y2: {
position: 'left',
stacked: true,
min: 0
}
},
elements: {
point: {
radius: 0
},
line: {
borderColor: 'transparent',
tension: 0
}
},
plugins: {
legend: false,
title: false,
tooltip: false
}
}
},
options: {
spriteText: true,
canvas: {
height: 256,
width: 512
}
}
};
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.