From e63723f39e89f606fab7cd22b5c9be460f6b9b05 Mon Sep 17 00:00:00 2001
From: "David F. Mulcahey" <david.mulcahey@me.com>
Date: Fri, 6 Mar 2020 07:45:12 -0500
Subject: [PATCH] fix click handlers on data tables (#5087)

---
 src/panels/config/zha/zha-devices-data-table.ts | 6 +++---
 src/panels/config/zha/zha-groups-data-table.ts  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/panels/config/zha/zha-devices-data-table.ts b/src/panels/config/zha/zha-devices-data-table.ts
index 619d81bb90..52ee1a744f 100644
--- a/src/panels/config/zha/zha-devices-data-table.ts
+++ b/src/panels/config/zha/zha-devices-data-table.ts
@@ -101,9 +101,9 @@ export class ZHADevicesDataTable extends LitElement {
   }
 
   private async _handleClicked(ev: CustomEvent) {
-    const ieee = (ev.target as HTMLElement)
-      .closest("tr")!
-      .getAttribute("data-row-id")!;
+    const ieee = ((ev.target as HTMLElement).closest(
+      ".mdc-data-table__row"
+    ) as any).rowId;
     showZHADeviceInfoDialog(this, { ieee });
   }
 }
diff --git a/src/panels/config/zha/zha-groups-data-table.ts b/src/panels/config/zha/zha-groups-data-table.ts
index a47cca603c..20bfc00b36 100644
--- a/src/panels/config/zha/zha-groups-data-table.ts
+++ b/src/panels/config/zha/zha-groups-data-table.ts
@@ -110,9 +110,9 @@ export class ZHAGroupsDataTable extends LitElement {
   }
 
   private _handleRowClicked(ev: CustomEvent) {
-    const groupId = (ev.target as HTMLElement)
-      .closest("tr")!
-      .getAttribute("data-row-id")!;
+    const groupId = ((ev.target as HTMLElement).closest(
+      ".mdc-data-table__row"
+    ) as any).rowId;
     navigate(this, `/config/zha/group/${groupId}`);
   }
 }