Skip to content

Commit 0768ce8

Browse files
committed
fix(drawer): backdrop not transitioning on close
Fixes the drawer backdrop not animating away on close. Also moves the drawer transitions together with all the other transitions since we don't exclude the `drawer-transitions.scss` from tests anymore.
1 parent ec4ea06 commit 0768ce8

File tree

5 files changed

+19
-24
lines changed

5 files changed

+19
-24
lines changed

src/lib/sidenav/drawer-transitions.scss

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/lib/sidenav/drawer.scss

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,14 @@
5959
visibility: visible;
6060
}
6161

62+
.mat-drawer-transition & {
63+
transition: {
64+
duration: $swift-ease-out-duration;
65+
timing-function: $swift-ease-out-timing-function;
66+
property: background-color, visibility;
67+
}
68+
}
69+
6270
@include cdk-high-contrast {
6371
opacity: 0.5;
6472
}
@@ -70,6 +78,14 @@
7078
display: block;
7179
height: 100%;
7280
overflow: auto;
81+
82+
.mat-drawer-transition & {
83+
transition: {
84+
duration: $swift-ease-out-duration;
85+
timing-function: $swift-ease-out-timing-function;
86+
property: transform, margin-left, margin-right;
87+
}
88+
}
7389
}
7490

7591
.mat-drawer {

src/lib/sidenav/drawer.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ describe('MdDrawer', () => {
3636
let drawer = fixture.debugElement.query(By.directive(MdDrawer));
3737
let drawerBackdropElement = fixture.debugElement.query(By.css('.mat-drawer-backdrop'));
3838

39+
drawerBackdropElement.nativeElement.style.transition = 'none';
3940
fixture.debugElement.query(By.css('.open')).nativeElement.click();
4041
fixture.detectChanges();
4142

src/lib/sidenav/drawer.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -303,10 +303,7 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
303303
moduleId: module.id,
304304
selector: 'md-drawer-container, mat-drawer-container',
305305
templateUrl: 'drawer-container.html',
306-
styleUrls: [
307-
'drawer.css',
308-
'drawer-transitions.css',
309-
],
306+
styleUrls: ['drawer.css'],
310307
host: {
311308
'class': 'mat-drawer-container',
312309
},

src/lib/sidenav/sidenav.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,7 @@ export class MdSidenav extends MdDrawer {}
5858
moduleId: module.id,
5959
selector: 'md-sidenav-container, mat-sidenav-container',
6060
templateUrl: 'drawer-container.html',
61-
styleUrls: [
62-
'drawer.css',
63-
'drawer-transitions.css',
64-
],
61+
styleUrls: ['drawer.css'],
6562
host: {
6663
'class': 'mat-drawer-container mat-sidenav-container',
6764
},

0 commit comments

Comments
 (0)