From e4ae7b2466b9aa0de6d8f28b72b16bb86bdb5bee Mon Sep 17 00:00:00 2001
From: pionnegru <cilibiu.bogdan@yahoo.com>
Date: Tue, 19 Nov 2019 13:24:58 +0200
Subject: [PATCH 1/6] enable focus from column definititon

---
 .../datatable/components/datatable/datatable.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/core/datatable/components/datatable/datatable.component.html b/lib/core/datatable/components/datatable/datatable.component.html
index 5de07bf4a6..e6ddf4ee66 100644
--- a/lib/core/datatable/components/datatable/datatable.component.html
+++ b/lib/core/datatable/components/datatable/datatable.component.html
@@ -197,7 +197,7 @@
                         </ng-container>
                     </div>
                     <div *ngIf="col.template" class="adf-datatable-cell-container">
-                        <div class="adf-cell-value">
+                        <div class="adf-cell-value" [attr.tabindex]="col.focus ? 0 : null">
                             <ng-container
                                 [ngTemplateOutlet]="col.template"
                                 [ngTemplateOutletContext]="{ $implicit: { data: data, row: row, col: col }, value: data.getValue(row, col, resolverFn) }">

From 7772f4a5e7ff2ed701e9dd8d65c4ceb568822954 Mon Sep 17 00:00:00 2001
From: pionnegru <cilibiu.bogdan@yahoo.com>
Date: Tue, 19 Nov 2019 13:25:52 +0200
Subject: [PATCH 2/6] disable cell focus for actions template

---
 demo-shell/src/app/components/files/files.component.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demo-shell/src/app/components/files/files.component.html b/demo-shell/src/app/components/files/files.component.html
index 8ef21bcdd2..7f92e391df 100644
--- a/demo-shell/src/app/components/files/files.component.html
+++ b/demo-shell/src/app/components/files/files.component.html
@@ -318,6 +318,7 @@
                     <data-column
                         title="{{'DOCUMENT_LIST.COLUMNS.IS_LOCKED' | translate}}"
                         key="id"
+                        [focus]="false"
                         class="app-desktop-only adf-ellipsis-cell">
                         <ng-template let-entry="$implicit">
                             <button mat-icon-button [adf-node-lock]="entry.row.node.entry" class="app-lock-button">

From 1784106e6bf4cbd3ae5e18b658a62ee52e10e37d Mon Sep 17 00:00:00 2001
From: pionnegru <cilibiu.bogdan@yahoo.com>
Date: Tue, 19 Nov 2019 13:26:43 +0200
Subject: [PATCH 3/6] add focus parameter

---
 lib/core/data-column/data-column.component.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/core/data-column/data-column.component.ts b/lib/core/data-column/data-column.component.ts
