Skip to content

Fix enter key support for generic dialog box #12600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bramkragten merged 1 commit into from
May 6, 2022
Merged

Fix enter key support for generic dialog box #12600

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 6 additions & 20 deletions src/dialogs/generic/dialog-box.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import "@material/mwc-button/mwc-button";
import { mdiAlertOutline } from "@mdi/js";
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 "../../components/ha-dialog";
import "../../components/ha-svg-icon";
import "../../components/ha-switch";
import "../../components/ha-textfield";
import { HaTextField } from "../../components/ha-textfield";
import { haStyleDialog } from "../../resources/styles";
import { HomeAssistant } from "../../types";
import { DialogBoxParams } from "./show-dialog-box";
Expand All @@ -17,13 +18,10 @@ class DialogBox extends LitElement {

@state() private _params?: DialogBoxParams;

@state() private _value?: string;
@query("ha-textfield") private _textField?: HaTextField;

public async showDialog(params: DialogBoxParams): Promise<void> {
this._params = params;
if (params.prompt) {
this._value = params.defaultValue;
}
}

public closeDialog(): boolean {
Expand Down Expand Up @@ -75,9 +73,7 @@ class DialogBox extends LitElement {
? html`
<ha-textfield
dialogInitialFocus
.value=${this._value || ""}
@keyup=${this._handleKeyUp}
@input=${this._valueChanged}
value=${ifDefined(this._params.defaultValue)}
.label=${this._params.inputLabel
? this._params.inputLabel
: ""}
Expand Down Expand Up @@ -109,26 +105,16 @@ class DialogBox extends LitElement {
`;
}

private _valueChanged(ev) {
this._value = ev.target.value;
}

private _dismiss(): void {
if (this._params?.cancel) {
this._params.cancel();
}
this._close();
}

private _handleKeyUp(ev: KeyboardEvent) {
if (ev.keyCode === 13) {
this._confirm();
}
}

private _confirm(): void {
if (this._params!.confirm) {
this._params!.confirm(this._value);
this._params!.confirm(this._textField?.value);
}
this._close();
}
Expand Down