Revert "fix(dialog,bottom-sheet): invert backdrop color on dark themes (

#13065)" This reverts commit fe96f38.
angular · Dec 13, 2018 · 8c0d35e · 8c0d35e
1 parent f625f21
commit 8c0d35e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 16 deletions.
diff --git a/src/dev-app/dialog/dialog-demo.ts b/src/dev-app/dialog/dialog-demo.ts
@@ -28,7 +28,7 @@ export class DialogDemo {
     disableClose: false,
     panelClass: 'custom-overlay-pane-class',
     hasBackdrop: true,
-    backdropClass: defaultDialogConfig.backdropClass,
+    backdropClass: '',
     width: '',
     height: '',
     minWidth: '',

diff --git a/src/lib/bottom-sheet/_bottom-sheet-theme.scss b/src/lib/bottom-sheet/_bottom-sheet-theme.scss
@@ -5,17 +5,12 @@
 @mixin mat-bottom-sheet-theme($theme) {
   $background: map-get($theme, background);
   $foreground: map-get($theme, foreground);
-  $backdrop-color: invert(mat-color($background, card, 0.288));
 
   .mat-bottom-sheet-container {
     @include _mat-theme-elevation(16, $theme);
     background: mat-color($background, dialog);
     color: mat-color($foreground, text);
   }
-
-  .mat-bottom-sheet-backdrop {
-    background: $backdrop-color;
-  }
 }
 
 @mixin mat-bottom-sheet-typography($config) {

diff --git a/src/lib/bottom-sheet/bottom-sheet-config.ts b/src/lib/bottom-sheet/bottom-sheet-config.ts
@@ -32,7 +32,7 @@ export class MatBottomSheetConfig<D = any> {
   hasBackdrop?: boolean = true;
 
   /** Custom class for the backdrop. */
-  backdropClass?: string = 'mat-bottom-sheet-backdrop';
+  backdropClass?: string;
 
   /** Whether the user can use escape or clicking outside to close the bottom sheet. */
   disableClose?: boolean = false;

diff --git a/src/lib/dialog/_dialog-theme.scss b/src/lib/dialog/_dialog-theme.scss
@@ -7,17 +7,12 @@
 @mixin mat-dialog-theme($theme) {
   $background: map-get($theme, background);
   $foreground: map-get($theme, foreground);
-  $backdrop-color: invert(mat-color($background, card, 0.288));
 
   .mat-dialog-container {
     @include _mat-theme-elevation(24, $theme);
     background: mat-color($background, dialog);
     color: mat-color($foreground, text);
   }
-
-  .mat-dialog-backdrop {
-    background: $backdrop-color;
-  }
 }
 
 @mixin mat-dialog-typography($config) {

diff --git a/src/lib/dialog/dialog-config.ts b/src/lib/dialog/dialog-config.ts
@@ -54,7 +54,7 @@ export class MatDialogConfig<D = any> {
   hasBackdrop?: boolean = true;
 
   /** Custom class for the backdrop, */
-  backdropClass?: string = 'mat-dialog-backdrop';
+  backdropClass?: string = '';
 
   /** Whether the user can use escape or clicking on the backdrop to close the modal. */
   disableClose?: boolean = false;

diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
@@ -189,7 +189,7 @@ export class MatDialog implements OnDestroy {
    * @returns The overlay configuration.
    */
   private _getOverlayConfig(dialogConfig: MatDialogConfig): OverlayConfig {
-    const overlayConfig = new OverlayConfig({
+    const state = new OverlayConfig({
       positionStrategy: this._overlay.position().global(),
       scrollStrategy: dialogConfig.scrollStrategy || this._scrollStrategy(),
       panelClass: dialogConfig.panelClass,
@@ -203,10 +203,10 @@ export class MatDialog implements OnDestroy {
     });
 
     if (dialogConfig.backdropClass) {
-      overlayConfig.backdropClass = dialogConfig.backdropClass;
+      state.backdropClass = dialogConfig.backdropClass;
     }
 
-    return overlayConfig;
+    return state;
   }
 
   /**