Skip to content

feat: enhance Table class with dynamic column width sampling #4528

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

Merged
GordonSmith merged 1 commit into from
Feb 19, 2026
Merged

feat: enhance Table class with dynamic column width sampling #4528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions packages/common/src/Utility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,10 +395,14 @@ export function faCode(key: string): number {
return faChar(key).charCodeAt(0);
}

let _removeHTMLFromStringDiv: HTMLDivElement;
export function removeHTMLFromString(str: string, div?: HTMLDivElement) {
div = div ? div : document.createElement("div");
if (div === undefined && _removeHTMLFromStringDiv === undefined) {
_removeHTMLFromStringDiv = document.createElement("div");
}
div = div ?? _removeHTMLFromStringDiv;
div.innerHTML = str;
return div.textContent || div.innerText || "";
return div.textContent ?? div.innerText ?? "";
}

// Template ---
Expand Down
24 changes: 18 additions & 6 deletions packages/dgrid/src/Table.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Palette, PropertyExt, Field } from "@hpcc-js/common";
import { Palette, PropertyExt, Field, Utility } from "@hpcc-js/common";
import { hashSum } from "@hpcc-js/util";
import { format as d3Format } from "d3-format";
import { select as d3Select } from "d3-selection";
Expand Down Expand Up @@ -155,9 +155,12 @@ export class Table extends Common {
this.guessWidth(column.children, sampleData);
} else {
column.width = data.reduce((prevVal: number, row) => {
const cell = ("" + row[column.idx]).trim();
return Math.max(prevVal, this.textSize(cell).width);
}, this.textSize("" + column.label, undefined, undefined, true).width + sortablePadding) + 8; // +12 for the sort icon, +8 for the cell padding.
let cell = ("" + row[column.idx]).trim();
if (this.renderHtml() && cell[0] === "<") {
cell = Utility.removeHTMLFromString(cell);
}
return Math.max(prevVal, this.textSize(cell, this.columnWidthAutoFontName(), this.columnWidthAutoFontSize()).width);
}, this.textSize("" + column.label, this.columnWidthAutoFontName(), this.columnWidthAutoFontSize(), true).width + sortablePadding) + 8; // +12 for the sort icon, +8 for the cell padding.
}
}
}
Expand All @@ -174,8 +177,8 @@ export class Table extends Common {
this._columns = this._store.columns(this.sortable(), this.formatterFunc(), this.renderCellFunc());
switch (this.columnWidth()) {
case "auto":
const tenRows = this.data().filter((row, idx) => idx < 10);
this.guessWidth(this._columns, tenRows);
const sampleRows = this.data().filter((row, idx) => idx < this.columnWidthAutoSampleSize());
this.guessWidth(this._columns, sampleRows);
break;
}
const columns = this.columns();
Expand Down Expand Up @@ -238,9 +241,18 @@ Table.prototype._class += " dgrid_Table";
export interface Table {
columnWidth(): "auto" | "none";
columnWidth(_: "auto" | "none"): this;
columnWidthAutoSampleSize(): number;
columnWidthAutoSampleSize(_: number): this;
columnWidthAutoFontName(): string;
columnWidthAutoFontName(_: string): this;
columnWidthAutoFontSize(): number;
columnWidthAutoFontSize(_: number): this;
columnFormats(): ColumnFormat[];
columnFormats(_: ColumnFormat[]): this;
}

Table.prototype.publish("columnWidth", "auto", "set", "Default column width", ["auto", "none"]);
Table.prototype.publish("columnWidthAutoSampleSize", 10, "number", "Number of rows to sample for auto column width");
Table.prototype.publish("columnWidthAutoFontName", "Verdana", "string", "Font name for auto column width calculation");
Table.prototype.publish("columnWidthAutoFontSize", 12, "number", "Font size for auto column width calculation");
Table.prototype.publish("columnFormats", [], "propertyArray", "Source Columns", null, { autoExpand: ColumnFormat });
Loading