check that typed arrays items aren't all NaNs in hasColorscale

- we could have used isNaN here, but isNumeric is fast enough that the gains would be negligible.
plotly · Feb 28, 2018 · 306986d · 306986d
1 parent 6dd2f69
commit 306986d
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 7 deletions.
diff --git a/src/components/colorscale/has_colorscale.js b/src/components/colorscale/has_colorscale.js
@@ -14,14 +14,12 @@ 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;
+        Lib.nestedProperty(trace, containerStr).get() || {} :
+        trace;
+    var color = container.color;
 
-    if(Lib.isTypedArray(color)) {
-        isArrayWithOneNumber = true;
-    } else if(Array.isArray(color)) {
+    var isArrayWithOneNumber = false;
+    if(Lib.isArrayOrTypedArray(color)) {
         for(var i = 0; i < color.length; i++) {
             if(isNumeric(color[i])) {
                 isArrayWithOneNumber = true;

diff --git a/test/jasmine/tests/colorscale_test.js b/test/jasmine/tests/colorscale_test.js
@@ -190,6 +190,41 @@ describe('Test colorscale:', function() {
             expect(hasColorscale(trace, 'marker')).toBe(true);
             expect(hasColorscale(trace, 'marker.line')).toBe(true);
         });
+
+        it('should return true when marker color is a typed array with at least one non-NaN', function() {
+            trace = {
+                marker: {
+                    color: new Float32Array([1, 2, 3]),
+                    line: {
+                        color: new Float32Array([2, 3, 4])
+                    }
+                }
+            };
+            expect(hasColorscale(trace, 'marker')).toBe(true);
+            expect(hasColorscale(trace, 'marker.line')).toBe(true);
+
+            trace = {
+                marker: {
+                    color: new Float32Array([1, NaN, 3]),
+                    line: {
+                        color: new Float32Array([2, 3, NaN])
+                    }
+                }
+            };
+            expect(hasColorscale(trace, 'marker')).toBe(true);
+            expect(hasColorscale(trace, 'marker.line')).toBe(true);
+
+            trace = {
+                marker: {
+                    color: new Float32Array([NaN, undefined, 'not-a-number']),
+                    line: {
+                        color: new Float32Array(['not-a-number', NaN, undefined])
+                    }
+                }
+            };
+            expect(hasColorscale(trace, 'marker')).toBe(false);
+            expect(hasColorscale(trace, 'marker.line')).toBe(false);
+        });
     });
 
     describe('handleDefaults (heatmap-like version)', function() {