extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 00:43:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Et2TreeDropdown: hide popup on escape

Browse Source
This commit is contained in:
nathan 2024-09-18 14:05:58 -06:00
parent cfbcaf3bab
commit 62f876de12
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/js/etemplate/Et2Tree/Et2TreeDropdown.ts
View File

@ -439,7 +439,7 @@ export class Et2TreeDropdown extends SearchMixin<Constructor<any> & Et2InputWidg
/** /**
* Keyboard events that the search input did not grab * Keyboard events that the search input did not grab
* (tags, otion navigation) * (tags, option navigation)
* *
* @param {KeyboardEvent} event * @param {KeyboardEvent} event
*/ */
@ -493,6 +493,15 @@ export class Et2TreeDropdown extends SearchMixin<Constructor<any> & Et2InputWidg
{ {
this._searchNode.focus(); this._searchNode.focus();
} }
event.stopPropagation();
return;
}
// Close popup if focus is on tree
if(["Escape"].includes(event.key))
{
this.hide();
event.stopPropagation();
return;
} }
} }
@ -594,6 +603,13 @@ export class Et2TreeDropdown extends SearchMixin<Constructor<any> & Et2InputWidg
{ {
super.handleSearchKeyDown(event); super.handleSearchKeyDown(event);
// Hide popup if focus is on search
if(["Escape"].includes(event.key))
{
this.hide();
event.stopPropagation();
return;
}
// Show options if popup is closed // Show options if popup is closed
if(event.key == "ArrowDown" && !this.open && !this.resultsOpen) if(event.key == "ArrowDown" && !this.open && !this.resultsOpen)
{ {
@ -958,6 +974,7 @@ export class Et2TreeDropdown extends SearchMixin<Constructor<any> & Et2InputWidg
?leafOnly = ${this.leafOnly} ?leafOnly = ${this.leafOnly}
@blur=${this.handleInternalBlur} @blur=${this.handleInternalBlur}
@keydown=${this.handleComboboxKeyDown}
@sl-selection-change=${this.handleTreeChange} @sl-selection-change=${this.handleTreeChange}
> >
</et2-tree> </et2-tree>