fix: setting null for a font style on a theme (google#5831)

alschmiedt · Jan 4, 2022 · 835fb02 · 835fb02
1 parent b5abb3e
commit 835fb02
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js
@@ -622,18 +622,17 @@ ConstantProvider.prototype.setDynamicProperties_ = function(theme) {
  * @protected
  */
 ConstantProvider.prototype.setFontConstants_ = function(theme) {
- this.FIELD_TEXT_FONTFAMILY =
- theme.fontStyle && theme.fontStyle['family'] !== undefined ?
- theme.fontStyle['family'] :
- this.FIELD_TEXT_FONTFAMILY;
- this.FIELD_TEXT_FONTWEIGHT =
- theme.fontStyle && theme.fontStyle['weight'] !== undefined ?
- theme.fontStyle['weight'] :
- this.FIELD_TEXT_FONTWEIGHT;
- this.FIELD_TEXT_FONTSIZE =
- theme.fontStyle && theme.fontStyle['size'] !== undefined ?
- theme.fontStyle['size'] :
- this.FIELD_TEXT_FONTSIZE;
+ if (theme.fontStyle && theme.fontStyle['family']) {
+ this.FIELD_TEXT_FONTFAMILY = theme.fontStyle['family'];
+ }
+
+ if (theme.fontStyle && theme.fontStyle['weight']) {
+ this.FIELD_TEXT_FONTWEIGHT = theme.fontStyle['weight'];
+ }
+
+ if (theme.fontStyle && theme.fontStyle['size']) {
+ this.FIELD_TEXT_FONTSIZE = theme.fontStyle['size'];
+ }
 
  const fontMetrics = dom.measureFontMetrics(
  'Hg', this.FIELD_TEXT_FONTSIZE + 'pt', this.FIELD_TEXT_FONTWEIGHT,