check if any of data, key, or service_data is in action when merging …

…instead of checking action, as action may be defined by a template
Nerwyn · Jan 29, 2024 · 0b03a88 · 0b03a88
1 parent b090c7b
commit 0b03a88
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/dist/android-tv-card.min.js b/dist/android-tv-card.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "android-tv-card",
-	"version": "3.2.9",
+	"version": "3.2.10",
 	"description": "Android TV Remote Card",
 	"main": "./dist/android-tv-card.js",
 	"scripts": {

diff --git a/src/android-tv-card.ts b/src/android-tv-card.ts
@@ -217,7 +217,11 @@ class AndroidTVCard extends LitElement {
 					}
 
 					// Merge service_data, target, and data fields
-					if (['call-service', 'more-info'].includes(action.action)) {
+					if (
+						['data', 'target', 'service_data'].some(
+							(key) => key in action,
+						)
+					) {
 						action.data = {
 							...action.data,
 							...(