From f88638e9fee32b820c2d983dd112ea65cecb6540 Mon Sep 17 00:00:00 2001
From: Hugo Dominguez <hugo@escire.lat>
Date: Sun, 13 Aug 2023 12:10:25 -0600
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Value=20of=20dropdown?=
 =?UTF-8?q?=20changes=20automatically=20on=20item=20submission=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 651305952d706f6c45eb47ff37dfb94f91979760)
---
 .../dynamic-scrollable-dropdown.component.html                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index 6e2d29b7893..1ac38e9943c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -43,7 +43,7 @@
 
       <button class="dropdown-item disabled" *ngIf="optionsList && optionsList.length == 0">{{'form.no-results' | translate}}</button>
       <button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList"
-              (click)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
+              (keydown.enter)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
               title="{{ listEntry.display }}" role="option"
               [attr.id]="listEntry.display == (currentValue|async) ? ('combobox_' + id + '_selected') : null">
         {{inputFormatter(listEntry)}}

From eb38b5877e231891a0fc26ab5ea7df86fcacc494 Mon Sep 17 00:00:00 2001
From: Hugo Dominguez <hugo@escire.lat>
Date: Sun, 13 Aug 2023 12:12:05 -0600
Subject: [PATCH 2/2] =?UTF-8?q?=E2=9C=85change=20test=20event,=20click=20b?=
 =?UTF-8?q?y=20mousedown=20on=20dynamic-scrollable-dropdown.component.spec?=
 =?UTF-8?q?.ts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 25479e17942bbd23e56a5f5a479d2e0dcc798087)
---
 .../dynamic-scrollable-dropdown.component.spec.ts          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
index 0fe617e231b..05e46c6e6de 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
@@ -159,14 +159,15 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
         let de: any = scrollableDropdownFixture.debugElement.query(By.css('input.form-control'));
         let btnEl = de.nativeElement;
 
-        btnEl.click();
+        const mousedownEvent = new MouseEvent('mousedown');
+
+        btnEl.dispatchEvent(mousedownEvent);
         scrollableDropdownFixture.detectChanges();
 
         de = scrollableDropdownFixture.debugElement.queryAll(By.css('button.dropdown-item'));
         btnEl = de[0].nativeElement;
 
-        btnEl.click();
-
+        btnEl.dispatchEvent(mousedownEvent);
         scrollableDropdownFixture.detectChanges();
 
         expect((scrollableDropdownComp.model as any).value).toEqual(selectedValue);