From ec3eeb7a63ffe46ca3634fd774f5360973ba5d08 Mon Sep 17 00:00:00 2001
From: Cilibiu Bogdan <pionnegru@users.noreply.github.com>
Date: Fri, 7 Dec 2018 18:12:15 +0200
Subject: [PATCH] [ACA-2075] Create Library dialog is not focused when opening
 it for the second time (#863)

* remove autofocus property

* let dialog focus elements

* remove autoFocus dialog configs

* autoFocus default config
---
 src/app/dialogs/library/library.dialog.html    |  1 -
 src/app/material.module.ts                     |  2 +-
 src/app/services/content-management.service.ts | 14 --------------
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/app/dialogs/library/library.dialog.html b/src/app/dialogs/library/library.dialog.html
index d808b3212..80e51e982 100644
--- a/src/app/dialogs/library/library.dialog.html
+++ b/src/app/dialogs/library/library.dialog.html
@@ -6,7 +6,6 @@
       <input
         placeholder="{{ 'LIBRARY.DIALOG.FORM.NAME' | translate }}"
         required
-        autofocus
         matInput
         formControlName="title"
         autocomplete="off"
diff --git a/src/app/material.module.ts b/src/app/material.module.ts
index ee901ed8d..b95e06de0 100644
--- a/src/app/material.module.ts
+++ b/src/app/material.module.ts
@@ -57,7 +57,7 @@ import {
   providers: [
     {
       provide: MAT_DIALOG_DEFAULT_OPTIONS,
-      useValue: { closeOnNavigation: true, hasBackdrop: true }
+      useValue: { closeOnNavigation: true, hasBackdrop: true, autoFocus: true }
     }
   ]
 })
diff --git a/src/app/services/content-management.service.ts b/src/app/services/content-management.service.ts
index 076fc6f00..31c02520c 100644
--- a/src/app/services/content-management.service.ts
+++ b/src/app/services/content-management.service.ts
@@ -236,13 +236,6 @@ export class ContentManagementService {
       this.store.dispatch(new SnackbarErrorAction(message));
     });
 
-    // todo: add focus in ADF component
-    dialogInstance
-      .afterOpened()
-      .subscribe(() =>
-        (<HTMLElement>document.querySelector('#adf-folder-name-input')).focus()
-      );
-
     dialogInstance.afterClosed().subscribe(node => {
       if (node) {
         this.folderCreated.next(node);
@@ -266,13 +259,6 @@ export class ContentManagementService {
       this.store.dispatch(new SnackbarErrorAction(message));
     });
 
-    // todo: add focus in ADF component
-    dialog
-      .afterOpened()
-      .subscribe(() =>
-        (<HTMLElement>document.querySelector('#adf-folder-name-input')).focus()
-      );
-
     dialog.afterClosed().subscribe((node: MinimalNodeEntryEntity) => {
       if (node) {
         this.folderEdited.next(node);