@@ -28,13 +28,13 @@ import { ModalContentComponent } from '../modal-content/modal-content.component'
28
28
state (
29
29
'visible' ,
30
30
style ( {
31
- display : 'block'
31
+ // display: 'block'
32
32
} )
33
33
) ,
34
34
state (
35
35
'hidden' ,
36
36
style ( {
37
- display : 'none'
37
+ // display: 'none'
38
38
} )
39
39
) ,
40
40
transition ( 'visible <=> *' , [ animate ( '300ms' ) ] )
@@ -147,7 +147,8 @@ export class ModalComponent implements OnInit, OnDestroy {
147
147
@ViewChild ( ModalContentComponent , { read : ElementRef } ) modalContent ! : ElementRef ;
148
148
private activeBackdrop ! : any ;
149
149
private stateToggleSubscription ! : Subscription ;
150
- private inBoundingClientRect ! : boolean ;
150
+
151
+ // private inBoundingClientRect!: boolean;
151
152
152
153
@HostBinding ( 'class' )
153
154
get hostClasses ( ) : any {
@@ -196,18 +197,24 @@ export class ModalComponent implements OnInit, OnDestroy {
196
197
if ( event . toState === 'visible' ) {
197
198
this . renderer . setStyle ( this . document . body , 'overflow' , 'hidden' ) ;
198
199
this . renderer . setStyle ( this . document . body , 'padding-right' , scrollbarWidth ) ;
200
+ this . renderer . setStyle ( this . hostElement . nativeElement , 'display' , 'block' ) ;
201
+ } else {
202
+ if ( ! this . transition ) {
203
+ this . renderer . setStyle ( this . hostElement . nativeElement , 'display' , 'none' ) ;
204
+ }
199
205
}
200
206
}
201
207
202
208
@HostListener ( '@showHide.done' , [ '$event' ] )
203
209
animateDone ( event : AnimationEvent ) {
204
210
setTimeout ( ( ) => {
205
211
if ( event . toState === 'hidden' ) {
212
+ this . renderer . setStyle ( this . hostElement . nativeElement , 'display' , 'none' ) ;
206
213
this . renderer . removeStyle ( this . document . body , 'overflow' ) ;
207
214
this . renderer . removeStyle ( this . document . body , 'padding-right' ) ;
208
215
}
209
- this . show = this . visible ;
210
216
} ) ;
217
+ this . show = this . visible ;
211
218
}
212
219
213
220
@HostListener ( 'document:keydown' , [ '$event' ] )
0 commit comments