fix(snack-bar): Fix snack-bar Context types

Author: jamOne-

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.')
@@ -998,7 +1001,7 @@ class ComponentWithChildViewContainer {
   `,
 })
 class ComponentWithTemplateRef {
-  @ViewChild(TemplateRef) templateRef: TemplateRef<unknown>;
+  @ViewChild(TemplateRef) templateRef: TemplateRef<SnackBarTemplateContext<{value: string}>>;
   localValue: string;
 }
 
@@ -1011,7 +1014,8 @@ interface BurritosNotificationData {
   template: '<p>Burritos are on the way.</p>',
 })
 class BurritosNotification {
-  snackBarRef = inject<MatSnackBarRef<BurritosNotification>>(MatSnackBarRef);
+  snackBarRef =
+    inject<MatSnackBarRef<BurritosNotification, BurritosNotificationData>>(MatSnackBarRef);
   data = inject<BurritosNotificationData>(MAT_SNACK_BAR_DATA);
 }
 

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

@@ -42,6 +42,11 @@ export const MAT_SNACK_BAR_DEFAULT_OPTIONS = new InjectionToken<MatSnackBarConfi
   },
 );
 
+export interface SnackBarTemplateContext<D> {
+  $implicit?: D | null;
+  snackBarRef?: MatSnackBarRef<EmbeddedViewRef<SnackBarTemplateContext<D>>, D>;
+}
+
 /**
  * Service to dispatch Material Design snack bar messages.
  */
@@ -108,10 +113,10 @@ export class MatSnackBar implements OnDestroy {
    * @param template Template to be instantiated.
    * @param config Extra configuration for the snack bar.
    */
-  openFromTemplate<C extends D, D>(
-    template: TemplateRef<C>,
+  openFromTemplate<D>(
+    template: TemplateRef<SnackBarTemplateContext<D>>,
     config?: MatSnackBarConfig<D>,
-  ): MatSnackBarRef<EmbeddedViewRef<C>, D> {
+  ): MatSnackBarRef<EmbeddedViewRef<SnackBarTemplateContext<D>>, D> {
     return this._attach(template, config);
   }
 
@@ -192,27 +197,30 @@ export class MatSnackBar implements OnDestroy {
     content: ComponentType<T>,
     userConfig?: MatSnackBarConfig<D>,
   ): MatSnackBarRef<T, D>;
-  private _attach<D, C extends D>(
-    content: TemplateRef<C>,
+  private _attach<D>(
+    content: TemplateRef<SnackBarTemplateContext<D>>,
     userConfig?: MatSnackBarConfig<D>,
-  ): MatSnackBarRef<EmbeddedViewRef<C>, D>;
-  private _attach<T, D, C extends D>(
-    content: ComponentType<T> | TemplateRef<C>,
+  ): MatSnackBarRef<EmbeddedViewRef<SnackBarTemplateContext<D>>, D>;
+  private _attach<T, D>(
+    content: ComponentType<T> | TemplateRef<SnackBarTemplateContext<D>>,
     userConfig?: MatSnackBarConfig<D>,
-  ): MatSnackBarRef<T | EmbeddedViewRef<C>, D> {
+  ): MatSnackBarRef<T | EmbeddedViewRef<SnackBarTemplateContext<D>>, D> {
     const config: MatSnackBarConfig<D> = {
       ...new MatSnackBarConfig(),
-      ...this._defaultConfig,
+      ...(this._defaultConfig as MatSnackBarConfig<D>),
       ...userConfig,
     };
     const overlayRef = this._createOverlay(config);
     const container = this._attachSnackBarContainer(overlayRef, config);
-    const snackBarRef = new MatSnackBarRef(container, overlayRef);
+    const snackBarRef = new MatSnackBarRef<T | EmbeddedViewRef<SnackBarTemplateContext<D>>, D>(
+      container,
+      overlayRef,
+    );
 
     if (content instanceof TemplateRef) {
-      const portal = new TemplatePortal<C>(content, null!, {
+      const portal = new TemplatePortal<SnackBarTemplateContext<D>>(content, null!, {
         $implicit: config.data,
-        snackBarRef,
+        snackBarRef: snackBarRef as MatSnackBarRef<EmbeddedViewRef<SnackBarTemplateContext<D>>, D>,
       });
 
       snackBarRef.instance = container.attachTemplatePortal(portal);