Skip to content

refactor(cdk/scrolling): refactors CdkVirtualScrollViewport destroyed… #32357

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(cdk/scrolling): refactors CdkVirtualScrollViewport destroyed… #32357

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: 3 additions & 5 deletions src/cdk/scrolling/virtual-scroll-viewport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ export class CdkVirtualScrollViewport extends CdkVirtualScrollable implements On

private _injector = inject(Injector);

private _isDestroyed = false;
private _destroyRef = inject(DestroyRef);
Copy link
Contributor

@tjshiu tjshiu Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be private readonly?

Copy link
Contributor Author

@SkyZeroZx SkyZeroZx Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was following the convention of the other injected properties; theoretically, no one should overwrite them, considering it implicit. Should we still use readonly?


constructor(...args: unknown[]);

Expand Down Expand Up @@ -211,7 +211,7 @@ export class CdkVirtualScrollViewport extends CdkVirtualScrollable implements On
// effect that runs before change detection of any application views (since we're depending on markForCheck marking parents dirty)
{injector: inject(ApplicationRef).injector},
);
inject(DestroyRef).onDestroy(() => void ref.destroy());
this._destroyRef.onDestroy(() => void ref.destroy());
}

override ngOnInit() {
Expand Down Expand Up @@ -262,8 +262,6 @@ export class CdkVirtualScrollViewport extends CdkVirtualScrollable implements On
this._detachedSubject.complete();
this._viewportChanges.unsubscribe();

this._isDestroyed = true;

super.ngOnDestroy();
}

Expand Down Expand Up @@ -512,7 +510,7 @@ export class CdkVirtualScrollViewport extends CdkVirtualScrollable implements On

/** Run change detection. */
private _doChangeDetection() {
if (this._isDestroyed) {
if (this._destroyRef.destroyed) {
return;
}

Expand Down
Loading