From 77f3d3ab889e0d95f5065f733e41e4a44f7817eb Mon Sep 17 00:00:00 2001
From: Nerwyn Singh <nerwyn1994@gmail.com>
Date: Mon, 9 Oct 2023 20:05:26 -0400
Subject: [PATCH] rearrange toucharea attributes, why is this not working
 anymore?

---
 dist/android-tv-card.js | 5 ++---
 src/android-tv-card.ts  | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dist/android-tv-card.js b/dist/android-tv-card.js
index 9e535d4b..a264a31d 100644
--- a/dist/android-tv-card.js
+++ b/dist/android-tv-card.js
@@ -25,14 +25,13 @@
 				<ha-icon .icon="${l?"":c}"></ha-icon>
 				${u}
 			</ha-icon-button>
-		`}buildRow(t){return s.html` <div class="row">${t}</div> `}buildColumn(t){return s.html` <div class="column">${t}</div> `}buildButtons(t,e=!1){"string"==typeof t&&(t=[t]);const i=[];for(const n of t)if("object"==typeof n&&null!=n)i.push(this.buildButtons(n,!e));else switch(n){case"volume_buttons":i.push(this.buildIconButton("volume_down"),this.buildIconButton("volume_mute"),this.buildIconButton("volume_up"));break;case"volume_slider":i.push(this.volume_slider);break;case"navigation_buttons":{const t=[];t.push(this.buildRow([this.buildIconButton("up")])),t.push(this.buildRow([this.buildIconButton("left"),this.buildIconButton("center"),this.buildIconButton("right")])),t.push(this.buildRow([this.buildIconButton("down")])),i.push(this.buildColumn(t));break}case"navigation_touchpad":{let t="";this._config.touchpad_height&&(t=`style="height: ${this._config.touchpad_height}"`);const e=s.html`
+		`}buildRow(t){return s.html` <div class="row">${t}</div> `}buildColumn(t){return s.html` <div class="column">${t}</div> `}buildButtons(t,e=!1){"string"==typeof t&&(t=[t]);const i=[];for(const n of t)if("object"==typeof n&&null!=n)i.push(this.buildButtons(n,!e));else switch(n){case"volume_buttons":i.push(this.buildIconButton("volume_down"),this.buildIconButton("volume_mute"),this.buildIconButton("volume_up"));break;case"volume_slider":i.push(this.volume_slider);break;case"navigation_buttons":{const t=[];t.push(this.buildRow([this.buildIconButton("up")])),t.push(this.buildRow([this.buildIconButton("left"),this.buildIconButton("center"),this.buildIconButton("right")])),t.push(this.buildRow([this.buildIconButton("down")])),i.push(this.buildColumn(t));break}case"navigation_touchpad":{let t="";this._config.touchpad_height&&(t=`style="height:${this._config.touchpad_height}"`);const e=s.html`
 							<toucharea
-								id="toucharea"
+								${t}
 								@click="${this.onTouchClick}"
 								@touchstart="${this.onTouchStart}"
 								@touchmove="${this.onTouchMove}"
 								@touchend="${this.onTouchEnd}"
-								${t}
 							>
 							</toucharea>
 						`;i.push(e);break}default:i.push(this.buildIconButton(n))}return e?this.buildColumn(i):this.buildRow(i)}render(){if(!this._config||!this._hass)return s.html``;const t=[];for(const e of this._config.rows){const i=this.buildButtons(e);t.push(i)}const e=s.html`<ha-card .header="${this._config.title}"
diff --git a/src/android-tv-card.ts b/src/android-tv-card.ts
index d9d1b736..299b70c9 100644
--- a/src/android-tv-card.ts
+++ b/src/android-tv-card.ts
@@ -840,16 +840,15 @@ class AndroidTVCard extends LitElement {
 					case 'navigation_touchpad': {
 						let style = ``;
 						if (this._config['touchpad_height']) {
-							style = `style="height: ${this._config['touchpad_height']}"`;
+							style = `style="height:${this._config['touchpad_height']}"`;
 						}
 						const touchpad = html`
 							<toucharea
-								id="toucharea"
+								${style}
 								@click="${this.onTouchClick}"
 								@touchstart="${this.onTouchStart}"
 								@touchmove="${this.onTouchMove}"
 								@touchend="${this.onTouchEnd}"
-								${style}
 							>
 							</toucharea>
 						`;