mirror of
https://github.com/chartjs/Chart.js.git
synced 2024-10-06 04:09:08 +02:00
Check colors definition in the chart options (#11003)
* Check colors definition in the chart options * Update src/plugins/plugin.colors.ts Co-authored-by: Dan Onoshko <danon0404@gmail.com> * Update src/plugins/plugin.colors.ts Co-authored-by: Dan Onoshko <danon0404@gmail.com> * Update src/plugins/plugin.colors.ts Co-authored-by: Dan Onoshko <danon0404@gmail.com> * apply review Co-authored-by: Dan Onoshko <danon0404@gmail.com>
This commit is contained in:
parent
97bc329d72
commit
ab55f6c976
@ -81,6 +81,12 @@ function containsColorsDefinitions(
|
||||
return false;
|
||||
}
|
||||
|
||||
function containsColorsDefinition(
|
||||
descriptor: ColorsDescriptor
|
||||
) {
|
||||
return descriptor && (descriptor.borderColor || descriptor.backgroundColor);
|
||||
}
|
||||
|
||||
export default {
|
||||
id: 'colors',
|
||||
|
||||
@ -95,11 +101,12 @@ export default {
|
||||
}
|
||||
|
||||
const {
|
||||
options: {elements},
|
||||
data: {datasets}
|
||||
data: {datasets},
|
||||
options: chartOptions
|
||||
} = chart.config;
|
||||
const {elements} = chartOptions;
|
||||
|
||||
if (!options.forceOverride && (containsColorsDefinitions(datasets) || elements && containsColorsDefinitions(elements))) {
|
||||
if (!options.forceOverride && (containsColorsDefinitions(datasets) || containsColorsDefinition(chartOptions) || (elements && containsColorsDefinitions(elements)))) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
37
test/fixtures/plugin.colors/chart-options-colors.js
vendored
Normal file
37
test/fixtures/plugin.colors/chart-options-colors.js
vendored
Normal file
@ -0,0 +1,37 @@
|
||||
module.exports = {
|
||||
config: {
|
||||
type: 'bar',
|
||||
data: {
|
||||
labels: [0, 1, 2, 3, 4, 5],
|
||||
datasets: [
|
||||
{
|
||||
data: [0, 5, 10, null, -10, -5],
|
||||
},
|
||||
{
|
||||
data: [10, 2, 3, null, 10, 5]
|
||||
}
|
||||
]
|
||||
},
|
||||
options: {
|
||||
backgroundColor: ['red', 'green'],
|
||||
scales: {
|
||||
x: {
|
||||
ticks: {
|
||||
display: false,
|
||||
}
|
||||
},
|
||||
y: {
|
||||
ticks: {
|
||||
display: false,
|
||||
}
|
||||
}
|
||||
},
|
||||
plugins: {
|
||||
legend: false,
|
||||
colors: {
|
||||
enabled: true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
BIN
test/fixtures/plugin.colors/chart-options-colors.png
vendored
Normal file
BIN
test/fixtures/plugin.colors/chart-options-colors.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 15 KiB |
Loading…
Reference in New Issue
Block a user