From: Jukka Kurkela <jukka.kurkela@gmail.com>
Date: Thu, 18 Mar 2021 20:34:08 +0000 (+0200)
Subject: Fix category scale invalid data handling (#8668)
X-Git-Tag: v3.0.0-rc~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=851861e9cce4c54c74dc4758b419aa0b6622cde0;p=thirdparty%2FChart.js.git

Fix category scale invalid data handling (#8668)

* Fix category scale invalid data handling
* Fix NaN
---

diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js
index c6efd61b8..175bd3e8f 100644
--- a/src/scales/scale.category.js
+++ b/src/scales/scale.category.js
@@ -1,10 +1,14 @@
 import Scale from '../core/core.scale';
-import {valueOrDefault} from '../helpers';
+import {isNullOrUndef, valueOrDefault} from '../helpers';
+
+const addIfString = (labels, raw, index) => typeof raw === 'string'
+  ? labels.push(raw) - 1
+  : isNaN(raw) ? null : index;
 
 function findOrAddLabel(labels, raw, index) {
   const first = labels.indexOf(raw);
   if (first === -1) {
-    return typeof raw === 'string' ? labels.push(raw) - 1 : index;
+    return addIfString(labels, raw, index);
   }
   const last = labels.lastIndexOf(raw);
   return first !== last ? index : first;
@@ -21,6 +25,9 @@ export default class CategoryScale extends Scale {
   }
 
   parse(raw, index) {
+    if (isNullOrUndef(raw)) {
+      return null;
+    }
     const labels = this.getLabels();
     return isFinite(index) && labels[index] === raw
       ? index : findOrAddLabel(labels, raw, valueOrDefault(index, raw));
@@ -96,7 +103,7 @@ export default class CategoryScale extends Scale {
       value = me.parse(value);
     }
 
-    return me.getPixelForDecimal((value - me._startValue) / me._valueRange);
+    return value === null ? NaN : me.getPixelForDecimal((value - me._startValue) / me._valueRange);
   }
 
   // Must override base implementation because it calls getPixelForValue
diff --git a/test/fixtures/scale.category/invalid-data.js b/test/fixtures/scale.category/invalid-data.js
new file mode 100644
index 000000000..33d1ee58b
--- /dev/null
+++ b/test/fixtures/scale.category/invalid-data.js
@@ -0,0 +1,41 @@
+module.exports = {
+  config: {
+    type: 'line',
+    data: {
+      labels: ['a', 'b', 'c', 'd', 'e', 'f', 'g'],
+      datasets: [{
+        data: [
+          {x: 'a', y: 1},
+          {x: null, y: 1},
+          {x: 2, y: 1},
+          {x: undefined, y: 1},
+          {x: 4, y: 1},
+          {x: NaN, y: 1},
+          {x: 6, y: 1}
+        ],
+        backgroundColor: 'red',
+        borderColor: 'red',
+        borderWidth: 5
+      }]
+    },
+    options: {
+      scales: {
+        y: {
+          display: false
+        },
+        x: {
+          grid: {
+            display: false
+          }
+        }
+      }
+    }
+  },
+  options: {
+    spriteText: true,
+    canvas: {
+      width: 256,
+      height: 256
+    }
+  }
+};
diff --git a/test/fixtures/scale.category/invalid-data.png b/test/fixtures/scale.category/invalid-data.png
new file mode 100644
index 000000000..126c0c888
Binary files /dev/null and b/test/fixtures/scale.category/invalid-data.png differ