Skip to content

Commit 3add6de

Browse files
committed
fix: misc fixes from big rebase
1 parent 05b614c commit 3add6de

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

src/cdk-experimental/scrolling/virtual-scroll-viewport.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ function finishInit(fixture: ComponentFixture<any>) {
9191
encapsulation: ViewEncapsulation.None,
9292
})
9393
class AutoSizeVirtualScroll {
94-
@ViewChild(CdkVirtualScrollViewport) viewport: CdkVirtualScrollViewport;
94+
@ViewChild(CdkVirtualScrollViewport, {static: true}) viewport: CdkVirtualScrollViewport;
9595

9696
@Input() orientation = 'vertical';
9797
@Input() viewportSize = 200;

src/lib/sidenav/drawer.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,8 @@ export class MatDrawerContent extends CdkScrollable implements AfterContentInit
117117
'class': 'mat-drawer',
118118
'[@transform]': '_animationState',
119119

120-
// These are commented out until FW-943 can be resolved.
121-
// '(@transform.start)': '_animationStarted.next($event)',
122-
// '(@transform.done)': '_animationEnd.next($event)',
120+
'(@transform.start)': '_animationStarted.next($event)',
121+
'(@transform.done)': '_animationEnd.next($event)',
123122

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

src/lib/sidenav/sidenav.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,8 @@ export class MatSidenavContent extends MatDrawerContent {
6161
'tabIndex': '-1',
6262
'[@transform]': '_animationState',
6363

64-
// These are commented out until FW-943 can be resolved.
65-
// '(@transform.start)': '_animationStarted.next($event)',
66-
// '(@transform.done)': '_animationEnd.next($event)',
64+
'(@transform.start)': '_animationStarted.next($event)',
65+
'(@transform.done)': '_animationEnd.next($event)',
6766

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

0 commit comments

Comments
 (0)