From 1f4394120fe05339d413a72ac0ccb72684f1e684 Mon Sep 17 00:00:00 2001
From: Nerwyn Singh <nerwyn1994@gmail.com>
Date: Sat, 12 Aug 2023 18:44:53 -0400
Subject: [PATCH] send text via onInput instead

---
 android-tv-card.js | 63 +++++++++++++++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 23 deletions(-)

diff --git a/android-tv-card.js b/android-tv-card.js
index 580a5889..0b4afa93 100644
--- a/android-tv-card.js
+++ b/android-tv-card.js
@@ -542,27 +542,48 @@ class TVCardServices extends LitElement {
 	}
 
 	/**
-	 * Event handler for keyboard events
+	 * Event handler for keyboard keydown events
 	 * @param {Event} e
 	 */
 	onKeyDown(e) {
 		e.stopImmediatePropagation();
-		let data = {
-			entity_id: this._config.adb_id,
-		};
+
+		// prettier-ignore
+		if (['Backspace', 'Delete', 'Control','Alt', 'Meta', 'Shift', 'Tab', 'Escape', 'CapsLock', 'Enter'].includes(e.key)) {
+			let e2 = JSON.stringify(
+				{
+					key: e.key,
+					keyCode: e.keyCode,
+					which: e.which,
+					code: e.code,
+					location: e.location,
+					altKey: e.altKey,
+					ctrlKey: e.ctrlKey,
+					metaKey: e.metaKey,
+					shiftKey: e.shiftKey,
+					repeat: e.repeat,
+				},
+				null,
+				'\t'
+			);
+			alert(e2);
+			console.log(e2);
+		}
+	}
+
+	/**
+	 * Event handler for keyboard input events
+	 * @param {Event} e
+	 */
+	onInput(e) {
+		e.stopImmediatePropagation();
 
 		let e2 = JSON.stringify(
 			{
-				key: e.key,
-				keyCode: e.keyCode,
-				which: e.which,
-				code: e.code,
-				location: e.location,
-				altKey: e.altKey,
-				ctrlKey: e.ctrlKey,
-				metaKey: e.metaKey,
-				shiftKey: e.shiftKey,
-				repeat: e.repeat,
+				data: e.data,
+				dataTransfer: e.dataTransfer,
+				inputType: e.inputType,
+				isComposing: e.isComposing,
 			},
 			null,
 			'\t'
@@ -570,15 +591,10 @@ class TVCardServices extends LitElement {
 		alert(e2);
 		console.log(e2);
 
-		let key = e.key;
-		// prettier-ignore
-		if (['Backspace', 'Delete', 'Control','Alt', 'Meta', 'Shift', 'Tab', 'Escape', 'CapsLock', 'Enter'].includes(key)) {
-			console.log('Not an alphanumerical key!'); // TODO: Send these as commands or ignore
-		} else {
-			data.command = 'input text "' + key + '"';
-		}
-		data.command = 'input text "' + key + '"';
-
+		let data = {
+			entity_id: this._config.adb_id,
+			command: 'input text "' + e.data + '"',
+		};
 		this._hass.callService('androidtv', 'adb_command', data);
 		e.currentTarget.value = '';
 	}
@@ -618,6 +634,7 @@ class TVCardServices extends LitElement {
 							id="kInput"
 							onfocus="this.value=''"
 							@keydown="${this.onKeyDown}"
+							@input="${this.onInput}"
 						>
 						</input>
 					</div>