correct displaying percentages

Author: archmoj

src/traces/sunburst/fx.js

@@ -46,6 +46,7 @@ module.exports = function attachFxHandlers(sliceTop, entry, gd, cd, opts) {
         var cdi = pt.data.data;
         var ptNumber = cdi.i;
         var isRoot = helpers.isHierarchyRoot(pt);
+        var isEntry = helpers.isEntry(pt);
 
         var _cast = function(astr) {
             return Lib.castOption(traceNow, ptNumber, astr);
@@ -94,20 +95,20 @@ module.exports = function attachFxHandlers(sliceTop, entry, gd, cd, opts) {
             }
 
             var tx;
-            var prevTx;
+            var allPercents = [];
             var insertPercent = function() {
-                if(tx !== prevTx) { // no need to add redundant info
+                if(allPercents.indexOf(tx) === -1) { // no need to add redundant info
                     thisText.push(tx);
-                    prevTx = '' + tx; // i.e. deep copy
+                    allPercents.push(tx);
                 }
             };
 
             var val = getVal(cdi);
 
-            var ref2 = pt.parent;
+            var ref2 = isEntry ? pt._parent : pt.parent;
             if(ref2 && getVal(ref2)) {
                 hoverPt.percentParent = pt.percentParent = val / getVal(ref2);
-                hoverPt.parent = pt.parent = helpers.getLabelString(ref2.data.data.label);
+                hoverPt.parent = pt.parentString = helpers.getLabelString(isEntry ? ref2.label : ref2.data.data.label);
                 if(hasFlag('percent parent')) {
                     tx = helpers.formatPercent(hoverPt.percentParent, separators) + ' of ' + hoverPt.parent;
                     insertPercent();
@@ -308,6 +309,8 @@ function makeEventData(pt, trace, keys) {
         var key = keys[i];
         if(key in pt) out[key] = pt[key];
     }
+    // handle special case of parent
+    if('parentString' in pt) out.parent = pt.parentString;
 
     appendArrayPointValue(out, trace, cdi.i);
 

src/traces/sunburst/helpers.js

@@ -155,9 +155,10 @@ exports.getLabelString = function(label) { // used in hover to reference to the
 };
 
 exports.listPath = function(d, keyStr) {
-    if(!d.parent) return [];
-    var list = keyStr ? [d.parent.data[keyStr]] : [d];
-    return exports.listPath(d.parent, keyStr).concat(list);
+    var parent = d.parent;
+    if(!parent) return [];
+    var list = keyStr ? [parent.data[keyStr]] : [parent];
+    return exports.listPath(parent, keyStr).concat(list);
 };
 
 exports.getPath = function(d) {

src/traces/sunburst/plot.js

@@ -86,6 +86,13 @@ function plotOne(gd, cd, element, transitionOpts) {
     var trace = cd0.trace;
     var hierarchy = cd0.hierarchy;
     var entry = helpers.findEntryWithLevel(hierarchy, trace.level);
+    var ancestorNodes = helpers.listPath(entry.data);
+    var numAncestors = ancestorNodes.length;
+    entry._parent = (numAncestors ?
+        ancestorNodes[numAncestors - 1] :
+        hierarchy // parent of root is itself
+    ).data;
+
     var maxDepth = helpers.getMaxDepth(trace);
 
     var gs = fullLayout._size;
@@ -482,9 +489,11 @@ exports.formatSliceLabel = function(pt, entry, trace, cd, fullLayout) {
     var hierarchy = cd0.hierarchy;
     var ref;
     var calcPercent = function() {
+        var refData = ref.data ? ref.data.data : ref;
+
         return cdi.hasOwnProperty('v') ?
-            cdi.v / ref.data.data.v :
-            cdi.value / ref.data.data.value;
+            cdi.v / refData.v :
+            cdi.value / refData.value;
     };
 
     if(trace.type === 'treemap' && helpers.isHeader(pt, trace)) {
@@ -504,6 +513,8 @@ exports.formatSliceLabel = function(pt, entry, trace, cd, fullLayout) {
         var hasFlag = function(flag) { return parts.indexOf(flag) !== -1; };
         var thisText = [];
         var tx;
+        var parent = helpers.isEntry(pt) ? pt._parent : pt.parent;
+        var isRoot = helpers.isHierarchyRoot(pt);
 
         if(hasFlag('label') && cdi.label) {
             thisText.push(cdi.label);
@@ -513,41 +524,43 @@ exports.formatSliceLabel = function(pt, entry, trace, cd, fullLayout) {
             thisText.push(helpers.formatValue(cdi.v, separators));
         }
 
-        if(hasFlag('current path')) {
-            thisText.push(helpers.getPath(pt.data));
-        }
-
-        var nPercent = 0;
-        if(hasFlag('percent parent')) nPercent++;
-        if(hasFlag('percent entry')) nPercent++;
-        if(hasFlag('percent root')) nPercent++;
-        var hasMultiplePercents = nPercent > 1;
-
-        if(nPercent) {
-            var percent;
-            var addPercent = function(key) {
-                tx = helpers.formatPercent(percent, separators);
-
-                if(hasMultiplePercents) tx += ' of ' + key + ' ';
-                thisText.push(tx);
-            };
-
-            var makePercent = function(key) {
-                percent = calcPercent();
-                addPercent(key);
-            };
-
-            if(hasFlag('percent parent') && pt.parent) {
-                ref = pt.parent;
-                makePercent('parent');
+        if(!isRoot) {
+            if(hasFlag('current path')) {
+                thisText.push(helpers.getPath(pt.data));
             }
-            if(hasFlag('percent entry') && pt.parent) {
-                ref = entry;
-                makePercent('entry');
-            }
-            if(hasFlag('percent root') && (pt.parent || helpers.isLeaf(pt))) {
-                ref = hierarchy;
-                makePercent('root');
+
+            var nPercent = 0;
+            if(hasFlag('percent parent')) nPercent++;
+            if(hasFlag('percent entry')) nPercent++;
+            if(hasFlag('percent root')) nPercent++;
+            var hasMultiplePercents = nPercent > 1;
+
+            if(nPercent) {
+                var percent;
+                var addPercent = function(key) {
+                    tx = helpers.formatPercent(percent, separators);
+
+                    if(hasMultiplePercents) tx += ' of ' + key + ' ';
+                    thisText.push(tx);
+                };
+
+                var makePercent = function(key) {
+                    percent = calcPercent();
+                    addPercent(key);
+                };
+
+                if(hasFlag('percent parent') && parent) {
+                    ref = parent;
+                    makePercent('parent');
+                }
+                if(hasFlag('percent entry') && parent) {
+                    ref = entry;
+                    makePercent('entry');
+                }
+                if(hasFlag('percent root') && (parent || helpers.isLeaf(pt))) {
+                    ref = hierarchy;
+                    makePercent('root');
+                }
             }
         }
 

src/traces/treemap/plot.js

@@ -79,6 +79,13 @@ function plotOne(gd, cd, element, transitionOpts) {
     var hasTransition = helpers.hasTransition(transitionOpts);
 
     var entry = helpers.findEntryWithLevel(hierarchy, trace.level);
+    var ancestorNodes = helpers.listPath(entry.data);
+    var numAncestors = ancestorNodes.length;
+    entry._parent = (numAncestors ?
+        ancestorNodes[numAncestors - 1] :
+        hierarchy // parent of root is itself
+    ).data;
+
     var maxDepth = helpers.getMaxDepth(trace);
     var hasVisibleDepth = function(pt) {
         return pt.data.depth - entry.data.depth < maxDepth;