implementation

archmoj · archmoj · commit 0a1f7a8604e7 · 2024-04-24T14:34:29.000-04:00
diff --git a/src/components/annotations/draw.js b/src/components/annotations/draw.js
@@ -198,7 +198,10 @@ function drawRaw(gd, options, index, subplotId, xa, ya) {
                 fontColor: hoverFont.color,
                 fontWeight: hoverFont.weight,
                 fontStyle: hoverFont.style,
-                fontVariant: hoverFont.variant
+                fontVariant: hoverFont.variant,
+                fontShadow: hoverFont.fontShadow,
+                fontStriding: hoverFont.fontStriding,
+                fontCapitalize: hoverFont.fontCapitalize,
             }, {
                 container: fullLayout._hoverlayer.node(),
                 outerContainer: fullLayout._paper.node(),
diff --git a/src/components/colorbar/defaults.js b/src/components/colorbar/defaults.js
@@ -128,6 +128,9 @@ module.exports = function colorbarDefaults(containerIn, containerOut, layout) {
         weight: font.weight,
         style: font.style,
         variant: font.variant,
+        capitalize: font.capitalize,
+        striding: font.striding,
+        shadow: font.shadow,
         color: font.color,
         size: Lib.bigFont(tickFont.size)
     });
diff --git a/src/components/drawing/index.js b/src/components/drawing/index.js
@@ -1164,6 +1164,9 @@ drawing.textPointStyle = function(s, trace, gd) {
             weight: d.tw || trace.textfont.weight,
             style: d.ty || trace.textfont.style,
             variant: d.tv || trace.textfont.variant,
+            capitalize: d.tC || trace.textfont.capitalize,
+            striding: d.tE || trace.textfont.striding,
+            shadow: d.tS || trace.textfont.shadow,
             size: fontSize,
             color: fontColor
         })
diff --git a/src/components/fx/hover.js b/src/components/fx/hover.js
@@ -961,6 +961,9 @@ function createHoverText(hoverData, opts) {
     var fontWeight = opts.fontWeight || fullLayout.font.weight;
     var fontStyle = opts.fontStyle || fullLayout.font.style;
     var fontVariant = opts.fontVariant || fullLayout.font.variant;
+    var fontCapitalize = opts.fontCapitalize || fullLayout.font.capitalize;
+    var fontStriding = opts.fontStriding || fullLayout.font.striding;
+    var fontShadow = opts.fontShadow || fullLayout.font.shadow;
 
     var c0 = hoverData[0];
     var xa = c0.xa;
@@ -1045,6 +1048,9 @@ function createHoverText(hoverData, opts) {
             weight: commonLabelOpts.font.weight || fontWeight,
             style: commonLabelOpts.font.style || fontStyle,
             variant: commonLabelOpts.font.variant || fontVariant,
+            capitalize: commonLabelOpts.font.capitalize || fontCapitalize,
+            striding: commonLabelOpts.font.striding || fontStriding,
+            shadow: commonLabelOpts.font.shadow || fontShadow,
             family: commonLabelOpts.font.family || fontFamily,
             size: commonLabelOpts.font.size || fontSize,
             color: commonLabelOpts.font.color || contrastColor
@@ -1370,6 +1376,9 @@ function createHoverText(hoverData, opts) {
                     weight: fontWeight,
                     style: fontStyle,
                     variant: fontVariant,
+                    capitalize: fontCapitalize,
+                    striding: fontStriding,
+                    shadow: fontShadow,
                     family: fontFamily,
                     size: fontSize
                 });
@@ -1413,7 +1422,10 @@ function createHoverText(hoverData, opts) {
                 color: d.fontColor || contrastColor,
                 weight: d.fontWeight || fontWeight,
                 style: d.fontStyle || fontStyle,
-                variant: d.fontVariant || fontVariant
+                variant: d.fontVariant || fontVariant,
+                capitalize: d.fontCapitalize || fontCapitalize,
+                striding: d.fontStriding || fontStriding,
+                shadow: d.fontShadow || fontShadow,
             })
             .text(text)
             .attr('data-notex', 1)
