From 7155917f2dd0f4d440abb0fc89f86ff77c88439a Mon Sep 17 00:00:00 2001 From: archmoj Date: Mon, 30 Sep 2019 11:46:50 -0400 Subject: [PATCH] dont show parent and percent of parent in the template --- src/traces/sunburst/plot.js | 14 ++++++++------ test/jasmine/tests/sunburst_test.js | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/traces/sunburst/plot.js b/src/traces/sunburst/plot.js index c0f31cd05c5..29ca35091b4 100644 --- a/src/traces/sunburst/plot.js +++ b/src/traces/sunburst/plot.js @@ -526,7 +526,7 @@ exports.formatSliceLabel = function(pt, entry, trace, cd, fullLayout) { thisText.push(tx); }; - if(hasFlag('percent parent')) { + if(hasFlag('percent parent') && !isRoot) { percent = val / helpers.getValue(parent); addPercent('parent'); } @@ -560,11 +560,13 @@ exports.formatSliceLabel = function(pt, entry, trace, cd, fullLayout) { obj.currentPath = helpers.getPath(pt.data); - obj.percentParent = val / helpers.getValue(parent); - obj.percentParentLabel = helpers.formatPercent( - obj.percentParent, separators - ); - obj.parent = helpers.isHierarchyRoot(pt) ? '' : helpers.getPtLabel(parent); + if(!isRoot) { + obj.percentParent = val / helpers.getValue(parent); + obj.percentParentLabel = helpers.formatPercent( + obj.percentParent, separators + ); + obj.parent = helpers.getPtLabel(parent); + } obj.percentEntry = val / helpers.getValue(entry); obj.percentEntryLabel = helpers.formatPercent( diff --git a/test/jasmine/tests/sunburst_test.js b/test/jasmine/tests/sunburst_test.js index ff90ea65326..ed3524e6719 100644 --- a/test/jasmine/tests/sunburst_test.js +++ b/test/jasmine/tests/sunburst_test.js @@ -1345,7 +1345,7 @@ describe('Test sunburst texttemplate without `values` should work at root level: ['path: %{currentPath}', ['path: /', 'path: Eve/', 'path: Eve/', 'path: Eve/', 'path: Eve/', 'path: Eve', 'path: Eve/Seth', 'path: Eve/Seth/', 'path: Eve/Awan/']], ['%{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 ', '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}', ['%{percentParent} of %{parent}', '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}', @@ -1389,7 +1389,7 @@ describe('Test sunburst texttemplate with *total* `values` should work at root l ['path: %{currentPath}', ['path: /', 'path: Eve/', 'path: Eve/', 'path: Eve/', 'path: Eve/', 'path: Eve', 'path: Eve/Seth', 'path: Eve/Seth/', 'path: Eve/Awan/']], ['%{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 ', '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}', ['%{percentParent} of %{parent}', '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}', @@ -1433,7 +1433,7 @@ describe('Test sunburst texttemplate with *remainder* `values` should work at ro ['path: %{currentPath}', ['path: /', 'path: Eve/', 'path: Eve/', 'path: Eve/', 'path: Eve/', 'path: Eve', 'path: Eve/Seth', 'path: Eve/Seth/', 'path: Eve/Awan/']], ['%{percentRoot} of %{root}', ['100% of Eve', '20% of Eve', '12% of Eve', '6% of Eve', '5% of Eve', '3% of Eve', '8% of Eve', '2% of Eve', '1% of Eve']], ['%{percentEntry} of %{entry}', ['100% of Eve', '20% of Eve', '12% of Eve', '6% of Eve', '5% of Eve', '3% of Eve', '8% of Eve', '2% of Eve', '1% of Eve']], - ['%{percentParent} of %{parent}', ['100% of ', '20% of Eve', '12% of Eve', '6% of Eve', '5% of Eve', '3% of Eve', '42% of Seth', '8% of Seth', '14% of Awan']], + ['%{percentParent} of %{parent}', ['%{percentParent} of %{parent}', '20% of Eve', '12% of Eve', '6% of Eve', '5% of Eve', '3% of Eve', '42% of Seth', '8% of Seth', '14% of Awan']], [ [ 'label: %{label}',