Merge pull request plotly#6070 from plotly/histogram-format-x-y-texttemplate

archmoj · web-flow · commit 9984e902fa2b · 2021-12-20T12:27:21.000-05:00
Correct formatted x/y `texttempate` for `histogram` trace
diff --git a/src/traces/bar/plot.js b/src/traces/bar/plot.js
@@ -629,6 +629,7 @@ function calcTexttemplate(fullLayout, cd, index, xa, ya) {
     var trace = cd[0].trace;
     var texttemplate = Lib.castOption(trace, index, 'texttemplate');
     if(!texttemplate) return '';
+    var isHistogram = (trace.type === 'histogram');
     var isWaterfall = (trace.type === 'waterfall');
     var isFunnel = (trace.type === 'funnel');
     var isHorizontal = trace.orientation === 'h';
@@ -670,10 +671,10 @@ function calcTexttemplate(fullLayout, cd, index, xa, ya) {
     var pt = {};
     appendArrayPointValue(pt, trace, cdi.i);
 
-    if(pt.x === undefined) pt.x = isHorizontal ? obj.value : obj.label;
-    if(pt.y === undefined) pt.y = isHorizontal ? obj.label : obj.value;
-    if(pt.xLabel === undefined) pt.xLabel = isHorizontal ? obj.valueLabel : obj.labelLabel;
-    if(pt.yLabel === undefined) pt.yLabel = isHorizontal ? obj.labelLabel : obj.valueLabel;
+    if(isHistogram || pt.x === undefined) pt.x = isHorizontal ? obj.value : obj.label;
+    if(isHistogram || pt.y === undefined) pt.y = isHorizontal ? obj.label : obj.value;
+    if(isHistogram || pt.xLabel === undefined) pt.xLabel = isHorizontal ? obj.valueLabel : obj.labelLabel;
+    if(isHistogram || pt.yLabel === undefined) pt.yLabel = isHorizontal ? obj.labelLabel : obj.valueLabel;
 
     if(isWaterfall) {
         obj.delta = +cdi.rawS || cdi.s;
diff --git a/test/image/baselines/hist_summed.png b/test/image/baselines/hist_summed.png
diff --git a/test/image/mocks/hist_summed.json b/test/image/mocks/hist_summed.json
@@ -16,7 +16,7 @@
                 "Oranges",
                 "Bananas"
             ],
-            "texttemplate": "%{value}<br>%{label}",
+            "texttemplate": "%{y:.1f}<br>%{x}",
             "type": "histogram"
         }
     ],

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`"Oranges",`
`17`	`17`	`"Bananas"`
`18`	`18`	`],`
`19`		`- "texttemplate": "%{value}<br>%{label}",`
	`19`	`+ "texttemplate": "%{y:.1f}<br>%{x}",`
`20`	`20`	`"type": "histogram"`
`21`	`21`	`}`
`22`	`22`	`],`