From 9c70aa3bddb88f876d4b22f28b05e6cc6d438266 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 11 Apr 2019 20:04:14 +0200
Subject: [PATCH] refactor(list): constructor breaking changes for 8.0 (#15723)

Applies the breaking changes for material/list for 8.0.

BREAKING CHANGES:
* `_elementRef` parameter in `MatList` constructor is now required.
* `_changeDetectorRef` parameter in `MatListItem` constructor is now required. Also the order of constructor parameters has changed.
---
 src/lib/list/list.ts                          | 33 +++++++------------
 .../ng-update/data/constructor-checks.ts      |  4 +++
 tools/public_api_guard/lib/list.d.ts          |  4 +--
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/lib/list/list.ts b/src/lib/list/list.ts
index 21603cda1f1..f22d988225e 100644
--- a/src/lib/list/list.ts
+++ b/src/lib/list/list.ts
@@ -88,32 +88,23 @@ export class MatList extends _MatListMixinBase implements CanDisableRipple, OnCh
   /** Emits when the state of the list changes. */
   _stateChanges = new Subject<void>();
 
-  /**
-   * @deprecated _elementRef parameter to be made required.
-   * @breaking-change 8.0.0
-   */
-  constructor(private _elementRef?: ElementRef<HTMLElement>) {
+  constructor(private _elementRef: ElementRef<HTMLElement>) {
     super();
 
-    if (this._getListType() === 'action-list' && _elementRef) {
+    if (this._getListType() === 'action-list') {
       _elementRef.nativeElement.classList.add('mat-action-list');
     }
   }
 
   _getListType(): 'list' | 'action-list' | null {
-    const elementRef = this._elementRef;
+    const nodeName = this._elementRef.nativeElement.nodeName.toLowerCase();
 
-    // @breaking-change 8.0.0 Remove null check once _elementRef is a required param.
-    if (elementRef) {
-      const nodeName = elementRef.nativeElement.nodeName.toLowerCase();
+    if (nodeName === 'mat-list') {
+      return 'list';
+    }
 
-      if (nodeName === 'mat-list') {
-        return 'list';
-      }
-
-      if (nodeName === 'mat-action-list') {
-        return 'action-list';
-      }
+    if (nodeName === 'mat-action-list') {
+      return 'action-list';
     }
 
     return null;
@@ -185,10 +176,9 @@ export class MatListItem extends _MatListItemMixinBase implements AfterContentIn
   @ContentChild(MatListIconCssMatStyler, {static: false}) _icon: MatListIconCssMatStyler;
 
   constructor(private _element: ElementRef<HTMLElement>,
+              _changeDetectorRef: ChangeDetectorRef,
               @Optional() navList?: MatNavList,
-              @Optional() list?: MatList,
-              // @breaking-change 8.0.0 `_changeDetectorRef` to be made into a required parameter.
-              _changeDetectorRef?: ChangeDetectorRef) {
+              @Optional() list?: MatList) {
     super();
     this._isInteractiveList = !!(navList || (list && list._getListType() === 'action-list'));
     this._list = navList || list;
@@ -201,8 +191,7 @@ export class MatListItem extends _MatListItemMixinBase implements AfterContentIn
       element.setAttribute('type', 'button');
     }
 
-    // @breaking-change 8.0.0 Remove null check for _changeDetectorRef.
-    if (this._list && _changeDetectorRef) {
+    if (this._list) {
       // React to changes in the state of the parent list since
       // some of the item's properties depend on it (e.g. `disableRipple`).
       this._list._stateChanges.pipe(takeUntil(this._destroyed)).subscribe(() => {
diff --git a/src/lib/schematics/ng-update/data/constructor-checks.ts b/src/lib/schematics/ng-update/data/constructor-checks.ts
index 3133dffa69c..8db776ef569 100644
--- a/src/lib/schematics/ng-update/data/constructor-checks.ts
+++ b/src/lib/schematics/ng-update/data/constructor-checks.ts
@@ -30,6 +30,10 @@ export const constructorChecks: VersionChanges<ConstructorChecksUpgradeData> = {
     {
       pr: 'https://github.com/angular/material2/pull/15761',
       changes: ['MatSpinner', 'MatProgressSpinner']
+    },
+    {
+      pr: 'https://github.com/angular/material2/pull/15723',
+      changes: ['MatList', 'MatListItem']
     }
   ],
 
diff --git a/tools/public_api_guard/lib/list.d.ts b/tools/public_api_guard/lib/list.d.ts
index 30ede83025b..2450377d426 100644
--- a/tools/public_api_guard/lib/list.d.ts
+++ b/tools/public_api_guard/lib/list.d.ts
@@ -10,7 +10,7 @@ export declare const MAT_SELECTION_LIST_VALUE_ACCESSOR: any;
 
 export declare class MatList extends _MatListMixinBase implements CanDisableRipple, OnChanges, OnDestroy {
     _stateChanges: Subject<void>;
-    constructor(_elementRef?: ElementRef<HTMLElement> | undefined);
+    constructor(_elementRef: ElementRef<HTMLElement>);
     _getListType(): 'list' | 'action-list' | null;
     ngOnChanges(): void;
     ngOnDestroy(): void;
@@ -29,7 +29,7 @@ export declare class MatListItem extends _MatListItemMixinBase implements AfterC
     _avatar: MatListAvatarCssMatStyler;
     _icon: MatListIconCssMatStyler;
     _lines: QueryList<MatLine>;
-    constructor(_element: ElementRef<HTMLElement>, navList?: MatNavList, list?: MatList, _changeDetectorRef?: ChangeDetectorRef);
+    constructor(_element: ElementRef<HTMLElement>, _changeDetectorRef: ChangeDetectorRef, navList?: MatNavList, list?: MatList);
     _getHostElement(): HTMLElement;
     _isRippleDisabled(): boolean;
     ngAfterContentInit(): void;