Time scale: skip invalid data (#8508)

chartjs · Feb 23, 2021 · 4207645 · 4207645
1 parent 99ca833
commit 4207645
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 2 deletions.
diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
@@ -47,7 +47,7 @@ function sorter(a, b) {
  */
 function parse(scale, input) {
   if (isNullOrUndef(input)) {
-    return null;
+    return NaN;
   }
 
   const adapter = scale._adapter;
@@ -67,7 +67,7 @@ function parse(scale, input) {
   }
 
   if (value === null) {
-    return value;
+    return NaN;
   }
 
   if (round) {

diff --git a/test/fixtures/scale.time/invalid-data.js b/test/fixtures/scale.time/invalid-data.js
@@ -0,0 +1,50 @@
+module.exports = {
+  description: 'Invalid data, https://github.com/chartjs/Chart.js/issues/5563',
+  config: {
+    type: 'line',
+    data: {
+      datasets: [{
+        data: [{
+          x: '14:45:00',
+          y: 20,
+        }, {
+          x: '20:30:00',
+          y: 10,
+        }, {
+          x: '25:15:00',
+          y: 15,
+        }, {
+          x: null,
+          y: 15,
+        }, {
+          x: undefined,
+          y: 15,
+        }, {
+          x: NaN,
+          y: 15,
+        }, {
+          x: 'monday',
+          y: 15,
+        }],
+      }]
+    },
+    options: {
+      scales: {
+        x: {
+          type: 'time',
+          time: {
+            parser: 'HH:mm:ss',
+            unit: 'hour'
+          },
+        },
+      },
+      layout: {
+        padding: 16
+      }
+    }
+  },
+  options: {
+    spriteText: true,
+    canvas: {width: 1000, height: 200}
+  }
+};
diff --git a/test/fixtures/scale.time/invalid-data.png b/test/fixtures/scale.time/invalid-data.png