javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 19:57:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(modal): life cycle events for controller modals (#24508)

Browse Source 
Resolves #24460
This commit is contained in:
Sean Perkins
2022-01-12 13:46:01 -05:00
committed by GitHub
parent a753d3438a
commit 9a15753fd9
1 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
core/src/components/modal/modal.tsx
View File

@ -216,28 +216,28 @@ export class Modal implements ComponentInterface, OverlayInterface {
*/
@Event({ eventName: 'ionModalDidDismiss' }) didDismiss!: EventEmitter<OverlayEventDetail>;
/**
* Emitted after the modal has presented.
* Shorthand for ionModalWillDismiss.
*/
/**
* Emitted after the modal has presented.
* Shorthand for ionModalWillDismiss.
*/
@Event({ eventName: 'didPresent' }) didPresentShorthand!: EventEmitter<void>;
/**
* Emitted before the modal has presented.
* Shorthand for ionModalWillPresent.
*/
/**
* Emitted before the modal has presented.
* Shorthand for ionModalWillPresent.
*/
@Event({ eventName: 'willPresent' }) willPresentShorthand!: EventEmitter<void>;
/**
* Emitted before the modal has dismissed.
* Shorthand for ionModalWillDismiss.
*/
/**
* Emitted before the modal has dismissed.
* Shorthand for ionModalWillDismiss.
*/
@Event({ eventName: 'willDismiss' }) willDismissShorthand!: EventEmitter<OverlayEventDetail>;
/**
* Emitted after the modal has dismissed.
* Shorthand for ionModalDidDismiss.
*/
/**
* Emitted after the modal has dismissed.
* Shorthand for ionModalDidDismiss.
*/
@Event({ eventName: 'didDismiss' }) didDismissShorthand!: EventEmitter<OverlayEventDetail>;
@Watch('swipeToClose')
@ -494,19 +494,7 @@ export class Modal implements ComponentInterface, OverlayInterface {
if (dismissed) {
const { delegate } = this.getDelegate();
/**
* If the modal is presented through a controller, we don't need to detach
* since the el was already removed during the `dismiss` call above. Skipping
* this step also prevents an issue where rapdily dismissing right after
* presenting could cause `detachComponent` to be called after the present
* finished, blanking out the newly opened modal.
*
* TODO(FW-423) try and find a way to resolve the race condition directly
*/
if (this.inline) {
await detachComponent(delegate, this.usersElement);
}
await detachComponent(delegate, this.usersElement);
if (this.animation) {
this.animation.destroy();