Fix enter key support for generic dialog box (#12600)

This commit is contained in:
Steve Repsher 2022-05-06 07:32:44 -04:00 committed by GitHub
parent 552c474feb
commit cf05fbaa9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,12 +1,13 @@
import "@material/mwc-button/mwc-button"; import "@material/mwc-button/mwc-button";
import { mdiAlertOutline } from "@mdi/js"; import { mdiAlertOutline } from "@mdi/js";
import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit"; import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
import { customElement, property, state } from "lit/decorators"; import { customElement, property, query, state } from "lit/decorators";
import { ifDefined } from "lit/directives/if-defined";
import { fireEvent } from "../../common/dom/fire_event"; import { fireEvent } from "../../common/dom/fire_event";
import "../../components/ha-dialog"; import "../../components/ha-dialog";
import "../../components/ha-svg-icon"; import "../../components/ha-svg-icon";
import "../../components/ha-switch"; import "../../components/ha-switch";
import "../../components/ha-textfield"; import { HaTextField } from "../../components/ha-textfield";
import { haStyleDialog } from "../../resources/styles"; import { haStyleDialog } from "../../resources/styles";
import { HomeAssistant } from "../../types"; import { HomeAssistant } from "../../types";
import { DialogBoxParams } from "./show-dialog-box"; import { DialogBoxParams } from "./show-dialog-box";
@ -17,13 +18,10 @@ class DialogBox extends LitElement {
@state() private _params?: DialogBoxParams; @state() private _params?: DialogBoxParams;
@state() private _value?: string; @query("ha-textfield") private _textField?: HaTextField;
public async showDialog(params: DialogBoxParams): Promise<void> { public async showDialog(params: DialogBoxParams): Promise<void> {
this._params = params; this._params = params;
if (params.prompt) {
this._value = params.defaultValue;
}
} }
public closeDialog(): boolean { public closeDialog(): boolean {
@ -75,9 +73,7 @@ class DialogBox extends LitElement {
? html` ? html`
<ha-textfield <ha-textfield
dialogInitialFocus dialogInitialFocus
.value=${this._value || ""} value=${ifDefined(this._params.defaultValue)}
@keyup=${this._handleKeyUp}
@input=${this._valueChanged}
.label=${this._params.inputLabel .label=${this._params.inputLabel
? this._params.inputLabel ? this._params.inputLabel
: ""} : ""}
@ -109,10 +105,6 @@ class DialogBox extends LitElement {
`; `;
} }
private _valueChanged(ev) {
this._value = ev.target.value;
}
private _dismiss(): void { private _dismiss(): void {
if (this._params?.cancel) { if (this._params?.cancel) {
this._params.cancel(); this._params.cancel();
@ -120,15 +112,9 @@ class DialogBox extends LitElement {
this._close(); this._close();
} }
private _handleKeyUp(ev: KeyboardEvent) {
if (ev.keyCode === 13) {
this._confirm();
}
}
private _confirm(): void { private _confirm(): void {
if (this._params!.confirm) { if (this._params!.confirm) {
this._params!.confirm(this._value); this._params!.confirm(this._textField?.value);
} }
this._close(); this._close();
} }