extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-24 20:01:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Et2Select: Fix keyboard navigation in search results & sidebox category closes

Browse Source
This commit is contained in:
nathan 2023-03-23 17:21:32 -06:00
parent 6b3acd3af8
commit ee758d3069
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/js/etemplate/Et2Select/Et2Select.ts
View File

@ -269,7 +269,7 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect)
this.addEventListener("mousewheel", this._handleMouseWheel); this.addEventListener("mousewheel", this._handleMouseWheel);
this.addEventListener("mouseenter", this._handleMouseEnter); this.addEventListener("mouseenter", this._handleMouseEnter);
this.addEventListener("mouseup", this.handleOptionClick); this.addEventListener("mouseup", this.handleOptionClick);
this.addEventListener("keyup", this.handleKeyDown); this.addEventListener("keydown", this.handleKeyDown);
this.updateComplete.then(() => this.updateComplete.then(() =>
{ {
@ -710,6 +710,7 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect)
this.handleMenuHide(); this.handleMenuHide();
} }
}); });
event.stopPropagation();
} }
} }

5
api/js/etemplate/Et2Select/SearchMixin.ts
View File

@ -884,7 +884,10 @@ export const Et2WithSearchMixin = <T extends Constructor<LitElement>>(superclass
// Pass off some keys to select // Pass off some keys to select
if(['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key)) if(['ArrowDown', 'ArrowUp', 'Home', 'End'].includes(event.key))
{ {
return this.handleKeyDown(event);
// Strip out hidden non-matching selected & disabled items so key navigation works
this.menuItems = this.menuItems.filter(i => !i.disabled);
return super.handleKeyDown(event);
} }
event.stopPropagation(); event.stopPropagation();