Skip to content

fix: DH-21616: use model text color instead of databar color for cell text #2629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gzh2003 wants to merge 3 commits into from
Closed

fix: DH-21616: use model text color instead of databar color for cell text #2629

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7733a9
Make databar and text color independent of eachother
gzh2003 Feb 26, 2026
0214b32
Override default text
gzh2003 Feb 27, 2026
ee911da
Add comment
gzh2003 Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion packages/grid/src/DataBarCellRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,13 @@ class DataBarCellRenderer extends CellRenderer {

context.save();
context.textAlign = textAlign;
if (hasGradient) {

// Use explicit text color from model if set.
// Otherwise, fall back to the databar color for text.
const textColor = model.colorForCell(modelColumn, modelRow, theme);
if (textColor && textColor !== theme.textColor) {
Comment on lines +152 to +153
Copy link
Copy Markdown
Member

@mofojed mofojed Mar 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't really correct, as we may return a green/red colour for positive/negative numbers.
Instead, we should be looking if a colour is set explicitly in the Format. E.g.

const format = model.formatForCell(...);
if (format?.color != null && format?.color != '') {
  ...
} else if (hasGradient) {

context.fillStyle = textColor;
} else if (hasGradient) {
const color =
value >= 0 ? dataBarColor[dataBarColor.length - 1] : dataBarColor[0];
context.fillStyle = color;
Expand Down Expand Up @@ -230,6 +236,10 @@ class DataBarCellRenderer extends CellRenderer {
context.restore(); // Restore gradient translate/scale
} else {
// Draw normal bar
const barColor = Array.isArray(dataBarColor)
? dataBarColor[0]
: dataBarColor;
context.fillStyle = barColor;
context.beginPath();
context.roundRect(dataBarX, dataBarY, dataBarWidth, rowHeight, 1);
context.fill();
Expand Down
Loading