handle text positions for out of range cases e.g. when transitioning with maxdepth

Author: archmoj

src/traces/treemap/draw_ancestors.js

@@ -148,16 +148,9 @@ module.exports = function drawAncestors(gd, cd, entry, slices, opts) {
             .call(svgTextUtils.convertToTspans, gd);
 
         pt.textBB = Drawing.bBox(sliceText.node());
-        pt.transform = toMoveInsideSlice(
-            pt.x0,
-            pt.x1,
-            pt.y0,
-            pt.y1,
-            pt.textBB,
-            {
-                onPathbar: true
-            }
-        );
+        pt.transform = toMoveInsideSlice(pt.x0, pt.x1, pt.y0, pt.y1, pt.textBB, {
+            onPathbar: true
+        });
 
         if(helpers.isOutsideText(trace, pt)) {
             // consider in/out diff font sizes

src/traces/treemap/draw_descendants.js

@@ -12,7 +12,7 @@ var d3 = require('d3');
 var Lib = require('../../lib');
 var Drawing = require('../../components/drawing');
 var svgTextUtils = require('../../lib/svg_text_utils');
-
+var TEXTPAD = require('../bar/constants').TEXTPAD;
 var partition = require('./partition');
 var styleOne = require('./style').styleOne;
 var constants = require('./constants');
@@ -164,13 +164,28 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
             s.attr('data-notex', 1);
         });
 
+        var _x0 = pt.x0;
+        var _x1 = pt.x1;
+        var _y0 = pt.y0;
+        var _y1 = pt.y1;
+
         var tx;
-        if(isHeader) {
-            if(noRoomForHeader) return;
+        if(_x0 < _x1 && _y0 < _y1) {
+            if(isHeader) {
+                if(noRoomForHeader) return;
 
-            tx = helpers.getPtLabel(pt);
-        } else {
-            tx = formatSliceLabel(pt, entry, trace, cd, fullLayout) || ' ';
+                tx = helpers.getPtLabel(pt);
+            } else {
+                tx = formatSliceLabel(pt, entry, trace, cd, fullLayout) || ' ';
+            }
+        } else { // handle text positions for out of range cases e.g. with maxdepth
+            tx = ' ';
+
+            var expand = 2 * TEXTPAD;
+            _x0 -= expand;
+            _x1 += expand;
+            _y0 -= expand;
+            _y1 += expand;
         }
 
         sliceText.text(tx)
@@ -180,16 +195,9 @@ module.exports = function drawDescendants(gd, cd, entry, slices, opts) {
             .call(svgTextUtils.convertToTspans, gd);
 
         pt.textBB = Drawing.bBox(sliceText.node());
-        pt.transform = toMoveInsideSlice(
-            pt.x0,
-            pt.x1,
-            pt.y0,
-            pt.y1,
-            pt.textBB,
-            {
-                isHeader: isHeader
-            }
-        );
+        pt.transform = toMoveInsideSlice(_x0, _x1, _y0, _y1, pt.textBB, {
+            isHeader: isHeader
+        });
 
         if(helpers.isOutsideText(trace, pt)) {
             // consider in/out diff font sizes

test/jasmine/tests/treemap_test.js

@@ -1225,7 +1225,7 @@ describe('Test treemap tweening:', function() {
                 'M284.375,188.5L548.375,188.5L548.375,308.5L284.375,308.5Z'
             );
             _assert('move B text to new position', 'transform', 'B', [220.25126, 0]);
-            _assert('enter b text to new position', 'transform', 'b', [287.375195, 5]);
+            _assert('enter b text to new position', 'transform', 'b', [284.66071, 35714285714286]);
         })
         .catch(failTest)
         .then(done);