Skip to content

Commit c2070e7

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 3571f68 commit c2070e7

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
@@ -65,6 +65,14 @@ $mat-drawer-over-drawer-z-index: 4;
6565
visibility: visible;
6666
}
6767

68+
.mat-drawer-transition & {
69+
transition: {
70+
duration: $swift-ease-out-duration;
71+
timing-function: $swift-ease-out-timing-function;
72+
property: background-color, visibility;
73+
}
74+
}
75+
6876
@include cdk-high-contrast {
6977
opacity: 0.5;
7078
}
@@ -76,6 +84,14 @@ $mat-drawer-over-drawer-z-index: 4;
7684
display: block;
7785
height: 100%;
7886
overflow: auto;
87+
88+
.mat-drawer-transition & {
89+
transition: {
90+
duration: $swift-ease-out-duration;
91+
timing-function: $swift-ease-out-timing-function;
92+
property: transform, margin-left, margin-right;
93+
}
94+
}
7995
}
8096

8197
.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
@@ -360,10 +360,7 @@ export class MdDrawer implements AfterContentInit, OnDestroy {
360360
moduleId: module.id,
361361
selector: 'md-drawer-container, mat-drawer-container',
362362
templateUrl: 'drawer-container.html',
363-
styleUrls: [
364-
'drawer.css',
365-
'drawer-transitions.css',
366-
],
363+
styleUrls: ['drawer.css'],
367364
host: {
368365
'class': 'mat-drawer-container',
369366
},

src/lib/sidenav/sidenav.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,7 @@ export class MdSidenav extends MdDrawer {
109109
moduleId: module.id,
110110
selector: 'md-sidenav-container, mat-sidenav-container',
111111
templateUrl: 'sidenav-container.html',
112-
styleUrls: [
113-
'drawer.css',
114-
'drawer-transitions.css',
115-
],
112+
styleUrls: ['drawer.css'],
116113
host: {
117114
'class': 'mat-drawer-container mat-sidenav-container',
118115
},

0 commit comments

Comments
 (0)