merge data/target fields after action is autofilled

Nerwyn · Jan 28, 2024 · b090c7b · b090c7b
1 parent a545e7a
commit b090c7b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 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.8",
+	"version": "3.2.9",
 	"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
@@ -193,19 +193,6 @@ class AndroidTVCard extends LitElement {
 					const action = customAction[
 						actionType as keyof IActions
 					] as IAction;
-					if (['call-service', 'more-info'].includes(action.action)) {
-						// Merge service_data, target, and data fields
-						action.data = {
-							...action.data,
-							...(
-								action as unknown as Record<
-									string,
-									IData | undefined
-								>
-							).service_data,
-							...action.target,
-						};
-					}
 
 					// Populate action field
 					if (!('action' in action)) {
@@ -228,6 +215,20 @@ class AndroidTVCard extends LitElement {
 							(action as IAction).action = 'none';
 						}
 					}
+
+					// Merge service_data, target, and data fields
+					if (['call-service', 'more-info'].includes(action.action)) {
+						action.data = {
+							...action.data,
+							...(
+								action as unknown as Record<
+									string,
+									IData | undefined
+								>
+							).service_data,
+							...action.target,
+						};
+					}
 				}
 			}
 		}