scale.category: options.min/max can be index (#8594)

chartjs · Mar 9, 2021 · b005143 · b005143
1 parent 7ec99c3
commit b005143
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 13 deletions.
diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js
@@ -1,4 +1,5 @@
 import Scale from '../core/core.scale';
+import {valueOrDefault} from '../helpers';
 
 function findOrAddLabel(labels, raw, index) {
   const first = labels.indexOf(raw);
@@ -22,7 +23,7 @@ export default class CategoryScale extends Scale {
   parse(raw, index) {
     const labels = this.getLabels();
     return isFinite(index) && labels[index] === raw
-      ? index : findOrAddLabel(labels, raw, index);
+      ? index : findOrAddLabel(labels, raw, valueOrDefault(index, raw));
   }
 
   determineDataLimits() {

diff --git a/test/fixtures/controller.bar/floatBar/float-bar-horizontal.json b/test/fixtures/controller.bar/floatBar/float-bar-horizontal.json
@@ -18,9 +18,7 @@
             "indexAxis": "y",
             "scales": {
                 "x": {
-                    "display": false,
-                    "min": -8,
-                    "max": 12
+                    "display": false
                 },
                 "y": {
                     "display": false

diff --git a/test/fixtures/controller.bar/floatBar/float-bar-stacked-horizontal.json b/test/fixtures/controller.bar/floatBar/float-bar-stacked-horizontal.json
@@ -23,9 +23,7 @@
                 },
                 "y": {
                     "display": false,
-                    "stacked": true,
-                    "min": -8,
-                    "max": 12
+                    "stacked": true
                 }
             }
         }

diff --git a/test/fixtures/controller.bar/floatBar/float-bar-stacked.json b/test/fixtures/controller.bar/floatBar/float-bar-stacked.json
@@ -18,9 +18,7 @@
             "scales": {
                 "x": {
                     "display": false,
-                    "stacked": true,
-                    "min": -8,
-                    "max": 12
+                    "stacked": true
                 },
                 "y": {
                     "display": false,

diff --git a/test/fixtures/controller.bar/floatBar/float-bar.json b/test/fixtures/controller.bar/floatBar/float-bar.json
@@ -17,9 +17,7 @@
         "options": {
             "scales": {
                 "x": {
-                    "display": false,
-                    "min": -8,
-                    "max": 12
+                    "display": false
                 },
                 "y": {
                     "display": false