reuse lib function and add jasmine test for pie and sunburst hover falsy zero text

Author: archmoj

src/traces/pie/calc.js

@@ -14,6 +14,7 @@ var tinycolor = require('tinycolor2');
 
 var Color = require('../../components/color');
 var helpers = require('./helpers');
+var isValidTextValue = require('../../lib').isValidTextValue;
 
 var pieExtendedColorWays = {};
 
@@ -99,8 +100,8 @@ function calc(gd, trace) {
             pt = cd[i];
             thisText = hasLabel ? [pt.label] : [];
             if(hasText) {
-                var texti = helpers.getFirstFilled(trace.text, pt.pts);
-                if(texti || texti === 0) thisText.push(texti);
+                var tx = helpers.getFirstFilled(trace.text, pt.pts);
+                if(isValidTextValue(tx)) thisText.push(tx);
             }
             if(hasValue) thisText.push(helpers.formatPieValue(pt.v, separators));
             if(hasPercent) thisText.push(helpers.formatPiePercent(pt.v / vTotal, separators));

src/traces/pie/plot.js

@@ -353,7 +353,7 @@ function attachFxHandlers(sliceTop, gd, cd) {
             pt.text = helpers.castOption(trace2.hovertext || trace2.text, pt.pts);
             if(hoverinfo && hoverinfo.indexOf('text') !== -1) {
                 var tx = pt.text;
-                if(tx || tx === 0) thisText.push(tx);
+                if(Lib.isValidTextValue(tx)) thisText.push(tx);
             }
             pt.value = pt.v;
             pt.valueLabel = helpers.formatPieValue(pt.v, separators);

src/traces/sunburst/plot.js

@@ -580,7 +580,7 @@ function attachFxHandlers(sliceTop, gd, cd) {
             hoverPt.text = _cast('hovertext') || _cast('text');
             if(hasFlag('text')) {
                 var tx = hoverPt.text;
-                if(tx || tx === 0) thisText.push(tx);
+                if(Lib.isValidTextValue(tx)) thisText.push(tx);
             }
 
             Fx.loneHover({
@@ -739,7 +739,7 @@ function formatSliceLabel(pt, trace, fullLayout) {
 
     if(hasFlag('text')) {
         var tx = Lib.castOption(trace, cdi.i, 'text');
-        if(tx || tx === 0) thisText.push(tx);
+        if(Lib.isValidTextValue(tx)) thisText.push(tx);
     }
 
     return thisText.join('<br>');

test/jasmine/tests/pie_test.js

@@ -998,6 +998,11 @@ describe('pie hovering', function() {
             Lib.clearThrottle();
         }
 
+        function _hover2() {
+            mouseEvent('mouseover', 200, 250);
+            Lib.clearThrottle();
+        }
+
         function assertLabel(content, style, msg) {
             assertHoverLabelContent({nums: content}, msg);
 
@@ -1103,6 +1108,27 @@ describe('pie hovering', function() {
             .then(done);
         });
 
+        it('should show falsy zero text', function(done) {
+            Plotly.plot(gd, {
+                data: [{
+                    type: 'pie',
+                    labels: ['A', 'B', 'C', 'D', 'E', 'F', 'G'],
+                    values: [7, 6, 5, 4, 3, 2, 1],
+                    text: [null, '', '0', 0, 1, true, false],
+                    textinfo: 'label+text+value'
+                }],
+                layout: {
+                    width: 400,
+                    height: 400
+                }
+            })
+            .then(_hover2)
+            .then(function() {
+                assertLabel('D\n0\n4\n14.3%');
+            })
+            .then(done);
+        });
+
         it('should use hovertemplate if specified', function(done) {
             mockCopy.data[0].name = '';
             Plotly.plot(gd, mockCopy.data, mockCopy.layout)

test/jasmine/tests/sunburst_test.js

@@ -1138,4 +1138,26 @@ describe('Test sunburst interactions edge cases', function() {
         .catch(failTest)
         .then(done);
     });
+
+    it('should show falsy zero text', function(done) {
+        Plotly.plot(gd, {
+            data: [{
+                type: 'sunburst',
+                parents: ['', 'A', 'B', 'C', 'D', 'E', 'F'],
+                labels: ['A', 'B', 'C', 'D', 'E', 'F', 'G'],
+                values: [7, 6, 5, 4, 3, 2, 1],
+                text: [null, '', '0', 0, 1, true, false],
+                textinfo: 'label+text+value'
+            }],
+            layout: {
+                width: 400,
+                height: 400
+            }
+        })
+        .then(hover(gd, 4))
+        .then(function() {
+            assertHoverLabelContent({ nums: 'D\n4\n0' });
+        })
+        .then(done);
+    });
 });