treemap pathbar.textfont should have an effect similar to insidetext.textfont

- fixing issue 4451

Author: archmoj

src/traces/bar/defaults.js

@@ -127,6 +127,7 @@ function handleText(traceIn, traceOut, layout, coerce, textposition, opts) {
     var moduleHasCliponaxis = !(opts.moduleHasCliponaxis === false);
     var moduleHasTextangle = !(opts.moduleHasTextangle === false);
     var moduleHasInsideanchor = !(opts.moduleHasInsideanchor === false);
+    var hasPathbar = !!opts.hasPathbar;
 
     var hasBoth = Array.isArray(textposition) || textposition === 'auto';
     var hasInside = hasBoth || textposition === 'inside';
@@ -147,8 +148,15 @@ function handleText(traceIn, traceOut, layout, coerce, textposition, opts) {
         }
         coerceFont(coerce, 'insidetextfont', insideTextFontDefault);
 
-        if(hasOutside) coerceFont(coerce, 'outsidetextfont', dfltFont);
+        if(hasPathbar) {
+            var pathbarTextFontDefault = Lib.extendFlat({}, dfltFont);
+            if(isColorInheritedFromLayoutFont) {
+                delete pathbarTextFontDefault.color;
+            }
+            coerceFont(coerce, 'pathbar.textfont', pathbarTextFontDefault);
+        }
 
+        if(hasOutside) coerceFont(coerce, 'outsidetextfont', dfltFont);
 
         if(moduleHasSelected) coerce('selected.textfont.color');
         if(moduleHasUnselected) coerce('unselected.textfont.color');

src/traces/bar/style.js

@@ -26,19 +26,19 @@ function resizeText(gd, gTrace, traceType) {
     if(minSize) {
         var shouldHide = fullLayout.uniformtext.mode === 'hide';
 
-        var t;
+        var selector;
         switch(traceType) {
             case 'funnelarea' :
             case 'pie' :
             case 'sunburst' :
             case 'treemap' :
-                t = gTrace.selectAll('g.slice');
+                selector = 'g.slice';
                 break;
             default :
-                t = gTrace.selectAll('g.points > g.point');
+                selector = 'g.points > g.point';
         }
 
-        t.each(function(d) {
+        gTrace.selectAll(selector).each(function(d) {
             var transform = d.transform;
             if(transform) {
                 transform.scale = (shouldHide && transform.hide) ? 0 : minSize / transform.fontSize;

src/traces/sunburst/helpers.js

@@ -83,11 +83,16 @@ function determineOutsideTextFont(trace, pt, layoutFont) {
     };
 }
 
-function determineInsideTextFont(trace, pt, layoutFont, cont) {
+function determineInsideTextFont(trace, pt, layoutFont, opts) {
+    var onPathbar = (opts || {}).onPathbar;
+
     var cdi = pt.data.data;
     var ptNumber = cdi.i;
 
-    var customColor = Lib.castOption(trace, ptNumber, 'insidetextfont.color');
+    var customColor = Lib.castOption(trace, ptNumber,
+        (onPathbar ? 'pathbar.textfont' : 'insidetextfont') + '.color'
+    );
+
     if(!customColor && trace._input.textfont) {
         // Why not simply using trace.textfont? Because if not set, it
         // defaults to layout.font which has a default color. But if
@@ -98,16 +103,18 @@ function determineInsideTextFont(trace, pt, layoutFont, cont) {
 
     return {
         color: customColor || Color.contrast(cdi.color),
-        family: exports.getInsideTextFontKey('family', cont || trace, pt, layoutFont),
-        size: exports.getInsideTextFontKey('size', cont || trace, pt, layoutFont)
+        family: exports.getInsideTextFontKey('family', trace, pt, layoutFont, opts),
+        size: exports.getInsideTextFontKey('size', trace, pt, layoutFont, opts)
     };
 }
 
-exports.getInsideTextFontKey = function(keyStr, trace, pt, layoutFont) {
+exports.getInsideTextFontKey = function(keyStr, trace, pt, layoutFont, opts) {
+    var onPathbar = (opts || {}).onPathbar;
+    var cont = onPathbar ? 'pathbar.textfont' : 'insidetextfont';
     var ptNumber = pt.data.data.i;
 
     return (
-        Lib.castOption(trace, ptNumber, 'insidetextfont.' + keyStr) ||
+        Lib.castOption(trace, ptNumber, cont + '.' + keyStr) ||
         Lib.castOption(trace, ptNumber, 'textfont.' + keyStr) ||
         layoutFont.size
     );
@@ -127,10 +134,10 @@ exports.isOutsideText = function(trace, pt) {
     return !trace._hasColorscale && exports.isHierarchyRoot(pt);
 };
 
-exports.determineTextFont = function(trace, pt, layoutFont, cont) {
+exports.determineTextFont = function(trace, pt, layoutFont, opts) {
     return exports.isOutsideText(trace, pt) ?
         determineOutsideTextFont(trace, pt, layoutFont) :
-        determineInsideTextFont(trace, pt, layoutFont, cont);
+        determineInsideTextFont(trace, pt, layoutFont, opts);
 };
 
 exports.hasTransition = function(transitionOpts) {

src/traces/treemap/defaults.js

@@ -57,8 +57,11 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     coerce('hovertext');
     coerce('hovertemplate');
 
+    var hasPathbar = coerce('pathbar.visible');
+
     var textposition = 'auto';
     handleText(traceIn, traceOut, layout, coerce, textposition, {
+        hasPathbar: hasPathbar,
         moduleHasSelected: false,
         moduleHasUnselected: false,
         moduleHasConstrain: false,
@@ -103,10 +106,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         }
     };
 
-    var hasPathbar = coerce('pathbar.visible');
     if(hasPathbar) {
-        Lib.coerceFont(coerce, 'pathbar.textfont', layout.font);
-
         // This works even for multi-line labels as treemap pathbar trim out line breaks
         coerce('pathbar.thickness', traceOut.pathbar.textfont.size + 2 * TEXTPAD);
 

src/traces/treemap/draw_ancestors.js

@@ -97,7 +97,7 @@ module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
     }
 
     updateSlices.each(function(pt) {
-        pt._hoverX = viewX(pt.x1 - height / 2);
+        pt._hoverX = viewX(pt.x1 - Math.min(width, height) / 2);
         pt._hoverY = viewY(pt.y1 - height / 2);
 
         var sliceTop = d3.select(this);
@@ -141,7 +141,9 @@ module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
             s.attr('data-notex', 1);
         });
 
-        var font = Lib.ensureUniformFontSize(gd, helpers.determineTextFont(trace, pt, fullLayout.font, trace.pathdir));
+        var font = Lib.ensureUniformFontSize(gd, helpers.determineTextFont(trace, pt, fullLayout.font, {
+            onPathbar: true
+        }));
 
         sliceText.text(pt._text || ' ') // use one space character instead of a blank string to avoid jumps during transition
             .classed('slicetext', true)
@@ -154,20 +156,8 @@ module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
             fontSize: font.size,
             onPathbar: true
         });
-
         pt.transform.fontSize = font.size;
 
-        if(helpers.isOutsideText(trace, pt)) {
-            // consider in/out diff font sizes
-            var outsideFont = helpers.getOutsideTextFontKey('size', trace, pt, fullLayout.font);
-            var insideFont = helpers.getInsideTextFontKey('size', trace, pt, fullLayout.font);
-
-            var diffFontSize = outsideFont - insideFont;
-
-            pt.transform.targetY -= diffFontSize;
-            pt.transform.fontSize -= diffFontSize;
-        }
-
         if(hasTransition) {
             sliceText.transition().attrTween('transform', function(pt2) {
                 var interp = makeUpdateTextInterpolator(pt2, onPathbar, refRect, [width, height]);