From 3459c98bd0414d6935f2d099b7def5c844ae6d59 Mon Sep 17 00:00:00 2001
From: Mark Steadman <47225088+Steady5063@users.noreply.github.com>
Date: Sun, 9 Feb 2020 15:22:56 -0600
Subject: [PATCH] [ACA-2602]- Datatable - Selected state properly announced
 (#5459)

* chore: selected row now announces state

* chore: removal of tabindex on icon button
---
 .../components/datatable/datatable-row.component.ts         | 6 +++++-
 .../datatable/components/datatable/datatable.component.html | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/core/datatable/components/datatable/datatable-row.component.ts b/lib/core/datatable/components/datatable/datatable-row.component.ts
index 613d13a3fd..6c82070f5f 100644
--- a/lib/core/datatable/components/datatable/datatable-row.component.ts
+++ b/lib/core/datatable/components/datatable/datatable-row.component.ts
@@ -67,7 +67,11 @@ export class DataTableRowComponent implements FocusableOption {
         if (!this.row) {
             return null;
         }
-        return this.row.getValue('name') || '';
+        if (this.row.isSelected) {
+            return this.row.getValue('name') + ' selected' || '';
+        } else {
+            return this.row.getValue('name') || '';
+        }
     }
 
     @HostBinding('attr.tabindex')
diff --git a/lib/core/datatable/components/datatable/datatable.component.html b/lib/core/datatable/components/datatable/datatable.component.html
index 9f0311c3de..5107fb582e 100644
--- a/lib/core/datatable/components/datatable/datatable.component.html
+++ b/lib/core/datatable/components/datatable/datatable.component.html
@@ -107,7 +107,7 @@
                      adf-drop-zone dropTarget="cell" [dropColumn]="col" [dropRow]="row">
                     <div *ngIf="!col.template" class="adf-datatable-cell-container">
                         <ng-container [ngSwitch]="col.type">
-                            <div *ngSwitchCase="'image'" class="adf-cell-value" tabindex="0">
+                            <div *ngSwitchCase="'image'" class="adf-cell-value">
                                 <mat-icon *ngIf="isIconValue(row, col); else no_iconvalue">{{ asIconValue(row, col) }}
                                 </mat-icon>
                                 <ng-template #no_iconvalue>