fix typed array support on axes with set type:multicategory

etpinard · etpinard · commit 69ccfd311d27 · 2018-12-06T15:29:41.000-05:00
diff --git a/src/lib/array.js b/src/lib/array.js
@@ -143,7 +143,7 @@ exports.minRowLength = function(z) {
 
 function _rowLength(z, fn, len0) {
     if(isArrayOrTypedArray(z)) {
-        if(Array.isArray(z[0])) {
+        if(isArrayOrTypedArray(z[0])) {
             var len = len0;
             for(var i = 0; i < z.length; i++) {
                 len = fn(len, z[i].length);
diff --git a/src/plots/cartesian/set_convert.js b/src/plots/cartesian/set_convert.js
@@ -155,7 +155,7 @@ module.exports = function setConvert(ax, fullLayout) {
         // [ [cnt, {$cat: index}], for j .. arrayIn.length ]
         var seen = [[0, {}], [0, {}]];
 
-        if(Array.isArray(arrayIn[0]) && Array.isArray(arrayIn[1])) {
+        if(Lib.isArrayOrTypedArray(arrayIn[0]) && Lib.isArrayOrTypedArray(arrayIn[1])) {
             for(i = 0; i < len; i++) {
                 var v0 = arrayIn[0][i];
                 var v1 = arrayIn[1][i];
diff --git a/test/jasmine/tests/axes_test.js b/test/jasmine/tests/axes_test.js
@@ -2862,6 +2862,19 @@ describe('Test axes', function() {
                 expect(ax._categories).toEqual([]);
                 expect(ax._categoriesMap).toEqual(undefined);
             });
+
+            it('case with inner typed arrays and set type:multicategory', function() {
+                var out = _makeCalcdata({
+                    x: [
+                        new Float32Array([1, 2, 1, 2]),
+                        new Float32Array([10, 10, 20, 20])
+                    ]
+                }, 'x', 'multicategory');
+
+                expect(out).toEqual([0, 1, 2, 3]);
+                expect(ax._categories).toEqual([[1, 10], [1, 20], [2, 10], [2, 20]]);
+                expect(ax._categoriesMap).toEqual({'1,10': 0, '1,20': 1, '2,10': 2, '2,20': 3});
+            });
         });
 
         describe('2d coordinate array on non-multicategory axes should return BADNUMs', function() {
