From 8397f85e92aa6482650a48bf1c94f2ecf6de6cc8 Mon Sep 17 00:00:00 2001 From: Jacco van den Berg <39033624+LeeLenaleee@users.noreply.github.com> Date: Wed, 22 Jun 2022 12:07:47 +0200 Subject: [PATCH 1/2] Add index to legendItem interface for doughnut, pie and polarArea charts. Make datasetIndex optional since the before named charts dont include it. --- types/index.esm.d.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/types/index.esm.d.ts b/types/index.esm.d.ts index d95c91fd12f..3edb09464ba 100644 --- a/types/index.esm.d.ts +++ b/types/index.esm.d.ts @@ -2165,7 +2165,12 @@ export interface LegendItem { /** * Index of the associated dataset */ - datasetIndex: number; + datasetIndex?: number; + + /** + * Index the associated label in the labels array + */ + index?: number /** * Fill style of the legend box From 6f00c7e837f264f888dcefc55827b31c11f63ce7 Mon Sep 17 00:00:00 2001 From: Jacco van den Berg <39033624+LeeLenaleee@users.noreply.github.com> Date: Wed, 22 Jun 2022 13:47:31 +0200 Subject: [PATCH 2/2] Remove test to check if datasetIndex has been set in generateLabels function for legend --- types/tests/plugins/defaults.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/types/tests/plugins/defaults.ts b/types/tests/plugins/defaults.ts index ceab8af9188..ec54b34ffa1 100644 --- a/types/tests/plugins/defaults.ts +++ b/types/tests/plugins/defaults.ts @@ -9,10 +9,3 @@ defaults.plugins.legend.labels.generateLabels = function(chart) { text: 'test' }]; }; - -// @ts-expect-error Type '{ text: string; }[]' is not assignable to type 'LegendItem[]'. -defaults.plugins.legend.labels.generateLabels = function(chart) { - return [{ - text: 'test' - }]; -};