flat input array before passing to autoType functions

archmoj · archmoj · commit f6d8c39ffe28 · 2020-11-03T23:21:12.000-05:00
diff --git a/src/plots/cartesian/axis_autotype.js b/src/plots/cartesian/axis_autotype.js
@@ -15,15 +15,19 @@ var Lib = require('../../lib');
 var BADNUM = require('../../constants/numerical').BADNUM;
 
 module.exports = function autoType(array, calendar, opts) {
-    if(Lib.isArrayOrTypedArray(array) && !array.length) return '-';
-    if(!opts.noMultiCategory && multiCategory(array)) return 'multicategory';
+    var a = array;
 
-    if(Lib.isArrayOrTypedArray(array[0])) return '-';
-    if(moreDates(array, calendar)) return 'date';
+    if(Lib.isArrayOrTypedArray(a) && !a.length) return '-';
+    if(!opts.noMultiCategory && multiCategory(a)) return 'multicategory';
+    if(opts.noMultiCategory && Lib.isArrayOrTypedArray(a[0])) {
+        a = a.flat(); // TODO: add support for IE
+    }
+
+    if(moreDates(a, calendar)) return 'date';
 
     var convertNumeric = opts.autotypenumbers !== 'strict'; // compare against strict, just in case autotypenumbers was not provided in opts
-    if(category(array, convertNumeric)) return 'category';
-    if(linearOK(array, convertNumeric)) return 'linear';
+    if(category(a, convertNumeric)) return 'category';
+    if(linearOK(a, convertNumeric)) return 'linear';
 
     return '-';
 };
diff --git a/test/jasmine/tests/axes_test.js b/test/jasmine/tests/axes_test.js
@@ -332,7 +332,7 @@ describe('Test axes', function() {
                         ['d', 'e', 'f']
                     ]
                 });
-                checkTypes('linear', 'linear');
+                checkTypes('linear', 'category');
             });
         });
 

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ describe('Test axes', function() {`
`332`	`332`	`['d', 'e', 'f']`
`333`	`333`	`]`
`334`	`334`	`});`
`335`		`- checkTypes('linear', 'linear');`
	`335`	`+ checkTypes('linear', 'category');`
`336`	`336`	`});`
`337`	`337`	`});`
`338`	`338`