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

Linear scale: use suggested limits as defaults (#6892)

Browse Source 
* Linear scale: use suggested limits as defaults

* Review update
This commit is contained in:
Jukka Kurkela
2020-01-03 16:07:33 +02:00
committed by Evert Timberg
parent 27129db2e8
commit 03f65d4e7f
2 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/scales/scale.linear.js
View File

@@ -1,6 +1,7 @@
'use strict';
import helpers from '../helpers/index';
import {isFinite, valueOrDefault} from '../helpers/helpers.core';
import {_parseFont} from '../helpers/helpers.options';
import LinearScaleBase from './scale.linearbase';
import Ticks from '../core/core.ticks';
@@ -12,18 +13,17 @@ const defaultConfig = {
class LinearScale extends LinearScaleBase {
determineDataLimits() {
var me = this;
var DEFAULT_MIN = 0;
var DEFAULT_MAX = 1;
var minmax = me._getMinMax(true);
var min = minmax.min;
var max = minmax.max;
const me = this;
const options = me.options;
const minmax = me._getMinMax(true);
let min = minmax.min;
let max = minmax.max;
me.min = helpers.isFinite(min) && !isNaN(min) ? min : DEFAULT_MIN;
me.max = helpers.isFinite(max) && !isNaN(max) ? max : DEFAULT_MAX;
me.min = isFinite(min) ? min : valueOrDefault(options.suggestedMin, 0);
me.max = isFinite(max) ? max : valueOrDefault(options.suggestedMax, 1);
// Backward compatible inconsistent min for stacked
if (me.options.stacked && min > 0) {
if (options.stacked && min > 0) {
me.min = 0;
}
@@ -39,7 +39,7 @@ class LinearScale extends LinearScaleBase {
if (me.isHorizontal()) {
return Math.ceil(me.width / 40);
}
tickFont = helpers.options._parseFont(me.options.ticks);
tickFont = _parseFont(me.options.ticks);
return Math.ceil(me.height / tickFont.lineHeight);
}

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

@@ -141,6 +141,27 @@ describe('Linear Scale', function() {
expect(chart.scales.y.max).toBe(15);
});
it('Should correctly determine the max & min when no datasets are associated and suggested minimum and maximum are set', function() {
var chart = window.acquireChart({
type: 'bar',
data: {
datasets: []
},
options: {
scales: {
y: {
type: 'linear',
suggestedMin: -10,
suggestedMax: 0
}
}
}
});
expect(chart.scales.y.min).toBe(-10);
expect(chart.scales.y.max).toBe(0);
});
it('Should correctly determine the max & min data values ignoring hidden datasets', function() {
var chart = window.acquireChart({
type: 'bar',