Skip to content

Commit 1d27210

Browse files
authored
fix: restrict custom data label colors (#10205)
To ensure a good contrast between the background color of a series and its data label color, a custom color is calculated and set to the data labels. That works well for some types of charts where the labels are placed within an area colored by the series color, like for Organization, Gantt, and Treemap. For other types, however, it can lead to unexpected results, when the data labels are placed in an area covered by the chart's background, when `useHTML` is used. This change restricts the setting of these custom colors to the types mentioned above, where they are expected to work well. Fixes #9988
1 parent 5f8e5b5 commit 1d27210

File tree

1 file changed

+30
-20
lines changed

1 file changed

+30
-20
lines changed

packages/charts/src/styles/vaadin-chart-base-styles.js

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -359,100 +359,110 @@ export const chartStyles = css`
359359
:where([styled-mode]) .highcharts-color-0 {
360360
fill: var(--_color-0);
361361
stroke: var(--_color-0);
362-
color: var(--_color-0-label);
363362
}
364363
365364
:where([styled-mode]) .highcharts-color-1 {
366365
fill: var(--_color-1);
367366
stroke: var(--_color-1);
368-
color: var(--_color-1-label);
369367
}
370368
371369
:where([styled-mode]) .highcharts-color-2 {
372370
fill: var(--_color-2);
373371
stroke: var(--_color-2);
374-
color: var(--_color-2-label);
375372
}
376373
377374
:where([styled-mode]) .highcharts-color-3 {
378375
fill: var(--_color-3);
379376
stroke: var(--_color-3);
380-
color: var(--_color-2-label);
381377
}
382378
383379
:where([styled-mode]) .highcharts-color-4 {
384380
fill: var(--_color-4);
385381
stroke: var(--_color-4);
386-
color: var(--_color-4-label);
387382
}
388383
389384
:where([styled-mode]) .highcharts-color-5 {
390385
fill: var(--_color-5);
391386
stroke: var(--_color-5);
392-
color: var(--_color-5-label);
393387
}
394388
395389
:where([styled-mode]) .highcharts-color-6 {
396390
fill: var(--_color-6);
397391
stroke: var(--_color-6);
398-
color: var(--_color-6-label);
399392
}
400393
401394
:where([styled-mode]) .highcharts-color-7 {
402395
fill: var(--_color-7);
403-
stroke: var(--_color-7);
404396
color: var(--_color-7-label);
405397
}
406398
407399
:where([styled-mode]) .highcharts-color-8 {
408400
fill: var(--_color-8);
409401
stroke: var(--_color-8);
410-
color: var(--_color-8-label);
411402
}
412403
413404
:where([styled-mode]) .highcharts-color-9 {
414405
fill: var(--_color-9);
415406
stroke: var(--_color-9);
416-
color: var(--_color-9-label);
417407
}
418408
419-
:where([styled-mode]) .highcharts-data-label-color-0 {
409+
:where([styled-mode])
410+
:where(.highcharts-treemap-series, .highcharts-organization-series, .highcharts-gantt-series)
411+
.highcharts-data-label-color-0 {
420412
color: var(--_color-0-label);
421413
}
422414
423-
:where([styled-mode]) .highcharts-data-label-color-1 {
415+
:where([styled-mode])
416+
:where(.highcharts-treemap-series, .highcharts-organization-series, .highcharts-gantt-series)
417+
.highcharts-data-label-color-1 {
424418
color: var(--_color-1-label);
425419
}
426420
427-
:where([styled-mode]) .highcharts-data-label-color-2 {
421+
:where([styled-mode])
422+
:where(.highcharts-treemap-series, .highcharts-organization-series, .highcharts-gantt-series)
423+
.highcharts-data-label-color-2 {
428424
color: var(--_color-2-label);
429425
}
430426
431-
:where([styled-mode]) .highcharts-data-label-color-3 {
427+
:where([styled-mode])
428+
:where(.highcharts-treemap-series, .highcharts-organization-series, .highcharts-gantt-series)
429+
.highcharts-data-label-color-3 {
432430
color: var(--_color-3-label);
433431
}
434432
435-
:where([styled-mode]) .highcharts-data-label-color-4 {
433+
:where([styled-mode])
434+
:where(.highcharts-treemap-series, .highcharts-organization-series, .highcharts-gantt-series)
435+
.highcharts-data-label-color-4 {
436436
color: var(--_color-4-label);
437437
}
438438
439-
:where([styled-mode]) .highcharts-data-label-color-5 {
439+
:where([styled-mode])
440+
:where(.highcharts-treemap-series, .highcharts-organization-series, .highcharts-gantt-series)
441+
.highcharts-data-label-color-5 {
440442
color: var(--_color-5-label);
441443
}
442444
443-
:where([styled-mode]) .highcharts-data-label-color-6 {
445+
:where([styled-mode])
446+
:where(.highcharts-treemap-series, .highcharts-organization-series, .highcharts-gantt-series)
447+
.highcharts-data-label-color-6 {
444448
color: var(--_color-6-label);
445449
}
446450
447-
:where([styled-mode]) .highcharts-data-label-color-7 {
451+
:where([styled-mode])
452+
:where(.highcharts-treemap-series, .highcharts-organization-series, .highcharts-gantt-series)
453+
.highcharts-data-label-color-7 {
448454
color: var(--_color-7-label);
449455
}
450456
451-
:where([styled-mode]) .highcharts-data-label-color-8 {
457+
:where([styled-mode])
458+
:where(.highcharts-treemap-series, .highcharts-organization-series, .highcharts-gantt-series)
459+
.highcharts-data-label-color-8 {
452460
color: var(--_color-8-label);
453461
}
454462
455-
:where([styled-mode]) .highcharts-data-label-color-9 {
463+
:where([styled-mode])
464+
:where(.highcharts-treemap-series, .highcharts-organization-series, .highcharts-gantt-series)
465+
.highcharts-data-label-color-9 {
456466
color: var(--_color-9-label);
457467
}
458468

0 commit comments

Comments
 (0)