centralize heatmap label defaults

Author: archmoj

src/traces/contour/defaults.js

@@ -7,6 +7,7 @@ var handlePeriodDefaults = require('../scatter/period_defaults');
 var handleConstraintDefaults = require('./constraint_defaults');
 var handleContoursDefaults = require('./contours_defaults');
 var handleStyleDefaults = require('./style_defaults');
+var handleHeatmapLabelDefaults = require('../heatmap/label_defaults');
 var attributes = require('./attributes');
 
 
@@ -48,10 +49,6 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         traceOut.contours &&
         traceOut.contours.coloring === 'heatmap'
     ) {
-        coerce('texttemplate');
-
-        var fontDflt = Lib.extendFlat({}, layout.font);
-        fontDflt.color = undefined; // color contrast by default
-        Lib.coerceFont(coerce, 'textfont', fontDflt);
+        handleHeatmapLabelDefaults(coerce, layout);
     }
 };

src/traces/heatmap/defaults.js

@@ -3,6 +3,7 @@
 var Lib = require('../../lib');
 
 var handleXYZDefaults = require('./xyz_defaults');
+var handleHeatmapLabelDefaults = require('./label_defaults');
 var handlePeriodDefaults = require('../scatter/period_defaults');
 var handleStyleDefaults = require('./style_defaults');
 var colorscaleDefaults = require('../../components/colorscale/defaults');
@@ -27,12 +28,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     coerce('text');
     coerce('hovertext');
     coerce('hovertemplate');
-    coerce('texttemplate');
-
-    var fontDflt = Lib.extendFlat({}, layout.font);
-    fontDflt.color = undefined; // color contrast by default
-    Lib.coerceFont(coerce, 'textfont', fontDflt);
 
+    handleHeatmapLabelDefaults(coerce, layout);
     handleStyleDefaults(traceIn, traceOut, coerce, layout);
 
     coerce('hoverongaps');

src/traces/heatmap/label_defaults.js

@@ -0,0 +1,11 @@
+'use strict';
+
+var Lib = require('../../lib');
+
+module.exports = function handleHeatmapLabelDefaults(coerce, layout) {
+    coerce('texttemplate');
+
+    var fontDflt = Lib.extendFlat({}, layout.font);
+    fontDflt.color = undefined; // color contrast by default
+    Lib.coerceFont(coerce, 'textfont', fontDflt);
+};

src/traces/histogram2d/defaults.js

@@ -5,6 +5,7 @@ var Lib = require('../../lib');
 var handleSampleDefaults = require('./sample_defaults');
 var handleStyleDefaults = require('../heatmap/style_defaults');
 var colorscaleDefaults = require('../../components/colorscale/defaults');
+var handleHeatmapLabelDefaults = require('../heatmap/label_defaults');
 var attributes = require('./attributes');
 
 
@@ -19,11 +20,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     handleStyleDefaults(traceIn, traceOut, coerce, layout);
     colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'});
     coerce('hovertemplate');
-    coerce('texttemplate');
 
-    var fontDflt = Lib.extendFlat({}, layout.font);
-    fontDflt.color = undefined; // color contrast by default
-    Lib.coerceFont(coerce, 'textfont', fontDflt);
+    handleHeatmapLabelDefaults(coerce, layout);
 
     coerce('xhoverformat');
     coerce('yhoverformat');

src/traces/histogram2dcontour/defaults.js

@@ -5,6 +5,7 @@ var Lib = require('../../lib');
 var handleSampleDefaults = require('../histogram2d/sample_defaults');
 var handleContoursDefaults = require('../contour/contours_defaults');
 var handleStyleDefaults = require('../contour/style_defaults');
+var handleHeatmapLabelDefaults = require('../heatmap/label_defaults');
 var attributes = require('./attributes');
 
 
@@ -29,10 +30,6 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         traceOut.contours &&
         traceOut.contours.coloring === 'heatmap'
     ) {
-        coerce('texttemplate');
-
-        var fontDflt = Lib.extendFlat({}, layout.font);
-        fontDflt.color = undefined; // color contrast by default
-        Lib.coerceFont(coerce, 'textfont', fontDflt);
+        handleHeatmapLabelDefaults(coerce, layout);
     }
 };