fix(drawer): backdrop not transitioning on close (#6651)

angular · Oct 3, 2017 · 80310a5 · 80310a5
1 parent 0875b85
commit 80310a5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 24 deletions.
diff --git a/src/lib/sidenav/drawer-transitions.scss b/src/lib/sidenav/drawer-transitions.scss
diff --git a/src/lib/sidenav/drawer.scss b/src/lib/sidenav/drawer.scss
@@ -65,6 +65,14 @@ $mat-drawer-over-drawer-z-index: 4;
     visibility: visible;
   }
 
+  .mat-drawer-transition & {
+    transition: {
+      duration: $swift-ease-out-duration;
+      timing-function: $swift-ease-out-timing-function;
+      property: background-color, visibility;
+    }
+  }
+
   @include cdk-high-contrast {
     opacity: 0.5;
   }
@@ -76,6 +84,14 @@ $mat-drawer-over-drawer-z-index: 4;
   display: block;
   height: 100%;
   overflow: auto;
+
+  .mat-drawer-transition & {
+    transition: {
+      duration: $swift-ease-out-duration;
+      timing-function: $swift-ease-out-timing-function;
+      property: transform, margin-left, margin-right;
+    }
+  }
 }
 
 .mat-drawer {

diff --git a/src/lib/sidenav/drawer.spec.ts b/src/lib/sidenav/drawer.spec.ts
@@ -36,6 +36,7 @@ describe('MatDrawer', () => {
       let drawer = fixture.debugElement.query(By.directive(MatDrawer));
       let drawerBackdropElement = fixture.debugElement.query(By.css('.mat-drawer-backdrop'));
 
+      drawerBackdropElement.nativeElement.style.transition = 'none';
       fixture.debugElement.query(By.css('.open')).nativeElement.click();
       fixture.detectChanges();
 

diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
@@ -355,10 +355,7 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
   moduleId: module.id,
   selector: 'mat-drawer-container',
   templateUrl: 'drawer-container.html',
-  styleUrls: [
-    'drawer.css',
-    'drawer-transitions.css',
-  ],
+  styleUrls: ['drawer.css'],
   host: {
     'class': 'mat-drawer-container',
   },

diff --git a/src/lib/sidenav/sidenav.ts b/src/lib/sidenav/sidenav.ts
@@ -109,10 +109,7 @@ export class MatSidenav extends MatDrawer {
   moduleId: module.id,
   selector: 'mat-sidenav-container',
   templateUrl: 'sidenav-container.html',
-  styleUrls: [
-    'drawer.css',
-    'drawer-transitions.css',
-  ],
+  styleUrls: ['drawer.css'],
   host: {
     'class': 'mat-drawer-container mat-sidenav-container',
   },