@@ -1432,7 +1444,10 @@ function createHoverText(hoverData, opts) {
                 color: nameColor,
                 weight: d.fontWeight || fontWeight,
                 style: d.fontStyle || fontStyle,
-                variant: d.fontVariant || fontVariant
+                variant: d.fontVariant || fontVariant,
+                capitalize: d.fontCapitalize || fontCapitalize,
+                striding: d.fontStriding || fontStriding,
+                shadow: d.fontShadow || fontShadow,
             }).text(name)
                 .attr('data-notex', 1)
                 .call(svgTextUtils.positionText, 0, 0)
diff --git a/src/components/legend/style.js b/src/components/legend/style.js
@@ -247,6 +247,9 @@ module.exports = function style(s, gd, legend) {
                 dEdit.tw = boundVal('textfont.weight', pickFirst);
                 dEdit.ty = boundVal('textfont.style', pickFirst);
                 dEdit.tv = boundVal('textfont.variant', pickFirst);
+                dEdit.tC = boundVal('textfont.capitalize', pickFirst);
+                dEdit.tE = boundVal('textfont.striding', pickFirst);
+                dEdit.tS = boundVal('textfont.shadow', pickFirst);
             }
 
             dMod = [Lib.minExtend(d0, dEdit)];
diff --git a/src/components/titles/index.js b/src/components/titles/index.js
@@ -71,6 +71,9 @@ function draw(gd, titleClass, options) {
     var fontWeight = font.weight;
     var fontStyle = font.style;
     var fontVariant = font.variant;
+    var fontCapitalize = font.capitalize;
+    var fontStriding = font.striding;
+    var fontShadow = font.shadow;
 
     // only make this title editable if we positively identify its property
     // as one that has editing enabled.
@@ -151,7 +154,10 @@ function draw(gd, titleClass, options) {
             opacity: opacity * Color.opacity(fontColor),
             'font-weight': fontWeight,
             'font-style': fontStyle,
-            'font-variant': fontVariant
+            'font-variant': fontVariant,
+            'text-transform': Drawing.capitalize2transform(fontCapitalize),
+            'text-shadow': fontShadow === 'auto' ? svgTextUtils.makeTextShadow(Color.contrast(fontColor)) : fontShadow,
+            'text-decoration-line': Drawing.striding2decorationLine(fontStriding),
         })
         .attr(attributes)
         .call(svgTextUtils.convertToTspans, gd);
diff --git a/src/lib/coerce.js b/src/lib/coerce.js
@@ -469,6 +469,9 @@ exports.coerceFont = function(coerce, attr, dfltObj, opts) {
     out.weight = coerce(attr + '.weight', dfltObj.weight);
     out.style = coerce(attr + '.style', dfltObj.style);
     if(!opts.noFontVariant) out.variant = coerce(attr + '.variant', dfltObj.variant);
+    if(!opts.noFontShadow) out.shadow = coerce(attr + '.shadow', dfltObj.shadow);
+    if(!opts.noFontStriding) out.striding = coerce(attr + '.striding', dfltObj.striding);
+    if(!opts.noFontCapitalize) out.capitalize = coerce(attr + '.capitalize', dfltObj.capitalize);
 
     return out;
 };
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
@@ -1740,6 +1740,9 @@ function tickTextObj(ax, x, text) {
         fontWeight: tf.weight,
         fontStyle: tf.style,
         fontVariant: tf.variant,
+        fontCapitalize: tf.capitalize,
+        fontStriding: tf.striding,
+        fontShadow: tf.shadow,
         fontColor: tf.color
     };
 }
@@ -3507,7 +3510,10 @@ axes.drawLabels = function(gd, ax, opts) {
                         color: d.fontColor,
                         weight: d.fontWeight,
                         style: d.fontStyle,
-                        variant: d.fontVariant
+                        variant: d.fontVariant,
+                        capitalize: d.fontCapitalize,
+                        striding: d.fontStriding,
+                        shadow: d.fontShadow,
                     })
                     .text(d.text)
                     .call(svgTextUtils.convertToTspans, gd);
diff --git a/src/plots/cartesian/axis_defaults.js b/src/plots/cartesian/axis_defaults.js
@@ -116,6 +116,9 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
         weight: font.weight,
         style: font.style,
         variant: font.variant,
