Skip to content

refactor(common): improve image directive typings #66850

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
SkyZeroZx wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −7
Open

refactor(common): improve image directive typings #66850

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
2 changes: 1 addition & 1 deletion goldens/public-api/common/index.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ export class NgOptimizedImage implements OnInit, OnChanges {
static ngAcceptInputType_priority: unknown;
// (undocumented)
static ngAcceptInputType_width: unknown;
ngOnChanges(changes: SimpleChanges): void;
ngOnChanges(changes: SimpleChanges<NgOptimizedImage>): void;
ngOnInit(): void;
ngSrc: string;
ngSrcset: string;
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/directives/ng_optimized_image/lcp_image_observer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export class LCPImageObserver implements OnDestroy {
return observer;
}

registerImage(rewrittenSrc: string, originalNgSrc: string, isPriority: boolean) {
registerImage(rewrittenSrc: string, isPriority: boolean) {
if (!this.observer) return;
const newObservedImageState: ObservedImageState = {
priority: isPriority,
Expand Down
10 changes: 5 additions & 5 deletions packages/common/src/directives/ng_optimized_image/ng_optimized_image.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ export class NgOptimizedImage implements OnInit, OnChanges {
/**
* Calculate the rewritten `src` once and store it.
* This is needed to avoid repetitive calculations and make sure the directive cleanup in the
* `ngOnDestroy` does not rely on the `IMAGE_LOADER` logic (which in turn can rely on some other
* `DestroyRef.onDestroy` does not rely on the `IMAGE_LOADER` logic (which in turn can rely on some other
* instance that might be already destroyed).
*/
private _renderedSrc: string | null = null;
Expand Down Expand Up @@ -454,7 +454,7 @@ export class NgOptimizedImage implements OnInit, OnChanges {
assertNoLoaderParamsWithoutLoader(this, this.imageLoader);

ngZone.runOutsideAngular(() => {
this.lcpObserver!.registerImage(this.getRewrittenSrc(), this.ngSrc, this.priority);
this.lcpObserver!.registerImage(this.getRewrittenSrc(), this.priority);
});

if (this.priority) {
Expand Down Expand Up @@ -523,7 +523,7 @@ export class NgOptimizedImage implements OnInit, OnChanges {
}

/** @docs-private */
ngOnChanges(changes: SimpleChanges) {
ngOnChanges(changes: SimpleChanges<NgOptimizedImage>) {
if (ngDevMode) {
assertNoPostInitInputChange(this, changes, [
'ngSrcset',
Expand All @@ -537,7 +537,7 @@ export class NgOptimizedImage implements OnInit, OnChanges {
'disableOptimizedSrcset',
]);
}
if (changes['ngSrc'] && !changes['ngSrc'].isFirstChange()) {
if (changes.ngSrc && !changes.ngSrc.isFirstChange()) {
const oldSrc = this._renderedSrc;
this.updateSrcAndSrcset(true);

Expand All @@ -554,7 +554,7 @@ export class NgOptimizedImage implements OnInit, OnChanges {

if (
ngDevMode &&
changes['placeholder']?.currentValue &&
changes.placeholder?.currentValue &&
typeof ngServerMode !== 'undefined' &&
!ngServerMode
) {
Expand Down