index 65248acfa8..271d8b13da 100644
--- a/lib/core/data-column/data-column.component.ts
+++ b/lib/core/data-column/data-column.component.ts
@@ -74,6 +74,10 @@ export class DataColumnComponent implements OnInit {
     @Input()
     editable: boolean = false;
 
+    /**  Enable or disable cell focus */
+    @Input()
+    focus: boolean = true;
+
     ngOnInit() {
         if (!this.srTitle && this.key === '$thumbnail') {
             this.srTitle = 'Thumbnail';

From 21d2d18d2e98c24a3dcc8072959ceb17e9878a27 Mon Sep 17 00:00:00 2001
From: pionnegru <cilibiu.bogdan@yahoo.com>
Date: Tue, 19 Nov 2019 13:27:25 +0200
Subject: [PATCH 4/6] update column models

---
 lib/core/datatable/data/data-column.model.ts       | 1 +
 lib/core/datatable/data/object-datacolumn.model.ts | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lib/core/datatable/data/data-column.model.ts b/lib/core/datatable/data/data-column.model.ts
index 311157ce1a..bc282dfa62 100644
--- a/lib/core/datatable/data/data-column.model.ts
+++ b/lib/core/datatable/data/data-column.model.ts
@@ -41,4 +41,5 @@ export interface DataColumn {
     formatTooltip?: Function;
     copyContent?: boolean;
     editable?: boolean;
+    focus?: boolean;
 }
diff --git a/lib/core/datatable/data/object-datacolumn.model.ts b/lib/core/datatable/data/object-datacolumn.model.ts
index 65dbcc2de0..800220c2dc 100644
--- a/lib/core/datatable/data/object-datacolumn.model.ts
+++ b/lib/core/datatable/data/object-datacolumn.model.ts
@@ -30,6 +30,7 @@ export class ObjectDataColumn implements DataColumn {
     cssClass: string;
     template?: TemplateRef<any>;
     copyContent?: boolean;
+    focus?: boolean;
 
     constructor(input: any) {
         this.key = input.key;
@@ -41,5 +42,6 @@ export class ObjectDataColumn implements DataColumn {
         this.cssClass = input.cssClass;
         this.template = input.template;
         this.copyContent = input.copyContent;
+        this.focus = input.focus;
     }
 }

From f06670f318cf46cf6edc502fca5df7d6bb155e2f Mon Sep 17 00:00:00 2001
From: pionnegru <cilibiu.bogdan@yahoo.com>
Date: Tue, 19 Nov 2019 13:27:57 +0200
Subject: [PATCH 5/6] update docs

---
 docs/core/components/data-column.component.md       | 1 +
 docs/core/interfaces/datatable-adapter.interface.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/core/components/data-column.component.md b/docs/core/components/data-column.component.md
index b699218277..cc5b10977f 100644
--- a/docs/core/components/data-column.component.md
+++ b/docs/core/components/data-column.component.md
@@ -53,6 +53,7 @@ Defines column properties for DataTable, Tasklist, Document List and other compo
 | srTitle | `string` |  | Title to be used for screen readers. |
 | title | `string` | "" | Display title of the column, typically used for column headers. You can use the i18n resource key to get it translated automatically. |
 | type | `string` | "text" | Value type for the column. Possible settings are 'text', 'image', 'date', 'fileSize', 'location', and 'json'. |
+| focus | `boolean` | "true" | Toggles keyboard focus for a column. This should be use for custom template columns that contain actions elements   |
 
 ## Details
 
diff --git a/docs/core/interfaces/datatable-adapter.interface.md b/docs/core/interfaces/datatable-adapter.interface.md
index 661d9cb78a..1e9138627c 100644
--- a/docs/core/interfaces/datatable-adapter.interface.md
+++ b/docs/core/interfaces/datatable-adapter.interface.md
@@ -70,6 +70,7 @@ interface DataColumn {
     cssClass?: string;
     template?: TemplateRef<any>;
     formatTooltip?: Function;
+    focus?: boolean;
 }
 ```
 

From 10b024e53acdc05baa39fad4a04d7babc098de79 Mon Sep 17 00:00:00 2001
From: pionnegru <cilibiu.bogdan@yahoo.com>
Date: Tue, 19 Nov 2019 13:28:31 +0200
Subject: [PATCH 6/6] tests

---
 .../datatable/datatable.component.spec.ts     | 50 ++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/lib/core/datatable/components/datatable/datatable.component.spec.ts b/lib/core/datatable/components/datatable/datatable.component.spec.ts
index 335637884d..1c29ec3733 100644
--- a/lib/core/datatable/components/datatable/datatable.component.spec.ts
+++ b/lib/core/datatable/components/datatable/datatable.component.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { SimpleChange, NO_ERRORS_SCHEMA, QueryList } from '@angular/core';
+import { SimpleChange, NO_ERRORS_SCHEMA, QueryList, Component, TemplateRef, ViewChild } from '@angular/core';
 import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { MatCheckboxChange } from '@angular/material';
 import { DataColumn } from '../../data/data-column.model';
@@ -29,6 +29,13 @@ import { CoreTestingModule } from '../../../testing/core.testing.module';
 import { DataColumnListComponent } from '../../../data-column/data-column-list.component';
 import { DataColumnComponent } from '../../../data-column/data-column.component';
 
+@Component({selector: 'adf-custom-column-template-component', template: `
+    <ng-template #tmplRef></ng-template>
+`})
+class CustomColumnTemplateComponent {
+    @ViewChild('tmplRef') templateRef: TemplateRef<any>;
+}
+
 class FakeDataRow implements DataRow {
     isDropTarget = false;
     isSelected = true;
@@ -1127,15 +1134,18 @@ describe('Accesibility', () => {
     let fixture: ComponentFixture<DataTableComponent>;
     let dataTable: DataTableComponent;
     let element: any;
+    let columnCustomTemplate: TemplateRef<any>;
 
     setupTestBed({
         imports: [
             CoreTestingModule
         ],
+        declarations: [CustomColumnTemplateComponent],
         schemas: [NO_ERRORS_SCHEMA]
     });
 
     beforeEach(() => {
+        columnCustomTemplate = TestBed.createComponent(CustomColumnTemplateComponent).componentInstance.templateRef;
         fixture = TestBed.createComponent(DataTableComponent);
         dataTable = fixture.componentInstance;
         element = fixture.debugElement.nativeElement;
@@ -1330,4 +1340,42 @@ describe('Accesibility', () => {
 
         expect(document.activeElement.getAttribute('data-automation-id')).toBe('datatable-row-1');
     });
+
+    it('should remove cell focus when [focus] is set to false', () => {
+        dataTable.showHeader = false;
+        const dataRows = [ { name: 'name1' } ];
+
+        dataTable.data = new ObjectDataTableAdapter([],
+            [new ObjectDataColumn({ key: 'name', template: columnCustomTemplate, focus: false })]
+        );
+
+        dataTable.ngOnChanges({
+            rows: new SimpleChange(null, dataRows, false)
+        });
+
+        fixture.detectChanges();
+        dataTable.ngAfterViewInit();
+
+        const cell = document.querySelector('.adf-datatable-row[data-automation-id="datatable-row-0"] .adf-cell-value');
+        expect(cell.getAttribute('tabindex')).toBe(null);
+    });
+
+    it('should allow element focus when [focus] is set to true', () => {
+        dataTable.showHeader = false;
+        const dataRows = [ { name: 'name1' } ];
+
+        dataTable.data = new ObjectDataTableAdapter([],
+            [new ObjectDataColumn({ key: 'name', template: columnCustomTemplate, focus: true })]
+        );
+
+        dataTable.ngOnChanges({
+            rows: new SimpleChange(null, dataRows, false)
+        });
+
+        fixture.detectChanges();
+        dataTable.ngAfterViewInit();
+
+        const cell = document.querySelector('.adf-datatable-row[data-automation-id="datatable-row-0"] .adf-cell-value');
+        expect(cell.getAttribute('tabindex')).toBe('0');
+    });
 });