Merge pull request #4211 from GordonSmith/DGRID_CELL_RENDER_HIDE

fix: Custom cell render fails with plain string
hpcc-systems · Jul 9, 2024 · 5e09c02 · 5e09c02
2 parents 63af377 + 3cd8004
commit 5e09c02
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/dgrid/src/Table.ts b/packages/dgrid/src/Table.ts
@@ -58,7 +58,7 @@ export class ColumnFormat extends PropertyExt {
                 d3Select(cellElement)
                     .style("background", background)
                     .style("color", Palette.textColor(background))
-                    .text(cellText.html ? cellText.html : cell)
+                    .text(cellText?.html ?? cellText ?? cell)
                     ;
             };
         }
@@ -184,7 +184,7 @@ export class Table extends Common {
                     }
                 }
             }
-            this._dgrid.set("columns", this._columns);
+            this._dgrid.set("columns", this._columns.filter(col => !col.hidden));
             this._colsRefresh = false;
         }
         if (this._colsRefresh || this._dataRefresh) {