mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
[ADF-5177] Pressing enter close filter menu (#5875)
This commit is contained in:
@@ -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">
|
||||
|
@@ -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();
|
||||
});
|
||||
|
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user