mirror of
https://github.com/chartjs/Chart.js.git
synced 2024-10-06 04:09:08 +02:00
Fix: tick spacing when min=0 | niceMin or max=0 (#8811)
This commit is contained in:
parent
bfd30eb9c5
commit
c58966d58c
@ -98,12 +98,12 @@ function generateTicks(generationOptions, dataRange) {
|
||||
let j = 0;
|
||||
if (minDefined) {
|
||||
ticks.push({value: min});
|
||||
// If the niceMin is smaller than min, skip it
|
||||
if (niceMin < min) {
|
||||
// If the niceMin is smaller or equal to min, skip it
|
||||
if (niceMin <= min) {
|
||||
j++;
|
||||
}
|
||||
// If the next nice tick is close to min, skip that too
|
||||
if (almostWhole(Math.round((niceMin + j * spacing) * factor) / factor / min, spacing / 1000)) {
|
||||
if (almostEquals(Math.round((niceMin + j * spacing) * factor) / factor, min, spacing / 10)) {
|
||||
j++;
|
||||
}
|
||||
}
|
||||
@ -114,7 +114,7 @@ function generateTicks(generationOptions, dataRange) {
|
||||
|
||||
if (maxDefined) {
|
||||
// If the previous tick is close to max, replace it with max, else add max
|
||||
if (almostWhole(ticks[ticks.length - 1].value / max, spacing / 1000)) {
|
||||
if (almostEquals(ticks[ticks.length - 1].value, max, spacing / 10)) {
|
||||
ticks[ticks.length - 1].value = max;
|
||||
} else {
|
||||
ticks.push({value: max});
|
||||
|
26
test/fixtures/scale.linear/issue-8806.js
vendored
Normal file
26
test/fixtures/scale.linear/issue-8806.js
vendored
Normal file
@ -0,0 +1,26 @@
|
||||
module.exports = {
|
||||
description: 'https://github.com/chartjs/Chart.js/issues/8806',
|
||||
config: {
|
||||
type: 'bar',
|
||||
data: {
|
||||
labels: ['0', '1', '2', '3', '4', '5', '6'],
|
||||
datasets: [{
|
||||
label: '# of Votes',
|
||||
data: [32, 46, 28, 21, 20, 13, 27]
|
||||
}]
|
||||
},
|
||||
options: {
|
||||
scales: {
|
||||
x: {display: false},
|
||||
y: {ticks: {maxTicksLimit: 4}, min: 0}
|
||||
}
|
||||
}
|
||||
},
|
||||
options: {
|
||||
spriteText: true,
|
||||
canvas: {
|
||||
width: 256,
|
||||
height: 256
|
||||
}
|
||||
}
|
||||
};
|
BIN
test/fixtures/scale.linear/issue-8806.png
vendored
Normal file
BIN
test/fixtures/scale.linear/issue-8806.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 4.7 KiB |
Loading…
Reference in New Issue
Block a user