pie: accept emptry string in helpers.getFirstFilled

antoinerg · antoinerg · commit cb40618530a7 · 2019-09-10T10:16:34.000-04:00
diff --git a/src/traces/pie/helpers.js b/src/traces/pie/helpers.js
@@ -30,7 +30,7 @@ exports.getFirstFilled = function getFirstFilled(array, indices) {
     if(!Array.isArray(array)) return;
     for(var i = 0; i < indices.length; i++) {
         var v = array[indices[i]];
-        if(v || v === 0) return v;
+        if(v || v === 0 || v === '') return v;
     }
 };
 
diff --git a/src/traces/pie/plot.js b/src/traces/pie/plot.js
@@ -991,7 +991,7 @@ function formatSliceLabel(gd, pt, cd0) {
             pt.text = '';
         } else {
             var obj = makeTemplateVariables(pt);
-            var ptTx = Lib.castOption(trace, pt.i, 'text');
+            var ptTx = helpers.getFirstFilled(trace.text, pt.pts);
             if(isValidTextValue(ptTx) || ptTx === '') obj.text = ptTx;
             pt.text = Lib.texttemplateString(txt, obj, gd._fullLayout._d3locale, obj, trace._meta || {});
         }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ exports.getFirstFilled = function getFirstFilled(array, indices) {`
`30`	`30`	`if(!Array.isArray(array)) return;`
`31`	`31`	`for(var i = 0; i < indices.length; i++) {`
`32`	`32`	`var v = array[indices[i]];`
`33`		`- if(v \|\| v === 0) return v;`
	`33`	`+ if(v \|\| v === 0 \|\| v === '') return v;`
`34`	`34`	`}`
`35`	`35`	`};`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -991,7 +991,7 @@ function formatSliceLabel(gd, pt, cd0) {`
`991`	`991`	`pt.text = '';`
`992`	`992`	`} else {`
`993`	`993`	`var obj = makeTemplateVariables(pt);`
`994`		`- var ptTx = Lib.castOption(trace, pt.i, 'text');`
	`994`	`+ var ptTx = helpers.getFirstFilled(trace.text, pt.pts);`
`995`	`995`	`if(isValidTextValue(ptTx) \|\| ptTx === '') obj.text = ptTx;`
`996`	`996`	`pt.text = Lib.texttemplateString(txt, obj, gd._fullLayout._d3locale, obj, trace._meta \|\| {});`
`997`	`997`	`}`