Skip to content

Commit a575a3d

Browse files
committed
refactor(common): improve image directive typings
Add image directive typings to improve type safety and removes an unused parameter from the observer registration.
1 parent 424ecf8 commit a575a3d

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

goldens/public-api/common/index.api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ export class NgOptimizedImage implements OnInit, OnChanges {
638638
static ngAcceptInputType_priority: unknown;
639639
// (undocumented)
640640
static ngAcceptInputType_width: unknown;
641-
ngOnChanges(changes: SimpleChanges): void;
641+
ngOnChanges(changes: SimpleChanges<NgOptimizedImage>): void;
642642
ngOnInit(): void;
643643
ngSrc: string;
644644
ngSrcset: string;

packages/common/src/directives/ng_optimized_image/lcp_image_observer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export class LCPImageObserver implements OnDestroy {
9292
return observer;
9393
}
9494

95-
registerImage(rewrittenSrc: string, originalNgSrc: string, isPriority: boolean) {
95+
registerImage(rewrittenSrc: string, isPriority: boolean) {
9696
if (!this.observer) return;
9797
const newObservedImageState: ObservedImageState = {
9898
priority: isPriority,

packages/common/src/directives/ng_optimized_image/ng_optimized_image.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ export class NgOptimizedImage implements OnInit, OnChanges {
283283
/**
284284
* Calculate the rewritten `src` once and store it.
285285
* This is needed to avoid repetitive calculations and make sure the directive cleanup in the
286-
* `ngOnDestroy` does not rely on the `IMAGE_LOADER` logic (which in turn can rely on some other
286+
* `DestroyRef.onDestroy` does not rely on the `IMAGE_LOADER` logic (which in turn can rely on some other
287287
* instance that might be already destroyed).
288288
*/
289289
private _renderedSrc: string | null = null;
@@ -454,7 +454,7 @@ export class NgOptimizedImage implements OnInit, OnChanges {
454454
assertNoLoaderParamsWithoutLoader(this, this.imageLoader);
455455

456456
ngZone.runOutsideAngular(() => {
457-
this.lcpObserver!.registerImage(this.getRewrittenSrc(), this.ngSrc, this.priority);
457+
this.lcpObserver!.registerImage(this.getRewrittenSrc(), this.priority);
458458
});
459459

460460
if (this.priority) {
@@ -523,7 +523,7 @@ export class NgOptimizedImage implements OnInit, OnChanges {
523523
}
524524

525525
/** @docs-private */
526-
ngOnChanges(changes: SimpleChanges) {
526+
ngOnChanges(changes: SimpleChanges<NgOptimizedImage>) {
527527
if (ngDevMode) {
528528
assertNoPostInitInputChange(this, changes, [
529529
'ngSrcset',
@@ -537,7 +537,7 @@ export class NgOptimizedImage implements OnInit, OnChanges {
537537
'disableOptimizedSrcset',
538538
]);
539539
}
540-
if (changes['ngSrc'] && !changes['ngSrc'].isFirstChange()) {
540+
if (changes.ngSrc && !changes.ngSrc.isFirstChange()) {
541541
const oldSrc = this._renderedSrc;
542542
this.updateSrcAndSrcset(true);
543543

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

555555
if (
556556
ngDevMode &&
557-
changes['placeholder']?.currentValue &&
557+
changes.placeholder?.currentValue &&
558558
typeof ngServerMode !== 'undefined' &&
559559
!ngServerMode
560560
) {

0 commit comments

Comments
 (0)