From 3934935caa916f5ad1dfcf0829b84913389443cd Mon Sep 17 00:00:00 2001
From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Thu, 1 Jul 2021 14:15:06 -0400
Subject: [PATCH] Enable pointStyle for doughnut, pie, and polar area charts
 (#9341)

* Enable pointStyle for doughnut, pie, and polar area charts

* Fix whitespace
---
 src/controllers/controller.doughnut.js        |   3 ++
 src/controllers/controller.polarArea.js       |   3 ++
 .../legend-doughnut-point-style.json          |  29 ++++++++++++++++++
 .../legend-doughnut-point-style.png           | Bin 0 -> 9488 bytes
 test/specs/global.defaults.tests.js           |  18 +++++++----
 5 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 test/fixtures/plugin.legend/legend-doughnut-point-style.json
 create mode 100644 test/fixtures/plugin.legend/legend-doughnut-point-style.png

diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js
index 0d4d135f248..20929bbe1f6 100644
--- a/src/controllers/controller.doughnut.js
+++ b/src/controllers/controller.doughnut.js
@@ -364,6 +364,8 @@ DoughnutController.overrides = {
         generateLabels(chart) {
           const data = chart.data;
           if (data.labels.length && data.datasets.length) {
+            const {labels: {pointStyle}} = chart.legend.options;
+
             return data.labels.map((label, i) => {
               const meta = chart.getDatasetMeta(0);
               const style = meta.controller.getStyle(i);
@@ -373,6 +375,7 @@ DoughnutController.overrides = {
                 fillStyle: style.backgroundColor,
                 strokeStyle: style.borderColor,
                 lineWidth: style.borderWidth,
+                pointStyle: pointStyle,
                 hidden: !chart.getDataVisibility(i),
 
                 // Extra data used for toggling the correct item
diff --git a/src/controllers/controller.polarArea.js b/src/controllers/controller.polarArea.js
index 0c6fa0c99bd..8a9a1b91e2d 100644
--- a/src/controllers/controller.polarArea.js
+++ b/src/controllers/controller.polarArea.js
@@ -155,6 +155,8 @@ PolarAreaController.overrides = {
         generateLabels(chart) {
           const data = chart.data;
           if (data.labels.length && data.datasets.length) {
+            const {labels: {pointStyle}} = chart.legend.options;
+
             return data.labels.map((label, i) => {
               const meta = chart.getDatasetMeta(0);
               const style = meta.controller.getStyle(i);
@@ -164,6 +166,7 @@ PolarAreaController.overrides = {
                 fillStyle: style.backgroundColor,
                 strokeStyle: style.borderColor,
                 lineWidth: style.borderWidth,
+                pointStyle: pointStyle,
                 hidden: !chart.getDataVisibility(i),
 
                 // Extra data used for toggling the correct item
diff --git a/test/fixtures/plugin.legend/legend-doughnut-point-style.json b/test/fixtures/plugin.legend/legend-doughnut-point-style.json
new file mode 100644
index 00000000000..6e644a39efd
--- /dev/null
+++ b/test/fixtures/plugin.legend/legend-doughnut-point-style.json
@@ -0,0 +1,29 @@
+{
+	"config": {
+		"type": "doughnut",
+		"data": {
+			"labels": [""],
+			"datasets": [{
+				"data": [10],
+				"backgroundColor": "#00ff00",
+				"borderWidth": 0
+			}]
+		},
+		"options": {
+			"plugins": {
+				"legend": {
+					"labels": {
+						"pointStyle": "triangle",
+						"usePointStyle": true
+					}
+				}
+			}
+		}
+	},
+	"options": {
+		"canvas": {
+			"height": 256,
+			"width": 512
+		}
+	}
+}
diff --git a/test/fixtures/plugin.legend/legend-doughnut-point-style.png b/test/fixtures/plugin.legend/legend-doughnut-point-style.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0b216b0b250007a2457bbf8a119586e371e8c50
GIT binary patch
literal 9488
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
YBb(83xAN~f@TL>Q%-Gtf)({u>Kf2;y!2kdN

literal 0
HcmV?d00001

diff --git a/test/specs/global.defaults.tests.js b/test/specs/global.defaults.tests.js
index b7fa9c8a276..31b763b7eab 100644
--- a/test/specs/global.defaults.tests.js
+++ b/test/specs/global.defaults.tests.js
@@ -103,7 +103,8 @@ describe('Default Configs', function() {
         index: 0,
         strokeStyle: '#000',
         textAlign: undefined,
-        lineWidth: 2
+        lineWidth: 2,
+        pointStyle: undefined
       }, {
         text: 'label2',
         fillStyle: 'green',
@@ -111,7 +112,8 @@ describe('Default Configs', function() {
         index: 1,
         strokeStyle: '#000',
         textAlign: undefined,
-        lineWidth: 2
+        lineWidth: 2,
+        pointStyle: undefined
       }, {
         text: 'label3',
         fillStyle: 'blue',
@@ -119,7 +121,8 @@ describe('Default Configs', function() {
         index: 2,
         strokeStyle: '#000',
         textAlign: undefined,
-        lineWidth: 2
+        lineWidth: 2,
+        pointStyle: undefined
       }];
       expect(chart.legend.legendItems).toEqual(expected);
     });
@@ -197,7 +200,8 @@ describe('Default Configs', function() {
         index: 0,
         strokeStyle: '#000',
         textAlign: undefined,
-        lineWidth: 2
+        lineWidth: 2,
+        pointStyle: undefined
       }, {
         text: 'label2',
         fillStyle: 'green',
@@ -205,7 +209,8 @@ describe('Default Configs', function() {
         index: 1,
         strokeStyle: '#000',
         textAlign: undefined,
-        lineWidth: 2
+        lineWidth: 2,
+        pointStyle: undefined
       }, {
         text: 'label3',
         fillStyle: 'blue',
@@ -213,7 +218,8 @@ describe('Default Configs', function() {
         index: 2,
         strokeStyle: '#000',
         textAlign: undefined,
-        lineWidth: 2
+        lineWidth: 2,
+        pointStyle: undefined
       }];
       expect(chart.legend.legendItems).toEqual(expected);
     });