From a27428ebcdbcafea54cd8853ae2bf7d36d89df7c Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Sat, 9 May 2020 21:17:55 +0200
Subject: [PATCH] Simplify enter handling

---
 src/components/ha-tab.ts         | 16 ++--------------
 src/layouts/hass-tabs-subpage.ts |  2 +-
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/components/ha-tab.ts b/src/components/ha-tab.ts
index 0b956429c1..f3a6b510ea 100644
--- a/src/components/ha-tab.ts
+++ b/src/components/ha-tab.ts
@@ -18,13 +18,6 @@ import "./ha-svg-icon";
 import { ifDefined } from "lit-html/directives/if-defined";
 import { fireEvent } from "../common/dom/fire_event";
 
-declare global {
-  // for fire event
-  interface HASSDomEvents {
-    activated: undefined;
-  }
-}
-
 @customElement("ha-tab")
 export class HaTab extends LitElement {
   @property({ type: Boolean, reflect: true }) public active = false;
@@ -54,11 +47,10 @@ export class HaTab extends LitElement {
         @touchend=${this.handleRippleDeactivate}
         @touchcancel=${this.handleRippleDeactivate}
         @keydown=${this._handleKeyDown}
-        @click=${this._handleClick}
       >
         ${this.narrow ? html`<slot name="icon"></slot>` : ""}
         ${!this.narrow || this.active
-          ? html` <span class="name">${this.name}</span> `
+          ? html`<span class="name">${this.name}</span>`
           : ""}
         ${this._shouldRenderRipple ? html`<mwc-ripple></mwc-ripple>` : ""}
       </div>
@@ -72,14 +64,10 @@ export class HaTab extends LitElement {
 
   private _handleKeyDown(ev: KeyboardEvent): void {
     if (ev.keyCode === 13) {
-      fireEvent(this, "activated");
+      (ev.target as HTMLElement).click();
     }
   }
 
-  private _handleClick(): void {
-    fireEvent(this, "activated");
-  }
-
   @eventOptions({ passive: true })
   private handleRippleActivate(evt?: Event) {
     this._rippleHandlers.startPress(evt);
diff --git a/src/layouts/hass-tabs-subpage.ts b/src/layouts/hass-tabs-subpage.ts
index f5a4d1be4b..454898f824 100644
--- a/src/layouts/hass-tabs-subpage.ts
+++ b/src/layouts/hass-tabs-subpage.ts
@@ -74,7 +74,7 @@ class HassTabsSubpage extends LitElement {
           html`
             <ha-tab
               .hass=${this.hass}
-              @activated=${this._tabTapped}
+              @click=${this._tabTapped}
               .path=${page.path}
               .active=${page === activeTab}
               .narrow=${this.narrow}