Fix dialog box callback order (#22097)

* Fix dialog box callback order

* Update dialog-box.ts
This commit is contained in:
Bram Kragten 2024-09-26 14:17:28 +02:00 committed by GitHub
parent ff9af2f980
commit 3fbd5f07a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -129,32 +129,31 @@ class DialogBox extends LitElement {
} }
private _dismiss(): void { private _dismiss(): void {
this._cancel();
this._closeState = "canceled"; this._closeState = "canceled";
this._closeDialog(); this._closeDialog();
this._cancel();
} }
private _confirm(): void { private _confirm(): void {
this._closeState = "confirmed";
this._closeDialog();
if (this._params!.confirm) { if (this._params!.confirm) {
this._params!.confirm(this._textField?.value); this._params!.confirm(this._textField?.value);
} }
this._closeState = "confirmed";
this._closeDialog();
} }
private _closeDialog() { private _closeDialog() {
fireEvent(this, "dialog-closed", { dialog: this.localName });
this._dialog?.close(); this._dialog?.close();
} }
private _dialogClosed() { private _dialogClosed() {
if (!this._closeState) { if (!this._closeState) {
fireEvent(this, "dialog-closed", { dialog: this.localName });
this._cancel(); this._cancel();
} }
if (!this._params) { this._closeState = undefined;
return;
}
this._params = undefined; this._params = undefined;
fireEvent(this, "dialog-closed", { dialog: this.localName });
} }
static get styles(): CSSResultGroup { static get styles(): CSSResultGroup {