handle typed arrays various traces

Author: archmoj

src/traces/bar/cross_trace_calc.js

@@ -432,9 +432,9 @@ function setBarCenterAndWidth(pa, sieve) {
         var calcTrace = calcTraces[i];
         var t = calcTrace[0].t;
         var poffset = t.poffset;
-        var poffsetIsArray = Array.isArray(poffset);
+        var poffsetIsArray = isArrayOrTypedArray(poffset);
         var barwidth = t.barwidth;
-        var barwidthIsArray = Array.isArray(barwidth);
+        var barwidthIsArray = isArrayOrTypedArray(barwidth);
 
         for(var j = 0; j < calcTrace.length; j++) {
             var calcBar = calcTrace[j];
@@ -478,8 +478,8 @@ function updatePositionAxis(pa, sieve, allowMinDtick) {
             var t = calcTrace0.t;
             var poffset = t.poffset;
             var barwidth = t.barwidth;
-            var poffsetIsArray = Array.isArray(poffset);
-            var barwidthIsArray = Array.isArray(barwidth);
+            var poffsetIsArray = isArrayOrTypedArray(poffset);
+            var barwidthIsArray = isArrayOrTypedArray(barwidth);
 
             for(j = 0; j < calcTrace.length; j++) {
                 bar = calcTrace[j];
@@ -750,7 +750,7 @@ function collectExtents(calcTraces, pa) {
         cd[0].t.extents = extents;
 
         var poffset = cd[0].t.poffset;
-        var poffsetIsArray = Array.isArray(poffset);
+        var poffsetIsArray = isArrayOrTypedArray(poffset);
 
         for(j = 0; j < cd.length; j++) {
             var di = cd[j];

src/traces/cone/convert.js

@@ -6,6 +6,7 @@ var createConeMesh = require('../../../stackgl_modules').gl_cone3d.createConeMes
 var simpleMap = require('../../lib').simpleMap;
 var parseColorScale = require('../../lib/gl_format_color').parseColorScale;
 var extractOpts = require('../../components/colorscale').extractOpts;
+var isArrayOrTypedArray = require('../../lib').isArrayOrTypedArray;
 var zip3 = require('../../plots/gl3d/zip3');
 
 function Cone(scene, uid) {
@@ -34,7 +35,7 @@ proto.handlePick = function(selection) {
         ];
 
         var text = this.data.hovertext || this.data.text;
-        if(Array.isArray(text) && text[selectIndex] !== undefined) {
+        if(isArrayOrTypedArray(text) && text[selectIndex] !== undefined) {
             selection.textLabel = text[selectIndex];
         } else if(text) {
             selection.textLabel = text;

src/traces/funnel/defaults.js

@@ -44,7 +44,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
     });
 
     if(traceOut.textposition !== 'none' && !traceOut.texttemplate) {
-        coerce('textinfo', Array.isArray(text) ? 'text+value' : 'value');
+        coerce('textinfo', Lib.isArrayOrTypedArray(text) ? 'text+value' : 'value');
     }
 
     var markerColor = coerce('marker.color', defaultColor);

src/traces/icicle/defaults.js

@@ -40,7 +40,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 
     var text = coerce('text');
     coerce('texttemplate');
-    if(!traceOut.texttemplate) coerce('textinfo', Array.isArray(text) ? 'text+label' : 'label');
+    if(!traceOut.texttemplate) coerce('textinfo', Lib.isArrayOrTypedArray(text) ? 'text+label' : 'label');
 
     coerce('hovertext');
     coerce('hovertemplate');

src/traces/isosurface/convert.js

@@ -2,6 +2,7 @@
 
 var createMesh = require('../../../stackgl_modules').gl_mesh3d;
 var parseColorScale = require('../../lib/gl_format_color').parseColorScale;
+var isArrayOrTypedArray = require('../../lib').isArrayOrTypedArray;
 var str2RgbaArray = require('../../lib/str2rgbarray');
 var extractOpts = require('../../components/colorscale').extractOpts;
 var zip3 = require('../../plots/gl3d/zip3');
@@ -59,7 +60,7 @@ proto.handlePick = function(selection) {
         ];
 
         var text = this.data.hovertext || this.data.text;
-        if(Array.isArray(text) && text[selectIndex] !== undefined) {
+        if(isArrayOrTypedArray(text) && text[selectIndex] !== undefined) {
             selection.textLabel = text[selectIndex];
         } else if(text) {
             selection.textLabel = text;

src/traces/mesh3d/convert.js

@@ -6,6 +6,7 @@ var alphaShape = require('../../../stackgl_modules').alpha_shape;
 var convexHull = require('../../../stackgl_modules').convex_hull;
 
 var parseColorScale = require('../../lib/gl_format_color').parseColorScale;
+var isArrayOrTypedArray = require('../../lib').isArrayOrTypedArray;
 var str2RgbaArray = require('../../lib/str2rgbarray');
 var extractOpts = require('../../components/colorscale').extractOpts;
 var zip3 = require('../../plots/gl3d/zip3');
@@ -37,7 +38,7 @@ proto.handlePick = function(selection) {
         }
 
         var text = this.data.hovertext || this.data.text;
-        if(Array.isArray(text) && text[selectIndex] !== undefined) {
+        if(isArrayOrTypedArray(text) && text[selectIndex] !== undefined) {
             selection.textLabel = text[selectIndex];
         } else if(text) {
             selection.textLabel = text;

src/traces/ohlc/calc.js

@@ -50,8 +50,8 @@ function calcCommon(gd, trace, origX, x, ya, ptFunc) {
     var l = ya.makeCalcdata(trace, 'low');
     var c = ya.makeCalcdata(trace, 'close');
 
-    var hasTextArray = Array.isArray(trace.text);
-    var hasHovertextArray = Array.isArray(trace.hovertext);
+    var hasTextArray = Lib.isArrayOrTypedArray(trace.text);
+    var hasHovertextArray = Lib.isArrayOrTypedArray(trace.hovertext);
 
     // we're optimists - before we have any changing data, assume increasing
     var increasing = true;

src/traces/pointcloud/convert.js

@@ -2,6 +2,7 @@
 
 var createPointCloudRenderer = require('../../../stackgl_modules').gl_pointcloud2d;
 
+var isArrayOrTypedArray = require('../../lib').isArrayOrTypedArray;
 var str2RGBArray = require('../../lib/str2rgbarray');
 var findExtremes = require('../../plots/cartesian/autorange').findExtremes;
 var getTraceColor = require('../scatter/get_trace_color');
@@ -48,7 +49,7 @@ proto.handlePick = function(pickResult) {
         traceCoord: this.pickXYData ?
             [this.pickXYData[index * 2], this.pickXYData[index * 2 + 1]] :
             [this.pickXData[index], this.pickYData[index]],
-        textLabel: Array.isArray(this.textLabels) ?
+        textLabel: isArrayOrTypedArray(this.textLabels) ?
             this.textLabels[index] :
             this.textLabels,
         color: this.color,

src/traces/scatter/hover.js

@@ -199,7 +199,7 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
 
             delete pointData.index;
 
-            if(trace.text && !Array.isArray(trace.text)) {
+            if(trace.text && !Lib.isArrayOrTypedArray(trace.text)) {
                 pointData.text = String(trace.text);
             } else pointData.text = trace.name;
 

src/traces/scatter3d/convert.js

@@ -58,7 +58,7 @@ proto.handlePick = function(selection) {
 
         selection.textLabel = '';
         if(this.textLabels) {
-            if(Array.isArray(this.textLabels)) {
+            if(Lib.isArrayOrTypedArray(this.textLabels)) {
                 if(this.textLabels[ind] || this.textLabels[ind] === 0) {
                     selection.textLabel = this.textLabels[ind];
                 }
@@ -227,7 +227,7 @@ function convertPlotlyOptions(scene, data) {
     }
 
     // convert text
-    if(Array.isArray(data.text)) text = data.text;
+    if(Lib.isArrayOrTypedArray(data.text)) text = data.text;
     else if(data.text !== undefined) {
         text = new Array(len);
         for(i = 0; i < len; i++) text[i] = data.text;