Revert "fix(sidenav): scrollable instance not exposed when explicitly specifying content element (#11517)" (#11697)

This reverts commit 436ac7d.

Author: andrewseguin

src/lib/sidenav/drawer-container.html

@@ -5,6 +5,6 @@
 
 <ng-content select="mat-drawer-content">
 </ng-content>
-<mat-drawer-content *ngIf="!_content">
+<mat-drawer-content *ngIf="!_content" cdkScrollable>
   <ng-content></ng-content>
 </mat-drawer-content>

src/lib/sidenav/drawer.spec.ts

@@ -15,7 +15,6 @@ import {A11yModule} from '@angular/cdk/a11y';
 import {PlatformModule} from '@angular/cdk/platform';
 import {ESCAPE} from '@angular/cdk/keycodes';
 import {dispatchKeyboardEvent} from '@angular/cdk/testing';
-import {CdkScrollable} from '@angular/cdk/scrolling';
 
 
 describe('MatDrawer', () => {
@@ -497,7 +496,6 @@ describe('MatDrawerContainer', () => {
         DrawerContainerStateChangesTestApp,
         AutosizeDrawer,
         BasicTestApp,
-        DrawerContainerWithContent,
       ],
     });
 
@@ -694,27 +692,6 @@ describe('MatDrawerContainer', () => {
       expect(fixture.componentInstance.drawer.opened).toBe(false);
     }));
 
-    it('should expose a scrollable when the consumer has not specified drawer content',
-      fakeAsync(() => {
-        const fixture = TestBed.createComponent(DrawerContainerTwoDrawerTestApp);
-
-        fixture.detectChanges();
-
-        expect(fixture.componentInstance.drawerContainer.scrollable instanceof CdkScrollable)
-            .toBe(true);
-      }));
-
-    it('should expose a scrollable when the consumer has specified drawer content',
-      fakeAsync(() => {
-        const fixture = TestBed.createComponent(DrawerContainerWithContent);
-
-        fixture.detectChanges();
-
-        expect(fixture.componentInstance.drawerContainer.scrollable instanceof CdkScrollable)
-            .toBe(true);
-      }));
-
-
 });
 
 
@@ -897,16 +874,3 @@ class AutosizeDrawer {
   @ViewChild(MatDrawer) drawer: MatDrawer;
   fillerWidth = 0;
 }
-
-
-@Component({
-  template: `
-    <mat-drawer-container>
-      <mat-drawer>Drawer</mat-drawer>
-      <mat-drawer-content>Content</mat-drawer-content>
-    </mat-drawer-container>
-  `,
-})
-class DrawerContainerWithContent {
-  @ViewChild(MatDrawerContainer) drawerContainer: MatDrawerContainer;
-}

src/lib/sidenav/drawer.ts

@@ -11,7 +11,7 @@ import {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {ESCAPE} from '@angular/cdk/keycodes';
 import {Platform} from '@angular/cdk/platform';
-import {CdkScrollable, ScrollDispatcher} from '@angular/cdk/scrolling';
+import {CdkScrollable} from '@angular/cdk/scrolling';
 import {DOCUMENT} from '@angular/common';
 import {
   AfterContentChecked,
@@ -75,14 +75,10 @@ export function MAT_DRAWER_DEFAULT_AUTOSIZE_FACTORY(): boolean {
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
 })
-export class MatDrawerContent extends CdkScrollable implements AfterContentInit {
+export class MatDrawerContent implements AfterContentInit {
   constructor(
       private _changeDetectorRef: ChangeDetectorRef,
-      @Inject(forwardRef(() => MatDrawerContainer)) public _container: MatDrawerContainer,
-      elementRef: ElementRef<HTMLElement>,
-      scrollDispatcher: ScrollDispatcher,
-      ngZone: NgZone) {
-    super(elementRef, scrollDispatcher, ngZone);
+      @Inject(forwardRef(() => MatDrawerContainer)) public _container: MatDrawerContainer) {
   }
 
   ngAfterContentInit() {
@@ -405,7 +401,6 @@ export class MatDrawer implements AfterContentInit, AfterContentChecked, OnDestr
 export class MatDrawerContainer implements AfterContentInit, DoCheck, OnDestroy {
   @ContentChildren(MatDrawer) _drawers: QueryList<MatDrawer>;
   @ContentChild(MatDrawerContent) _content: MatDrawerContent;
-  @ViewChild(MatDrawerContent) _userContent: MatDrawerContent;
 
   /** The drawer child with the `start` position. */
   get start(): MatDrawer | null { return this._start; }
@@ -476,9 +471,7 @@ export class MatDrawerContainer implements AfterContentInit, DoCheck, OnDestroy
   readonly _contentMarginChanges = new Subject<{left: number|null, right: number|null}>();
 
   /** Reference to the CdkScrollable instance that wraps the scrollable content. */
-  get scrollable(): CdkScrollable {
-    return this._userContent || this._content;
-  }
+  @ViewChild(CdkScrollable) scrollable: CdkScrollable;
 
   constructor(@Optional() private _dir: Directionality,
               private _element: ElementRef,

src/lib/sidenav/sidenav.md

@@ -109,8 +109,8 @@ The `<mat-sidenav>` can render in one of three different ways based on the `mode
 
 | Mode   | Description                                                                             |
 |--------|-----------------------------------------------------------------------------------------|
-| `over` | Sidenav floats over the primary content, which is covered by a backdrop                 |
-| `push` | Sidenav pushes the primary content out of its way, also covering it with a backdrop     |
+| `over` | Sidenav floats over the primary content, which is covered by a backdrop               |
+| `push` | Sidenav pushes the primary content out of its way, also covering it with a backdrop   |
 | `side` | Sidenav appears side-by-side with the main content, shrinking the main content's width to make space for the sidenav. |
 
 If no `mode` is specified, `over` is used by default.
@@ -186,10 +186,10 @@ To react to scrolling inside the `<mat-sidenav-container>`, you can get a hold o
 `CdkScrollable` instance through the `MatSidenavContainer`.
 
 ```ts
-class YourComponent implements AfterViewInit {
+class YourComponent {
   @ViewChild(MatSidenavContainer) sidenavContainer: MatSidenavContainer;
 
-  ngAfterViewInit() {
+  constructor() {
     this.sidenavContainer.scrollable.elementScrolled().subscribe(() => /* react to scrolling */);
   }
 }

src/lib/sidenav/sidenav.ts

@@ -17,13 +17,10 @@ import {
   Input,
   ViewEncapsulation,
   QueryList,
-  ElementRef,
-  NgZone,
 } from '@angular/core';
 import {MatDrawer, MatDrawerContainer, MatDrawerContent} from './drawer';
 import {matDrawerAnimations} from './drawer-animations';
 import {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk/coercion';
-import {ScrollDispatcher} from '@angular/cdk/scrolling';
 
 
 @Component({
@@ -41,11 +38,8 @@ import {ScrollDispatcher} from '@angular/cdk/scrolling';
 export class MatSidenavContent extends MatDrawerContent {
   constructor(
       changeDetectorRef: ChangeDetectorRef,
-      @Inject(forwardRef(() => MatSidenavContainer)) container: MatSidenavContainer,
-      elementRef: ElementRef<HTMLElement>,
-      scrollDispatcher: ScrollDispatcher,
-      ngZone: NgZone) {
-    super(changeDetectorRef, container, elementRef, scrollDispatcher, ngZone);
+      @Inject(forwardRef(() => MatSidenavContainer)) container: MatSidenavContainer) {
+    super(changeDetectorRef, container);
   }
 }