File tree Expand file tree Collapse file tree 2 files changed +15
-4
lines changed Expand file tree Collapse file tree 2 files changed +15
-4
lines changed Original file line number Diff line number Diff line change @@ -126,6 +126,15 @@ describe('MatDrawer', () => {
126
126
expect ( testComponent . closeCount ) . toBe ( 1 , 'Expected one close event.' ) ;
127
127
} ) ) ;
128
128
129
+ it ( 'should fire the open event when open on init' , fakeAsync ( ( ) => {
130
+ let fixture = TestBed . createComponent ( DrawerSetToOpenedTrue ) ;
131
+
132
+ fixture . detectChanges ( ) ;
133
+ tick ( ) ;
134
+
135
+ expect ( fixture . componentInstance . openCallback ) . toHaveBeenCalledTimes ( 1 ) ;
136
+ } ) ) ;
137
+
129
138
it ( 'should not close by pressing escape when disableClose is set' , fakeAsync ( ( ) => {
130
139
let fixture = TestBed . createComponent ( BasicTestApp ) ;
131
140
let testComponent = fixture . debugElement . componentInstance ;
@@ -430,12 +439,14 @@ class DrawerSetToOpenedFalse { }
430
439
@Component ( {
431
440
template : `
432
441
<mat-drawer-container>
433
- <mat-drawer #drawer mode="side" opened="true">
442
+ <mat-drawer #drawer mode="side" opened="true" (open)="openCallback()" >
434
443
Closed Drawer.
435
444
</mat-drawer>
436
445
</mat-drawer-container>` ,
437
446
} )
438
- class DrawerSetToOpenedTrue { }
447
+ class DrawerSetToOpenedTrue {
448
+ openCallback = jasmine . createSpy ( 'open callback' ) ;
449
+ }
439
450
440
451
@Component ( {
441
452
template : `
Original file line number Diff line number Diff line change @@ -329,9 +329,9 @@ export class MatDrawer implements AfterContentInit, OnDestroy {
329
329
_onAnimationEnd ( event : AnimationEvent ) {
330
330
const { fromState, toState} = event ;
331
331
332
- if ( toState === 'open' && fromState === 'void' ) {
332
+ if ( toState . indexOf ( 'open' ) === 0 && fromState === 'void' ) {
333
333
this . onOpen . emit ( new MatDrawerToggleResult ( 'open' , true ) ) ;
334
- } else if ( toState === 'void' && fromState === 'open' ) {
334
+ } else if ( toState === 'void' && fromState . indexOf ( 'open' ) === 0 ) {
335
335
this . onClose . emit ( new MatDrawerToggleResult ( 'close' , true ) ) ;
336
336
}
337
337
You can’t perform that action at this time.
0 commit comments