Merge pull request #4469 from plotly/treemap-textanchor

Improve text fit in treemap trace
plotly · Jan 7, 2020 · ba8d941 · ba8d941
2 parents ec2a31e + 7098a97
commit ba8d941
Show file tree

Hide file tree

Showing 22 changed files with 363 additions and 39 deletions.
diff --git a/src/traces/bar/plot.js b/src/traces/bar/plot.js
@@ -442,6 +442,9 @@ function toMoveInsideBar(x0, x1, y0, y1, textBB, opts) {
     var anchor = opts.anchor || 'end';
     var isEnd = anchor === 'end';
     var isStart = anchor === 'start';
+    var leftToRight = opts.leftToRight || 0; // left: -1, center: 0, right: 1
+    var toRight = (leftToRight + 1) / 2;
+    var toLeft = 1 - toRight;
 
     var textWidth = textBB.width;
     var textHeight = textBB.height;
@@ -479,9 +482,15 @@ function toMoveInsideBar(x0, x1, y0, y1, textBB, opts) {
     }
 
     // compute text and target positions
-    var textX = (textBB.left + textBB.right) / 2;
+    var textX = (
+        textBB.left * toLeft +
+        textBB.right * toRight
+    );
     var textY = (textBB.top + textBB.bottom) / 2;
-    var targetX = (x0 + x1) / 2;
+    var targetX = (
+        (x0 + TEXTPAD) * toLeft +
+        (x1 - TEXTPAD) * toRight
+    );
     var targetY = (y0 + y1) / 2;
     var anchorX = 0;
     var anchorY = 0;

diff --git a/src/traces/treemap/plot.js b/src/traces/treemap/plot.js
@@ -299,16 +299,6 @@ function plotOne(gd, cd, element, transitionOpts) {
         var y1 = pt.y1;
         var textBB = pt.textBB;
 
-        if(x0 === x1) {
-            x0 -= TEXTPAD;
-            x1 += TEXTPAD;
-        }
-
-        if(y0 === y1) {
-            y0 -= TEXTPAD;
-            y1 += TEXTPAD;
-        }
-
         var hasFlag = function(f) { return trace.textposition.indexOf(f) !== -1; };
 
         var hasBottom = hasFlag('bottom');
@@ -321,23 +311,18 @@ function plotOne(gd, cd, element, transitionOpts) {
         var hasRight = hasFlag('right');
         var hasLeft = hasFlag('left') || opts.onPathbar;
 
-        var offsetDir =
-            hasLeft ? 'left' :
-            hasRight ? 'right' : 'center';
-
-        if(opts.onPathbar || !opts.isHeader) {
-            x0 += hasLeft ? TEXTPAD : 0;
-            x1 -= hasRight ? TEXTPAD : 0;
-        }
+        var leftToRight =
+            hasLeft ? -1 :
+            hasRight ? 1 : 0;
 
         var pad = trace.marker.pad;
         if(opts.isHeader) {
             x0 += pad.l - TEXTPAD;
             x1 -= pad.r - TEXTPAD;
             if(x0 >= x1) {
                 var mid = (x0 + x1) / 2;
-                x0 = mid - TEXTPAD;
-                x1 = mid + TEXTPAD;
+                x0 = mid;
+                x1 = mid;
             }
 
             // limit the drawing area for headers
@@ -356,33 +341,29 @@ function plotOne(gd, cd, element, transitionOpts) {
             isHorizontal: false,
             constrained: true,
             angle: 0,
-            anchor: anchor
+            anchor: anchor,
+            leftToRight: leftToRight
         });
         transform.fontSize = opts.fontSize;
 
-        if(offsetDir !== 'center') {
-            var deltaX = (x1 - x0) / 2 - transform.scale * (textBB.right - textBB.left) / 2;
-            if(opts.isHeader) deltaX -= TEXTPAD;
-
-            if(offsetDir === 'left') transform.targetX -= deltaX;
-            else if(offsetDir === 'right') transform.targetX += deltaX;
-        }
-
-        transform.targetX = viewMapX(transform.targetX - transform.anchorX * transform.scale);
-        transform.targetY = viewMapY(transform.targetY - transform.anchorY * transform.scale);
-        transform.anchorX = 0;
-        transform.anchorY = 0;
+        transform.targetX = viewMapX(transform.targetX);
+        transform.targetY = viewMapY(transform.targetY);
 
         if(isNaN(transform.targetX) || isNaN(transform.targetY)) {
             return {};
         }
 
-        recordMinTextSize(trace.type, transform, fullLayout);
+        if(x0 !== x1 && y0 !== y1) {
+            recordMinTextSize(trace.type, transform, fullLayout);
+        }
+
         return {
             scale: transform.scale,
             rotate: transform.rotate,
             textX: transform.textX,
             textY: transform.textY,
+            anchorX: transform.anchorX,
+            anchorY: transform.anchorY,
             targetX: transform.targetX,
             targetY: transform.targetY
         };
@@ -495,13 +476,18 @@ function plotOne(gd, cd, element, transitionOpts) {
         }
 
         var transform = pt.transform;
-        recordMinTextSize(trace.type, transform, fullLayout);
+        if(pt.x0 !== pt.x1 && pt.y0 !== pt.y1) {
+            recordMinTextSize(trace.type, transform, fullLayout);
+        }
+
         return d3.interpolate(prev, {
             transform: {
                 scale: transform.scale,
                 rotate: transform.rotate,
                 textX: transform.textX,
                 textY: transform.textY,
+                anchorX: transform.anchorX,
+                anchorY: transform.anchorY,
                 targetX: transform.targetX,
                 targetY: transform.targetY
             }
@@ -534,11 +520,16 @@ function plotOne(gd, cd, element, transitionOpts) {
 
     var strTransform = function(d) {
         var transform = d.transform;
-        recordMinTextSize(trace.type, transform, fullLayout);
+
+        if(d.x0 !== d.x1 && d.y0 !== d.y1) {
+            recordMinTextSize(trace.type, transform, fullLayout);
+        }
 
         return Lib.getTextTransform({
             textX: transform.textX,
             textY: transform.textY,
+            anchorX: transform.anchorX,
+            anchorY: transform.anchorY,
             targetX: transform.targetX,
             targetY: transform.targetY,
             scale: transform.scale,
@@ -561,6 +552,8 @@ function plotOne(gd, cd, element, transitionOpts) {
                 prevLookupPathbar[getKey(pt)].transform = {
                     textX: pt.transform.textX,
                     textY: pt.transform.textY,
+                    anchorX: pt.transform.anchorX,
+                    anchorY: pt.transform.anchorY,
                     targetX: pt.transform.targetX,
                     targetY: pt.transform.targetY,
                     scale: pt.transform.scale,
@@ -581,6 +574,8 @@ function plotOne(gd, cd, element, transitionOpts) {
                 prevLookupSlices[getKey(pt)].transform = {
                     textX: pt.transform.textX,
                     textY: pt.transform.textY,
+                    anchorX: pt.transform.anchorX,
+                    anchorY: pt.transform.anchorY,
                     targetX: pt.transform.targetX,
                     targetY: pt.transform.targetY,
                     scale: pt.transform.scale,

diff --git a/test/image/baselines/treemap_coffee.png b/test/image/baselines/treemap_coffee.png
diff --git a/test/image/baselines/treemap_flare.png b/test/image/baselines/treemap_flare.png
diff --git a/test/image/baselines/treemap_level-depth.png b/test/image/baselines/treemap_level-depth.png
diff --git a/test/image/baselines/treemap_packages_colorscale_allone.png b/test/image/baselines/treemap_packages_colorscale_allone.png
diff --git a/test/image/baselines/treemap_packages_colorscale_novalue.png b/test/image/baselines/treemap_packages_colorscale_novalue.png
diff --git a/test/image/baselines/treemap_packings.png b/test/image/baselines/treemap_packings.png
diff --git a/test/image/baselines/treemap_pad_mirror.png b/test/image/baselines/treemap_pad_mirror.png
diff --git a/test/image/baselines/treemap_pad_transpose.png b/test/image/baselines/treemap_pad_transpose.png
diff --git a/test/image/baselines/treemap_sunburst_marker_colors.png b/test/image/baselines/treemap_sunburst_marker_colors.png
diff --git a/test/image/baselines/treemap_textfit.png b/test/image/baselines/treemap_textfit.png
diff --git a/test/image/baselines/treemap_textposition.png b/test/image/baselines/treemap_textposition.png
diff --git a/test/image/baselines/treemap_values.png b/test/image/baselines/treemap_values.png
diff --git a/test/image/baselines/treemap_values_colorscale.png b/test/image/baselines/treemap_values_colorscale.png
diff --git a/test/image/baselines/treemap_with-without_values.png b/test/image/baselines/treemap_with-without_values.png
diff --git a/test/image/baselines/treemap_with-without_values_template.png b/test/image/baselines/treemap_with-without_values_template.png
diff --git a/test/image/baselines/uniformtext_sunburst_treemap.png b/test/image/baselines/uniformtext_sunburst_treemap.png
diff --git a/test/image/baselines/uniformtext_treemap.png b/test/image/baselines/uniformtext_treemap.png
diff --git a/test/image/baselines/uniformtext_treemap_coffee-maxdepth3.png b/test/image/baselines/uniformtext_treemap_coffee-maxdepth3.png