revert sunburst hoverinfo defaults

also applied the same defaults for treemap
fix pointer to entry in hover
clean up unused keys and variables

Author: archmoj

src/traces/sunburst/attributes.js

@@ -159,10 +159,7 @@ module.exports = {
             'current path',
             'percent root',
             'percent visible',
-            'percent parent',
-            'root label',
-            'visible label',
-            'parent label'
+            'percent parent'
         ],
         extras: ['none'],
         editType: 'plot',
@@ -186,22 +183,9 @@ module.exports = {
             'current path',
             'percent root',
             'percent visible',
-            'percent parent',
-            'root label',
-            'visible label',
-            'parent label'
+            'percent parent'
         ],
-        dflt: [
-            'label',
-            'text',
-            'value',
-            'percent root',
-            'percent visible',
-            'percent parent',
-            'root label',
-            'visible label',
-            'parent label'
-        ].join('+')
+        dflt: 'label+text+value+name'
     }),
     hovertemplate: hovertemplateAttrs({}, {
         keys: constants.eventDataKeys

src/traces/sunburst/plot.js

@@ -231,7 +231,7 @@ function plotOne(gd, cd, element, transitionOpts) {
         }
 
         sliceTop
-            .call(exports.attachFxHandlers, gd, cd, styleOne, constants)
+            .call(exports.attachFxHandlers, entry, gd, cd, styleOne, constants)
             .call(helpers.setSliceCursor, gd, {isTransitioning: gd._transitioning});
 
         slicePath.call(styleOne, pt, trace);
@@ -251,7 +251,7 @@ function plotOne(gd, cd, element, transitionOpts) {
 
         // position the text relative to the slice
         var textBB = Drawing.bBox(sliceText.node());
-        pt.transform = transformInsideText(textBB, pt, cd0, styleOne);
+        pt.transform = transformInsideText(textBB, pt, cd0);
         pt.translateX = transTextX(pt);
         pt.translateY = transTextY(pt);
 
@@ -500,7 +500,7 @@ function makeEventData(pt, trace) {
     return out;
 }
 
-exports.attachFxHandlers = function(sliceTop, gd, cd, styleOne, constants) {
+exports.attachFxHandlers = function(sliceTop, entry, gd, cd, styleOne, constants) {
     var cd0 = cd[0];
     var trace = cd0.trace;
     var hierarchy = cd0.hierarchy;
@@ -595,7 +595,7 @@ exports.attachFxHandlers = function(sliceTop, gd, cd, styleOne, constants) {
                 }
             }
 
-            var ref1 = hierarchy;
+            var ref1 = entry;
             if(ref1 && getVal(ref1)) {
                 hoverPt.percentVisible = pt.percentVisible = val / getVal(ref1);
                 hoverPt.visibleLabel = pt.visibleLabel = helpers.getLabelString(ref1.data.data.label);

src/traces/treemap/attributes.js

@@ -272,27 +272,4 @@ module.exports = {
     },
 
     domain: domainAttrs({name: 'treemap', trace: true, editType: 'calc'}),
-
-    _hovered: {
-        marker: {
-            line: {
-                color: extendFlat({}, pieAttrs.marker.line.color, {
-                    description: [
-                        'Sets the color of the line',
-                        'enclosing each sector when it is hovered'
-                    ].join(' ')
-                }),
-                width: extendFlat({}, pieAttrs.marker.line.width, {
-                    description: [
-                        'Sets the width (in px) of the line',
-                        'enclosing each sector when it is hovered.'
-                    ].join(' ')
-                }),
-                editType: 'style'
-            },
-
-            editType: 'style'
-        },
-        editType: 'style'
-    }
 };

src/traces/treemap/draw_ancestors.js

@@ -116,7 +116,7 @@ module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
         }
 
         sliceTop
-            .call(attachFxHandlers, gd, cd, styleOne, constants)
+            .call(attachFxHandlers, entry, gd, cd, styleOne, constants)
             .call(helpers.setSliceCursor, gd, { isTransitioning: gd._transitioning });
 
         slicePath.call(styleOne, pt, trace);

src/traces/treemap/draw_descendants.js

@@ -118,7 +118,7 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
         }
 
         sliceTop
-            .call(attachFxHandlers, gd, cd, styleOne, constants)
+            .call(attachFxHandlers, entry, gd, cd, styleOne, constants)
             .call(helpers.setSliceCursor, gd, { isTransitioning: gd._transitioning });
 
         slicePath.call(styleOne, pt, trace);

test/jasmine/tests/sunburst_test.js

@@ -345,7 +345,7 @@ describe('Test sunburst hover:', function() {
         pos: 2,
         exp: {
             label: {
-                nums: 'Seth\n33.3% of Eve',
+                nums: 'Seth',
             },
             ptData: {
                 curveNumber: 0,
@@ -360,7 +360,7 @@ describe('Test sunburst hover:', function() {
         pos: 3,
         exp: {
             label: {
-                nums: 'Cain\n16.7% of Eve\nA',
+                nums: 'Cain\nA',
             },
             ptData: {
                 curveNumber: 0,
@@ -1179,7 +1179,7 @@ describe('Test sunburst interactions edge cases', function() {
         })
         .then(hover(gd, 4))
         .then(function() {
-            assertHoverLabelContent({ nums: 'D\n4\n26.7% of C\n14.3% of A\n0' });
+            assertHoverLabelContent({ nums: 'D\n4\n0' });
         })
         .then(done);
     });

test/jasmine/tests/treemap_test.js

@@ -344,7 +344,7 @@ describe('Test treemap hover:', function() {
         pos: 2,
         exp: {
             label: {
-                nums: 'Seth\n33.3% of Eve',
+                nums: 'Seth',
             },
             ptData: {
                 curveNumber: 0,
@@ -359,7 +359,7 @@ describe('Test treemap hover:', function() {
         pos: 3,
         exp: {
             label: {
-                nums: 'Cain\n16.7% of Eve\nA',
+                nums: 'Cain\nA',
             },
             ptData: {
                 curveNumber: 0,
@@ -971,7 +971,7 @@ describe('Test treemap interactions edge cases', function() {
         })
         .then(hover(gd, 4))
         .then(function() {
-            assertHoverLabelContent({ nums: 'D\n4\n26.7% of C\n14.3% of A\n0' });
+            assertHoverLabelContent({ nums: 'D\n4\n0' });
         })
         .then(done);
     });