CategoryScale: automatically add missing labels (#8053)

CategoryScale: automatically add missing labels

diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js
index 1c8c933284a3ca9c10a44cc045ddb81522a06f1b..d61d4c5ff07ad963e13f879c235400deca74ee94 100644 (file)
--- a/src/scales/scale.category.js
+++ b/src/scales/scale.category.js
@@ -1,5 +1,14 @@
 import Scale from '../core/core.scale';
 
+function findOrAddLabel(labels, raw, index) {
+       const first = labels.indexOf(raw);
+       if (first === -1) {
+               return typeof raw === 'string' ? labels.push(raw) - 1 : index;
+       }
+       const last = labels.lastIndexOf(raw);
+       return first !== last ? index : first;
+}
+
 export default class CategoryScale extends Scale {
 
        constructor(cfg) {
@@ -12,12 +21,8 @@ export default class CategoryScale extends Scale {
 
        parse(raw, index) {
                const labels = this.getLabels();
-               if (labels[index] === raw) {
-                       return index;
-               }
-               const first = labels.indexOf(raw);
-               const last = labels.lastIndexOf(raw);
-               return first === -1 || first !== last ? index : first;
+               return isFinite(index) && labels[index] === raw
+                       ? index : findOrAddLabel(labels, raw, index);
        }
 
        determineDataLimits() {

diff --git a/test/fixtures/controller.bar/bar-skip-null-object-data.js b/test/fixtures/controller.bar/bar-skip-null-object-data.js
index 3be0fc964bdaaaafb726b9a4bb87542a372c1a7d..8690aec27182eb85a0585f49a89f666f52b166c7 100644 (file)
--- a/test/fixtures/controller.bar/bar-skip-null-object-data.js
+++ b/test/fixtures/controller.bar/bar-skip-null-object-data.js
@@ -2,7 +2,6 @@ module.exports = {
        config: {
                type: 'bar',
                data: {
-                       labels: [0, 1, 3, 4],
                        datasets: [
                                {
                                        data: {0: 5, 1: 20, 2: 1, 3: 10},

diff --git a/test/specs/scale.category.tests.js b/test/specs/scale.category.tests.js
index fe9c74c68c8df3e967b53c3f73066ea4f7274931..97183a822146f3c00ce7a0db26f07d979ed695dc 100644 (file)
--- a/test/specs/scale.category.tests.js
+++ b/test/specs/scale.category.tests.js
@@ -90,6 +90,30 @@ describe('Category scale tests', function() {
                expect(getLabels(scale)).toEqual(labels);
        });
 
+       it('Should generate missing labels', function() {
+               var labels = ['a', 'b', 'c', 'd'];
+               var chart = window.acquireChart({
+                       type: 'line',
+                       data: {
+                               datasets: [{
+                                       data: {a: 1, b: 3, c: -1, d: 10}
+                               }]
+                       },
+                       options: {
+                               scales: {
+                                       x: {
+                                               type: 'category',
+                                               labels: ['a']
+                                       }
+                               }
+                       }
+               });
+
+               var scale = chart.scales.x;
+               expect(getLabels(scale)).toEqual(labels);
+
+       });
+
        it('should get the correct label for the index', function() {
                var chart = window.acquireChart({
                        type: 'line',