From 00c839cc9fd8733f3c307f05773c27ee878be3c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Baptiste=20Mah=C3=A9?= <mahe.baptiste.19@gmail.com>
Date: Thu, 16 Jul 2020 11:54:14 +0100
Subject: [PATCH] [ADF-5177] Pressing enter close filter menu (#5875)

---
 .../components/search-header/search-header.component.html   | 2 +-
 .../search-header/search-header.component.spec.ts           | 2 +-
 .../components/search-header/search-header.component.ts     | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/content-services/src/lib/search/components/search-header/search-header.component.html b/lib/content-services/src/lib/search/components/search-header/search-header.component.html
index 997ac27a28..9fff042e0c 100644
--- a/lib/content-services/src/lib/search/components/search-header/search-header.component.html
+++ b/lib/content-services/src/lib/search/components/search-header/search-header.component.html
@@ -20,7 +20,7 @@
                 <div (click)="$event.stopPropagation()" class="adf-filter-container">
                     <div class="adf-filter-title">{{ category?.name | translate }}</div>
                     <adf-search-widget-container
-                        (keydown.enter)="onEnterPressed()"
+                        (keypress)="onKeyPressed($event, menuTrigger)"
                         [id]="category?.id"
                         [selector]="category?.component?.selector"
                         [settings]="category?.component?.settings">
diff --git a/lib/content-services/src/lib/search/components/search-header/search-header.component.spec.ts b/lib/content-services/src/lib/search/components/search-header/search-header.component.spec.ts
index b072e8880e..d37ccfd5d2 100644
--- a/lib/content-services/src/lib/search/components/search-header/search-header.component.spec.ts
+++ b/lib/content-services/src/lib/search/components/search-header/search-header.component.spec.ts
@@ -116,7 +116,7 @@ describe('SearchHeaderComponent', () => {
         await fixture.whenStable();
         component.widgetContainer.componentRef.instance.value = 'searchText';
         const widgetContainer = fixture.debugElement.query(By.css('adf-search-widget-container'));
-        widgetContainer.triggerEventHandler('keydown.enter', {});
+        widgetContainer.triggerEventHandler('keypress', {key: 'Enter'});
         fixture.detectChanges();
         await fixture.whenStable();
     });
diff --git a/lib/content-services/src/lib/search/components/search-header/search-header.component.ts b/lib/content-services/src/lib/search/components/search-header/search-header.component.ts
index a79bfba706..6c0bcde183 100644
--- a/lib/content-services/src/lib/search/components/search-header/search-header.component.ts
+++ b/lib/content-services/src/lib/search/components/search-header/search-header.component.ts
@@ -38,6 +38,7 @@ import { SearchCategory } from '../../search-category.interface';
 import { SEARCH_QUERY_SERVICE_TOKEN } from '../../search-query-service.token';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
+import { MatMenuTrigger } from '@angular/material/menu';
 
 @Component({
     selector: 'adf-search-header',
@@ -127,9 +128,10 @@ export class SearchHeaderComponent implements OnInit, OnChanges, OnDestroy {
         this.onDestroy$.complete();
     }
 
-    onEnterPressed() {
-        if (this.widgetContainer.selector !== 'check-list') {
+    onKeyPressed(event: KeyboardEvent, menuTrigger: MatMenuTrigger) {
+        if (event.key === 'Enter' && this.widgetContainer.selector !== 'check-list') {
             this.onApply();
+            menuTrigger.closeMenu();
         }
     }