remove stretch from src

archmoj · archmoj · commit 50b8ccd98e40 · 2024-04-17T15:49:06.000-04:00
diff --git a/src/components/annotations/common_defaults.js b/src/components/annotations/common_defaults.js
@@ -62,7 +62,6 @@ module.exports = function handleAnnotationCommonDefaults(annIn, annOut, fullLayo
             family: globalHoverLabel.font.family,
             weight: globalHoverLabel.font.weight,
             style: globalHoverLabel.font.style,
-            stretch: globalHoverLabel.font.stretch,
             variant: globalHoverLabel.font.variant,
             size: globalHoverLabel.font.size,
             color: globalHoverLabel.font.color || hoverBorder
diff --git a/src/components/annotations/draw.js b/src/components/annotations/draw.js
@@ -198,7 +198,6 @@ function drawRaw(gd, options, index, subplotId, xa, ya) {
                 fontColor: hoverFont.color,
                 fontWeight: hoverFont.weight,
                 fontStyle: hoverFont.style,
-                fontStretch: hoverFont.stretch,
                 fontVariant: hoverFont.variant
             }, {
                 container: fullLayout._hoverlayer.node(),
diff --git a/src/components/colorbar/defaults.js b/src/components/colorbar/defaults.js
@@ -127,7 +127,6 @@ module.exports = function colorbarDefaults(containerIn, containerOut, layout) {
     var dfltTitleFont = Lib.extendFlat({}, tickFont, {
         weight: font.weight,
         style: font.style,
-        stretch: font.stretch,
         variant: font.variant,
         color: font.color,
         size: Lib.bigFont(tickFont.size)
diff --git a/src/components/drawing/index.js b/src/components/drawing/index.js
@@ -27,11 +27,10 @@ var drawing = module.exports = {};
 // styling functions for plot elements
 // -----------------------------------------------------
 
-drawing.font = function(s, family, size, color, weight, style, stretch, variant) {
-    // also allow the form font(s, {family, size, color, weight, style, stretch, variant})
+drawing.font = function(s, family, size, color, weight, style, variant) {
+    // also allow the form font(s, {family, size, color, weight, style, variant})
     if(Lib.isPlainObject(family)) {
         variant = family.variant;
-        stretch = family.stretch;
         style = family.style;
         weight = family.weight;
         color = family.color;
@@ -44,7 +43,6 @@ drawing.font = function(s, family, size, color, weight, style, stretch, variant)
 
     if(weight) s.style('font-weight', weight);
     if(style) s.style('font-style', style);
-    if(stretch) s.style('font-stretch', stretch);
     if(variant) s.style('font-variant', variant);
 };
 
@@ -1139,7 +1137,6 @@ drawing.textPointStyle = function(s, trace, gd) {
             family: d.tf || trace.textfont.family,
             weight: d.tw || trace.textfont.weight,
             style: d.ty || trace.textfont.style,
-            stretch: d.th || trace.textfont.stretch,
             variant: d.tv || trace.textfont.variant,
             size: fontSize,
             color: fontColor
diff --git a/src/components/fx/calc.js b/src/components/fx/calc.js
@@ -37,7 +37,6 @@ module.exports = function calc(gd) {
         fillFn(trace.hoverlabel.font.family, cd, 'htf');
         fillFn(trace.hoverlabel.font.weight, cd, 'htw');
         fillFn(trace.hoverlabel.font.style, cd, 'hty');
-        fillFn(trace.hoverlabel.font.stretch, cd, 'hth');
         fillFn(trace.hoverlabel.font.variant, cd, 'htv');
         fillFn(trace.hoverlabel.namelength, cd, 'hnl');
         fillFn(trace.hoverlabel.align, cd, 'hta');
diff --git a/src/components/fx/hover.js b/src/components/fx/hover.js
@@ -191,7 +191,6 @@ exports.loneHover = function loneHover(hoverItems, opts) {
             fontColor: hoverItem.fontColor,
             fontWeight: hoverItem.fontWeight,
             fontStyle: hoverItem.fontStyle,
-            fontStretch: hoverItem.fontStretch,
             fontVariant: hoverItem.fontVariant,
             nameLength: hoverItem.nameLength,
             textAlign: hoverItem.textAlign,
@@ -931,7 +930,6 @@ function createHoverText(hoverData, opts) {
     var fontSize = opts.fontSize || constants.HOVERFONTSIZE;
     var fontWeight = opts.fontWeight || 'normal';
     var fontStyle = opts.fontStyle || 'normal';
-    var fontStretch = opts.fontStretch || 'normal';
     var fontVariant = opts.fontVariant || 'normal';
 
     var c0 = hoverData[0];
@@ -1016,7 +1014,6 @@ function createHoverText(hoverData, opts) {
         var commonLabelFont = {
             weight: commonLabelOpts.font.weight || fontWeight,
             style: commonLabelOpts.font.style || fontStyle,
-            stretch: commonLabelOpts.font.stretch || fontStretch,
             variant: commonLabelOpts.font.variant || fontVariant,
             family: commonLabelOpts.font.family || fontFamily,
             size: commonLabelOpts.font.size || fontSize,
@@ -1342,7 +1339,6 @@ function createHoverText(hoverData, opts) {
                 .call(Drawing.font, {
                     weight: fontWeight,
                     style: fontStyle,
-                    stretch: fontStretch,
                     variant: fontVariant,
                     family: fontFamily,
                     size: fontSize
@@ -1387,7 +1383,6 @@ function createHoverText(hoverData, opts) {
                 color: d.fontColor || contrastColor,
                 weight: d.fontWeight || fontWeight,
                 style: d.fontStyle || fontStyle,
-                stretch: d.fontStretch || fontStretch,
                 variant: d.fontVariant || fontVariant
             })
             .text(text)
@@ -1950,7 +1945,6 @@ function cleanPoint(d, hovermode) {
     fill('fontColor', 'htc', 'hoverlabel.font.color');
     fill('fontWeight', 'htw', 'hoverlabel.font.weight');
     fill('fontStyle', 'hty', 'hoverlabel.font.style');
-    fill('fontStretch', 'hth', 'hoverlabel.font.stretch');
     fill('fontVariant', 'htv', 'hoverlabel.font.variant');
     fill('nameLength', 'hnl', 'hoverlabel.namelength');
     fill('textAlign', 'hta', 'hoverlabel.align');
diff --git a/src/components/fx/hoverlabel_defaults.js b/src/components/fx/hoverlabel_defaults.js
@@ -23,7 +23,6 @@ module.exports = function handleHoverLabelDefaults(contIn, contOut, coerce, opts
         inheritFontAttr('color');
         inheritFontAttr('weight');
         inheritFontAttr('style');
-        inheritFontAttr('stretch');
         inheritFontAttr('variant');
 
         if(hasLegend) {
diff --git a/src/components/legend/style.js b/src/components/legend/style.js
@@ -246,7 +246,6 @@ module.exports = function style(s, gd, legend) {
                 dEdit.tf = boundVal('textfont.family', pickFirst);
                 dEdit.tw = boundVal('textfont.weight', pickFirst);
                 dEdit.ty = boundVal('textfont.style', pickFirst);
-                dEdit.th = boundVal('textfont.stretch', pickFirst);
                 dEdit.tv = boundVal('textfont.variant', pickFirst);
             }
 
diff --git a/src/components/titles/index.js b/src/components/titles/index.js
@@ -70,7 +70,6 @@ function draw(gd, titleClass, options) {
     var fontColor = font.color;
     var fontWeight = font.weight;
     var fontStyle = font.style;
-    var fontStretch = font.stretch;
     var fontVariant = font.variant;
 
     // only make this title editable if we positively identify its property
@@ -152,7 +151,6 @@ function draw(gd, titleClass, options) {
             opacity: opacity * Color.opacity(fontColor),
             'font-weight': fontWeight,
             'font-style': fontStyle,
-            'font-stretch': fontStretch,
             'font-variant': fontVariant
         })
         .attr(attributes)
diff --git a/src/lib/coerce.js b/src/lib/coerce.js
@@ -473,7 +473,6 @@ exports.coerceFont = function(coerce, attr, dfltObj, opts) {
 
     if(!opts.noWeight) out.weight = coerce(attr + '.weight', dfltObj.weight);
     if(!opts.noStyle) out.style = coerce(attr + '.style', dfltObj.style);
-    if(!opts.noStretch) out.stretch = coerce(attr + '.stretch', dfltObj.stretch);
     if(!opts.noVariant) out.variant = coerce(attr + '.variant', dfltObj.variant);
 
     return out;
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
@@ -1739,7 +1739,6 @@ function tickTextObj(ax, x, text) {
         font: tf.family,
         fontWeight: tf.weight,
         fontStyle: tf.style,
-        fontStretch: tf.stretch,
         fontVariant: tf.variant,
         fontColor: tf.color
     };
@@ -3508,7 +3507,6 @@ axes.drawLabels = function(gd, ax, opts) {
                         color: d.fontColor,
                         weight: d.fontWeight,
                         style: d.fontStyle,
-                        stretch: d.fontStretch,
                         variant: d.fontVariant
                     })
                     .text(d.text)
diff --git a/src/plots/cartesian/axis_defaults.js b/src/plots/cartesian/axis_defaults.js
@@ -115,7 +115,6 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
         family: font.family,
         weight: font.weight,
         style: font.style,
-        stretch: font.stretch,
         variant: font.variant,
         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
@@ -30,7 +30,6 @@ module.exports = function handleTickLabelDefaults(containerIn, containerOut, coe
             family: font.family,
             weight: font.weight,
             style: font.style,
-            stretch: font.stretch,
             variant: font.variant,
             size: font.size,
             color: dfltFontColor
diff --git a/src/plots/font_attributes.js b/src/plots/font_attributes.js
@@ -74,30 +74,6 @@ module.exports = function(opts) {
             ].join(' ')
         },
 
-        stretch: {
-            editType: editType,
-            valType: 'enumerated',
-            values: [
-                'normal',
-                'ultra-condensed',
-                'extra-condensed',
-                'condensed',
-                'semi-condensed',
-                'semi-expanded',
-                'expanded',
-                'extra-expanded',
-                'ultra-expanded',
-                // TODO: Do we want to add numeric options e.g. '50%' and '200%'?
-                // If so please note that those values are not supported in gl3d
-                // since vectorize-text uses CanvasRenderingContext2D fontStretch
-                // https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/fontStretch)
-            ],
-            dflt: 'normal',
-            description: [
-                'See https://developer.mozilla.org/en-US/docs/Web/CSS/font-stretch',
-            ].join(' ')
-        },
-
         variant: {
             editType: editType,
             valType: 'string',
diff --git a/src/plots/gl3d/layout/convert.js b/src/plots/gl3d/layout/convert.js
@@ -17,7 +17,6 @@ function AxesOptions() {
     this.tickSize = [ 12, 12, 12 ];
     this.tickFontWeight = [ 'normal', 'normal', 'normal', 'normal' ];
     this.tickFontStyle = [ 'normal', 'normal', 'normal', 'normal' ];
-    this.tickFontStretch = [ 'normal', 'normal', 'normal', 'normal' ];
     this.tickFontVariant = [ 'normal', 'normal', 'normal', 'normal' ];
     this.tickAngle = [ 0, 0, 0 ];
     this.tickColor = [ [0, 0, 0, 1], [0, 0, 0, 1], [0, 0, 0, 1] ];
@@ -29,7 +28,6 @@ function AxesOptions() {
     this.labelSize = [ 20, 20, 20 ];
     this.labelFontWeight = [ 'normal', 'normal', 'normal', 'normal' ];
     this.labelFontStyle = [ 'normal', 'normal', 'normal', 'normal' ];
-    this.labelFontStretch = [ 'normal', 'normal', 'normal', 'normal' ];
     this.labelFontVariant = [ 'normal', 'normal', 'normal', 'normal' ];
     this.labelColor = [ [0, 0, 0, 1], [0, 0, 0, 1], [0, 0, 0, 1] ];
     this.labelPad = [ 30, 30, 30 ];
@@ -93,7 +91,6 @@ proto.merge = function(fullLayout, sceneLayout) {
             if(axes.title.font.size) opts.labelSize[i] = axes.title.font.size;
             if(axes.title.font.weight) opts.labelFontWeight[i] = axes.title.font.weight;
             if(axes.title.font.style) opts.labelFontStyle[i] = axes.title.font.style;
-            if(axes.title.font.stretch) opts.labelFontStretch[i] = axes.title.font.stretch;
             if(axes.title.font.variant) opts.labelFontVariant[i] = axes.title.font.variant;
         }
 
@@ -136,7 +133,6 @@ proto.merge = function(fullLayout, sceneLayout) {
             if(axes.tickfont.size) opts.tickSize[i] = axes.tickfont.size;
             if(axes.tickfont.weight) opts.tickFontWeight[i] = axes.tickfont.weight;
             if(axes.tickfont.style) opts.tickFontStyle[i] = axes.tickfont.style;
-            if(axes.tickfont.stretch) opts.tickFontStretch[i] = axes.tickfont.stretch;
             if(axes.tickfont.variant) opts.tickFontVariant[i] = axes.tickfont.variant;
         }
 
diff --git a/src/plots/mapbox/layout_attributes.js b/src/plots/mapbox/layout_attributes.js
@@ -19,7 +19,6 @@ var fontAttr = fontAttrs({
 fontAttr.family.dflt = 'Open Sans Regular, Arial Unicode MS Regular';
 delete fontAttr.weight;
 delete fontAttr.style;
-delete fontAttr.stretch;
 delete fontAttr.variant;
 
 var attrs = module.exports = overrideAll({
diff --git a/src/plots/mapbox/layout_defaults.js b/src/plots/mapbox/layout_defaults.js
@@ -106,7 +106,6 @@ function handleLayerDefaults(layerIn, layerOut) {
             Lib.coerceFont(coerce, 'symbol.textfont', undefined, {
                 noWeight: true,
                 noStyle: true,
-                noStretch: true,
                 noVariant: true
             });
             coerce('symbol.textposition');
diff --git a/src/plots/polar/layout_defaults.js b/src/plots/polar/layout_defaults.js
@@ -156,7 +156,6 @@ function handleDefaults(contIn, contOut, coerce, opts) {
             var dfltFontFamily;
             var dfltFontWeight;
             var dfltFontStyle;
-            var dfltFontStretch;
             var dfltFontVariant;
             var font = opts.font || {};
 
@@ -166,15 +165,13 @@ function handleDefaults(contIn, contOut, coerce, opts) {
             dfltFontFamily = font.family;
             dfltFontWeight = font.weight;
             dfltFontStyle = font.style;
-            dfltFontStretch = font.stretch;
             dfltFontVariant = font.variant;
 
             handleTickValueDefaults(axIn, axOut, coerceAxis, axOut.type);
             handleTickLabelDefaults(axIn, axOut, coerceAxis, axOut.type, {
                 font: {
                     weight: dfltFontWeight,
                     style: dfltFontStyle,
-                    stretch: dfltFontStretch,
                     variant: dfltFontVariant,
                     color: dfltFontColor,
                     size: dfltFontSize,
@@ -207,7 +204,6 @@ function handleDefaults(contIn, contOut, coerce, opts) {
                 Lib.coerceFont(coerceAxis, 'title.font', {
                     weight: dfltFontWeight,
                     style: dfltFontStyle,
-                    stretch: dfltFontStretch,
                     variant: dfltFontVariant,
                     color: dfltFontColor,
                     size: Lib.bigFont(dfltFontSize),
diff --git a/src/plots/ternary/layout_defaults.js b/src/plots/ternary/layout_defaults.js
@@ -84,7 +84,6 @@ function handleAxisDefaults(containerIn, containerOut, options, ternaryLayoutOut
     Lib.coerceFont(coerce, 'title.font', {
         weight: options.font.weight,
         style: options.font.style,
-        stretch: options.font.stretch,
         variant: options.font.variant,
         family: options.font.family,
         size: Lib.bigFont(options.font.size),
@@ -105,7 +104,6 @@ function handleAxisDefaults(containerIn, containerOut, options, ternaryLayoutOut
         Lib.coerceFont(coerce, 'tickfont', {
             weight: options.font.weight,
             style: options.font.style,
-            stretch: options.font.stretch,
             variant: options.font.variant,
             family: options.font.family,
             size: options.font.size,
diff --git a/src/traces/bar/style.js b/src/traces/bar/style.js
@@ -126,7 +126,6 @@ function getInsideTextFont(trace, index, layoutFont, barColor) {
             size: defaultFont.size,
             weight: defaultFont.weight,
             style: defaultFont.style,
-            stretch: defaultFont.stretch,
             variant: defaultFont.variant
         };
     }
@@ -149,7 +148,6 @@ function getFontValue(attributeDefinition, attributeValue, index, defaultValue)
     var colorValue = helpers.getValue(attributeValue.color, index);
     var weightValue = helpers.getValue(attributeValue.weight, index);
     var styleValue = helpers.getValue(attributeValue.style, index);
-    var stretchValue = helpers.getValue(attributeValue.stretch, index);
     var variantValue = helpers.getValue(attributeValue.variant, index);
 
     return {
@@ -163,8 +161,6 @@ function getFontValue(attributeDefinition, attributeValue, index, defaultValue)
             attributeDefinition.weight, weightValue, defaultValue.weight),
         style: helpers.coerceString(
             attributeDefinition.style, styleValue, defaultValue.style),
-        stretch: helpers.coerceString(
-            attributeDefinition.stretch, stretchValue, defaultValue.stretch),
         variant: helpers.coerceString(
             attributeDefinition.variant, variantValue, defaultValue.variant)
     };
diff --git a/src/traces/carpet/axis_defaults.js b/src/traces/carpet/axis_defaults.js
@@ -112,7 +112,6 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, options)
         Lib.coerceFont(coerce, 'title.font', {
             weight: font.weight,
             style: font.style,
-            stretch: font.stretch,
             variant: font.variant,
             family: font.family,
             size: Lib.bigFont(font.size),
diff --git a/src/traces/contour/label_defaults.js b/src/traces/contour/label_defaults.js
@@ -10,7 +10,6 @@ module.exports = function handleLabelDefaults(coerce, layout, lineColor, opts) {
         Lib.coerceFont(coerce, 'contours.labelfont', {
             weight: globalFont.weight,
             style: globalFont.style,
-            stretch: globalFont.stretch,
             variant: globalFont.variant,
             family: globalFont.family,
             size: globalFont.size,
diff --git a/src/traces/contour/style.js b/src/traces/contour/style.js
@@ -43,7 +43,6 @@ module.exports = function style(gd) {
             Drawing.font(d3.select(this), {
                 weight: labelFont.weight,
                 style: labelFont.style,
-                stretch: labelFont.stretch,
                 variant: labelFont.variant,
                 family: labelFont.family,
                 size: labelFont.size,
diff --git a/src/traces/heatmap/plot.js b/src/traces/heatmap/plot.js
@@ -550,7 +550,6 @@ module.exports = function(gd, plotinfo, cdheatmaps, heatmapLayer) {
                             color: fontColor,
                             weight: font.weight,
                             style: font.style,
-                            stretch: font.stretch,
                             variant: font.variant,
                         })
                         .text(d.t)
diff --git a/src/traces/parcats/defaults.js b/src/traces/parcats/defaults.js
@@ -98,7 +98,6 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     var labelfontDflt = {
         weight: layout.font.weight,
         style: layout.font.style,
-        stretch: layout.font.stretch,
         variant: layout.font.variant,
         family: layout.font.family,
         size: Math.round(layout.font.size),
@@ -110,7 +109,6 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     var categoryfontDefault = {
         weight: layout.font.weight,
         style: layout.font.style,
-        stretch: layout.font.stretch,
         variant: layout.font.variant,
         family: layout.font.family,
         size: Math.round(layout.font.size / 1.2),
diff --git a/src/traces/parcoords/defaults.js b/src/traces/parcoords/defaults.js
@@ -98,7 +98,6 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     var fontDflt = {
         weight: layout.font.weight,
         style: layout.font.style,
-        stretch: layout.font.stretch,
         variant: layout.font.variant,
         family: layout.font.family,
         size: Math.round(layout.font.size / 1.2),
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/scatter/text_defaults.js b/src/traces/scatter/text_defaults.js
diff --git a/src/traces/scatter3d/attributes.js b/src/traces/scatter3d/attributes.js
diff --git a/src/traces/scatter3d/convert.js b/src/traces/scatter3d/convert.js
diff --git a/src/traces/scattergl/convert.js b/src/traces/scattergl/convert.js
diff --git a/src/traces/scattergl/hover.js b/src/traces/scattergl/hover.js
diff --git a/src/traces/scattermapbox/defaults.js b/src/traces/scattermapbox/defaults.js
diff --git a/src/traces/sunburst/fx.js b/src/traces/sunburst/fx.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
`@@ -246,7 +246,6 @@ module.exports = function style(s, gd, legend) {`
`246`	`246`	`dEdit.tf = boundVal('textfont.family', pickFirst);`
`247`	`247`	`dEdit.tw = boundVal('textfont.weight', pickFirst);`
`248`	`248`	`dEdit.ty = boundVal('textfont.style', pickFirst);`
`249`		`- dEdit.th = boundVal('textfont.stretch', pickFirst);`
`250`	`249`	`dEdit.tv = boundVal('textfont.variant', pickFirst);`
`251`	`250`	`}`
`252`	`251`