Fix autoskip logic (#10663)

* fix autoskip logic

* add test

* fix lint erro

* Update variable name

diff --git a/docs/migration/v4-migration.md b/docs/migration/v4-migration.md
index d065fee04f77122fa151e7a8364ac36217615d32..cce70bc4af26ddad78f37f831a06170ffeec7b00 100644 (file)
--- a/docs/migration/v4-migration.md
+++ b/docs/migration/v4-migration.md
@@ -28,6 +28,7 @@ A number of changes were made to the configuration options passed to the `Chart`
 * If the tooltip callback returns `undefined`, then the default callback will be used.
 * `maintainAspectRatio` respects container height.
 * Time and timeseries scales use `ticks.stepSize` instead of `time.stepSize`, which has been removed.
+* `maxTickslimit` wont be used for the ticks in `autoSkip` if the determined max ticks is less then the `maxTicksLimit`.
 
 #### Type changes
 * The order of the `ChartMeta` parameters have been changed from `<Element, DatasetElement, Type>` to `<Type, Element, DatasetElement>`.

diff --git a/src/core/core.scale.autoskip.js b/src/core/core.scale.autoskip.js
index 89d0ddfac0a0fb39d9a01c485b8316ecef85e749..1fc7283d652c221871910eaf3815f3730891f23b 100644 (file)
--- a/src/core/core.scale.autoskip.js
+++ b/src/core/core.scale.autoskip.js
@@ -16,7 +16,8 @@ import {_factorize} from '../helpers/helpers.math';
  */
 export function autoSkip(scale, ticks) {
   const tickOpts = scale.options.ticks;
-  const ticksLimit = tickOpts.maxTicksLimit || determineMaxTicks(scale);
+  const determinedMaxTicks = determineMaxTicks(scale);
+  const ticksLimit = Math.min(tickOpts.maxTicksLimit || determinedMaxTicks, determinedMaxTicks);
   const majorIndices = tickOpts.major.enabled ? getMajorIndices(ticks) : [];
   const numMajorIndices = majorIndices.length;
   const first = majorIndices[0];

diff --git a/test/specs/core.scale.tests.js b/test/specs/core.scale.tests.js
index e5e94926d563ac2f869f5e9801bdcbda215449fa..3b30e5600ea955cb47d7433d77a40e8b784b5b2e 100644 (file)
--- a/test/specs/core.scale.tests.js
+++ b/test/specs/core.scale.tests.js
@@ -34,12 +34,44 @@ describe('Core.scale', function() {
       });
     }
 
+    function getChartBigData(maxTicksLimit) {
+      return window.acquireChart({
+        type: 'line',
+        data: {
+          labels: new Array(300).fill('red'),
+          datasets: [{
+            data: new Array(300).fill(5),
+          }]
+        },
+        options: {
+          scales: {
+            x: {
+              ticks: {
+                autoSkip: true,
+                maxTicksLimit
+              }
+            }
+          }
+        }
+      });
+    }
+
     function lastTick(chart) {
       var xAxis = chart.scales.x;
       var ticks = xAxis.getTicks();
       return ticks[ticks.length - 1];
     }
 
+    it('should use autoSkip amount of ticks when maxTicksLimit is set to a larger number as autoSkip calculation', function() {
+      var chart = getChartBigData(300);
+      expect(chart.scales.x.ticks.length).toEqual(20);
+    });
+
+    it('should use maxTicksLimit amount of ticks when maxTicksLimit is set to a smaller number as autoSkip calculation', function() {
+      var chart = getChartBigData(3);
+      expect(chart.scales.x.ticks.length).toEqual(3);
+    });
+
     it('should display the last tick if it fits evenly with other ticks', function() {
       var chart = getChart({
         labels: [