Add fallback to calls to texttemplateString

camdecoster · camdecoster · commit 02a4cadb53c6 · 2025-10-08T18:05:29.000-06:00
diff --git a/src/components/drawing/index.js b/src/components/drawing/index.js
@@ -1299,8 +1299,13 @@ drawing.textPointStyle = function (s, trace, gd) {
             var labels = fn ? fn(d, trace, fullLayout) : {};
             var pointValues = {};
             appendArrayPointValue(pointValues, trace, d.i);
-            var meta = trace._meta || {};
-            text = Lib.texttemplateString(text, labels, fullLayout._d3locale, pointValues, d, meta);
+            text = Lib.texttemplateString({
+                args: [pointValues, d, trace._meta],
+                d3locale: fullLayout._d3locale,
+                fallback: trace.texttemplatefallback,
+                labels,
+                string: text
+            });
         }
 
         var pos = d.tp || trace.textposition;
diff --git a/src/traces/bar/plot.js b/src/traces/bar/plot.js
@@ -1073,7 +1073,13 @@ function calcTexttemplate(fullLayout, cd, index, xa, ya) {
 
     var customdata = Lib.castOption(trace, cdi.i, 'customdata');
     if (customdata) obj.customdata = customdata;
-    return Lib.texttemplateString(texttemplate, obj, fullLayout._d3locale, pt, obj, trace._meta || {});
+    return Lib.texttemplateString({
+        args: [pt, obj, trace._meta],
+        d3locale: fullLayout._d3locale,
+        fallback: trace.texttemplatefallback,
+        labels: obj,
+        string: texttemplate
+    });
 }
 
 function calcTextinfo(cd, index, xa, ya) {
diff --git a/src/traces/heatmap/plot.js b/src/traces/heatmap/plot.js
@@ -450,13 +450,13 @@ module.exports = function (gd, plotinfo, cdheatmaps, heatmapLayer) {
                     if (theText === undefined || theText === false) theText = '';
                     obj.text = theText;
 
-                    var _t = Lib.texttemplateString(
-                        texttemplate,
-                        obj,
-                        gd._fullLayout._d3locale,
-                        obj,
-                        trace._meta || {}
-                    );
+                    var _t = Lib.texttemplateString({
+                        args: [obj, trace._meta],
+                        d3locale: gd._fullLayout._d3locale,
+                        fallback: trace.texttemplatefallback,
+                        labels: obj,
+                        string: texttemplate
+                    });
                     if (!_t) continue;
 
                     var lines = _t.split('<br>');
diff --git a/src/traces/pie/plot.js b/src/traces/pie/plot.js
@@ -1271,7 +1271,13 @@ function formatSliceLabel(gd, pt, cd0) {
             var obj = makeTemplateVariables(pt);
             var ptTx = helpers.getFirstFilled(trace.text, pt.pts);
             if (isValidTextValue(ptTx) || ptTx === '') obj.text = ptTx;
-            pt.text = Lib.texttemplateString(txt, obj, gd._fullLayout._d3locale, obj, trace._meta || {});
+            pt.text = Lib.texttemplateString({
+                args: [obj, trace._meta],
+                d3locale: gd._fullLayout._d3locale,
+                fallback: trace.texttemplatefallback,
+                labels: obj,
+                string: txt
+            });
         }
     }
 }
diff --git a/src/traces/scatter3d/convert.js b/src/traces/scatter3d/convert.js
@@ -257,8 +257,13 @@ function convertPlotlyOptions(scene, data) {
             };
             var pointValues = {};
             appendArrayPointValue(pointValues, data, i);
-            var meta = data._meta || {};
-            text[i] = Lib.texttemplateString(txt(i), labels, d3locale, pointValues, d, meta);
+            text[i] = Lib.texttemplateString({
+                args: [pointValues, d, data._meta],
+                d3locale,
+                fallback: data.texttemplatefallback,
+                labels,
+                string: txt(i)
+            });
         }
     }
 
