fix: DH-21616: Databar overrides text color when using format prop

packages/grid/src/DataBarCellRenderer.ts

@@ -146,7 +146,13 @@ class DataBarCellRenderer extends CellRenderer {
 
     context.save();
     context.textAlign = textAlign;
-    if (hasGradient) {
+
+    // Use explicit format color if set.
+    // Otherwise, fall back to the databar color for text.
+    const formatColor = model.formatColorForCell(modelColumn, modelRow);
+    if (formatColor != null) {
+      context.fillStyle = formatColor;
+    } else if (hasGradient) {
       const color =
         value >= 0 ? dataBarColor[dataBarColor.length - 1] : dataBarColor[0];
       context.fillStyle = color;
@@ -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();

packages/grid/src/GridModel.ts

@@ -110,6 +110,18 @@ abstract class GridModel<
     return theme.textColor;
   }
 
+  /**
+   * Get the explicitly set format color for a cell
+   * Unlike colorForCell, this only returns a color that was explicitly
+   * set via formatting not type-based theme colors.
+   * @param column Column to get the format color for
+   * @param row Row to get the format color for
+   * @returns Explicitly set format color, or null if none was set
+   */
+  formatColorForCell(_column: ModelIndex, _row: ModelIndex): NullableGridColor {
+    return null;
+  }
+
   /**
    * Get the background color for the cell
    * @param column Column to get the background color for

packages/iris-grid/src/IrisGridTableModelTemplate.ts

@@ -651,6 +651,10 @@ class IrisGridTableModelTemplate<
     return theme.textColor;
   }
 
+  formatColorForCell(x: ModelIndex, y: ModelIndex): string | null {
+    return this.formatForCell(x, y)?.color ?? null;
+  }
+
   backgroundColorForCell(
     x: ModelIndex,
     y: ModelIndex,