thanks to a typo leading to apply a better easing option suitable for treemaps

loop in eventDataKeys from sunburst and treemap constants

clean up an unused condition check

Author: archmoj

src/traces/sunburst/fx.js

@@ -156,7 +156,7 @@ module.exports = function attachFxHandlers(sliceTop, entry, gd, cd, opts) {
                 textAlign: _cast('hoverlabel.align'),
                 hovertemplate: hovertemplate,
                 hovertemplateLabels: hoverPt,
-                eventData: [makeEventData(pt, traceNow)]
+                eventData: [makeEventData(pt, traceNow, opts.eventDataKeys)]
             };
 
             if(isSunburst) {
@@ -187,7 +187,7 @@ module.exports = function attachFxHandlers(sliceTop, entry, gd, cd, opts) {
 
         trace._hasHoverEvent = true;
         gd.emit('plotly_hover', {
-            points: [makeEventData(pt, traceNow)],
+            points: [makeEventData(pt, traceNow, opts.eventDataKeys)],
             event: d3.event
         });
     };
@@ -200,7 +200,7 @@ module.exports = function attachFxHandlers(sliceTop, entry, gd, cd, opts) {
         if(trace._hasHoverEvent) {
             evt.originalEvent = d3.event;
             gd.emit('plotly_unhover', {
-                points: [makeEventData(pt, traceNow)],
+                points: [makeEventData(pt, traceNow, opts.eventDataKeys)],
                 event: d3.event
             });
             trace._hasHoverEvent = false;
@@ -229,7 +229,7 @@ module.exports = function attachFxHandlers(sliceTop, entry, gd, cd, opts) {
         var traceNow = gd._fullData[trace.index];
 
         var clickVal = Events.triggerHandler(gd, 'plotly_' + trace.type + 'click', {
-            points: [makeEventData(pt, traceNow)],
+            points: [makeEventData(pt, traceNow, opts.eventDataKeys)],
             event: d3.event
         });
 
@@ -243,7 +243,7 @@ module.exports = function attachFxHandlers(sliceTop, entry, gd, cd, opts) {
             )
         ) {
             if(fullLayoutNow.hovermode) {
-                gd._hoverdata = [makeEventData(pt, traceNow)];
+                gd._hoverdata = [makeEventData(pt, traceNow, opts.eventDataKeys)];
                 Fx.click(gd, d3.event);
             }
             return;
@@ -316,7 +316,7 @@ module.exports = function attachFxHandlers(sliceTop, entry, gd, cd, opts) {
     sliceTop.on('click', onClick);
 };
 
-function makeEventData(pt, trace) {
+function makeEventData(pt, trace, keys) {
     var cdi = pt.data.data;
 
     var out = {
@@ -328,17 +328,10 @@ function makeEventData(pt, trace) {
         // TODO more things like 'children', 'siblings', 'hierarchy?
     };
 
-    [ // TODO: read these from (sunburst | treemap) trace constants
-        'parentLabel',
-        'visibleLabel',
-        'rootLabel',
-        'percentParent',
-        'percentVisible',
-        'percentRoot',
-        'currentPath'
-    ].forEach(function(key) {
+    for(var i = 0; i < keys.length; i++) {
+        var key = keys[i];
         if(key in pt) out[key] = pt[key];
-    });
+    }
 
     appendArrayPointValue(out, trace, cdi.i);
 

src/traces/sunburst/plot.js

@@ -233,8 +233,9 @@ function plotOne(gd, cd, element, transitionOpts) {
 
         sliceTop
             .call(attachFxHandlers, entry, gd, cd, {
+                eventDataKeys: constants.eventDataKeys,
                 transitionTime: constants.CLICK_TRANSITION_TIME,
-                transitonEasing: constants.CLICK_TRANSITION_EASING
+                transitionEasing: constants.CLICK_TRANSITION_EASING
             })
             .call(helpers.setSliceCursor, gd, {
                 hideOnRoot: true,

src/traces/treemap/constants.js

@@ -10,7 +10,7 @@
 
 module.exports = {
     CLICK_TRANSITION_TIME: 750,
-    CLICK_TRANSITION_EASING: 'cubic',
+    CLICK_TRANSITION_EASING: 'poly',
     eventDataKeys: [
         'currentPath',
         'percentRoot',

src/traces/treemap/draw_ancestors.js

@@ -118,8 +118,9 @@ module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
         sliceTop
             .call(attachFxHandlers, entry, gd, cd, {
                 styleOne: styleOne,
+                eventDataKeys: constants.eventDataKeys,
                 transitionTime: constants.CLICK_TRANSITION_TIME,
-                transitonEasing: constants.CLICK_TRANSITION_EASING
+                transitionEasing: constants.CLICK_TRANSITION_EASING
             })
             .call(helpers.setSliceCursor, gd, {
                 hideOnRoot: false,

src/traces/treemap/draw_descendants.js

@@ -120,8 +120,9 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
         sliceTop
             .call(attachFxHandlers, entry, gd, cd, {
                 styleOne: styleOne,
+                eventDataKeys: constants.eventDataKeys,
                 transitionTime: constants.CLICK_TRANSITION_TIME,
-                transitonEasing: constants.CLICK_TRANSITION_EASING
+                transitionEasing: constants.CLICK_TRANSITION_EASING
             })
             .call(helpers.setSliceCursor, gd, { isTransitioning: gd._transitioning });
 

src/traces/treemap/plot.js

@@ -333,18 +333,7 @@ function plotOne(gd, cd, element, transitionOpts) {
                 parentPrev = getPrev(Q, upDown);
             } else i = maxDepth;
         }
-        var result = parentPrev || {};
-
-        if(upDown && !isNaN(result.x1)) {
-            // always slide pathbar from the right
-            var difX = result.x1 - result.x0;
-            if(result.transform) {
-                result.transform.scale = 0;
-                result.transform.targetX += difX;
-            }
-            result.x0 += difX;
-        }
-        return result;
+        return parentPrev || {};
     };
 
     var makeExitSliceInterpolator = function(pt, upDown, refRect, size) {