Skip to content

refactor: remove unnecessary calls of detailsRowHeight functions #486

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
merged 1 commit into from
Oct 30, 2025
Merged

refactor: remove unnecessary calls of detailsRowHeight functions #486

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
5 changes: 3 additions & 2 deletions projects/ngx-datatable/src/lib/components/body/body-row-wrapper.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { DatatableRowDetailDirective } from '../row-detail/row-detail.directive'
<ng-content />
@let rowDetailTemplate = rowDetail()?.template();
@if (rowDetailTemplate && expanded()) {
<div class="datatable-row-detail" [style.height.px]="detailRowHeight()">
<div class="datatable-row-detail" [style.height.px]="detailsRowHeight()">
<ng-template [ngTemplateOutlet]="rowDetailTemplate" [ngTemplateOutletContext]="context()" />
</div>
}
Expand All @@ -37,7 +37,7 @@ import { DatatableRowDetailDirective } from '../row-detail/row-detail.directive'
export class DataTableRowWrapperComponent<TRow extends Row = any> implements DoCheck {
readonly innerWidth = input.required<number>();
readonly rowDetail = input<DatatableRowDetailDirective>();
readonly detailRowHeight = input.required<number>();
readonly detailRowHeightFn = input.required<(row?: TRow, index?: number) => number>();
readonly row = input.required<TRow>();
readonly disabled = input<boolean>();
readonly rowContextmenu = output<{
Expand All @@ -50,6 +50,7 @@ export class DataTableRowWrapperComponent<TRow extends Row = any> implements DoC
readonly expanded = input(false, { transform: booleanAttribute });
readonly ariaGroupHeaderCheckboxMessage = input.required<string>();

readonly detailsRowHeight = computed(() => this.detailRowHeightFn()(this.row(), this.rowIndex()));
readonly context = computed<RowDetailContext<TRow>>(() => {
this.rowDiffedCount(); // This allows us to get re-evaluated when the row was mutated internally.
return {
Expand Down
25 changes: 11 additions & 14 deletions projects/ngx-datatable/src/lib/components/body/body.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ import { DataTableSummaryRowComponent } from './summary/summary-row.component';
"
[innerWidth]="innerWidth()"
[rowDetail]="rowDetail()"
[detailRowHeight]="getDetailRowHeight(row, index)"
[detailRowHeightFn]="detailRowHeightFn()"
[row]="row"
[disabled]="disabled"
[expanded]="getRowExpanded(row)"
Expand Down Expand Up @@ -340,6 +340,15 @@ export class DataTableBodyComponent<TRow extends Row = any> implements OnInit, O
return undefined;
});

readonly detailRowHeightFn = computed(() => {
const rowDetail = this.rowDetail();
if (!rowDetail) {
return () => 0;
}
const rowHeight = rowDetail.rowHeight();
return typeof rowHeight === 'function' ? rowHeight : () => rowHeight;
});

readonly rowsToRender = computed(() => {
return this.updateRows();
});
Expand Down Expand Up @@ -566,18 +575,6 @@ export class DataTableBodyComponent<TRow extends Row = any> implements OnInit, O
return rowHeight as number;
}

/**
* Get the height of the detail row.
*/
getDetailRowHeight = (row?: TRow, index?: number): number => {
const rowDetail = this.rowDetail();
if (!rowDetail) {
return 0;
}
const rowHeight = rowDetail.rowHeight();
return typeof rowHeight === 'function' ? rowHeight(row, index) : (rowHeight as number);
};

getGroupHeaderRowHeight = (row?: any, index?: any): number => {
const groupHeader = this.groupHeader();
if (!groupHeader) {
Expand Down Expand Up @@ -645,7 +642,7 @@ export class DataTableBodyComponent<TRow extends Row = any> implements OnInit, O
cache.initCache({
rows: this.rows() as TRow[], // TODO: RowHeightCache does not support grouping
rowHeight: this.rowHeight(),
detailRowHeight: this.getDetailRowHeight,
detailRowHeight: this.detailRowHeightFn(),
externalVirtual: this.scrollbarV() && this.externalPaging(),
indexOffset: this.externalPaging() ? this.offset() * this.pageSize() : 0,
rowCount: this.rowCount(),
Expand Down
Loading