Skip to content

Commit

Permalink
chore(grid-demo): move virtual rows init code back to ngOnInit
Browse files Browse the repository at this point in the history
DOM queries and subscriptions should be in `ngOnInit`, not the directive
constructor.

Signed-off-by: Kevin Buhmann <kbuhmann@vmware.com>
  • Loading branch information
kevinbuhmann committed Feb 21, 2024
1 parent 2bcc75b commit 1ee8658
Showing 1 changed file with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
CdkFixedSizeVirtualScroll,
CdkVirtualForOf,
CdkVirtualForOfContext,
CdkVirtualScrollableElement,
CdkVirtualScrollViewport,
CdkVirtualScrollableElement,
FixedSizeVirtualScrollStrategy,
ScrollDispatcher,
ViewportRuler,
Expand Down Expand Up @@ -135,9 +135,9 @@ export class CustomClrVirtualRowsDirective<T> implements OnInit, DoCheck, OnDest
private datagridKeyNavigationController = getDatagridKeyNavigationController(this.datagrid);

private gridRoleElement: HTMLElement | null | undefined;
private virtualScrollStrategy: FixedSizeVirtualScrollStrategy | undefined;
private virtualScrollViewport: CdkVirtualScrollViewport | undefined;
private cdkVirtualFor: CdkVirtualForOf<T> | undefined;
private virtualScrollStrategy: FixedSizeVirtualScrollStrategy;
private virtualScrollViewport: CdkVirtualScrollViewport;
private cdkVirtualFor: CdkVirtualForOf<T>;
private setActiveCellSubscription: Subscription | undefined;
private dataStreamSubscription: Subscription | undefined;
private renderedRangeChangeSubscription: Subscription | undefined;
Expand All @@ -157,8 +157,6 @@ export class CustomClrVirtualRowsDirective<T> implements OnInit, DoCheck, OnDest
private readonly viewportRuler: ViewportRuler,
private readonly datagrid: ClrDatagrid
) {
this.gridRoleElement = this.datagridElementRef.nativeElement.querySelector<HTMLElement>('[role="grid"]');

this.virtualScrollStrategy = new FixedSizeVirtualScrollStrategy(
this._cdkFixedSizeVirtualScrollInputs.itemSize,
this._cdkFixedSizeVirtualScrollInputs.minBufferPx,
Expand All @@ -185,6 +183,10 @@ export class CustomClrVirtualRowsDirective<T> implements OnInit, DoCheck, OnDest
this.virtualScrollViewport,
this.ngZone
);
}

ngOnInit() {
this.gridRoleElement = this.datagridElementRef.nativeElement.querySelector<HTMLElement>('[role="grid"]');

this.updateCdkVirtualForInputs();

Expand All @@ -209,8 +211,6 @@ export class CustomClrVirtualRowsDirective<T> implements OnInit, DoCheck, OnDest
});
}

ngOnInit() {}

ngDoCheck() {
this.cdkVirtualFor?.ngDoCheck();
this.updateAriaRowIndexes();
Expand Down

0 comments on commit 1ee8658

Please sign in to comment.