Refactor label variable filtering to use arrays from label_texttemplate

alexshoe · alexshoe · commit fe4576e34f1a · 2026-02-03T10:12:54.000-05:00
diff --git a/src/components/shapes/display_labels.js b/src/components/shapes/display_labels.js
@@ -30,17 +30,17 @@ module.exports = function drawLabel(gd, index, options, shapeGroup) {
             const isMultiAxisX = Array.isArray(options.xref);
             const isMultiAxisY = Array.isArray(options.yref);
 
-            // For multi-axis shapes, derived variables are meaningless
-            // Skip them and let texttemplatefallback handle those cases.
-            const derivedX = ['dx', 'width', 'xcenter', 'slope', 'length'];
-            const derivedY = ['dy', 'height', 'ycenter', 'slope', 'length'];
-
             for (var key in shapeLabelTexttemplateVars) {
-                if (isMultiAxisX && derivedX.includes(key)) continue;
-                if (isMultiAxisY && derivedY.includes(key)) continue;
+                // For multi-axis shapes, skip variables that require single-axis calculations
+                // and let texttemplatefallback handle those cases.
+                var isFunction = typeof shapeLabelTexttemplateVars[key] === 'function';
+                var isValidForX = !isMultiAxisX || shapeLabelTexttemplateVars.simpleXVariables.includes(key);
+                var isValidForY = !isMultiAxisY || shapeLabelTexttemplateVars.simpleYVariables.includes(key);
 
-                var val = shapeLabelTexttemplateVars[key](options, _xa, _ya);
-                if (val !== undefined) templateValues[key] = val;
+                if (isFunction && isValidForX && isValidForY) {
+                    var val = shapeLabelTexttemplateVars[key](options, _xa, _ya);
+                    if (val !== undefined) templateValues[key] = val;
+                }
             }
         }
         text = Lib.texttemplateStringForShapes({
diff --git a/src/components/shapes/label_texttemplate.js b/src/components/shapes/label_texttemplate.js
@@ -59,6 +59,12 @@ function slopeFn(shape, xa, ya) {
     );
 }
 
+// Variables valid for multi-axis shape references (xref/yref as arrays).
+// When a shape spans multiple axes, only these variables can be computed
+// because other variables require single-axis calculations.
+var simpleXVariables = ['x0', 'x1', 'y0', 'y1', 'dy', 'height', 'ycenter'];
+var simpleYVariables = ['x0', 'x1', 'y0', 'y1', 'dx', 'width', 'xcenter'];
+
 module.exports = {
     x0: x0Fn,
     x1: x1Fn,
@@ -72,4 +78,6 @@ module.exports = {
     length: lengthFn,
     xcenter: xcenterFn,
     ycenter: ycenterFn,
+    simpleXVariables: simpleXVariables,
+    simpleYVariables: simpleYVariables,
 };
