From a704c2f196e4ba16e7d691ba0f95c76128ab91e6 Mon Sep 17 00:00:00 2001
From: agonzalez97 <aidamaria.gonzalez@dxc.com>
Date: Thu, 24 Feb 2022 09:51:02 +0100
Subject: [PATCH] [Patch] Fix double click when searchable select

---
 .../src/lib/dxc-select/dxc-select.component.html         | 2 +-
 .../src/lib/dxc-select/dxc-select.component.ts           | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/projects/dxc-ngx-cdk/src/lib/dxc-select/dxc-select.component.html b/projects/dxc-ngx-cdk/src/lib/dxc-select/dxc-select.component.html
index db15331d4..a0374485f 100644
--- a/projects/dxc-ngx-cdk/src/lib/dxc-select/dxc-select.component.html
+++ b/projects/dxc-ngx-cdk/src/lib/dxc-select/dxc-select.component.html
@@ -22,7 +22,7 @@
 <div
   class="container"
   [tabindex]="tabIndex"
-  (focus)="focusContainer($event)"
+  (focus)="focusContainer($event, false)"
   (click)="handleSelectOpen()"
   (keydown)="handleOnKeyDown($event)"
   (focusout)="handleOnFocusOut()"
diff --git a/projects/dxc-ngx-cdk/src/lib/dxc-select/dxc-select.component.ts b/projects/dxc-ngx-cdk/src/lib/dxc-select/dxc-select.component.ts
index 60a964b08..0c84a4908 100644
--- a/projects/dxc-ngx-cdk/src/lib/dxc-select/dxc-select.component.ts
+++ b/projects/dxc-ngx-cdk/src/lib/dxc-select/dxc-select.component.ts
@@ -280,7 +280,7 @@ export class DxcSelectComponent implements OnInit, ControlValueAccessor {
 
   handleOptionClick(option, event) {
     if (!this.disabled) {
-      this.focusContainer(event);
+      this.focusContainer(event, true);
       if (this.multiple) {
         const arr: Option[] = this.service.getSelectedValues() || [];
         const index = arr.indexOf(option);
@@ -347,14 +347,13 @@ export class DxcSelectComponent implements OnInit, ControlValueAccessor {
     }
   }
 
-  focusContainer(event) {
+  focusContainer(event, isOptionClicked: boolean) {
     if (!this.disabled && this.searchable) {
       event.preventDefault();
       event.stopPropagation();
       this.isInputVisible = true;
-      setTimeout(() => {
-        this.inputRef.nativeElement.focus();
-      }, 0);
+      this.inputRef.nativeElement.focus();
+      this.isOpened = !isOptionClicked ? true : false;
     }
   }