diff --git a/src/traces/scattergl/convert.js b/src/traces/scattergl/convert.js
@@ -141,8 +141,15 @@ function convertTextStyle(gd, trace) {
             var labels = trace._module.formatLabels(d, trace, fullLayout);
             var pointValues = {};
             appendArrayPointValue(pointValues, trace, i);
-            var meta = trace._meta || {};
-            optsOut.text.push(Lib.texttemplateString(txt(i), labels, d3locale, pointValues, d, meta));
+            optsOut.text.push(
+                Lib.texttemplateString({
+                    args: [pointValues, d, trace._meta],
+                    d3locale,
+                    fallback: trace.texttemplatefallback,
+                    labels,
+                    string: txt(i)
+                })
+            );
         }
     } else {
         if (isArrayOrTypedArray(trace.text) && trace.text.length < count) {
diff --git a/src/traces/scattermap/convert.js b/src/traces/scattermap/convert.js
@@ -300,8 +300,13 @@ function makeSymbolGeoJSON(calcTrace, gd) {
             var labels = trace._module.formatLabels(calcPt, trace, fullLayout);
             var pointValues = {};
             appendArrayPointValue(pointValues, trace, calcPt.i);
-            var meta = trace._meta || {};
-            text = Lib.texttemplateString(tt, labels, fullLayout._d3locale, pointValues, calcPt, meta);
+            text = Lib.texttemplateString({
+                args: [pointValues, calcPt, trace._meta],
+                d3locale: fullLayout._d3locale,
+                fallback: trace.texttemplatefallback,
+                labels,
+                string: tt
+            });
         } else {
             text = fillText(i);
         }
diff --git a/src/traces/scattermapbox/convert.js b/src/traces/scattermapbox/convert.js
@@ -300,8 +300,13 @@ function makeSymbolGeoJSON(calcTrace, gd) {
             var labels = trace._module.formatLabels(calcPt, trace, fullLayout);
             var pointValues = {};
             appendArrayPointValue(pointValues, trace, calcPt.i);
-            var meta = trace._meta || {};
-            text = Lib.texttemplateString(tt, labels, fullLayout._d3locale, pointValues, calcPt, meta);
+            text = Lib.texttemplateString({
+                args: [pointValues, calcPt, trace._meta],
+                d3locale: fullLayout._d3locale,
+                fallback: trace.texttemplatefallback,
+                labels,
+                string: tt
+            });
         } else {
             text = fillText(i);
         }
diff --git a/src/traces/sunburst/plot.js b/src/traces/sunburst/plot.js
@@ -632,7 +632,13 @@ exports.formatSliceLabel = function (pt, entry, trace, cd, fullLayout) {
     var ptTx = Lib.castOption(trace, cdi.i, 'text');
     if (Lib.isValidTextValue(ptTx) || ptTx === '') obj.text = ptTx;
     obj.customdata = Lib.castOption(trace, cdi.i, 'customdata');
-    return Lib.texttemplateString(txt, obj, fullLayout._d3locale, obj, trace._meta || {});
+    return Lib.texttemplateString({
+        args: [obj, trace._meta],
+        d3locale: fullLayout._d3locale,
+        fallback: trace.texttemplatefallback,
+        labels: obj,
+        string: txt
+    });
 };
 
 function getInscribedRadiusFraction(pt) {

Original file line number	Diff line number	Diff line change
`@@ -1271,7 +1271,13 @@ function formatSliceLabel(gd, pt, cd0) {`
`1271`	`1271`	`var obj = makeTemplateVariables(pt);`
`1272`	`1272`	`var ptTx = helpers.getFirstFilled(trace.text, pt.pts);`
`1273`	`1273`	`if (isValidTextValue(ptTx) \|\| ptTx === '') obj.text = ptTx;`
`1274`		`- pt.text = Lib.texttemplateString(txt, obj, gd._fullLayout._d3locale, obj, trace._meta \|\| {});`
	`1274`	`+ pt.text = Lib.texttemplateString({`
	`1275`	`+ args: [obj, trace._meta],`
	`1276`	`+ d3locale: gd._fullLayout._d3locale,`
	`1277`	`+ fallback: trace.texttemplatefallback,`
	`1278`	`+ labels: obj,`
	`1279`	`+ string: txt`
	`1280`	`+ });`
`1275`	`1281`	`}`
`1276`	`1282`	`}`
`1277`	`1283`	`}`