introduce overrideDflt option for coerceFont

Author: archmoj

src/components/legend/defaults.js

@@ -33,9 +33,9 @@ function groupDefaults(legendId, layoutIn, layoutOut, fullData) {
     };
 
     var globalFont = layoutOut.font || {};
-    var grouptitlefont = Lib.coerceFont(coerce, 'grouptitlefont', Lib.extendFlat({}, globalFont, {
+    var grouptitlefont = Lib.coerceFont(coerce, 'grouptitlefont', globalFont, { overrideDflt: {
         size: Math.round(globalFont.size * 1.1)
-    }));
+    }});
 
     var legendTraceCount = 0;
     var legendReallyHasATrace = false;

src/lib/coerce.js

@@ -3,6 +3,8 @@
 var isNumeric = require('fast-isnumeric');
 var tinycolor = require('tinycolor2');
 
+var extendFlat = require('./extend').extendFlat;
+
 var baseTraceAttrs = require('../plots/attributes');
 var colorscales = require('../components/colorscale/scales');
 var Color = require('../components/color');
@@ -457,17 +459,17 @@ exports.coerce2 = function(containerIn, containerOut, attributes, attribute, dfl
  */
 exports.coerceFont = function(coerce, attr, dfltObj, opts) {
     if(!opts) opts = {};
+    dfltObj = extendFlat({}, dfltObj);
+    dfltObj = extendFlat(dfltObj, opts.overrideDflt || {});
 
-    var out = {};
-
-    dfltObj = dfltObj || {};
-
-    out.family = coerce(attr + '.family', dfltObj.family);
-    out.size = coerce(attr + '.size', dfltObj.size);
-    out.color = coerce(attr + '.color', dfltObj.color);
+    var out = {
+        family: coerce(attr + '.family', dfltObj.family),
+        size: coerce(attr + '.size', dfltObj.size),
+        color: coerce(attr + '.color', dfltObj.color),
+        weight: coerce(attr + '.weight', dfltObj.weight),
+        style: coerce(attr + '.style', dfltObj.style),
+    };
 
-    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.noFontStriding) out.striding = coerce(attr + '.striding', dfltObj.striding);
     if(!opts.noFontCapitalize) out.capitalize = coerce(attr + '.capitalize', dfltObj.capitalize);

src/plots/cartesian/axis_defaults.js

@@ -111,17 +111,10 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
     if(!visible) return containerOut;
 
     coerce('title.text', dfltTitle);
-    Lib.coerceFont(coerce, 'title.font', {
-        family: font.family,
-        weight: font.weight,
-        style: font.style,
-        variant: font.variant,
-        capitalize: font.capitalize,
-        striding: font.striding,
-        shadow: font.shadow,
+    Lib.coerceFont(coerce, 'title.font', font, { overrideDflt: {
         size: Lib.bigFont(font.size),
         color: dfltFontColor
-    });
+    }});
 
     // major ticks
     handleTickValueDefaults(containerIn, containerOut, coerce, axType);

src/plots/cartesian/tick_label_defaults.js

@@ -26,17 +26,9 @@ module.exports = function handleTickLabelDefaults(containerIn, containerOut, coe
             (contColor && contColor !== layoutAttributes.color.dflt) ?
             contColor : font.color;
 
-        Lib.coerceFont(coerce, 'tickfont', {
-            family: font.family,
-            weight: font.weight,
-            style: font.style,
-            variant: font.variant,
-            capitalize: font.capitalize,
-            striding: font.striding,
-            shadow: font.shadow,
-            size: font.size,
+        Lib.coerceFont(coerce, 'tickfont', font, { overrideDflt: {
             color: dfltFontColor
-        });
+        }});
 
         if(
             !options.noTicklabelstep &&

src/plots/plots.js

@@ -1476,9 +1476,9 @@ plots.supplyLayoutGlobalDefaults = function(layoutIn, layoutOut, formatObj) {
     var font = Lib.coerceFont(coerce, 'font');
     var fontSize = font.size;
 
-    Lib.coerceFont(coerce, 'title.font', Lib.extendFlat({}, font, {
+    Lib.coerceFont(coerce, 'title.font', font, { overrideDflt: {
         size: Math.round(fontSize * 1.4)
-    }));
+    }});
 
     coerce('title.text', layoutOut._dfltTitle.plot);
     coerce('title.xref');

src/plots/ternary/layout_defaults.js

@@ -81,17 +81,10 @@ function handleAxisDefaults(containerIn, containerOut, options, ternaryLayoutOut
     var title = coerce('title.text', dfltTitle);
     containerOut._hovertitle = title === dfltTitle ? title : letterUpper;
 
-    Lib.coerceFont(coerce, 'title.font', {
-        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,
+    Lib.coerceFont(coerce, 'title.font', options.font, { overrideDflt: {
         size: Lib.bigFont(options.font.size),
         color: dfltFontColor
-    });
+    }});
 
     // range is just set by 'min' - max is determined by the other axes mins
     coerce('min');
@@ -104,17 +97,9 @@ function handleAxisDefaults(containerIn, containerOut, options, ternaryLayoutOut
 
     var showTickLabels = coerce('showticklabels');
     if(showTickLabels) {
-        Lib.coerceFont(coerce, 'tickfont', {
-            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,
+        Lib.coerceFont(coerce, 'tickfont', options.font, { overrideDflt: {
             color: dfltFontColor
-        });
+        }});
         coerce('tickangle');
         coerce('tickformat');
     }

src/traces/carpet/axis_defaults.js

@@ -109,17 +109,10 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, options)
 
     var title = coerce('title.text');
     if(title) {
-        Lib.coerceFont(coerce, 'title.font', {
-            weight: font.weight,
-            style: font.style,
-            variant: font.variant,
-            capitalize: font.capitalize,
-            striding: font.striding,
-            shadow: font.shadow,
-            family: font.family,
+        Lib.coerceFont(coerce, 'title.font', font, { overrideDflt: {
             size: Lib.bigFont(font.size),
             color: dfltFontColor
-        });
+        }});
         coerce('title.offset');
     }
 

src/traces/contour/label_defaults.js

@@ -7,17 +7,9 @@ module.exports = function handleLabelDefaults(coerce, layout, lineColor, opts) {
     var showLabels = coerce('contours.showlabels');
     if(showLabels) {
         var globalFont = layout.font;
-        Lib.coerceFont(coerce, 'contours.labelfont', {
-            weight: globalFont.weight,
-            style: globalFont.style,
-            variant: globalFont.variant,
-            capitalize: globalFont.capitalize,
-            striding: globalFont.striding,
-            shadow: globalFont.shadow,
-            family: globalFont.family,
-            size: globalFont.size,
+        Lib.coerceFont(coerce, 'contours.labelfont', globalFont, { overrideDflt: {
             color: lineColor
-        });
+        }});
         coerce('contours.labelformat');
     }
 

src/traces/parcats/defaults.js

@@ -95,31 +95,18 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     coerce('sortpaths');
     coerce('counts');
 
-    var labelfontDflt = {
-        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
-    };
-
-    Lib.coerceFont(coerce, 'labelfont', labelfontDflt);
-
-    var categoryfontDefault = {
-        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
-    };
-
-    Lib.coerceFont(coerce, 'tickfont', categoryfontDefault, { autoShadowDflt: true });
+    var layoutFont = layout.font;
+
+    Lib.coerceFont(coerce, 'labelfont', layoutFont, {
+        overrideDflt: {
+            size: Math.round(layoutFont.size)
+        }
+    });
+
+    Lib.coerceFont(coerce, 'tickfont', layoutFont, {
+        autoShadowDflt: true,
+        overrideDflt: {
+            size: Math.round(layoutFont.size / 1.2)
+        }
+    });
 };

src/traces/parcoords/defaults.js

@@ -95,17 +95,9 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 
     // make default font size 10px (default is 12),
     // scale linearly with global font size
-    var fontDflt = {
-        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
-    };
+    var fontDflt = Lib.extendFlat({}, layout.font, {
+        size: Math.round(layout.font.size / 1.2)
+    });
 
     Lib.coerceFont(coerce, 'labelfont', fontDflt);
     Lib.coerceFont(coerce, 'tickfont', fontDflt, { autoShadowDflt: true });