Skip to content

Commit fcc0448

Browse files
crisbetojelbourn
authored andcommitted
test(sidenav): fix sidenav failures under Ivy (#15300)
* Fixes one unit test that was depending on static queries. * Fixes the remaining 16 failures that were due to some code that was commented out while waiting for a task which was resolved.
1 parent 4d38453 commit fcc0448

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

src/lib/sidenav/drawer.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,7 @@ describe('MatDrawerContainer', () => {
699699
it('should be able to explicitly enable the backdrop in `side` mode', fakeAsync(() => {
700700
const fixture = TestBed.createComponent(BasicTestApp);
701701
const root = fixture.nativeElement;
702+
fixture.detectChanges();
702703

703704
fixture.componentInstance.drawer.mode = 'side';
704705
fixture.detectChanges();

src/lib/sidenav/drawer.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,8 @@ export class MatDrawerContent extends CdkScrollable implements AfterContentInit
116116
host: {
117117
'class': 'mat-drawer',
118118
'[@transform]': '_animationState',
119-
120-
// These are commented out until FW-943 can be resolved.
121-
// '(@transform.start)': '_animationStarted.next($event)',
122-
// '(@transform.done)': '_animationEnd.next($event)',
119+
'(@transform.start)': '_animationStarted.next($event)',
120+
'(@transform.done)': '_animationEnd.next($event)',
123121

124122
// must prevent the browser from aligning text based on value
125123
'[attr.align]': 'null',

src/lib/sidenav/sidenav.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,8 @@ export class MatSidenavContent extends MatDrawerContent {
6060
'class': 'mat-drawer mat-sidenav',
6161
'tabIndex': '-1',
6262
'[@transform]': '_animationState',
63-
64-
// These are commented out until FW-943 can be resolved.
65-
// '(@transform.start)': '_animationStarted.next($event)',
66-
// '(@transform.done)': '_animationEnd.next($event)',
63+
'(@transform.start)': '_animationStarted.next($event)',
64+
'(@transform.done)': '_animationEnd.next($event)',
6765

6866
// must prevent the browser from aligning text based on value
6967
'[attr.align]': 'null',

0 commit comments

Comments
 (0)