@angular/material 14.0.0-rc.0 → 14.0.0

package/fesm2020/bottom-sheet.mjs

@@ -1,20 +1,18 @@
-import * as i1$1 from '@angular/cdk/overlay';
-import { OverlayModule, OverlayConfig } from '@angular/cdk/overlay';
-import * as i4 from '@angular/cdk/portal';
-import { BasePortalOutlet, CdkPortalOutlet, PortalModule, TemplatePortal, ComponentPortal } from '@angular/cdk/portal';
+import * as i2 from '@angular/cdk/dialog';
+import { CdkDialogContainer, DialogModule, Dialog } from '@angular/cdk/dialog';
+import * as i5 from '@angular/cdk/portal';
+import { PortalModule } from '@angular/cdk/portal';
 import * as i0 from '@angular/core';
-import { InjectionToken, EventEmitter, Component, ChangeDetectionStrategy, ViewEncapsulation, Optional, Inject, ViewChild, NgModule, TemplateRef, Injector, InjectFlags, Injectable, SkipSelf } from '@angular/core';
+import { EventEmitter, Component, ChangeDetectionStrategy, ViewEncapsulation, Optional, Inject, NgModule, InjectionToken, Injectable, SkipSelf } from '@angular/core';
 import { AnimationDurations, AnimationCurves, MatCommonModule } from '@angular/material/core';
 import * as i1 from '@angular/cdk/a11y';
-import { coerceArray } from '@angular/cdk/coercion';
-import * as i2 from '@angular/cdk/layout';
+import * as i4 from '@angular/cdk/layout';
 import { Breakpoints } from '@angular/cdk/layout';
-import { _getFocusedElementPierceShadowDom } from '@angular/cdk/platform';
+import * as i3 from '@angular/cdk/overlay';
 import { DOCUMENT } from '@angular/common';
 import { trigger, state, style, transition, group, animate, query, animateChild } from '@angular/animations';
-import { Directionality } from '@angular/cdk/bidi';
-import { Subject, merge, of } from 'rxjs';
 import { ESCAPE, hasModifierKey } from '@angular/cdk/keycodes';
+import { Subject, merge } from 'rxjs';
 import { filter, take } from 'rxjs/operators';
 
 /**
@@ -41,85 +39,18 @@ const matBottomSheetAnimations = {
     ]),
 };
 
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-/** Injection token that can be used to access the data that was passed in to a bottom sheet. */
-const MAT_BOTTOM_SHEET_DATA = new InjectionToken('MatBottomSheetData');
-/**
- * Configuration used when opening a bottom sheet.
- */
-class MatBottomSheetConfig {
-    constructor() {
-        /** Data being injected into the child component. */
-        this.data = null;
-        /** Whether the bottom sheet has a backdrop. */
-        this.hasBackdrop = true;
-        /** Whether the user can use escape or clicking outside to close the bottom sheet. */
-        this.disableClose = false;
-        /** Aria label to assign to the bottom sheet element. */
-        this.ariaLabel = null;
-        /**
-         * Whether the bottom sheet should close when the user goes backwards/forwards in history.
-         * Note that this usually doesn't include clicking on links (unless the user is using
-         * the `HashLocationStrategy`).
-         */
-        this.closeOnNavigation = true;
-        // Note that this is set to 'dialog' by default, because while the a11y recommendations
-        // are to focus the first focusable element, doing so prevents screen readers from reading out the
-        // rest of the bottom sheet content.
-        /**
-         * Where the bottom sheet should focus on open.
-         * @breaking-change 14.0.0 Remove boolean option from autoFocus. Use string or
-         * AutoFocusTarget instead.
-         */
-        this.autoFocus = 'dialog';
-        /**
-         * Whether the bottom sheet should restore focus to the
-         * previously-focused element, after it's closed.
-         */
-        this.restoreFocus = true;
-    }
-}
-
-// TODO(crisbeto): consolidate some logic between this, MatDialog and MatSnackBar
 /**
  * Internal component that wraps user-provided bottom sheet content.
  * @docs-private
  */