+        capitalize: font.capitalize,
+        striding: font.striding,
+        shadow: font.shadow,
         size: Lib.bigFont(font.size),
         color: dfltFontColor
     });
diff --git a/src/plots/cartesian/tick_label_defaults.js b/src/plots/cartesian/tick_label_defaults.js
@@ -31,6 +31,9 @@ module.exports = function handleTickLabelDefaults(containerIn, containerOut, coe
             weight: font.weight,
             style: font.style,
             variant: font.variant,
+            capitalize: font.capitalize,
+            striding: font.striding,
+            shadow: font.shadow,
             size: font.size,
             color: dfltFontColor
         });
diff --git a/src/plots/font_attributes.js b/src/plots/font_attributes.js
@@ -111,7 +111,7 @@ module.exports = function(opts) {
             ].join(' ')
         },
 
-        shadow: opts.noFontCapitalize ? undefined : {
+        shadow: opts.noFontShadow ? undefined : {
             editType: editType,
             valType: 'string',
             dflt: 'none',
@@ -136,7 +136,18 @@ module.exports = function(opts) {
         attrs.family.arrayOk = true;
         attrs.weight.arrayOk = true;
         attrs.style.arrayOk = true;
-        attrs.variant.arrayOk = true;
+        if(!opts.noFontVariant) {
+            attrs.variant.arrayOk = true;
+        }
+        if(!opts.noFontCapitalize) {
+            attrs.capitalize.arrayOk = true;
+        }
+        if(!opts.noFontStriding) {
+            attrs.striding.arrayOk = true;
+        }
+        if(!opts.noFontShadow) {
+            attrs.shadow.arrayOk = true;
+        }
         attrs.size.arrayOk = true;
         attrs.color.arrayOk = true;
     }
diff --git a/src/plots/mapbox/layout_attributes.js b/src/plots/mapbox/layout_attributes.js
@@ -12,6 +12,9 @@ var constants = require('./constants');
 
 var fontAttr = fontAttrs({
     noFontVariant: true,
+    noFontShadow: true,
+    noFontStriding: true,
+    noFontCapitalize: true,
     description: [
         'Sets the icon text font (color=mapbox.layer.paint.text-color, size=mapbox.layer.layout.text-size).',
         'Has an effect only when `type` is set to *symbol*.'
diff --git a/src/plots/mapbox/layout_defaults.js b/src/plots/mapbox/layout_defaults.js
@@ -104,7 +104,10 @@ function handleLayerDefaults(layerIn, layerOut) {
 
             coerce('symbol.text');
             Lib.coerceFont(coerce, 'symbol.textfont', undefined, {
-                noFontVariant: true
+                noFontVariant: true,
+                noFontShadow: true,
+                noFontStriding: true,
+                noFontCapitalize: true,
             });
             coerce('symbol.textposition');
             coerce('symbol.placement');
diff --git a/src/plots/polar/layout_defaults.js b/src/plots/polar/layout_defaults.js
@@ -157,6 +157,9 @@ function handleDefaults(contIn, contOut, coerce, opts) {
             var dfltFontWeight;
             var dfltFontStyle;
             var dfltFontVariant;
+            var dfltFontCapitalize;
+            var dfltFontStriding;
+            var dfltFontShadow;
             var font = opts.font || {};
 
             dfltColor = coerceAxis('color');
@@ -166,13 +169,19 @@ function handleDefaults(contIn, contOut, coerce, opts) {
             dfltFontWeight = font.weight;
             dfltFontStyle = font.style;
             dfltFontVariant = font.variant;
+            dfltFontCapitalize = font.capitalize;
+            dfltFontStriding = font.striding;
+            dfltFontShadow = font.shadow;
 
             handleTickValueDefaults(axIn, axOut, coerceAxis, axOut.type);
             handleTickLabelDefaults(axIn, axOut, coerceAxis, axOut.type, {
                 font: {
                     weight: dfltFontWeight,
                     style: dfltFontStyle,
                     variant: dfltFontVariant,
+                    capitalize: dfltFontCapitalize,
+                    striding: dfltFontStriding,
+                    shadow: dfltFontShadow,
                     color: dfltFontColor,
                     size: dfltFontSize,
                     family: dfltFontFamily
@@ -205,6 +214,9 @@ function handleDefaults(contIn, contOut, coerce, opts) {
                     weight: dfltFontWeight,
                     style: dfltFontStyle,
                     variant: dfltFontVariant,
+                    capitalize: dfltFontCapitalize,
+                    striding: dfltFontStriding,
+                    shadow: dfltFontShadow,
                     color: dfltFontColor,
                     size: Lib.bigFont(dfltFontSize),
                     family: dfltFontFamily
diff --git a/src/plots/ternary/layout_defaults.js b/src/plots/ternary/layout_defaults.js
@@ -85,6 +85,9 @@ function handleAxisDefaults(containerIn, containerOut, options, ternaryLayoutOut
         weight: options.font.weight,
         style: options.font.style,
         variant: options.font.variant,
+        capitalize: options.font.capitalize,
+        striding: options.font.striding,
+        shadow: options.font.shadow,
         family: options.font.family,
         size: Lib.bigFont(options.font.size),
         color: dfltFontColor
@@ -105,6 +108,9 @@ function handleAxisDefaults(containerIn, containerOut, options, ternaryLayoutOut
             weight: options.font.weight,
             style: options.font.style,
             variant: options.font.variant,
+            capitalize: options.font.capitalize,
+            striding: options.font.striding,
+            shadow: options.font.shadow,
             family: options.font.family,
             size: options.font.size,
             color: dfltFontColor
diff --git a/src/traces/bar/style.js b/src/traces/bar/style.js
@@ -126,7 +126,10 @@ function getInsideTextFont(trace, index, layoutFont, barColor) {
             size: defaultFont.size,
             weight: defaultFont.weight,
             style: defaultFont.style,
-            variant: defaultFont.variant
+            variant: defaultFont.variant,
+            capitalize: defaultFont.capitalize,
+            striding: defaultFont.striding,
+            shadow: defaultFont.shadow,
         };
     }
 
@@ -149,6 +152,9 @@ function getFontValue(attributeDefinition, attributeValue, index, defaultValue)
     var weightValue = helpers.getValue(attributeValue.weight, index);
     var styleValue = helpers.getValue(attributeValue.style, index);
     var variantValue = helpers.getValue(attributeValue.variant, index);
+    var capitalizeValue = helpers.getValue(attributeValue.capitalize, index);
+    var stridingValue = helpers.getValue(attributeValue.striding, index);
+    var shadowValue = helpers.getValue(attributeValue.shadow, index);
 
     return {
         family: helpers.coerceString(
@@ -162,7 +168,13 @@ function getFontValue(attributeDefinition, attributeValue, index, defaultValue)
         style: helpers.coerceString(
             attributeDefinition.style, styleValue, defaultValue.style),
         variant: helpers.coerceString(
-            attributeDefinition.variant, variantValue, defaultValue.variant)
+            attributeDefinition.variant, variantValue, defaultValue.variant),
+        capitalize: helpers.coerceString(
+            attributeDefinition.variant, capitalizeValue, defaultValue.capitalize),
+        striding: helpers.coerceString(
+            attributeDefinition.variant, stridingValue, defaultValue.striding),
+        shadow: helpers.coerceString(
+            attributeDefinition.variant, shadowValue, defaultValue.shadow),
     };
 }
 
diff --git a/src/traces/carpet/axis_defaults.js b/src/traces/carpet/axis_defaults.js
@@ -113,6 +113,9 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, options)
             weight: font.weight,
             style: font.style,
             variant: font.variant,
+            capitalize: font.capitalize,
+            striding: font.striding,
+            shadow: font.shadow,
             family: font.family,
             size: Lib.bigFont(font.size),
             color: dfltFontColor
diff --git a/src/traces/contour/label_defaults.js b/src/traces/contour/label_defaults.js
@@ -11,6 +11,9 @@ module.exports = function handleLabelDefaults(coerce, layout, lineColor, opts) {
             weight: globalFont.weight,
             style: globalFont.style,
             variant: globalFont.variant,
+            capitalize: globalFont.capitalize,
+            striding: globalFont.striding,
+            shadow: globalFont.shadow,
             family: globalFont.family,
             size: globalFont.size,
             color: lineColor
diff --git a/src/traces/contour/style.js b/src/traces/contour/style.js
@@ -44,6 +44,9 @@ module.exports = function style(gd) {
                 weight: labelFont.weight,
                 style: labelFont.style,
                 variant: labelFont.variant,
+                capitalize: labelFont.capitalize,
+                striding: labelFont.striding,
+                shadow: labelFont.shadow,
                 family: labelFont.family,
                 size: labelFont.size,
                 color: labelFont.color || (colorLines ? colorMap(d.level) : line.color)
diff --git a/src/traces/heatmap/plot.js b/src/traces/heatmap/plot.js
@@ -551,6 +551,9 @@ module.exports = function(gd, plotinfo, cdheatmaps, heatmapLayer) {
                             weight: font.weight,
                             style: font.style,
                             variant: font.variant,
+                            capitalize: font.capitalize,
+                            striding: font.striding,
+                            shadow: font.shadow,
                         })
                         .text(d.t)
                         .call(svgTextUtils.convertToTspans, gd);
diff --git a/src/traces/parcats/defaults.js b/src/traces/parcats/defaults.js
@@ -99,6 +99,9 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         weight: layout.font.weight,
         style: layout.font.style,
         variant: layout.font.variant,
+        capitalize: layout.font.capitalize,
+        striding: layout.font.striding,
+        shadow: layout.font.shadow,
         family: layout.font.family,
         size: Math.round(layout.font.size),
         color: layout.font.color
@@ -110,6 +113,9 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         weight: layout.font.weight,
         style: layout.font.style,
         variant: layout.font.variant,
+        capitalize: layout.font.capitalize,
+        striding: layout.font.striding,
+        shadow: layout.font.shadow,
         family: layout.font.family,
         size: Math.round(layout.font.size / 1.2),
         color: layout.font.color
diff --git a/src/traces/parcoords/defaults.js b/src/traces/parcoords/defaults.js
@@ -99,6 +99,9 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         weight: layout.font.weight,
         style: layout.font.style,
         variant: layout.font.variant,
+        capitalize: layout.font.capitalize,
+        striding: layout.font.striding,
+        shadow: layout.font.shadow,
         family: layout.font.family,
         size: Math.round(layout.font.size / 1.2),
         color: layout.font.color
diff --git a/src/traces/pie/plot.js b/src/traces/pie/plot.js
diff --git a/src/traces/sankey/plot.js b/src/traces/sankey/plot.js
diff --git a/src/traces/scatter/arrays_to_calcdata.js b/src/traces/scatter/arrays_to_calcdata.js
diff --git a/src/traces/scatter3d/attributes.js b/src/traces/scatter3d/attributes.js
diff --git a/src/traces/scatter3d/defaults.js b/src/traces/scatter3d/defaults.js
diff --git a/src/traces/scattergl/attributes.js b/src/traces/scattergl/attributes.js
diff --git a/src/traces/scattergl/defaults.js b/src/traces/scattergl/defaults.js
diff --git a/src/traces/scattermapbox/defaults.js b/src/traces/scattermapbox/defaults.js
diff --git a/src/traces/scatterpolargl/defaults.js b/src/traces/scatterpolargl/defaults.js
diff --git a/src/traces/sunburst/helpers.js b/src/traces/sunburst/helpers.js
diff --git a/src/traces/table/plot.js b/src/traces/table/plot.js

Original file line number	Diff line number	Diff line change
`@@ -247,6 +247,9 @@ module.exports = function style(s, gd, legend) {`
`247`	`247`	`dEdit.tw = boundVal('textfont.weight', pickFirst);`
`248`	`248`	`dEdit.ty = boundVal('textfont.style', pickFirst);`
`249`	`249`	`dEdit.tv = boundVal('textfont.variant', pickFirst);`
	`250`	`+ dEdit.tC = boundVal('textfont.capitalize', pickFirst);`
	`251`	`+ dEdit.tE = boundVal('textfont.striding', pickFirst);`
	`252`	`+ dEdit.tS = boundVal('textfont.shadow', pickFirst);`
`250`	`253`	`}`
`251`	`254`
`252`	`255`	`dMod = [Lib.minExtend(d0, dEdit)];`