From ff811aaddf4dc17f34983f7d697230d8229561e3 Mon Sep 17 00:00:00 2001 From: Jukka Kurkela Date: Fri, 16 Oct 2020 17:32:37 +0300 Subject: [PATCH] Fix: beginAtZero for logarighmic (#7899) --- src/scales/scale.logarithmic.js | 5 ++++- test/specs/scale.logarithmic.tests.js | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/scales/scale.logarithmic.js b/src/scales/scale.logarithmic.js index 57bbafa78..526ada835 100644 --- a/src/scales/scale.logarithmic.js +++ b/src/scales/scale.logarithmic.js @@ -77,6 +77,10 @@ export default class LogarithmicScale extends Scale { me.min = isFinite(min) ? Math.max(0, min) : null; me.max = isFinite(max) ? Math.max(0, max) : null; + if (me.options.beginAtZero) { + me._zero = true; + } + me.handleTickRangeOptions(); } @@ -159,7 +163,6 @@ export default class LogarithmicScale extends Scale { me._startValue = log10(start); me._valueRange = log10(me.max) - log10(start); - me._zero = me.options.beginAtZero; } getPixelForValue(value) { diff --git a/test/specs/scale.logarithmic.tests.js b/test/specs/scale.logarithmic.tests.js index df169c954..699881380 100644 --- a/test/specs/scale.logarithmic.tests.js +++ b/test/specs/scale.logarithmic.tests.js @@ -345,7 +345,7 @@ describe('Logarithmic Scale tests', function() { } }); - expect(chart.scales.y.min).toBe(1); + expect(chart.scales.y.min).toBe(0.1); expect(chart.scales.y.max).toBe(200); }); @@ -387,7 +387,7 @@ describe('Logarithmic Scale tests', function() { } }); - expect(chart.scales.y.min).toBe(1); + expect(chart.scales.y.min).toBe(0.1); expect(chart.scales.y.max).toBe(200); }); @@ -517,7 +517,7 @@ describe('Logarithmic Scale tests', function() { type: 'bar', data: { datasets: [{ - data: [10, 5, 1, 25, 78] + data: [10, 5, 2, 25, 78] }], labels: [] }, @@ -659,7 +659,7 @@ describe('Logarithmic Scale tests', function() { type: 'bar', data: { datasets: [{ - data: [10, 5, 1, 25, 78] + data: [10, 5, 2, 25, 78] }], labels: [] }, -- 2.47.2