Mirrors/Chart.js
2
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2026-03-06 00:14:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Linear: Respect bounds option in tick generation (#9181)

Browse Source 
* Linear: Respect bounds option in tick generation
* Remove leftover _filterBetween
This commit is contained in:
Jukka Kurkela
2021-05-30 00:32:03 +03:00
committed by GitHub
parent 8c63351067
commit db74d2f44c
3 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/scales/scale.linearbase.js
View File

@@ -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,