From 1d0389327fb2ef02949daddd67667df8cf52b88c Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Thu, 12 Mar 2020 20:10:06 +0100
Subject: [PATCH] Fix helper UI (#5161)

Fixes #5146
Fixes #5145
Fixes #5142
---
 .../config/helpers/dialog-helper-detail.ts    | 22 ++++++++++++++++++-
 .../helpers/forms/ha-input_boolean-form.ts    |  9 ++++++++
 .../helpers/forms/ha-input_datetime-form.ts   |  9 ++++++++
 .../helpers/forms/ha-input_number-form.ts     |  9 ++++++++
 .../helpers/forms/ha-input_select-form.ts     |  9 ++++++++
 .../helpers/forms/ha-input_text-form.ts       |  9 ++++++++
 .../dialog-lovelace-dashboard-detail.ts       |  1 +
 .../dialog-lovelace-resource-detail.ts        |  1 +
 8 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/src/panels/config/helpers/dialog-helper-detail.ts b/src/panels/config/helpers/dialog-helper-detail.ts
index b2ceee0e23..379639fbc0 100644
--- a/src/panels/config/helpers/dialog-helper-detail.ts
+++ b/src/panels/config/helpers/dialog-helper-detail.ts
@@ -6,6 +6,7 @@ import {
   LitElement,
   property,
   TemplateResult,
+  query,
 } from "lit-element";
 import "../../../components/ha-dialog";
 import { HomeAssistant } from "../../../types";
@@ -44,6 +45,7 @@ export class DialogHelperDetail extends LitElement {
   @property() private _platform?: string;
   @property() private _error?: string;
   @property() private _submitting = false;
+  @query(".form") private _form?: HTMLDivElement;
 
   public async showDialog(): Promise<void> {
     this._platform = undefined;
@@ -108,11 +110,13 @@ export class DialogHelperDetail extends LitElement {
               ${Object.keys(HELPERS).map((platform: string) => {
                 const isLoaded = isComponentLoaded(this.hass, platform);
                 return html`
-                  <div>
+                  <div class="form">
                     <paper-icon-item
                       .disabled=${!isLoaded}
                       @click=${this._platformPicked}
+                      @keydown=${this._handleEnter}
                       .platform=${platform}
+                      dialogInitialFocus
                     >
                       <ha-icon
                         slot="item-icon"
@@ -166,12 +170,28 @@ export class DialogHelperDetail extends LitElement {
     }
   }
 
+  private _handleEnter(ev: KeyboardEvent) {
+    if (ev.keyCode !== 13) {
+      return;
+    }
+    ev.stopPropagation();
+    ev.preventDefault();
+    this._platformPicked(ev);
+  }
+
   private _platformPicked(ev: Event): void {
     this._platform = (ev.currentTarget! as any).platform;
+    this._focusForm();
+  }
+
+  private async _focusForm(): Promise<void> {
+    await this.updateComplete;
+    (this._form?.lastElementChild as HTMLElement).focus();
   }
 
   private _goBack() {
     this._platform = undefined;
+    this._item = undefined;
   }
 
   static get styles(): CSSResult[] {
diff --git a/src/panels/config/helpers/forms/ha-input_boolean-form.ts b/src/panels/config/helpers/forms/ha-input_boolean-form.ts
index 0cf70281eb..1d1bfe6b35 100644
--- a/src/panels/config/helpers/forms/ha-input_boolean-form.ts
+++ b/src/panels/config/helpers/forms/ha-input_boolean-form.ts
@@ -36,6 +36,14 @@ class HaInputBooleanForm extends LitElement {
     }
   }
 
+  public focus() {
+    this.updateComplete.then(() =>
+      (this.shadowRoot?.querySelector(
+        "[dialogInitialFocus]"
+      ) as HTMLElement)?.focus()
+    );
+  }
+
   protected render(): TemplateResult {
     if (!this.hass) {
       return html``;
@@ -55,6 +63,7 @@ class HaInputBooleanForm extends LitElement {
             "ui.dialogs.helper_settings.required_error_msg"
           )}"
           .invalid=${nameInvalid}
+          dialogInitialFocus
         ></paper-input>
         <ha-icon-input
           .value=${this._icon}
diff --git a/src/panels/config/helpers/forms/ha-input_datetime-form.ts b/src/panels/config/helpers/forms/ha-input_datetime-form.ts
index a34a381247..2e71669226 100644
--- a/src/panels/config/helpers/forms/ha-input_datetime-form.ts
+++ b/src/panels/config/helpers/forms/ha-input_datetime-form.ts
@@ -44,6 +44,14 @@ class HaInputDateTimeForm extends LitElement {
     }
   }
 
+  public focus() {
+    this.updateComplete.then(() =>
+      (this.shadowRoot?.querySelector(
+        "[dialogInitialFocus]"
+      ) as HTMLElement)?.focus()
+    );
+  }
+
   protected render(): TemplateResult {
     if (!this.hass) {
       return html``;
@@ -63,6 +71,7 @@ class HaInputDateTimeForm extends LitElement {
             "ui.dialogs.helper_settings.required_error_msg"
           )}"
           .invalid=${nameInvalid}
+          dialogInitialFocus
         ></paper-input>
         <ha-icon-input
           .value=${this._icon}
diff --git a/src/panels/config/helpers/forms/ha-input_number-form.ts b/src/panels/config/helpers/forms/ha-input_number-form.ts
index 7ca6ef9920..a09e920b17 100644
--- a/src/panels/config/helpers/forms/ha-input_number-form.ts
+++ b/src/panels/config/helpers/forms/ha-input_number-form.ts
@@ -55,6 +55,14 @@ class HaInputNumberForm extends LitElement {
     }
   }
 
+  public focus() {
+    this.updateComplete.then(() =>
+      (this.shadowRoot?.querySelector(
+        "[dialogInitialFocus]"
+      ) as HTMLElement)?.focus()
+    );
+  }
+
   protected render(): TemplateResult {
     if (!this.hass) {
       return html``;
@@ -74,6 +82,7 @@ class HaInputNumberForm extends LitElement {
             "ui.dialogs.helper_settings.required_error_msg"
           )}"
           .invalid=${nameInvalid}
+          dialogInitialFocus
         ></paper-input>
         <ha-icon-input
           .value=${this._icon}
diff --git a/src/panels/config/helpers/forms/ha-input_select-form.ts b/src/panels/config/helpers/forms/ha-input_select-form.ts
index f3b8f2b7a9..6b0a23b24b 100644
--- a/src/panels/config/helpers/forms/ha-input_select-form.ts
+++ b/src/panels/config/helpers/forms/ha-input_select-form.ts
@@ -44,6 +44,14 @@ class HaInputSelectForm extends LitElement {
     }
   }
 
+  public focus() {
+    this.updateComplete.then(() =>
+      (this.shadowRoot?.querySelector(
+        "[dialogInitialFocus]"
+      ) as HTMLElement)?.focus()
+    );
+  }
+
   protected render(): TemplateResult {
     if (!this.hass) {
       return html``;
@@ -63,6 +71,7 @@ class HaInputSelectForm extends LitElement {
             "ui.dialogs.helper_settings.required_error_msg"
           )}"
           .invalid=${nameInvalid}
+          dialogInitialFocus
         ></paper-input>
         <ha-icon-input
           .value=${this._icon}
diff --git a/src/panels/config/helpers/forms/ha-input_text-form.ts b/src/panels/config/helpers/forms/ha-input_text-form.ts
index 89c2a05a00..aa9cde3041 100644
--- a/src/panels/config/helpers/forms/ha-input_text-form.ts
+++ b/src/panels/config/helpers/forms/ha-input_text-form.ts
@@ -47,6 +47,14 @@ class HaInputTextForm extends LitElement {
     }
   }
 
+  public focus() {
+    this.updateComplete.then(() =>
+      (this.shadowRoot?.querySelector(
+        "[dialogInitialFocus]"
+      ) as HTMLElement)?.focus()
+    );
+  }
+
   protected render(): TemplateResult {
     if (!this.hass) {
       return html``;
@@ -66,6 +74,7 @@ class HaInputTextForm extends LitElement {
             "ui.dialogs.helper_settings.required_error_msg"
           )}"
           .invalid=${nameInvalid}
+          dialogInitialFocus
         ></paper-input>
         <ha-icon-input
           .value=${this._icon}
diff --git a/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts b/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts
index 62171907dd..441f6d3728 100644
--- a/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts
+++ b/src/panels/config/lovelace/dashboards/dialog-lovelace-dashboard-detail.ts
@@ -104,6 +104,7 @@ export class DialogLovelaceDashboardDetail extends LitElement {
                     .errorMessage=${this.hass.localize(
                       "ui.panel.config.lovelace.dashboards.detail.title_required"
                     )}
+                    dialogInitialFocus
                   ></paper-input>
                   <ha-icon-input
                     .value=${this._icon}
diff --git a/src/panels/config/lovelace/resources/dialog-lovelace-resource-detail.ts b/src/panels/config/lovelace/resources/dialog-lovelace-resource-detail.ts
index c897059711..7fce68b229 100644
--- a/src/panels/config/lovelace/resources/dialog-lovelace-resource-detail.ts
+++ b/src/panels/config/lovelace/resources/dialog-lovelace-resource-detail.ts
@@ -86,6 +86,7 @@ export class DialogLovelaceResourceDetail extends LitElement {
                 "ui.panel.config.lovelace.resources.detail.url_error_msg"
               )}
               .invalid=${urlInvalid}
+              dialogInitialFocus
             ></paper-input>
             <br />
             <ha-paper-dropdown-menu