From a40ac53e9c7f90e6514810d3b72a33dee219039e Mon Sep 17 00:00:00 2001
From: Simon Brunel <simonbrunel@users.noreply.github.com>
Date: Sun, 3 Dec 2017 22:22:51 +0100
Subject: [PATCH] Prevent labels to be displayed for `null` data

---
 src/defaults.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/defaults.js b/src/defaults.js
index c4ad4d6..9fd7214 100644
--- a/src/defaults.js
+++ b/src/defaults.js
@@ -68,26 +68,21 @@ export default {
 	/**
 	 * The font options used to draw the label text.
 	 * @member {Object|Array|Function}
-	 * @prop {Boolean} font.family - defaults to Chart.defaults.global.defaultFontFamily
-	 * @prop {Boolean} font.size - defaults to Chart.defaults.global.defaultFontSize
-	 * @prop {Boolean} font.style - defaults to Chart.defaults.global.defaultFontStyle
-	 * @prop {Boolean} font.weight - defaults to 'normal'
+	 * @prop {String} font.family - defaults to Chart.defaults.global.defaultFontFamily
+	 * @prop {Number} font.lineHeight - defaults to 1.2
+	 * @prop {Number} font.size - defaults to Chart.defaults.global.defaultFontSize
+	 * @prop {String} font.style - defaults to Chart.defaults.global.defaultFontStyle
+	 * @prop {Number} font.weight - defaults to 'normal'
 	 * @default Chart.defaults.global.defaultFont.*
 	 */
 	font: {
 		family: undefined,
+		lineHeight: 1.2,
 		size: undefined,
 		style: undefined,
 		weight: null
 	},
 
-	/**
-	 * The line height (in pixel) to use for multi-lines labels.
-	 * @member {Number|Array|Function|undefined}
-	 * @default 1.2
-	 */
-	lineHeight: 1.2,
-
 	/**
 	 * The distance (in pixels) to pull the label away from the anchor point, the direction
 	 * being determined by the `align` value (only applicable if `align` is `start` or `end`).
@@ -138,9 +133,12 @@ export default {
 	 * @default data[index]
 	 */
 	formatter: function(value) {
+		if (helpers.isNullOrUndef(value)) {
+			return null;
+		}
+
 		var label = value;
 		var keys, klen, k;
-
 		if (helpers.isObject(value)) {
 			if (!helpers.isNullOrUndef(value.label)) {
 				label = value.label;