Fix tap firing twice on iOS (#4841)

home-assistant · Feb 12, 2020 · 97a6354 · 97a6354
1 parent 50d0671
commit 97a6354
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/panels/lovelace/cards/hui-entity-button-card.ts b/src/panels/lovelace/cards/hui-entity-button-card.ts
@@ -138,7 +138,10 @@ class HuiEntityButtonCard extends LitElement implements LovelaceCard {
           hasDoubleClick: hasAction(this._config!.double_tap_action),
         })}
         tabindex=${ifDefined(
-          hasAction(this._config.tap_action) ? "0" : undefined
+          hasAction(this._config.tap_action) ||
+            this._config.tap_action === undefined
+            ? "0"
+            : undefined
         )}
       >
         ${this._config.show_icon
@@ -203,7 +206,6 @@ class HuiEntityButtonCard extends LitElement implements LovelaceCard {
 
       ha-card:focus {
         outline: none;
-        background: var(--divider-color);
       }
 
       ha-icon {

diff --git a/src/panels/lovelace/common/directives/action-handler-directive.ts b/src/panels/lovelace/common/directives/action-handler-directive.ts
@@ -177,7 +177,7 @@ class ActionHandler extends HTMLElement implements ActionHandler {
       } else {
         fireEvent(element, "action", { action: "tap" });
       }
-      window.setTimeout(() => (this.touch = undefined), 100);
+      window.setTimeout(() => (this.touch = undefined), this.holdTime);
     };
 
     element.addEventListener("touchstart", touchStart, { passive: true });