a few more Array.isArray -> Lib.isArrayOrTypedArray

Author: etpinard

src/components/colorscale/has_colorscale.js

@@ -6,24 +6,22 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
 var isNumeric = require('fast-isnumeric');
-
 var Lib = require('../../lib');
-
 var isValidScale = require('./is_valid_scale');
 
-
 module.exports = function hasColorscale(trace, containerStr) {
     var container = containerStr ?
             Lib.nestedProperty(trace, containerStr).get() || {} :
             trace,
         color = container.color,
         isArrayWithOneNumber = false;
 
-    if(Array.isArray(color)) {
+    if(Lib.isTypedArray(color)) {
+        isArrayWithOneNumber = true;
+    } else if(Array.isArray(color)) {
         for(var i = 0; i < color.length; i++) {
             if(isNumeric(color[i])) {
                 isArrayWithOneNumber = true;

src/components/drawing/index.js

@@ -316,10 +316,10 @@ function singlePointStyle(d, sel, trace, markerScale, lineScale, marker, markerL
 
         if('mlc' in d) lineColor = d.mlcc = lineScale(d.mlc);
         // weird case: array wasn't long enough to apply to every point
-        else if(Array.isArray(markerLine.color)) lineColor = Color.defaultLine;
+        else if(Lib.isArrayOrTypedArray(markerLine.color)) lineColor = Color.defaultLine;
         else lineColor = markerLine.color;
 
-        if(Array.isArray(marker.color)) {
+        if(Lib.isArrayOrTypedArray(marker.color)) {
             fillColor = Color.defaultLine;
             perPointGradient = true;
         }
@@ -542,7 +542,7 @@ drawing.tryColorscale = function(marker, prefix) {
         scl = cont.colorscale,
         colorArray = cont.color;
 
-    if(scl && Array.isArray(colorArray)) {
+    if(scl && Lib.isArrayOrTypedArray(colorArray)) {
         return Colorscale.makeColorScaleFunc(
             Colorscale.extractScale(scl, cont.cmin, cont.cmax)
         );

src/lib/index.js

@@ -433,8 +433,7 @@ lib.castOption = function(trace, ptNumber, astr, fn) {
     var val = lib.nestedProperty(trace, astr).get();
 
     if(lib.isArrayOrTypedArray(val)) {
-        // TODO what to do with 2d arrays?
-        if(Array.isArray(ptNumber) && Array.isArray(val[ptNumber[0]])) {
+        if(Array.isArray(ptNumber) && lib.isArrayOrTypedArray(val[ptNumber[0]])) {
             return fn(val[ptNumber[0]][ptNumber[1]]);
         } else {
             return fn(val[ptNumber]);

src/lib/stats.js

@@ -10,7 +10,7 @@
 'use strict';
 
 var isNumeric = require('fast-isnumeric');
-
+var isArrayOrTypedArray = require('./is_array').isArrayOrTypedArray;
 
 /**
  * aggNums() returns the result of an aggregate function applied to an array of
@@ -30,7 +30,7 @@ exports.aggNums = function(f, v, a, len) {
         b;
     if(!len) len = a.length;
     if(!isNumeric(v)) v = false;
-    if(Array.isArray(a[0])) {
+    if(isArrayOrTypedArray(a[0])) {
         b = new Array(len);
         for(i = 0; i < len; i++) b[i] = exports.aggNums(f, v, a[i]);
         a = b;

src/traces/heatmap/has_columns.js

@@ -6,9 +6,10 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
+var Lib = require('../../lib');
+
 module.exports = function(trace) {
-    return !Array.isArray(trace.z[0]);
+    return !Lib.isArrayOrTypedArray(trace.z[0]);
 };

src/traces/heatmap/make_bound_array.js

@@ -8,6 +8,7 @@
 
 'use strict';
 
+var Lib = require('../../lib');
 var Registry = require('../../registry');
 
 module.exports = function makeBoundArray(trace, arrayIn, v0In, dvIn, numbricks, ax) {
@@ -19,7 +20,7 @@ module.exports = function makeBoundArray(trace, arrayIn, v0In, dvIn, numbricks,
         dv,
         i;
 
-    var isArrayOfTwoItemsOrMore = Array.isArray(arrayIn) && arrayIn.length > 1;
+    var isArrayOfTwoItemsOrMore = Lib.isArrayOrTypedArray(arrayIn) && arrayIn.length > 1;
 
     if(isArrayOfTwoItemsOrMore && !isHist && (ax.type !== 'category')) {
         var len = arrayIn.length;
@@ -67,7 +68,7 @@ module.exports = function makeBoundArray(trace, arrayIn, v0In, dvIn, numbricks,
         var calendar = trace[ax._id.charAt(0) + 'calendar'];
 
         if(isHist || ax.type === 'category') v0 = ax.r2c(v0In, 0, calendar) || 0;
-        else if(Array.isArray(arrayIn) && arrayIn.length === 1) v0 = arrayIn[0];
+        else if(Lib.isArrayOrTypedArray(arrayIn) && arrayIn.length === 1) v0 = arrayIn[0];
         else if(v0In === undefined) v0 = 0;
         else v0 = ax.d2c(v0In, 0, calendar);
 

src/traces/heatmap/xyz_defaults.js

@@ -11,10 +11,10 @@
 
 var isNumeric = require('fast-isnumeric');
 
+var Lib = require('../../lib');
 var Registry = require('../../registry');
 var hasColumns = require('./has_columns');
 
-
 module.exports = function handleXYZDefaults(traceIn, traceOut, coerce, layout, xName, yName) {
     var z = coerce('z');
     xName = xName || 'x';
@@ -76,7 +76,7 @@ function isValidZ(z) {
 
     for(var i = 0; i < z.length; i++) {
         zi = z[i];
-        if(!Array.isArray(zi)) {
+        if(!Lib.isArrayOrTypedArray(zi)) {
             allRowsAreArrays = false;
             break;
         }

src/traces/surface/convert.js

@@ -16,6 +16,7 @@ var fill = require('ndarray-fill');
 var ops = require('ndarray-ops');
 var tinycolor = require('tinycolor2');
 
+var Lib = require('../../lib');
 var str2RgbaArray = require('../../lib/str2rgbarray');
 
 var MIN_RESOLUTION = 128;
@@ -45,17 +46,17 @@ proto.handlePick = function(selection) {
         ];
         var traceCoordinate = [0, 0, 0];
 
-        if(!Array.isArray(this.data.x)) {
+        if(!Lib.isArrayOrTypedArray(this.data.x)) {
             traceCoordinate[0] = selectIndex[0];
-        } else if(Array.isArray(this.data.x[0])) {
+        } else if(Lib.isArrayOrTypedArray(this.data.x[0])) {
             traceCoordinate[0] = this.data.x[selectIndex[1]][selectIndex[0]];
         } else {
             traceCoordinate[0] = this.data.x[selectIndex[0]];
         }
 
-        if(!Array.isArray(this.data.y)) {
+        if(!Lib.isArrayOrTypedArray(this.data.y)) {
             traceCoordinate[1] = selectIndex[1];
-        } else if(Array.isArray(this.data.y[0])) {
+        } else if(Lib.isArrayOrTypedArray(this.data.y[0])) {
             traceCoordinate[1] = this.data.y[selectIndex[1]][selectIndex[0]];
         } else {
             traceCoordinate[1] = this.data.y[selectIndex[1]];
@@ -231,11 +232,11 @@ proto.update = function(data) {
     });
 
     // coords x
-    if(!Array.isArray(x)) {
+    if(!Lib.isArrayOrTypedArray(x)) {
         fill(xc, function(row) {
             return xaxis.d2l(row, 0, xcalendar) * scaleFactor[0];
         });
-    } else if(Array.isArray(x[0])) {
+    } else if(Lib.isArrayOrTypedArray(x[0])) {
         fill(xc, function(row, col) {
             return xaxis.d2l(x[col][row], 0, xcalendar) * scaleFactor[0];
         });
@@ -247,11 +248,11 @@ proto.update = function(data) {
     }
 
     // coords y
-    if(!Array.isArray(x)) {
+    if(!Lib.isArrayOrTypedArray(x)) {
         fill(yc, function(row, col) {
             return yaxis.d2l(col, 0, xcalendar) * scaleFactor[1];
         });
-    } else if(Array.isArray(y[0])) {
+    } else if(Lib.isArrayOrTypedArray(y[0])) {
         fill(yc, function(row, col) {
             return yaxis.d2l(y[col][row], 0, ycalendar) * scaleFactor[1];
         });

src/traces/surface/defaults.js

@@ -32,8 +32,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     var x = coerce('x');
     coerce('y');
 
-    // TODO
-    traceOut._xlength = (Array.isArray(x) && Array.isArray(x[0])) ? z.length : z[0].length;
+    traceOut._xlength = (Array.isArray(x) && Lib.isArrayOrTypedArray(x[0])) ? z.length : z[0].length;
     traceOut._ylength = z.length;
 
     var handleCalendarDefaults = Registry.getComponentMethod('calendars', 'handleTraceDefaults');