From f478100711f447c05d9518e567464a3f0d969cec Mon Sep 17 00:00:00 2001 From: Jukka Kurkela Date: Sun, 30 May 2021 00:17:20 +0300 Subject: [PATCH 1/2] Linear: Respect bounds option in tick generation --- src/scales/scale.linearbase.js | 13 ++++++-- .../controller.line/stacking/bounds-data.js | 29 ++++++++++++++++++ .../controller.line/stacking/bounds-data.png | Bin 0 -> 17328 bytes 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 test/fixtures/controller.line/stacking/bounds-data.js create mode 100644 test/fixtures/controller.line/stacking/bounds-data.png diff --git a/src/scales/scale.linearbase.js b/src/scales/scale.linearbase.js index ab2c4b91e5c..e0500c6cce2 100644 --- a/src/scales/scale.linearbase.js +++ b/src/scales/scale.linearbase.js @@ -2,6 +2,7 @@ import {isNullOrUndef} from '../helpers/helpers.core'; import {almostEquals, almostWhole, niceNum, _decimalPlaces, _setMinAndMaxByKey, sign, toRadians} from '../helpers/helpers.math'; import Scale from '../core/core.scale'; import {formatNumber} from '../helpers/helpers.intl'; +import {_filterBetween} from '../helpers'; /** * Generate a set of linear ticks for an axis @@ -29,7 +30,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 +59,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 +247,7 @@ export default class LinearScaleBase extends Scale { const numericGeneratorOptions = { maxTicks, + bounds: opts.bounds, min: opts.min, max: opts.max, precision: tickOpts.precision, diff --git a/test/fixtures/controller.line/stacking/bounds-data.js b/test/fixtures/controller.line/stacking/bounds-data.js new file mode 100644 index 00000000000..413af181f5a --- /dev/null +++ b/test/fixtures/controller.line/stacking/bounds-data.js @@ -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 + } +}; diff --git a/test/fixtures/controller.line/stacking/bounds-data.png b/test/fixtures/controller.line/stacking/bounds-data.png new file mode 100644 index 0000000000000000000000000000000000000000..90ce6a30c282c7f2dbec6a7934fdc828ab3b3219 GIT binary patch literal 17328 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 rQ-T%{#Kmjj+gQ=nG}#ryl7kp4 literal 0 HcmV?d00001 From 2b5a067d8859fbb15ef1929dfd7a632bcb357c40 Mon Sep 17 00:00:00 2001 From: Jukka Kurkela Date: Sun, 30 May 2021 00:25:11 +0300 Subject: [PATCH 2/2] Remove leftover _filterBetween --- src/scales/scale.linearbase.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/scales/scale.linearbase.js b/src/scales/scale.linearbase.js index e0500c6cce2..8bd3c7e1fef 100644 --- a/src/scales/scale.linearbase.js +++ b/src/scales/scale.linearbase.js @@ -2,7 +2,6 @@ import {isNullOrUndef} from '../helpers/helpers.core'; import {almostEquals, almostWhole, niceNum, _decimalPlaces, _setMinAndMaxByKey, sign, toRadians} from '../helpers/helpers.math'; import Scale from '../core/core.scale'; import {formatNumber} from '../helpers/helpers.intl'; -import {_filterBetween} from '../helpers'; /** * Generate a set of linear ticks for an axis