From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Tue, 11 Aug 2020 21:11:57 +0000 (-0400)
Subject: Doughnut controller overrides (#7702)
X-Git-Tag: v3.0.0-beta.2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fd7ef2901f202942bf023047a70d2643012b683;p=thirdparty%2FChart.js.git

Doughnut controller overrides (#7702)
---

diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js
index 562ae11af..bf6cdaef5 100644
--- a/src/controllers/controller.doughnut.js
+++ b/src/controllers/controller.doughnut.js
@@ -185,6 +185,18 @@ export default class DoughnutController extends DatasetController {
 		return 0;
 	}
 
+	getLabelAndValue(index) {
+		const me = this;
+		const meta = me._cachedMeta;
+		const chart = me.chart;
+		const labels = chart.data.labels || [];
+
+		return {
+			label: labels[index] || '',
+			value: meta._parsed[index],
+		};
+	}
+
 	getMaxBorderWidth(arcs) {
 		const me = this;
 		let max = 0;
@@ -334,8 +346,8 @@ DoughnutController.defaults = {
 				return '';
 			},
 			label(tooltipItem) {
-				let dataLabel = tooltipItem.chart.data.labels[tooltipItem.dataIndex];
-				const value = ': ' + tooltipItem.dataset.data[tooltipItem.dataIndex];
+				let dataLabel = tooltipItem.label;
+				const value = ': ' + tooltipItem.formattedValue;
 
 				if (isArray(dataLabel)) {
 					// show value on first line of multiline label