Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-06 12:19:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Avoid negative layout dimensions (#9027)

Browse Source
This commit is contained in:
Jukka Kurkela 2021-05-05 14:49:44 +03:00 committed by GitHub
parent f5c51afd51
commit 1a1e677699
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/core.layouts.js
View File

@ -309,8 +309,8 @@ export default {
}
const padding = toPadding(chart.options.layout.padding);
const availableWidth = width - padding.width;
const availableHeight = height - padding.height;
const availableWidth = Math.max(width - padding.width, 0);
const availableHeight = Math.max(height - padding.height, 0);
const boxes = buildLayoutBoxes(chart.boxes);
const verticalBoxes = boxes.vertical;
const horizontalBoxes = boxes.horizontal;

27
test/specs/scale.linear.tests.js
View File

@ -1220,4 +1220,31 @@ describe('Linear Scale', function() {
expect(scale.getValueForPixel(end)).toBeCloseTo(min, 4);
expect(scale.getValueForPixel(start)).toBeCloseTo(max, 4);
});
it('should not throw errors when chart size is negative', function() {
function createChart() {
return window.acquireChart({
type: 'bar',
data: {
labels: [0, 1, 2, 3, 4, 5, 6, 7, '7+'],
datasets: [{
data: [29.05, 4, 15.69, 11.69, 2.84, 4, 0, 3.84, 4],
}],
},
options: {
plugins: false,
layout: {
padding: {top: 30, left: 1, right: 1, bottom: 1}
}
}
}, {
canvas: {
height: 0,
width: 0
}
});
}
expect(createChart).not.toThrow();
});
});