Merge pull request #6061 from plotly/heatmap-max-font-size

Do not exceed global font size when heatmap textfont is set to auto
plotly · Dec 15, 2021 · 1c0a886 · 1c0a886
2 parents abbfa7b + f0fa670
commit 1c0a886
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 2 deletions.
diff --git a/draftlogs/6061_fix.md b/draftlogs/6061_fix.md
@@ -0,0 +1 @@
+ - Do not exceed layout font size when `textfont` is set to "auto" for `heatmap`, `histogram2d` and `contour` traces [[#6061](https://github.com/plotly/plotly.js/pull/6061)]
diff --git a/src/traces/heatmap/plot.js b/src/traces/heatmap/plot.js
@@ -453,6 +453,7 @@ module.exports = function(gd, plotinfo, cdheatmaps, heatmapLayer) {
             var font = trace.textfont;
             var fontFamily = font.family;
             var fontSize = font.size;
+            var globalFontSize = gd._fullLayout.font.size;
 
             if(!fontSize || fontSize === 'auto') {
                 var minW = Infinity;
@@ -479,7 +480,7 @@ module.exports = function(gd, plotinfo, cdheatmaps, heatmapLayer) {
                     !isFinite(minW) ||
                     !isFinite(minH)
                 ) {
-                    fontSize = 12;
+                    fontSize = globalFontSize;
                 } else {
                     minW -= xGap;
                     minH -= yGap;
@@ -492,7 +493,8 @@ module.exports = function(gd, plotinfo, cdheatmaps, heatmapLayer) {
 
                     fontSize = Math.min(
                         Math.floor(minW),
-                        Math.floor(minH)
+                        Math.floor(minH),
+                        globalFontSize
                     );
                 }
             }

diff --git a/test/image/baselines/contour_heatmap_coloring_reversescale.png b/test/image/baselines/contour_heatmap_coloring_reversescale.png
diff --git a/test/image/baselines/heatmap_brick_padding.png b/test/image/baselines/heatmap_brick_padding.png
diff --git a/test/image/baselines/heatmap_categoryorder.png b/test/image/baselines/heatmap_categoryorder.png
diff --git a/test/image/baselines/heatmap_columnar.png b/test/image/baselines/heatmap_columnar.png
diff --git a/test/image/baselines/heatmap_xyz-gaps-on-sides.png b/test/image/baselines/heatmap_xyz-gaps-on-sides.png
diff --git a/test/image/baselines/hist2d_summed.png b/test/image/baselines/hist2d_summed.png
diff --git a/test/image/baselines/histogram2d_bingroup-coloraxis.png b/test/image/baselines/histogram2d_bingroup-coloraxis.png
diff --git a/test/image/baselines/histogram2d_bingroup.png b/test/image/baselines/histogram2d_bingroup.png
diff --git a/test/image/baselines/histogram2d_legend.png b/test/image/baselines/histogram2d_legend.png
diff --git a/test/image/baselines/zsmooth_methods.png b/test/image/baselines/zsmooth_methods.png