mirror of
https://github.com/chartjs/Chart.js.git
synced 2024-10-06 04:09:08 +02:00
Linear: Respect bounds option in tick generation (#9181)
* Linear: Respect bounds option in tick generation * Remove leftover _filterBetween
This commit is contained in:
parent
8c63351067
commit
db74d2f44c
@ -29,7 +29,7 @@ function generateTicks(generationOptions, dataRange) {
|
||||
// for details.
|
||||
|
||||
const MIN_SPACING = 1e-14;
|
||||
const {step, min, max, precision, count, maxTicks, maxDigits, includeBounds} = generationOptions;
|
||||
const {bounds, step, min, max, precision, count, maxTicks, maxDigits, includeBounds} = generationOptions;
|
||||
const unit = step || 1;
|
||||
const maxSpaces = maxTicks - 1;
|
||||
const {min: rmin, max: rmax} = dataRange;
|
||||
@ -58,8 +58,13 @@ function generateTicks(generationOptions, dataRange) {
|
||||
spacing = Math.ceil(spacing * factor) / factor;
|
||||
}
|
||||
|
||||
niceMin = Math.floor(rmin / spacing) * spacing;
|
||||
niceMax = Math.ceil(rmax / spacing) * spacing;
|
||||
if (bounds === 'ticks') {
|
||||
niceMin = Math.floor(rmin / spacing) * spacing;
|
||||
niceMax = Math.ceil(rmax / spacing) * spacing;
|
||||
} else {
|
||||
niceMin = rmin;
|
||||
niceMax = rmax;
|
||||
}
|
||||
|
||||
if (minDefined && maxDefined && step && almostWhole((max - min) / step, spacing / 1000)) {
|
||||
// Case 1: If min, max and stepSize are set and they make an evenly spaced scale use it.
|
||||
@ -241,6 +246,7 @@ export default class LinearScaleBase extends Scale {
|
||||
|
||||
const numericGeneratorOptions = {
|
||||
maxTicks,
|
||||
bounds: opts.bounds,
|
||||
min: opts.min,
|
||||
max: opts.max,
|
||||
precision: tickOpts.precision,
|
||||
|
29
test/fixtures/controller.line/stacking/bounds-data.js
vendored
Normal file
29
test/fixtures/controller.line/stacking/bounds-data.js
vendored
Normal file
@ -0,0 +1,29 @@
|
||||
module.exports = {
|
||||
config: {
|
||||
type: 'line',
|
||||
data: {
|
||||
labels: ['a', 'b'],
|
||||
datasets: [{
|
||||
borderColor: 'red',
|
||||
data: [50, 75],
|
||||
}, {
|
||||
borderColor: 'blue',
|
||||
data: [25, 50],
|
||||
}]
|
||||
},
|
||||
options: {
|
||||
scales: {
|
||||
x: {
|
||||
display: false
|
||||
},
|
||||
y: {
|
||||
stacked: true,
|
||||
bounds: 'data'
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
options: {
|
||||
spriteText: true
|
||||
}
|
||||
};
|
BIN
test/fixtures/controller.line/stacking/bounds-data.png
vendored
Normal file
BIN
test/fixtures/controller.line/stacking/bounds-data.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 17 KiB |
Loading…
Reference in New Issue
Block a user