From 8ab62f57be0c65f16520ede167590a95ef76c8cf Mon Sep 17 00:00:00 2001 From: Jukka Kurkela Date: Mon, 14 Dec 2020 23:08:40 +0200 Subject: [PATCH] Use correct color for legend labels (#8167) * Legend colors fallback * Update test --- docs/docs/configuration/legend.md | 4 +++- src/plugins/plugin.legend.js | 5 +++++ test/specs/plugin.legend.tests.js | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/docs/configuration/legend.md b/docs/docs/configuration/legend.md index 6a4733e05..5ea804066 100644 --- a/docs/docs/configuration/legend.md +++ b/docs/docs/configuration/legend.md @@ -52,6 +52,7 @@ The legend label configuration is nested below the legend configuration using th | ---- | ---- | ------- | ----------- | `boxWidth` | `number` | `40` | Width of coloured box. | `boxHeight` | `number` | fontSize | Height of the coloured box. +| `color` |[`Color`](../general/colors.md) | `defaults.color` | Color of text. | `font` | `Font` | `defaults.font` | See [Fonts](../general/fonts.md) | `padding` | `number` | `10` | Padding between rows of colored boxes. | `generateLabels` | `function` | | Generates legend items for each thing in the legend. Default implementation returns the text + styling for the color box. See [Legend Item](#legend-item-interface) for details. @@ -66,9 +67,10 @@ The legend title configuration is nested below the legend configuration using th | Name | Type | Default | Description | ---- | ---- | ------- | ----------- +| `color` | [`Color`](../general/colors.md) | `defaults.color` | Color of text. | `display` | `boolean` | `false` | Is the legend title displayed. | `font` | `Font` | `defaults.font` | See [Fonts](../general/fonts.md) -| `padding` | number|object | `0` | Padding around the title. If specified as a number, it applies evenly to all sides. +| `padding` | `number`\|`object` | `0` | Padding around the title. If specified as a number, it applies evenly to all sides. | `text` | `string` | | The string title. ## Legend Item Interface diff --git a/src/plugins/plugin.legend.js b/src/plugins/plugin.legend.js index 7c7fb8260..a1614187c 100644 --- a/src/plugins/plugin.legend.js +++ b/src/plugins/plugin.legend.js @@ -611,5 +611,10 @@ export default { position: 'center', text: '', } + }, + + defaultRoutes: { + 'labels.color': 'color', + 'title.color': 'color' } }; diff --git a/test/specs/plugin.legend.tests.js b/test/specs/plugin.legend.tests.js index 2a333fed4..79d149c21 100644 --- a/test/specs/plugin.legend.tests.js +++ b/test/specs/plugin.legend.tests.js @@ -17,12 +17,14 @@ describe('Legend block tests', function() { onLeave: null, labels: { + color: Chart.defaults.color, boxWidth: 40, padding: 10, generateLabels: jasmine.any(Function) }, title: { + color: Chart.defaults.color, display: false, position: 'center', text: '',