refactor(material/snack-bar): eliminate any type

Author: jamOne-

goldens/material/snack-bar/index.api.md

@@ -32,10 +32,10 @@ import { TemplateRef } from '@angular/core';
 import { ViewContainerRef } from '@angular/core';
 
 // @public
-export const MAT_SNACK_BAR_DATA: InjectionToken<any>;
+export const MAT_SNACK_BAR_DATA: InjectionToken<unknown>;
 
 // @public
-export const MAT_SNACK_BAR_DEFAULT_OPTIONS: InjectionToken<MatSnackBarConfig<any>>;
+export const MAT_SNACK_BAR_DEFAULT_OPTIONS: InjectionToken<MatSnackBarConfig<unknown>>;
 
 // @public
 export class MatSnackBar implements OnDestroy {
@@ -45,10 +45,10 @@ export class MatSnackBar implements OnDestroy {
     // (undocumented)
     ngOnDestroy(): void;
     open(message: string, action?: string, config?: MatSnackBarConfig): MatSnackBarRef<TextOnlySnackBar>;
-    get _openedSnackBarRef(): MatSnackBarRef<any> | null;
-    set _openedSnackBarRef(value: MatSnackBarRef<any> | null);
-    openFromComponent<T, D = any>(component: ComponentType<T>, config?: MatSnackBarConfig<D>): MatSnackBarRef<T>;
-    openFromTemplate(template: TemplateRef<any>, config?: MatSnackBarConfig): MatSnackBarRef<EmbeddedViewRef<any>>;
+    get _openedSnackBarRef(): MatSnackBarRef<unknown> | null;
+    set _openedSnackBarRef(value: MatSnackBarRef<unknown> | null);
+    openFromComponent<T, D = unknown>(component: ComponentType<T>, config?: MatSnackBarConfig<D>): MatSnackBarRef<T>;
+    openFromTemplate<C = unknown>(template: TemplateRef<C>, config?: MatSnackBarConfig): MatSnackBarRef<EmbeddedViewRef<C>>;
     simpleSnackBarComponent: typeof SimpleSnackBar;
     snackBarContainerComponent: typeof MatSnackBarContainer;
     // (undocumented)
@@ -74,7 +74,7 @@ export class MatSnackBarActions {
 }
 
 // @public
-export class MatSnackBarConfig<D = any> {
+export class MatSnackBarConfig<D = unknown> {
     announcementMessage?: string;
     data?: D | null;
     direction?: Direction;
@@ -168,7 +168,7 @@ export class SimpleSnackBar implements TextOnlySnackBar {
     constructor(...args: unknown[]);
     action(): void;
     // (undocumented)
-    data: any;
+    data: TextOnlySnackBarData;
     get hasAction(): boolean;
     // (undocumented)
     snackBarRef: MatSnackBarRef<SimpleSnackBar>;
@@ -183,16 +183,21 @@ export interface TextOnlySnackBar {
     // (undocumented)
     action: () => void;
     // (undocumented)
-    data: {
-        message: string;
-        action: string;
-    };
+    data: TextOnlySnackBarData;
     // (undocumented)
     hasAction: boolean;
     // (undocumented)
     snackBarRef: MatSnackBarRef<TextOnlySnackBar>;
 }
 
+// @public
+export interface TextOnlySnackBarData {
+    // (undocumented)
+    action: string;
+    // (undocumented)
+    message: string;
+}
+
 // (No @packageDocumentation comment for this package)
 
 ```

src/material/snack-bar/simple-snack-bar.ts

@@ -12,12 +12,18 @@ import {MatSnackBarRef} from './snack-bar-ref';
 import {MAT_SNACK_BAR_DATA} from './snack-bar-config';
 import {MatSnackBarAction, MatSnackBarActions, MatSnackBarLabel} from './snack-bar-content';
 
+/** Input data for a simple snack bar component that has a message and a single action. */
+export interface TextOnlySnackBarData {
+  message: string;
+  action: string;
+}
+
 /**
  * Interface for a simple snack bar component that has a message and a single action.
  */
 export interface TextOnlySnackBar {
-  data: {message: string; action: string};
-  snackBarRef: MatSnackBarRef<TextOnlySnackBar>;
+  data: TextOnlySnackBarData;
+  snackBarRef: MatSnackBarRef<TextOnlySnackBar, TextOnlySnackBarData>;
   action: () => void;
   hasAction: boolean;
 }
@@ -35,8 +41,8 @@ export interface TextOnlySnackBar {
   },
 })
 export class SimpleSnackBar implements TextOnlySnackBar {
-  snackBarRef = inject<MatSnackBarRef<SimpleSnackBar>>(MatSnackBarRef);
-  data = inject(MAT_SNACK_BAR_DATA);
+  snackBarRef = inject<MatSnackBarRef<SimpleSnackBar, TextOnlySnackBarData>>(MatSnackBarRef);
+  data = inject<TextOnlySnackBarData>(MAT_SNACK_BAR_DATA);
 
   constructor(...args: unknown[]);
   constructor() {}

src/material/snack-bar/snack-bar-config.ts

@@ -11,7 +11,7 @@ import {AriaLivePoliteness} from '@angular/cdk/a11y';
 import {Direction} from '@angular/cdk/bidi';
 
 /** Injection token that can be used to access the data that was passed in to a snack bar. */
-export const MAT_SNACK_BAR_DATA = new InjectionToken<any>('MatSnackBarData');
+export const MAT_SNACK_BAR_DATA = new InjectionToken<unknown>('MatSnackBarData');
 
 /** Possible values for horizontalPosition on MatSnackBarConfig. */
 export type MatSnackBarHorizontalPosition = 'start' | 'center' | 'end' | 'left' | 'right';
@@ -22,7 +22,7 @@ export type MatSnackBarVerticalPosition = 'top' | 'bottom';
 /**
  * Configuration used when opening a snack-bar.
  */
-export class MatSnackBarConfig<D = any> {
+export class MatSnackBarConfig<D = unknown> {
   /** The politeness level for the MatAriaLiveAnnouncer announcement. */
   politeness?: AriaLivePoliteness = 'polite';
 

src/material/snack-bar/snack-bar-container.ts

@@ -63,13 +63,13 @@ const EXIT_ANIMATION = '_mat-snack-bar-exit';
     '(animationcancel)': 'onAnimationEnd($event.animationName)',
   },
 })
-export class MatSnackBarContainer extends BasePortalOutlet implements OnDestroy {
+export class MatSnackBarContainer<D = unknown> extends BasePortalOutlet implements OnDestroy {
   private _ngZone = inject(NgZone);
   readonly _elementRef = inject<ElementRef<HTMLElement>>(ElementRef);
   private _changeDetectorRef = inject(ChangeDetectorRef);
   private _platform = inject(Platform);
   protected _animationsDisabled = _animationsDisabled();
-  snackBarConfig = inject(MatSnackBarConfig);
+  snackBarConfig = inject<MatSnackBarConfig<D>>(MatSnackBarConfig);
 
   private _document = inject(DOCUMENT);
   private _trackedModals = new Set<Element>();

src/material/snack-bar/snack-bar-ref.ts

@@ -22,15 +22,15 @@ const MAX_TIMEOUT = Math.pow(2, 31) - 1;
 /**
  * Reference to a snack bar dispatched from the snack bar service.
  */
-export class MatSnackBarRef<T> {
+export class MatSnackBarRef<T, D = unknown> {
   /** The instance of the component making up the content of the snack bar. */
   instance!: T;
 
   /**
    * The instance of the component making up the content of the snack bar.
    * @docs-private
    */
-  containerInstance: MatSnackBarContainer;
+  containerInstance: MatSnackBarContainer<D>;
 
   /** Subject for notifying the user that the snack bar has been dismissed. */
   private readonly _afterDismissed = new Subject<MatSnackBarDismiss>();
@@ -51,7 +51,7 @@ export class MatSnackBarRef<T> {
   private _dismissedByAction = false;
 
   constructor(
-    containerInstance: MatSnackBarContainer,
+    containerInstance: MatSnackBarContainer<D>,
     private _overlayRef: OverlayRef,
   ) {
     this.containerInstance = containerInstance;

src/material/snack-bar/snack-bar.spec.ts

@@ -19,7 +19,7 @@ import {
   MatSnackBarRef,
   SimpleSnackBar,
 } from './index';
-import {MAT_SNACK_BAR_DEFAULT_OPTIONS} from './snack-bar';
+import {MAT_SNACK_BAR_DEFAULT_OPTIONS, SnackBarTemplateContext} from './snack-bar';
 import {MATERIAL_ANIMATIONS} from '../core';
 
 describe('MatSnackBar', () => {
@@ -571,7 +571,10 @@ describe('MatSnackBar', () => {
     });
 
     it('should inject the snack bar reference into the component', () => {
-      const snackBarRef = snackBar.openFromComponent(BurritosNotification);
+      const snackBarRef = snackBar.openFromComponent<
+        BurritosNotification,
+        BurritosNotificationData
+      >(BurritosNotification);
 
       expect(snackBarRef.instance.snackBarRef)
         .withContext('Expected component to have an injected snack bar reference.')
@@ -585,10 +588,11 @@ describe('MatSnackBar', () => {
     });
 
     it('should be able to inject arbitrary user data', () => {
+      const data: BurritosNotificationData = {
+        burritoType: 'Chimichanga',
+      };
       const snackBarRef = snackBar.openFromComponent(BurritosNotification, {
-        data: {
-          burritoType: 'Chimichanga',
-        },
+        data,
       });
 
       expect(snackBarRef.instance.data)
@@ -997,17 +1001,22 @@ class ComponentWithChildViewContainer {
   `,
 })
 class ComponentWithTemplateRef {
-  @ViewChild(TemplateRef) templateRef!: TemplateRef<any>;
+  @ViewChild(TemplateRef) templateRef!: TemplateRef<SnackBarTemplateContext<{value: string}>>;
   localValue!: string;
 }
 
+interface BurritosNotificationData {
+  burritoType: string;
+}
+
 /** Simple component for testing ComponentPortal. */
 @Component({
   template: '<p>Burritos are on the way.</p>',
 })
 class BurritosNotification {
-  snackBarRef = inject<MatSnackBarRef<BurritosNotification>>(MatSnackBarRef);
-  data = inject(MAT_SNACK_BAR_DATA);
+  snackBarRef =
+    inject<MatSnackBarRef<BurritosNotification, BurritosNotificationData>>(MatSnackBarRef);
+  data = inject<BurritosNotificationData>(MAT_SNACK_BAR_DATA);
 }
 
 @Component({