Fixes of uniformtext and enable coloraxis for sunburst and treemap

- fix clear previous uniformtext scale before each plot
- fix uniformtext after switch level when has no transition for sunburst and treemap
- fix tests and add new tests

Author: archmoj

src/traces/bar/plot.js

@@ -91,6 +91,9 @@ function plot(gd, plotinfo, cdModule, traceLayer, opts, makeOnCompleteCallback)
             gap: fullLayout.bargap,
             groupgap: fullLayout.bargroupgap
         };
+
+        // don't clear bar when this is called from waterfall or funnel
+        clearMinTextSize('bar', fullLayout);
     }
 
     var bartraces = Lib.makeTraceGroups(traceLayer, cdModule, 'trace bars').each(function(cd) {
@@ -419,7 +422,7 @@ function recordMinTextSize(
     fullLayout // inout
 ) {
     if(fullLayout.uniformtext.mode) {
-        var minKey = '_' + traceType + 'Text_minsize';
+        var minKey = getMinKey(traceType);
         var minSize = fullLayout.uniformtext.minsize;
         var size = transform.scale * transform.fontSize;
 
@@ -435,6 +438,18 @@ function recordMinTextSize(
     }
 }
 
+function clearMinTextSize(
+    traceType, // in
+    fullLayout // inout
+) {
+    var minKey = getMinKey(traceType);
+    fullLayout[minKey] = undefined;
+}
+
+function getMinKey(traceType) {
+    return '_' + traceType + 'Text_minsize';
+}
+
 function getRotateFromAngle(angle) {
     return (angle === 'auto') ? 0 : angle;
 }
@@ -750,5 +765,6 @@ function calcTextinfo(cd, index, xa, ya) {
 module.exports = {
     plot: plot,
     toMoveInsideBar: toMoveInsideBar,
-    recordMinTextSize: recordMinTextSize
+    recordMinTextSize: recordMinTextSize,
+    clearMinTextSize: clearMinTextSize
 };

src/traces/funnel/plot.js

@@ -11,15 +11,18 @@
 var d3 = require('d3');
 var Lib = require('../../lib');
 var Drawing = require('../../components/drawing');
-var barPlot = require('../bar/plot').plot;
+var barPlot = require('../bar/plot');
+var clearMinTextSize = barPlot.clearMinTextSize;
 
 module.exports = function plot(gd, plotinfo, cdModule, traceLayer) {
     var fullLayout = gd._fullLayout;
 
+    clearMinTextSize('funnel', fullLayout);
+
     plotConnectorRegions(gd, plotinfo, cdModule, traceLayer);
     plotConnectorLines(gd, plotinfo, cdModule, traceLayer);
 
-    barPlot(gd, plotinfo, cdModule, traceLayer, {
+    barPlot.plot(gd, plotinfo, cdModule, traceLayer, {
         mode: fullLayout.funnelmode,
         norm: fullLayout.funnelmode,
         gap: fullLayout.funnelgap,

src/traces/funnelarea/plot.js

@@ -17,6 +17,7 @@ var svgTextUtils = require('../../lib/svg_text_utils');
 var barPlot = require('../bar/plot');
 var toMoveInsideBar = barPlot.toMoveInsideBar;
 var recordMinTextSize = barPlot.recordMinTextSize;
+var clearMinTextSize = barPlot.clearMinTextSize;
 
 var pieHelpers = require('../pie/helpers');
 var piePlot = require('../pie/plot');
@@ -32,6 +33,8 @@ var formatSliceLabel = piePlot.formatSliceLabel;
 module.exports = function plot(gd, cdModule) {
     var fullLayout = gd._fullLayout;
 
+    clearMinTextSize('funnelarea', fullLayout);
+
     prerenderTitles(cdModule, gd);
     layoutAreas(cdModule, fullLayout._size);
 

src/traces/pie/plot.js

@@ -16,7 +16,9 @@ var Color = require('../../components/color');
 var Drawing = require('../../components/drawing');
 var Lib = require('../../lib');
 var svgTextUtils = require('../../lib/svg_text_utils');
-var recordMinTextSize = require('../bar/plot').recordMinTextSize;
+var barPlot = require('../bar/plot');
+var recordMinTextSize = barPlot.recordMinTextSize;
+var clearMinTextSize = barPlot.clearMinTextSize;
 
 var helpers = require('./helpers');
 var eventData = require('./event_data');
@@ -26,6 +28,8 @@ function plot(gd, cdModule) {
     var fullLayout = gd._fullLayout;
     var gs = fullLayout._size;
 
+    clearMinTextSize('pie', fullLayout);
+
     prerenderTitles(cdModule, gd);
     layoutAreas(cdModule, gs);
 

src/traces/sunburst/defaults.js

@@ -44,7 +44,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     if(lineWidth) coerce('marker.line.color', layout.paper_bgcolor);
 
     coerce('marker.colors');
-    var withColorscale = traceOut._hasColorscale = hasColorscale(traceIn, 'marker', 'colors');
+    var withColorscale = traceOut._hasColorscale = (traceIn.marker || {}).coloraxis || hasColorscale(traceIn, 'marker', 'colors');
     if(withColorscale) {
         colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: 'marker.', cLetter: 'c'});
     }

src/traces/sunburst/plot.js

@@ -14,12 +14,14 @@ var d3Hierarchy = require('d3-hierarchy');
 var Drawing = require('../../components/drawing');
 var Lib = require('../../lib');
 var svgTextUtils = require('../../lib/svg_text_utils');
-var recordMinTextSize = require('../bar/plot').recordMinTextSize;
+var barPlot = require('../bar/plot');
+var recordMinTextSize = barPlot.recordMinTextSize;
+var clearMinTextSize = barPlot.clearMinTextSize;
 var piePlot = require('../pie/plot');
 var computeTransform = piePlot.computeTransform;
 var transformInsideText = piePlot.transformInsideText;
 var styleOne = require('./style').styleOne;
-
+var style = require('./style').style;
 var attachFxHandlers = require('./fx');
 var constants = require('./constants');
 var helpers = require('./helpers');
@@ -34,6 +36,8 @@ exports.plot = function(gd, cdmodule, transitionOpts, makeOnCompleteCallback) {
     var isFullReplot = !transitionOpts;
     var hasTransition = helpers.hasTransition(transitionOpts);
 
+    clearMinTextSize('sunburst', fullLayout);
+
     join = layer.selectAll('g.trace.sunburst')
         .data(cdmodule, function(cd) { return cd[0].trace.uid; });
 
@@ -70,6 +74,10 @@ exports.plot = function(gd, cdmodule, transitionOpts, makeOnCompleteCallback) {
         join.each(function(cd) {
             plotOne(gd, cd, this, transitionOpts);
         });
+
+        if(fullLayout.uniformtext.mode) {
+            style(gd);
+        }
     }
 
     if(isFullReplot) {

src/traces/treemap/defaults.js

@@ -73,7 +73,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     if(lineWidth) coerce('marker.line.color', layout.paper_bgcolor);
 
     var colors = coerce('marker.colors');
-    var withColorscale = traceOut._hasColorscale = hasColorscale(traceIn, 'marker', 'colors');
+    var withColorscale = traceOut._hasColorscale = (traceIn.marker || {}).coloraxis || hasColorscale(traceIn, 'marker', 'colors');
     if(withColorscale) {
         colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: 'marker.', cLetter: 'c'});
     } else {

src/traces/treemap/draw_ancestors.js

@@ -151,6 +151,7 @@ module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
 
         pt.textBB = Drawing.bBox(sliceText.node());
         pt.transform = toMoveInsideSlice(pt, {
+            fontSize: font.size,
             onPathbar: true
         });
 

src/traces/treemap/draw_descendants.js

@@ -192,6 +192,7 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
 
         pt.textBB = Drawing.bBox(sliceText.node());
         pt.transform = toMoveInsideSlice(pt, {
+            fontSize: font.size,
             isHeader: isHeader
         });
         pt.transform.fontSize = font.size;

src/traces/treemap/plot.js

@@ -10,15 +10,15 @@
 
 var d3 = require('d3');
 
-var hasTransition = require('../sunburst/helpers').hasTransition;
 var helpers = require('../sunburst/helpers');
 
 var Lib = require('../../lib');
 var TEXTPAD = require('../bar/constants').TEXTPAD;
 var barPlot = require('../bar/plot');
 var toMoveInsideBar = barPlot.toMoveInsideBar;
 var recordMinTextSize = barPlot.recordMinTextSize;
-
+var clearMinTextSize = barPlot.clearMinTextSize;
+var style = require('./style').style;
 var constants = require('./constants');
 var drawDescendants = require('./draw_descendants');
 var drawAncestors = require('./draw_ancestors');
@@ -32,6 +32,8 @@ module.exports = function(gd, cdmodule, transitionOpts, makeOnCompleteCallback)
     // updated are removed.
     var isFullReplot = !transitionOpts;
 
+    clearMinTextSize('treemap', fullLayout);
+
     join = layer.selectAll('g.trace.treemap')
         .data(cdmodule, function(cd) { return cd[0].trace.uid; });
 
@@ -41,7 +43,7 @@ module.exports = function(gd, cdmodule, transitionOpts, makeOnCompleteCallback)
 
     join.order();
 
-    if(hasTransition(transitionOpts)) {
+    if(helpers.hasTransition(transitionOpts)) {
         if(makeOnCompleteCallback) {
             // If it was passed a callback to register completion, make a callback. If
             // this is created, then it must be executed on completion, otherwise the
@@ -66,6 +68,10 @@ module.exports = function(gd, cdmodule, transitionOpts, makeOnCompleteCallback)
         join.each(function(cd) {
             plotOne(gd, cd, this, transitionOpts);
         });
+
+        if(fullLayout.uniformtext.mode) {
+            style(gd);
+        }
     }
 
     if(isFullReplot) {
@@ -351,6 +357,7 @@ function plotOne(gd, cd, element, transitionOpts) {
             angle: 0,
             anchor: anchor
         });
+        transform.fontSize = opts.fontSize;
 
         if(offsetDir !== 'center') {
             var deltaX = (x1 - x0) / 2 - transform.scale * (textBB.right - textBB.left) / 2;