From 9de80b29470a643d27ac62e37150853dd5ed6550 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Fri, 24 Jan 2020 23:21:41 +0100
Subject: [PATCH] Fix menu button for touch (#4589)

* Fix menu button for touch

* Missed 2
---
 .../config/automation/action/ha-automation-action-row.ts     | 4 ++--
 .../automation/condition/ha-automation-condition-row.ts      | 4 ++--
 .../config/automation/trigger/ha-automation-trigger-row.ts   | 4 ++--
 src/panels/config/entities/ha-config-entities.ts             | 4 ++--
 .../config/integrations/ha-config-entries-dashboard.ts       | 2 +-
 src/panels/lovelace/components/hui-card-options.ts           | 5 +++--
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/panels/config/automation/action/ha-automation-action-row.ts b/src/panels/config/automation/action/ha-automation-action-row.ts
index df0b925ea8..f308d6d84a 100644
--- a/src/panels/config/automation/action/ha-automation-action-row.ts
+++ b/src/panels/config/automation/action/ha-automation-action-row.ts
@@ -120,7 +120,7 @@ export default class HaAutomationActionRow extends LitElement {
               ></paper-icon-button>
               <paper-listbox slot="dropdown-content">
                 <paper-item
-                  @click=${this._switchYamlMode}
+                  @tap=${this._switchYamlMode}
                   .disabled=${selected === -1}
                 >
                   ${yamlMode
@@ -136,7 +136,7 @@ export default class HaAutomationActionRow extends LitElement {
                     "ui.panel.config.automation.editor.actions.duplicate"
                   )}
                 </paper-item>
-                <paper-item @click=${this._onDelete}>
+                <paper-item @tap=${this._onDelete}>
                   ${this.hass.localize(
                     "ui.panel.config.automation.editor.actions.delete"
                   )}
diff --git a/src/panels/config/automation/condition/ha-automation-condition-row.ts b/src/panels/config/automation/condition/ha-automation-condition-row.ts
index e3552302ce..111fd49a1b 100644
--- a/src/panels/config/automation/condition/ha-automation-condition-row.ts
+++ b/src/panels/config/automation/condition/ha-automation-condition-row.ts
@@ -71,7 +71,7 @@ export default class HaAutomationConditionRow extends LitElement {
                 slot="dropdown-trigger"
               ></paper-icon-button>
               <paper-listbox slot="dropdown-content">
-                <paper-item @click=${this._switchYamlMode}>
+                <paper-item @tap=${this._switchYamlMode}>
                   ${this._yamlMode
                     ? this.hass.localize(
                         "ui.panel.config.automation.editor.edit_ui"
@@ -85,7 +85,7 @@ export default class HaAutomationConditionRow extends LitElement {
                     "ui.panel.config.automation.editor.conditions.duplicate"
                   )}
                 </paper-item>
-                <paper-item @click=${this._onDelete}>
+                <paper-item @tap=${this._onDelete}>
                   ${this.hass.localize(
                     "ui.panel.config.automation.editor.conditions.delete"
                   )}
diff --git a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
index afab74c95b..cb5f6bc2a9 100644
--- a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
+++ b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts
@@ -102,7 +102,7 @@ export default class HaAutomationTriggerRow extends LitElement {
               ></paper-icon-button>
               <paper-listbox slot="dropdown-content">
                 <paper-item
-                  @click=${this._switchYamlMode}
+                  @tap=${this._switchYamlMode}
                   .disabled=${selected === -1}
                 >
                   ${yamlMode
@@ -118,7 +118,7 @@ export default class HaAutomationTriggerRow extends LitElement {
                     "ui.panel.config.automation.editor.triggers.duplicate"
                   )}
                 </paper-item>
-                <paper-item @click=${this._onDelete}>
+                <paper-item @tap=${this._onDelete}>
                   ${this.hass.localize(
                     "ui.panel.config.automation.editor.triggers.delete"
                   )}
diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts
index cdc39c4e76..9b90e28dae 100644
--- a/src/panels/config/entities/ha-config-entities.ts
+++ b/src/panels/config/entities/ha-config-entities.ts
@@ -342,7 +342,7 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
                         slot="dropdown-trigger"
                       ></paper-icon-button>
                       <paper-listbox slot="dropdown-content">
-                        <paper-icon-item @click="${this._showDisabledChanged}">
+                        <paper-icon-item @tap="${this._showDisabledChanged}">
                           <paper-checkbox
                             .checked=${this._showDisabled}
                             slot="item-icon"
@@ -351,7 +351,7 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
                             "ui.panel.config.entities.picker.filter.show_disabled"
                           )}
                         </paper-icon-item>
-                        <paper-icon-item @click="${this._showRestoredChanged}">
+                        <paper-icon-item @tap="${this._showRestoredChanged}">
                           <paper-checkbox
                             .checked=${this._showUnavailable}
                             slot="item-icon"
diff --git a/src/panels/config/integrations/ha-config-entries-dashboard.ts b/src/panels/config/integrations/ha-config-entries-dashboard.ts
index d4d4091c5a..66fcb0a940 100644
--- a/src/panels/config/integrations/ha-config-entries-dashboard.ts
+++ b/src/panels/config/integrations/ha-config-entries-dashboard.ts
@@ -93,7 +93,7 @@ export class HaConfigManagerDashboard extends LitElement {
             role="listbox"
             selected="{{selectedItem}}"
           >
-            <paper-item @click=${this._toggleShowIgnored}>
+            <paper-item @tap=${this._toggleShowIgnored}>
               ${this.hass.localize(
                 this._showIgnored
                   ? "ui.panel.config.integrations.ignore.hide_ignored"
diff --git a/src/panels/lovelace/components/hui-card-options.ts b/src/panels/lovelace/components/hui-card-options.ts
index cdcc59d197..6697a72b33 100644
--- a/src/panels/lovelace/components/hui-card-options.ts
+++ b/src/panels/lovelace/components/hui-card-options.ts
@@ -62,6 +62,7 @@ export class HuiCardOptions extends LitElement {
             horizontal-align="right"
             vertical-align="bottom"
             vertical-offset="40"
+            close-on-activate
           >
             <paper-icon-button
               icon="hass:dots-vertical"
@@ -71,12 +72,12 @@ export class HuiCardOptions extends LitElement {
               )}
             ></paper-icon-button>
             <paper-listbox slot="dropdown-content">
-              <paper-item @click="${this._moveCard}">
+              <paper-item @tap="${this._moveCard}">
                 ${this.hass!.localize(
                   "ui.panel.lovelace.editor.edit_card.move"
                 )}</paper-item
               >
-              <paper-item .class="delete-item" @click="${this._deleteCard}">
+              <paper-item .class="delete-item" @tap="${this._deleteCard}">
                 ${this.hass!.localize(
                   "ui.panel.lovelace.editor.edit_card.delete"
                 )}</paper-item