dataset tooltip now shows correctly (#8024)

* dataset tooltip now shows correctly

* removed optional chaining

diff --git a/src/plugins/plugin.tooltip.js b/src/plugins/plugin.tooltip.js
index c4fbb38c8cc270cb2a756e37e495567ad9981bfb..7a33d39676d027aca729598ddda1e2bb52b90edb 100644 (file)
--- a/src/plugins/plugin.tooltip.js
+++ b/src/plugins/plugin.tooltip.js
@@ -1146,7 +1146,10 @@ export default {
                                        const item = tooltipItems[0];
                                        const labels = item.chart.data.labels;
                                        const labelCount = labels ? labels.length : 0;
-                                       if (item.label) {
+
+                                       if (this && this.options && this.options.mode === 'dataset') {
+                                               return item.dataset.label || '';
+                                       } else if (item.label) {
                                                return item.label;
                                        } else if (labelCount > 0 && item.dataIndex < labelCount) {
                                                return labels[item.dataIndex];
@@ -1163,6 +1166,10 @@ export default {
                        // Args are: (tooltipItem, data)
                        beforeLabel: noop,
                        label(tooltipItem) {
+                               if (this && this.options && this.options.mode === 'dataset') {
+                                       return tooltipItem.label + ': ' + tooltipItem.formattedValue || tooltipItem.formattedValue;
+                               }
+
                                let label = tooltipItem.dataset.label || '';
 
                                if (label) {