pass in textColor through databar

Author: gzh2003

packages/grid/src/DataBarCellRenderer.ts

@@ -121,6 +121,7 @@ class DataBarCellRenderer extends CellRenderer {
       columnMax,
       axis,
       color: dataBarColor,
+      textColor,
       valuePlacement,
       opacity,
       markers,
@@ -147,11 +148,10 @@ class DataBarCellRenderer extends CellRenderer {
     context.save();
     context.textAlign = textAlign;
 
-    // Use explicit format color if set.
+    // Use explicit text color if set.
     // Otherwise, fall back to the databar color for text.
-    const formatColor = model.formatColorForCell(modelColumn, modelRow);
-    if (formatColor != null) {
-      context.fillStyle = formatColor;
+    if (textColor != null) {
+      context.fillStyle = textColor;
     } else if (hasGradient) {
       const color =
         value >= 0 ? dataBarColor[dataBarColor.length - 1] : dataBarColor[0];

packages/grid/src/DataBarGridModel.ts

@@ -35,6 +35,7 @@ export interface DataBarOptions {
   columnMax: number;
   axis: AxisOption;
   color: GridColor | GridColor[];
+  textColor?: GridColor;
   valuePlacement: ValuePlacementOption;
   opacity: number;
   markers: Marker[];

packages/grid/src/GridModel.ts

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