From 357c5dad555fb00e375a8f6d17c5ba22ee9316ea Mon Sep 17 00:00:00 2001
From: dcapslock <dcapes-davis@outlook.com.au>
Date: Wed, 3 Sep 2025 01:32:33 +0000
Subject: [PATCH 1/3] fix: Embedded light card handle issue

---
 src/button-card.ts | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/button-card.ts b/src/button-card.ts
index fd71a464..ca67fefb 100644
--- a/src/button-card.ts
+++ b/src/button-card.ts
@@ -918,12 +918,12 @@ class ButtonCard extends LitElement {
           <div
             id=${key}
             @action=${this._stopPropagation}
-            @click=${this._stopPropagation}
-            @touchstart=${this._stopPropagation}
-            @mousedown=${this._stopPropagation}
-            @mouseup=${this._stopPropagation}
-            @touchend=${this._stopPropagation}
-            @touchcancel=${this._stopPropagation}
+            @click=${this._sendToDocumet}
+            @touchstart=${this._sendToDocumet}
+            @mousedown=${this._sendToDocumet}
+            @mouseup=${this._sendToDocumet}
+            @touchend=${this._sendToDocumet}
+            @touchcancel=${this._sendToDocumet}
             style=${styleMap(customStyle)}
           >
             ${thing}
@@ -1525,4 +1525,10 @@ class ButtonCard extends LitElement {
   private _stopPropagation(ev: Event): void {
     ev.stopPropagation();
   }
+
+  private _sendToDocumet(ev: Event): void {
+    ev.stopPropagation();
+    const event = new CustomEvent(ev.type, ev);
+    document.dispatchEvent(event);
+  }
 }

From 262165ce08e2b9d8f4c2e79ffddc5b90603be99b Mon Sep 17 00:00:00 2001
From: dcapslock <dcapes-davis@outlook.com.au>
Date: Wed, 3 Sep 2025 02:16:34 +0000
Subject: [PATCH 2/3] Send events to button-card parent

---
 src/button-card.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/button-card.ts b/src/button-card.ts
index ca67fefb..aea60330 100644
--- a/src/button-card.ts
+++ b/src/button-card.ts
@@ -918,12 +918,12 @@ class ButtonCard extends LitElement {
           <div
             id=${key}
             @action=${this._stopPropagation}
-            @click=${this._sendToDocumet}
-            @touchstart=${this._sendToDocumet}
-            @mousedown=${this._sendToDocumet}
-            @mouseup=${this._sendToDocumet}
-            @touchend=${this._sendToDocumet}
-            @touchcancel=${this._sendToDocumet}
+            @click=${this._sendToParent}
+            @touchstart=${this._sendToParent}
+            @mousedown=${this._sendToParent}
+            @mouseup=${this._sendToParent}
+            @touchend=${this._sendToParent}
+            @touchcancel=${this._sendToParent}
             style=${styleMap(customStyle)}
           >
             ${thing}
@@ -1526,9 +1526,9 @@ class ButtonCard extends LitElement {
     ev.stopPropagation();
   }
 
-  private _sendToDocumet(ev: Event): void {
+  private _sendToParent(ev: Event): void {
     ev.stopPropagation();
     const event = new CustomEvent(ev.type, ev);
-    document.dispatchEvent(event);
+    this.parentElement?.dispatchEvent(event);
   }
 }

From 003a17a939efbcb809a7546d73ba4229307ddee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Wiedemann?= <jerome@wnetworks.org>
Date: Mon, 15 Sep 2025 12:15:39 +0000
Subject: [PATCH 3/3] adding some tests

---
 test/ui-lovelace.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/ui-lovelace.yaml b/test/ui-lovelace.yaml
index 942b5a27..e45c76f3 100644
--- a/test/ui-lovelace.yaml
+++ b/test/ui-lovelace.yaml
@@ -1471,6 +1471,9 @@ views:
         entity: switch.skylight
         show_icon: false
         name: '[[[ return `Main entity: ${entity.entity_id || "unknown entity"}`; ]]]'
+        label: Tap should toggle
+        tap_action:
+          action: toggle
         styles:
           grid:
             - grid-template-areas: '"n" "nested"'
@@ -1482,7 +1485,13 @@ views:
               type: 'custom:button-card'
               name: '[[[[ return (entity?.entity_id || "4[ ]: main button entity not known"); ]]]]'
               label: '[[[ return `3[ ]: ${(entity?.entity_id || "main button state not known")}`; ]]]'
+              show_state: true
+              state_display: Above should show "not known" <br/> below should show ¨switch.skylight".<br/>Tap should not trigger parent button action
               show_label: true
+              show_icon: false
+              tap_action:
+                action: more-info
+                entity: switch.skylight
 
       - type: custom:button-card
         entity: switch.skylight