From fb180c7b9b1c3097e7822945b23515edc1450c0b Mon Sep 17 00:00:00 2001
From: Ian Richardson <iantrich@gmail.com>
Date: Wed, 5 Dec 2018 15:00:52 -0600
Subject: [PATCH] Align `picture` card tap/hold actions (#2186)

Also removed unneccessary `navigation_path` config from `picture-entity`
---
 src/panels/lovelace/cards/hui-picture-card.ts | 30 +++++++++----------
 .../lovelace/cards/hui-picture-entity-card.ts |  1 -
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-picture-card.ts b/src/panels/lovelace/cards/hui-picture-card.ts
index a638da66a2..43ddd1a14e 100644
--- a/src/panels/lovelace/cards/hui-picture-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-card.ts
@@ -3,17 +3,17 @@ import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element";
 import "../../../components/ha-card";
 
 import { LovelaceCard } from "../types";
-import { LovelaceCardConfig } from "../../../data/lovelace";
-import { navigate } from "../../../common/navigate";
+import { LovelaceCardConfig, ActionConfig } from "../../../data/lovelace";
 import { HomeAssistant } from "../../../types";
 import { TemplateResult } from "lit-html";
 import { classMap } from "lit-html/directives/classMap";
+import { handleClick } from "../common/handle-click";
+import { longPress } from "../common/directives/long-press-directive";
 
 interface Config extends LovelaceCardConfig {
   image?: string;
-  navigation_path?: string;
-  service?: string;
-  service_data?: object;
+  tap_action?: ActionConfig;
+  hold_action?: ActionConfig;
 }
 
 export class HuiPictureCard extends LitElement implements LovelaceCard {
@@ -46,11 +46,13 @@ export class HuiPictureCard extends LitElement implements LovelaceCard {
     return html`
       ${this.renderStyle()}
       <ha-card
-        @click="${this.handleClick}"
+        @ha-click="${this._handleTap}"
+        @ha-hold="${this._handleHold}"
+        .longPress="${longPress()}"
         class="${
           classMap({
             clickable: Boolean(
-              this._config.navigation_path || this._config.service
+              this._config.tap_action || this._config.hold_action
             ),
           })
         }"
@@ -77,14 +79,12 @@ export class HuiPictureCard extends LitElement implements LovelaceCard {
     `;
   }
 
-  private handleClick(): void {
-    if (this._config!.navigation_path) {
-      navigate(this, this._config!.navigation_path!);
-    }
-    if (this._config!.service) {
-      const [domain, service] = this._config!.service!.split(".", 2);
-      this.hass!.callService(domain, service, this._config!.service_data);
-    }
+  private _handleTap() {
+    handleClick(this, this.hass!, this._config!, false);
+  }
+
+  private _handleHold() {
+    handleClick(this, this.hass!, this._config!, true);
   }
 }
 
diff --git a/src/panels/lovelace/cards/hui-picture-entity-card.ts b/src/panels/lovelace/cards/hui-picture-entity-card.ts
index 64580368e7..81be371ed9 100644
--- a/src/panels/lovelace/cards/hui-picture-entity-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-entity-card.ts
@@ -20,7 +20,6 @@ import { UNAVAILABLE } from "../../../data/entity";
 interface Config extends LovelaceCardConfig {
   entity: string;
   name?: string;
-  navigation_path?: string;
   image?: string;
   camera_image?: string;
   state_image?: {};