inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-5177] Pressing enter close filter menu (#5875)

Browse Source
This commit is contained in:
Baptiste Mahé
2020-07-16 11:54:14 +01:00
committed by GitHub
parent 9f7a73e5cf
commit 00c839cc9f
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/content-services/src/lib/search/components/search-header/search-header.component.html
View File

@@ -20,7 +20,7 @@
<div (click)="$event.stopPropagation()" class="adf-filter-container"> <div (click)="$event.stopPropagation()" class="adf-filter-container">
<div class="adf-filter-title">{{ category?.name | translate }}</div> <div class="adf-filter-title">{{ category?.name | translate }}</div>
<adf-search-widget-container <adf-search-widget-container
(keydown.enter)="onEnterPressed()" (keypress)="onKeyPressed($event, menuTrigger)"
[id]="category?.id" [id]="category?.id"
[selector]="category?.component?.selector" [selector]="category?.component?.selector"
[settings]="category?.component?.settings"> [settings]="category?.component?.settings">

2
lib/content-services/src/lib/search/components/search-header/search-header.component.spec.ts
View File

@@ -116,7 +116,7 @@ describe('SearchHeaderComponent', () => {
await fixture.whenStable(); await fixture.whenStable();
component.widgetContainer.componentRef.instance.value = 'searchText'; component.widgetContainer.componentRef.instance.value = 'searchText';
const widgetContainer = fixture.debugElement.query(By.css('adf-search-widget-container')); const widgetContainer = fixture.debugElement.query(By.css('adf-search-widget-container'));
widgetContainer.triggerEventHandler('keydown.enter', {}); widgetContainer.triggerEventHandler('keypress', {key: 'Enter'});
fixture.detectChanges(); fixture.detectChanges();
await fixture.whenStable(); await fixture.whenStable();
}); });

6
lib/content-services/src/lib/search/components/search-header/search-header.component.ts
View File

@@ -38,6 +38,7 @@ import { SearchCategory } from '../../search-category.interface';
import { SEARCH_QUERY_SERVICE_TOKEN } from '../../search-query-service.token'; import { SEARCH_QUERY_SERVICE_TOKEN } from '../../search-query-service.token';
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators'; import { takeUntil } from 'rxjs/operators';
import { MatMenuTrigger } from '@angular/material/menu';
@Component({ @Component({
selector: 'adf-search-header', selector: 'adf-search-header',
@@ -127,9 +128,10 @@ export class SearchHeaderComponent implements OnInit, OnChanges, OnDestroy {
this.onDestroy$.complete(); this.onDestroy$.complete();
} }
onEnterPressed() { onKeyPressed(event: KeyboardEvent, menuTrigger: MatMenuTrigger) {
if (this.widgetContainer.selector !== 'check-list') { if (event.key === 'Enter' && this.widgetContainer.selector !== 'check-list') {
this.onApply(); this.onApply();
menuTrigger.closeMenu();
} }
} }