From 7d89185f84ec6a8cda066a77cedaa38d3c4b1b6e Mon Sep 17 00:00:00 2001 From: Jacco van den Berg Date: Sat, 12 Oct 2024 20:14:42 +0200 Subject: [PATCH] Add check to colors plugin if defaults are set --- src/plugins/plugin.colors.ts | 14 +++++++++++-- test/specs/plugin.colors.tests.js | 34 +++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/src/plugins/plugin.colors.ts b/src/plugins/plugin.colors.ts index 03af80eeabd..a32998a95dc 100644 --- a/src/plugins/plugin.colors.ts +++ b/src/plugins/plugin.colors.ts @@ -1,4 +1,4 @@ -import {DoughnutController, PolarAreaController} from '../index.js'; +import {DoughnutController, PolarAreaController, defaults} from '../index.js'; import type {Chart, ChartDataset} from '../types.js'; export interface ColorsPluginOptions { @@ -87,6 +87,10 @@ function containsColorsDefinition( return descriptor && (descriptor.borderColor || descriptor.backgroundColor); } +function containsDefaultColorsDefenitions() { + return defaults.borderColor !== 'rgba(0,0,0,0.1)' || defaults.backgroundColor !== 'rgba(0,0,0,0.1)'; +} + export default { id: 'colors', @@ -106,7 +110,13 @@ export default { } = chart.config; const {elements} = chartOptions; - if (!options.forceOverride && (containsColorsDefinitions(datasets) || containsColorsDefinition(chartOptions) || (elements && containsColorsDefinitions(elements)))) { + const containsColorDefenition = ( + containsColorsDefinitions(datasets) || + containsColorsDefinition(chartOptions) || + (elements && containsColorsDefinitions(elements)) || + containsDefaultColorsDefenitions()); + + if (!options.forceOverride && containsColorDefenition) { return; } diff --git a/test/specs/plugin.colors.tests.js b/test/specs/plugin.colors.tests.js index df5ff8fb993..9e66f6f5ea8 100644 --- a/test/specs/plugin.colors.tests.js +++ b/test/specs/plugin.colors.tests.js @@ -1,3 +1,37 @@ describe('Plugin.colors', () => { describe('auto', jasmine.fixture.specs('plugin.colors')); + + describe('Plugin.colors.chartDefaults', () => { + beforeAll(() => { + Chart.defaults.backgroundColor = ['green', 'yellow']; + }); + + afterAll(() => { + Chart.defaults.backgroundColor = 'rgba(0,0,0,0.1)'; + }); + + it('should not use colors plugin when chart defaults are given', () => { + const chart = window.acquireChart({ + type: 'bar', + data: { + datasets: [{ + data: [1, 10], + label: 'dataset1' + }], + labels: ['label1', 'label2'] + }, + options: { + plugins: { + colors: { + enabled: true + } + } + } + }); + + const meta = chart.getDatasetMeta(0); + expect(meta.data[0].options.backgroundColor).toBe('green'); + expect(meta.data[1].options.backgroundColor).toBe('yellow'); + }); + }); });