-class MatBottomSheetContainer extends BasePortalOutlet {
-    constructor(_elementRef, _changeDetectorRef, _focusTrapFactory, _interactivityChecker, _ngZone, breakpointObserver, document, 
-    /** The bottom sheet configuration. */
-    bottomSheetConfig) {
-        super();
-        this._elementRef = _elementRef;
+class MatBottomSheetContainer extends CdkDialogContainer {
+    constructor(elementRef, focusTrapFactory, document, config, checker, ngZone, overlayRef, breakpointObserver, _changeDetectorRef, focusMonitor) {
+        super(elementRef, focusTrapFactory, document, config, checker, ngZone, overlayRef, focusMonitor);
         this._changeDetectorRef = _changeDetectorRef;
-        this._focusTrapFactory = _focusTrapFactory;
-        this._interactivityChecker = _interactivityChecker;
-        this._ngZone = _ngZone;
-        this.bottomSheetConfig = bottomSheetConfig;
         /** The state of the bottom sheet animations. */
         this._animationState = 'void';
         /** Emits whenever the state of the animation changes. */
         this._animationStateChanged = new EventEmitter();
-        /** Element that was focused before the bottom sheet was opened. */
-        this._elementFocusedBeforeOpened = null;
-        /**
-         * Attaches a DOM portal to the bottom sheet container.
-         * @deprecated To be turned into a method.
-         * @breaking-change 10.0.0
-         */
-        this.attachDomPortal = (portal) => {
-            this._validatePortalAttached();
-            this._setPanelClass();
-            this._savePreviouslyFocusedElement();
-            return this._portalOutlet.attachDomPortal(portal);
-        };
-        this._document = document;
         this._breakpointSubscription = breakpointObserver
             .observe([Breakpoints.Medium, Breakpoints.Large, Breakpoints.XLarge])
             .subscribe(() => {
@@ -128,20 +59,6 @@ class MatBottomSheetContainer extends BasePortalOutlet {
             this._toggleClass('mat-bottom-sheet-container-xlarge', breakpointObserver.isMatched(Breakpoints.XLarge));
         });
     }
-    /** Attach a component portal as content to this bottom sheet container. */
-    attachComponentPortal(portal) {
-        this._validatePortalAttached();
-        this._setPanelClass();
-        this._savePreviouslyFocusedElement();
-        return this._portalOutlet.attachComponentPortal(portal);
-    }
-    /** Attach a template portal as content to this bottom sheet container. */
-    attachTemplatePortal(portal) {
-        this._validatePortalAttached();
-        this._setPanelClass();
-        this._savePreviouslyFocusedElement();
-        return this._portalOutlet.attachTemplatePortal(portal);
-    }
     /** Begin animation of bottom sheet entrance into view. */
     enter() {
         if (!this._destroyed) {
@@ -157,14 +74,12 @@ class MatBottomSheetContainer extends BasePortalOutlet {
         }
     }
     ngOnDestroy() {
+        super.ngOnDestroy();
         this._breakpointSubscription.unsubscribe();
         this._destroyed = true;
     }
     _onAnimationDone(event) {
-        if (event.toState === 'hidden') {
-            this._restoreFocus();
-        }
-        else if (event.toState === 'visible') {
+        if (event.toState === 'visible') {
             this._trapFocus();
         }
         this._animationStateChanged.emit(event);
@@ -172,144 +87,31 @@ class MatBottomSheetContainer extends BasePortalOutlet {
     _onAnimationStart(event) {
         this._animationStateChanged.emit(event);
     }
+    _captureInitialFocus() { }
     _toggleClass(cssClass, add) {
         this._elementRef.nativeElement.classList.toggle(cssClass, add);
     }
-    _validatePortalAttached() {
-        if (this._portalOutlet.hasAttached() && (typeof ngDevMode === 'undefined' || ngDevMode)) {
-            throw Error('Attempting to attach bottom sheet content after content is already attached');
-        }
-    }
-    _setPanelClass() {
-        const element = this._elementRef.nativeElement;
-        element.classList.add(...coerceArray(this.bottomSheetConfig.panelClass || []));
-    }
-    /**
-     * Focuses the provided element. If the element is not focusable, it will add a tabIndex
-     * attribute to forcefully focus it. The attribute is removed after focus is moved.
-     * @param element The element to focus.
-     */
-    _forceFocus(element, options) {
-        if (!this._interactivityChecker.isFocusable(element)) {
-            element.tabIndex = -1;
-            // The tabindex attribute should be removed to avoid navigating to that element again
-            this._ngZone.runOutsideAngular(() => {
-                const callback = () => {
-                    element.removeEventListener('blur', callback);
-                    element.removeEventListener('mousedown', callback);
-                    element.removeAttribute('tabindex');
-                };
-                element.addEventListener('blur', callback);
-                element.addEventListener('mousedown', callback);
-            });
-        }
-        element.focus(options);
-    }
-    /**
-     * Focuses the first element that matches the given selector within the focus trap.
-     * @param selector The CSS selector for the element to set focus to.
-     */
-    _focusByCssSelector(selector, options) {
-        let elementToFocus = this._elementRef.nativeElement.querySelector(selector);
-        if (elementToFocus) {
-            this._forceFocus(elementToFocus, options);
-        }
-    }
-    /**
-     * Moves the focus inside the focus trap. When autoFocus is not set to 'bottom-sheet',
-     * if focus cannot be moved then focus will go to the bottom sheet container.
-     */
-    _trapFocus() {
-        const element = this._elementRef.nativeElement;
-        if (!this._focusTrap) {
-            this._focusTrap = this._focusTrapFactory.create(element);
-        }
-        // If were to attempt to focus immediately, then the content of the bottom sheet would not
-        // yet be ready in instances where change detection has to run first. To deal with this,
-        // we simply wait for the microtask queue to be empty when setting focus when autoFocus
-        // isn't set to bottom sheet. If the element inside the bottom sheet can't be focused,
-        // then the container is focused so the user can't tab into other elements behind it.
-        switch (this.bottomSheetConfig.autoFocus) {
-            case false:
-            case 'dialog':
-                const activeElement = _getFocusedElementPierceShadowDom();
-                // Ensure that focus is on the bottom sheet container. It's possible that a different
-                // component tried to move focus while the open animation was running. See:
-                // https://github.com/angular/components/issues/16215. Note that we only want to do this
-                // if the focus isn't inside the bottom sheet already, because it's possible that the
-                // consumer specified `autoFocus` in order to move focus themselves.
-                if (activeElement !== element && !element.contains(activeElement)) {
-                    element.focus();
-                }
-                break;
-            case true:
-            case 'first-tabbable':
-                this._focusTrap.focusInitialElementWhenReady();
-                break;
-            case 'first-heading':
-                this._focusByCssSelector('h1, h2, h3, h4, h5, h6, [role="heading"]');
-                break;
-            default:
-                this._focusByCssSelector(this.bottomSheetConfig.autoFocus);
-                break;
-        }
-    }
-    /** Restores focus to the element that was focused before the bottom sheet was opened. */
-    _restoreFocus() {
-        const toFocus = this._elementFocusedBeforeOpened;
-        // We need the extra check, because IE can set the `activeElement` to null in some cases.
-        if (this.bottomSheetConfig.restoreFocus && toFocus && typeof toFocus.focus === 'function') {
-            const activeElement = _getFocusedElementPierceShadowDom();
-            const element = this._elementRef.nativeElement;
-            // Make sure that focus is still inside the bottom sheet or is on the body (usually because a
-            // non-focusable element like the backdrop was clicked) before moving it. It's possible that
-            // the consumer moved it themselves before the animation was done, in which case we shouldn't
-            // do anything.
-            if (!activeElement ||
-                activeElement === this._document.body ||
-                activeElement === element ||
-                element.contains(activeElement)) {
-                toFocus.focus();
-            }
-        }
-        if (this._focusTrap) {
-            this._focusTrap.destroy();
-        }
-    }
-    /** Saves a reference to the element that was focused before the bottom sheet was opened. */
-    _savePreviouslyFocusedElement() {
-        this._elementFocusedBeforeOpened = _getFocusedElementPierceShadowDom();
-        // The `focus` method isn't available during server-side rendering.
-        if (this._elementRef.nativeElement.focus) {
-            this._ngZone.runOutsideAngular(() => {
-                Promise.resolve().then(() => this._elementRef.nativeElement.focus());
-            });
-        }
-    }
 }
-MatBottomSheetContainer.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.0-next.16", ngImport: i0, type: MatBottomSheetContainer, deps: [{ token: i0.ElementRef }, { token: i0.ChangeDetectorRef }, { token: i1.FocusTrapFactory }, { token: i1.InteractivityChecker }, { token: i0.NgZone }, { token: i2.BreakpointObserver }, { token: DOCUMENT, optional: true }, { token: MatBottomSheetConfig }], target: i0.ɵɵFactoryTarget.Component });
-MatBottomSheetContainer.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.0.0-next.16", type: MatBottomSheetContainer, selector: "mat-bottom-sheet-container", host: { attributes: { "tabindex": "-1", "role": "dialog", "aria-modal": "true" }, listeners: { "@state.start": "_onAnimationStart($event)", "@state.done": "_onAnimationDone($event)" }, properties: { "attr.aria-label": "bottomSheetConfig?.ariaLabel", "@state": "_animationState" }, classAttribute: "mat-bottom-sheet-container" }, viewQueries: [{ propertyName: "_portalOutlet", first: true, predicate: CdkPortalOutlet, descendants: true, static: true }], usesInheritance: true, ngImport: i0, template: "<ng-template cdkPortalOutlet></ng-template>\r\n", styles: [".mat-bottom-sheet-container{padding:8px 16px;min-width:100vw;box-sizing:border-box;display:block;outline:0;max-height:80vh;overflow:auto}.cdk-high-contrast-active .mat-bottom-sheet-container{outline:1px solid}.mat-bottom-sheet-container-xlarge,.mat-bottom-sheet-container-large,.mat-bottom-sheet-container-medium{border-top-left-radius:4px;border-top-right-radius:4px}.mat-bottom-sheet-container-medium{min-width:384px;max-width:calc(100vw - 128px)}.mat-bottom-sheet-container-large{min-width:512px;max-width:calc(100vw - 256px)}.mat-bottom-sheet-container-xlarge{min-width:576px;max-width:calc(100vw - 384px)}"], dependencies: [{ kind: "directive", type: i4.CdkPortalOutlet, selector: "[cdkPortalOutlet]", inputs: ["cdkPortalOutlet"], outputs: ["attached"], exportAs: ["cdkPortalOutlet"] }], animations: [matBottomSheetAnimations.bottomSheetState], changeDetection: i0.ChangeDetectionStrategy.Default, encapsulation: i0.ViewEncapsulation.None });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-next.16", ngImport: i0, type: MatBottomSheetContainer, decorators: [{
+MatBottomSheetContainer.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.0-rc.1", ngImport: i0, type: MatBottomSheetContainer, deps: [{ token: i0.ElementRef }, { token: i1.FocusTrapFactory }, { token: DOCUMENT, optional: true }, { token: i2.DialogConfig }, { token: i1.InteractivityChecker }, { token: i0.NgZone }, { token: i3.OverlayRef }, { token: i4.BreakpointObserver }, { token: i0.ChangeDetectorRef }, { token: i1.FocusMonitor }], target: i0.ɵɵFactoryTarget.Component });
+MatBottomSheetContainer.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.0.0-rc.1", type: MatBottomSheetContainer, selector: "mat-bottom-sheet-container", host: { attributes: { "tabindex": "-1" }, listeners: { "@state.start": "_onAnimationStart($event)", "@state.done": "_onAnimationDone($event)" }, properties: { "attr.role": "_config.role", "attr.aria-modal": "_config.isModal", "attr.aria-label": "_config.ariaLabel", "@state": "_animationState" }, classAttribute: "mat-bottom-sheet-container" }, usesInheritance: true, ngImport: i0, template: "<ng-template cdkPortalOutlet></ng-template>\r\n", styles: [".mat-bottom-sheet-container{padding:8px 16px;min-width:100vw;box-sizing:border-box;display:block;outline:0;max-height:80vh;overflow:auto}.cdk-high-contrast-active .mat-bottom-sheet-container{outline:1px solid}.mat-bottom-sheet-container-xlarge,.mat-bottom-sheet-container-large,.mat-bottom-sheet-container-medium{border-top-left-radius:4px;border-top-right-radius:4px}.mat-bottom-sheet-container-medium{min-width:384px;max-width:calc(100vw - 128px)}.mat-bottom-sheet-container-large{min-width:512px;max-width:calc(100vw - 256px)}.mat-bottom-sheet-container-xlarge{min-width:576px;max-width:calc(100vw - 384px)}"], dependencies: [{ kind: "directive", type: i5.CdkPortalOutlet, selector: "[cdkPortalOutlet]", inputs: ["cdkPortalOutlet"], outputs: ["attached"], exportAs: ["cdkPortalOutlet"] }], animations: [matBottomSheetAnimations.bottomSheetState], changeDetection: i0.ChangeDetectionStrategy.Default, encapsulation: i0.ViewEncapsulation.None });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-rc.1", ngImport: i0, type: MatBottomSheetContainer, decorators: [{
             type: Component,
             args: [{ selector: 'mat-bottom-sheet-container', changeDetection: ChangeDetectionStrategy.Default, encapsulation: ViewEncapsulation.None, animations: [matBottomSheetAnimations.bottomSheetState], host: {
                         'class': 'mat-bottom-sheet-container',
                         'tabindex': '-1',
-                        'role': 'dialog',
-                        'aria-modal': 'true',
-                        '[attr.aria-label]': 'bottomSheetConfig?.ariaLabel',
+                        '[attr.role]': '_config.role',
+                        '[attr.aria-modal]': '_config.isModal',
+                        '[attr.aria-label]': '_config.ariaLabel',
                         '[@state]': '_animationState',
                         '(@state.start)': '_onAnimationStart($event)',
                         '(@state.done)': '_onAnimationDone($event)',
                     }, template: "<ng-template cdkPortalOutlet></ng-template>\r\n", styles: [".mat-bottom-sheet-container{padding:8px 16px;min-width:100vw;box-sizing:border-box;display:block;outline:0;max-height:80vh;overflow:auto}.cdk-high-contrast-active .mat-bottom-sheet-container{outline:1px solid}.mat-bottom-sheet-container-xlarge,.mat-bottom-sheet-container-large,.mat-bottom-sheet-container-medium{border-top-left-radius:4px;border-top-right-radius:4px}.mat-bottom-sheet-container-medium{min-width:384px;max-width:calc(100vw - 128px)}.mat-bottom-sheet-container-large{min-width:512px;max-width:calc(100vw - 256px)}.mat-bottom-sheet-container-xlarge{min-width:576px;max-width:calc(100vw - 384px)}"] }]
-        }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: i0.ChangeDetectorRef }, { type: i1.FocusTrapFactory }, { type: i1.InteractivityChecker }, { type: i0.NgZone }, { type: i2.BreakpointObserver }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: i1.FocusTrapFactory }, { type: undefined, decorators: [{
                     type: Optional
                 }, {
                     type: Inject,
                     args: [DOCUMENT]
-                }] }, { type: MatBottomSheetConfig }]; }, propDecorators: { _portalOutlet: [{
-                type: ViewChild,
-                args: [CdkPortalOutlet, { static: true }]
-            }] } });
+                }] }, { type: i2.DialogConfig }, { type: i1.InteractivityChecker }, { type: i0.NgZone }, { type: i3.OverlayRef }, { type: i4.BreakpointObserver }, { type: i0.ChangeDetectorRef }, { type: i1.FocusMonitor }]; } });
 
 /**
  * @license
@@ -320,18 +122,63 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-next.16",
  */
 class MatBottomSheetModule {
 }
-MatBottomSheetModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.0-next.16", ngImport: i0, type: MatBottomSheetModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-MatBottomSheetModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.0.0-next.16", ngImport: i0, type: MatBottomSheetModule, declarations: [MatBottomSheetContainer], imports: [OverlayModule, MatCommonModule, PortalModule], exports: [MatBottomSheetContainer, MatCommonModule] });
-MatBottomSheetModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.0.0-next.16", ngImport: i0, type: MatBottomSheetModule, imports: [OverlayModule, MatCommonModule, PortalModule, MatCommonModule] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-next.16", ngImport: i0, type: MatBottomSheetModule, decorators: [{
+MatBottomSheetModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.0-rc.1", ngImport: i0, type: MatBottomSheetModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+MatBottomSheetModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.0.0-rc.1", ngImport: i0, type: MatBottomSheetModule, declarations: [MatBottomSheetContainer], imports: [DialogModule, MatCommonModule, PortalModule], exports: [MatBottomSheetContainer, MatCommonModule] });
+MatBottomSheetModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.0.0-rc.1", ngImport: i0, type: MatBottomSheetModule, imports: [DialogModule, MatCommonModule, PortalModule, MatCommonModule] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-rc.1", ngImport: i0, type: MatBottomSheetModule, decorators: [{
             type: NgModule,
             args: [{
-                    imports: [OverlayModule, MatCommonModule, PortalModule],
+                    imports: [DialogModule, MatCommonModule, PortalModule],
                     exports: [MatBottomSheetContainer, MatCommonModule],
                     declarations: [MatBottomSheetContainer],
                 }]
         }] });
 
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+/** Injection token that can be used to access the data that was passed in to a bottom sheet. */
+const MAT_BOTTOM_SHEET_DATA = new InjectionToken('MatBottomSheetData');
+/**
+ * Configuration used when opening a bottom sheet.
+ */
+class MatBottomSheetConfig {
+    constructor() {
+        /** Data being injected into the child component. */
+        this.data = null;
+        /** Whether the bottom sheet has a backdrop. */
+        this.hasBackdrop = true;
+        /** Whether the user can use escape or clicking outside to close the bottom sheet. */
+        this.disableClose = false;
+        /** Aria label to assign to the bottom sheet element. */
+        this.ariaLabel = null;
+        /**
+         * Whether the bottom sheet should close when the user goes backwards/forwards in history.
+         * Note that this usually doesn't include clicking on links (unless the user is using
+         * the `HashLocationStrategy`).
+         */
+        this.closeOnNavigation = true;
+        // Note that this is set to 'dialog' by default, because while the a11y recommendations
+        // are to focus the first focusable element, doing so prevents screen readers from reading out the
+        // rest of the bottom sheet content.
+        /**
+         * Where the bottom sheet should focus on open.
+         * @breaking-change 14.0.0 Remove boolean option from autoFocus. Use string or
+         * AutoFocusTarget instead.
+         */
+        this.autoFocus = 'dialog';
+        /**
+         * Whether the bottom sheet should restore focus to the
+         * previously-focused element, after it's closed.
+         */
+        this.restoreFocus = true;
+    }
+}
+
 /**
  * @license
  * Copyright Google LLC All Rights Reserved.
@@ -343,14 +190,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-next.16",
  * Reference to a bottom sheet dispatched from the bottom sheet service.
  */
 class MatBottomSheetRef {
-    constructor(containerInstance, _overlayRef) {
-        this._overlayRef = _overlayRef;
-        /** Subject for notifying the user that the bottom sheet has been dismissed. */
-        this._afterDismissed = new Subject();
+    constructor(_ref, config, containerInstance) {
+        this._ref = _ref;
         /** Subject for notifying the user that the bottom sheet has opened and appeared. */
         this._afterOpened = new Subject();
         this.containerInstance = containerInstance;
-        this.disableClose = containerInstance.bottomSheetConfig.disableClose;
+        this.disableClose = config.disableClose;
         // Emit when opening animation completes
         containerInstance._animationStateChanged
             .pipe(filter(event => event.phaseName === 'done' && event.toState === 'visible'), take(1))
@@ -363,16 +208,12 @@ class MatBottomSheetRef {
             .pipe(filter(event => event.phaseName === 'done' && event.toState === 'hidden'), take(1))
             .subscribe(() => {
             clearTimeout(this._closeFallbackTimeout);
-            _overlayRef.dispose();
+            this._ref.close(this._result);
         });
-        _overlayRef
-            .detachments()
-            .pipe(take(1))
-            .subscribe(() => {
-            this._afterDismissed.next(this._result);
-            this._afterDismissed.complete();
+        _ref.overlayRef.detachments().subscribe(() => {
+            this._ref.close(this._result);
         });
-        merge(_overlayRef.backdropClick(), _overlayRef.keydownEvents().pipe(filter(event => event.keyCode === ESCAPE))).subscribe(event => {
+        merge(this.backdropClick(), this.keydownEvents().pipe(filter(event => event.keyCode === ESCAPE))).subscribe(event => {
             if (!this.disableClose &&
                 (event.type !== 'keydown' || !hasModifierKey(event))) {
                 event.preventDefault();
@@ -380,33 +221,39 @@ class MatBottomSheetRef {
             }
         });
     }
+    /** Instance of the component making up the content of the bottom sheet. */
+    get instance() {
+        return this._ref.componentInstance;
+    }
     /**
      * Dismisses the bottom sheet.
      * @param result Data to be passed back to the bottom sheet opener.
      */
     dismiss(result) {
-        if (!this._afterDismissed.closed) {
-            // Transition the backdrop in parallel to the bottom sheet.
-            this.containerInstance._animationStateChanged
-                .pipe(filter(event => event.phaseName === 'start'), take(1))
-                .subscribe(event => {
-                // The logic that disposes of the overlay depends on the exit animation completing, however
-                // it isn't guaranteed if the parent view is destroyed while it's running. Add a fallback
-                // timeout which will clean everything up if the animation hasn't fired within the specified
-                // amount of time plus 100ms. We don't need to run this outside the NgZone, because for the
-                // vast majority of cases the timeout will have been cleared before it has fired.
-                this._closeFallbackTimeout = setTimeout(() => {
-                    this._overlayRef.dispose();
-                }, event.totalTime + 100);
-                this._overlayRef.detachBackdrop();
-            });
-            this._result = result;
-            this.containerInstance.exit();
+        if (!this.containerInstance) {
+            return;
         }
+        // Transition the backdrop in parallel to the bottom sheet.
+        this.containerInstance._animationStateChanged
+            .pipe(filter(event => event.phaseName === 'start'), take(1))
+            .subscribe(event => {
+            // The logic that disposes of the overlay depends on the exit animation completing, however
+            // it isn't guaranteed if the parent view is destroyed while it's running. Add a fallback
+            // timeout which will clean everything up if the animation hasn't fired within the specified
+            // amount of time plus 100ms. We don't need to run this outside the NgZone, because for the
+            // vast majority of cases the timeout will have been cleared before it has fired.
+            this._closeFallbackTimeout = setTimeout(() => {
+                this._ref.close(this._result);
+            }, event.totalTime + 100);
+            this._ref.overlayRef.detachBackdrop();
+        });
+        this._result = result;
+        this.containerInstance.exit();
+        this.containerInstance = null;
     }
     /** Gets an observable that is notified when the bottom sheet is finished closing. */
     afterDismissed() {
-        return this._afterDismissed;
+        return this._ref.closed;
     }
     /** Gets an observable that is notified when the bottom sheet has opened and appeared. */
     afterOpened() {
@@ -416,13 +263,13 @@ class MatBottomSheetRef {
      * Gets an observable that emits when the overlay's backdrop has been clicked.
      */
     backdropClick() {
-        return this._overlayRef.backdropClick();
+        return this._ref.backdropClick;
     }
     /**
      * Gets an observable that emits when keydown events are targeted on the overlay.
      */
     keydownEvents() {
-        return this._overlayRef.keydownEvents();
+        return this._ref.keydownEvents;
     }
 }
 
@@ -439,12 +286,12 @@ const MAT_BOTTOM_SHEET_DEFAULT_OPTIONS = new InjectionToken('mat-bottom-sheet-de
  * Service to trigger Material Design bottom sheets.
  */
 class MatBottomSheet {
-    constructor(_overlay, _injector, _parentBottomSheet, _defaultOptions) {
+    constructor(_overlay, injector, _parentBottomSheet, _defaultOptions) {
         this._overlay = _overlay;
-        this._injector = _injector;
         this._parentBottomSheet = _parentBottomSheet;
         this._defaultOptions = _defaultOptions;
         this._bottomSheetRefAtThisLevel = null;
+        this._dialog = injector.get(Dialog);
     }
     /** Reference to the currently opened bottom sheet. */
     get _openedBottomSheetRef() {
@@ -460,32 +307,36 @@ class MatBottomSheet {
         }
     }
     open(componentOrTemplateRef, config) {
-        const _config = _applyConfigDefaults(this._defaultOptions || new MatBottomSheetConfig(), config);
-        const overlayRef = this._createOverlay(_config);
-        const container = this._attachContainer(overlayRef, _config);
-        const ref = new MatBottomSheetRef(container, overlayRef);
-        if (componentOrTemplateRef instanceof TemplateRef) {
-            container.attachTemplatePortal(new TemplatePortal(componentOrTemplateRef, null, {
-                $implicit: _config.data,
-                bottomSheetRef: ref,
-            }));
-        }
-        else {
-            const portal = new ComponentPortal(componentOrTemplateRef, undefined, this._createInjector(_config, ref));
-            const contentRef = container.attachComponentPortal(portal);
-            ref.instance = contentRef.instance;
-        }
+        const _config = { ...(this._defaultOptions || new MatBottomSheetConfig()), ...config };
+        let ref;
+        this._dialog.open(componentOrTemplateRef, {
+            ..._config,
+            // Disable closing since we need to sync it up to the animation ourselves.
+            disableClose: true,
+            maxWidth: '100%',
+            container: MatBottomSheetContainer,
+            scrollStrategy: _config.scrollStrategy || this._overlay.scrollStrategies.block(),
+            positionStrategy: this._overlay.position().global().centerHorizontally().bottom('0'),
+            templateContext: () => ({ bottomSheetRef: ref }),
+            providers: (cdkRef, _cdkConfig, container) => {
+                ref = new MatBottomSheetRef(cdkRef, _config, container);
+                return [
+                    { provide: MatBottomSheetRef, useValue: ref },
+                    { provide: MAT_BOTTOM_SHEET_DATA, useValue: _config.data },
+                ];
+            },
+        });
         // When the bottom sheet is dismissed, clear the reference to it.
         ref.afterDismissed().subscribe(() => {
             // Clear the bottom sheet ref if it hasn't already been replaced by a newer one.
-            if (this._openedBottomSheetRef == ref) {
+            if (this._openedBottomSheetRef === ref) {
                 this._openedBottomSheetRef = null;
             }
         });
         if (this._openedBottomSheetRef) {
             // If a bottom sheet is already in view, dismiss it and enter the
             // new bottom sheet after exit animation is complete.
-            this._openedBottomSheetRef.afterDismissed().subscribe(() => ref.containerInstance.enter());
+            this._openedBottomSheetRef.afterDismissed().subscribe(() => ref.containerInstance?.enter());
             this._openedBottomSheetRef.dismiss();
         }
         else {
@@ -509,65 +360,13 @@ class MatBottomSheet {
             this._bottomSheetRefAtThisLevel.dismiss();
         }
     }
-    /**
-     * Attaches the bottom sheet container component to the overlay.
-     */
-    _attachContainer(overlayRef, config) {
-        const userInjector = config && config.viewContainerRef && config.viewContainerRef.injector;
-        const injector = Injector.create({
-            parent: userInjector || this._injector,
-            providers: [{ provide: MatBottomSheetConfig, useValue: config }],
-        });
-        const containerPortal = new ComponentPortal(MatBottomSheetContainer, config.viewContainerRef, injector);
-        const containerRef = overlayRef.attach(containerPortal);
-        return containerRef.instance;
-    }
-    /**
-     * Creates a new overlay and places it in the correct location.
-     * @param config The user-specified bottom sheet config.
-     */
-    _createOverlay(config) {
-        const overlayConfig = new OverlayConfig({
-            direction: config.direction,
-            hasBackdrop: config.hasBackdrop,
-            disposeOnNavigation: config.closeOnNavigation,
-            maxWidth: '100%',
-            scrollStrategy: config.scrollStrategy || this._overlay.scrollStrategies.block(),
-            positionStrategy: this._overlay.position().global().centerHorizontally().bottom('0'),
-        });
-        if (config.backdropClass) {
-            overlayConfig.backdropClass = config.backdropClass;
-        }
-        return this._overlay.create(overlayConfig);
-    }
-    /**
-     * Creates an injector to be used inside of a bottom sheet component.
-     * @param config Config that was used to create the bottom sheet.
-     * @param bottomSheetRef Reference to the bottom sheet.
-     */
-    _createInjector(config, bottomSheetRef) {
-        const userInjector = config && config.viewContainerRef && config.viewContainerRef.injector;
-        const providers = [
-            { provide: MatBottomSheetRef, useValue: bottomSheetRef },
-            { provide: MAT_BOTTOM_SHEET_DATA, useValue: config.data },
-        ];
-        if (config.direction &&
-            (!userInjector ||
-                !userInjector.get(Directionality, null, InjectFlags.Optional))) {
-            providers.push({
-                provide: Directionality,
-                useValue: { value: config.direction, change: of() },
-            });
-        }
-        return Injector.create({ parent: userInjector || this._injector, providers });
-    }
 }
-MatBottomSheet.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.0-next.16", ngImport: i0, type: MatBottomSheet, deps: [{ token: i1$1.Overlay }, { token: i0.Injector }, { token: MatBottomSheet, optional: true, skipSelf: true }, { token: MAT_BOTTOM_SHEET_DEFAULT_OPTIONS, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
-MatBottomSheet.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.0-next.16", ngImport: i0, type: MatBottomSheet, providedIn: MatBottomSheetModule });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-next.16", ngImport: i0, type: MatBottomSheet, decorators: [{
+MatBottomSheet.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.0-rc.1", ngImport: i0, type: MatBottomSheet, deps: [{ token: i3.Overlay }, { token: i0.Injector }, { token: MatBottomSheet, optional: true, skipSelf: true }, { token: MAT_BOTTOM_SHEET_DEFAULT_OPTIONS, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
+MatBottomSheet.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.0-rc.1", ngImport: i0, type: MatBottomSheet, providedIn: MatBottomSheetModule });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-rc.1", ngImport: i0, type: MatBottomSheet, decorators: [{
             type: Injectable,
             args: [{ providedIn: MatBottomSheetModule }]
-        }], ctorParameters: function () { return [{ type: i1$1.Overlay }, { type: i0.Injector }, { type: MatBottomSheet, decorators: [{
+        }], ctorParameters: function () { return [{ type: i3.Overlay }, { type: i0.Injector }, { type: MatBottomSheet, decorators: [{
                     type: Optional
                 }, {
                     type: SkipSelf
@@ -577,15 +376,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.0-next.16",
                     type: Inject,
                     args: [MAT_BOTTOM_SHEET_DEFAULT_OPTIONS]
                 }] }]; } });
-/**
- * Applies default options to the bottom sheet config.
- * @param defaults Object containing the default values to which to fall back.
- * @param config The configuration to which the defaults will be applied.
- * @returns The new configuration object with defaults applied.
- */
-function _applyConfigDefaults(defaults, config) {
-    return { ...defaults, ...config };
-}
 
 /**
  * @license