revisit sunburst and treemap percentages

Author: archmoj

src/traces/sunburst/fx.js

@@ -75,8 +75,8 @@ module.exports = function attachFxHandlers(sliceTop, entry, gd, cd, opts) {
             var thisText = [];
             var hasFlag = function(flag) { return parts.indexOf(flag) !== -1; };
             var getVal = function(d) {
-                if(d.hasOwnProperty('hierarchy')) return d.hierarchy.value;
-                return d.hasOwnProperty('v') ? d.v : d.value;
+                var result = d.hasOwnProperty('v') ? d.v : d.value;
+                return result !== undefined ? result : hierarchy.value;
             };
 
             if(hoverinfo) {

src/traces/sunburst/plot.js

@@ -493,9 +493,15 @@ exports.formatSliceLabel = function(pt, entry, trace, cd, fullLayout) {
 
     var ref;
     var getLabel = function(d) {
-        if(d.hasOwnProperty('hierarchy')) return d.hierarchy.label;
-        if(!(d.data && d.data.data)) return '';
-        var id = helpers.getPtId(d);
+        var id = d.id;
+        if(d.data) {
+            id = d.data.id;
+            if(d.data.data) {
+                id = d.data.data.id;
+            }
+        }
+        if(!id) return '';
+
         for(var q = 0; q < cd.length; q++) {
             if(cd[q].label === id) {
                 return id;

test/image/baselines/treemap_level-depth.png

@@ -1344,7 +1344,7 @@ describe('Test sunburst texttemplate without `values` should work:', function()
         ['text: %{text}', ['text: sixty-five', 'text: fourteen', 'text: twelve', 'text: ten', 'text: two', 'text: six', 'text: six', 'text: one', 'text: four']],
         ['%{percentRoot} of %{root}', ['100% of Eve', '33% of Eve', '17% of Eve', '17% of Eve', '17% of Eve', '17% of Eve', '17% of Eve', '17% of Eve', '17% of Eve']],
         ['%{percentEntry} of %{entry}', ['100% of Eve', '33% of Eve', '17% of Eve', '17% of Eve', '17% of Eve', '17% of Eve', '17% of Eve', '17% of Eve', '17% of Eve']],
-        ['%{percentParent} of %{parent}', ['100% of "root"', '100% of Seth', '33% of Eve', '17% of Eve', '17% of Eve', '17% of Eve', '17% of Eve', '50% of Seth', '100% of Awan']],
+        ['%{percentParent} of %{parent}', ['100% of Eve', '100% of Seth', '33% of Eve', '17% of Eve', '17% of Eve', '17% of Eve', '17% of Eve', '50% of Seth', '100% of Awan']],
         [
             [
                 'label: %{label}',
@@ -1387,7 +1387,7 @@ describe('Test sunburst texttemplate with *total* `values` should work:', functi
         ['text: %{text}', ['text: sixty-five', 'text: fourteen', 'text: twelve', 'text: ten', 'text: two', 'text: six', 'text: six', 'text: one', 'text: four']],
         ['%{percentRoot} of %{root}', ['100% of Eve', '22% of Eve', '18% of Eve', '9% of Eve', '9% of Eve', '6% of Eve', '15% of Eve', '3% of Eve', '2% of Eve']],
         ['%{percentEntry} of %{entry}', ['100% of Eve', '22% of Eve', '18% of Eve', '9% of Eve', '9% of Eve', '6% of Eve', '15% of Eve', '3% of Eve', '2% of Eve']],
-        ['%{percentParent} of %{parent}', ['100% of "root"', '22% of Eve', '18% of Eve', '9% of Eve', '9% of Eve', '6% of Eve', '83% of Seth', '17% of Seth', '17% of Awan']],
+        ['%{percentParent} of %{parent}', ['100% of Eve', '22% of Eve', '18% of Eve', '9% of Eve', '9% of Eve', '6% of Eve', '83% of Seth', '17% of Seth', '17% of Awan']],
         [
             [
                 'label: %{label}',
@@ -1430,7 +1430,7 @@ describe('Test sunburst texttemplate with *remainder* `values` should work:', fu
         ['text: %{text}', ['text: sixty-five', 'text: fourteen', 'text: twelve', 'text: ten', 'text: two', 'text: six', 'text: six', 'text: one', 'text: four']],
         ['%{percentRoot} of %{root}', ['54% of Eve', '10% of Eve', '12% of Eve', '5% of Eve', '5% of Eve', '3% of Eve', '8% of Eve', '2% of Eve', '1% of Eve']],
         ['%{percentEntry} of %{entry}', ['54% of Eve', '10% of Eve', '12% of Eve', '5% of Eve', '5% of Eve', '3% of Eve', '8% of Eve', '2% of Eve', '1% of Eve']],
-        ['%{percentParent} of %{parent}', ['100% of "root"', '10% of Eve', '12% of Eve', '5% of Eve', '5% of Eve', '3% of Eve', '42% of Seth', '8% of Seth', '14% of Awan']],
+        ['%{percentParent} of %{parent}', ['100% of Eve', '10% of Eve', '12% of Eve', '5% of Eve', '5% of Eve', '3% of Eve', '42% of Seth', '8% of Seth', '14% of Awan']],
         [
             [
                 'label: %{label}',