1
0
mirror of https://github.com/bitwarden/browser.git synced 2024-07-07 12:25:46 +02:00

[EC-1028] [Design feedback] There is no way to close the multi-select with the keyboard when it is in a modal (#4627)

* [EC-1028] feat: close dropdown on `enter`

* [EC-1028] fix: form submitting on enter

* [EC-1028] feat: close dropdown on escape

Close dropdown on escape, otherwise allow propagation so that modals can be closed with another escape click.

* [EC-1028] feat: allow submit form using enter when dropdown is closed
This commit is contained in:
Andreas Coroiu 2023-02-13 13:10:53 +01:00 committed by GitHub
parent a90b04a5e3
commit d65acc3bad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 0 deletions

View File

@ -17,6 +17,7 @@
[disabled]="disabled" [disabled]="disabled"
[clearSearchOnAdd]="true" [clearSearchOnAdd]="true"
[labelForId]="labelForId" [labelForId]="labelForId"
[keyDownFn]="keyDown"
appendTo="body" appendTo="body"
> >
<ng-template ng-loadingspinner-tmp> <ng-template ng-loadingspinner-tmp>

View File

@ -1,3 +1,4 @@
import { hasModifierKey } from "@angular/cdk/keycodes";
import { import {
Component, Component,
Input, Input,
@ -67,6 +68,29 @@ export class MultiSelectComponent implements OnInit, BitFormFieldControl, Contro
this.loadingText = this.i18nService.t("multiSelectLoading"); this.loadingText = this.i18nService.t("multiSelectLoading");
} }
/** Function for customizing keyboard navigation */
/** Needs to be arrow function to retain `this` scope. */
keyDown = (event: KeyboardEvent) => {
if (!this.select.isOpen && event.key === "Enter" && !hasModifierKey(event)) {
return false;
}
if (this.select.isOpen && event.key === "Enter" && !hasModifierKey(event)) {
this.select.close();
event.preventDefault();
return false;
}
if (this.select.isOpen && event.key === "Escape" && !hasModifierKey(event)) {
this.selectedItems = [];
this.select.close();
event.stopPropagation();
return false;
}
return true;
};
/** Helper method for showing selected state in custom template */ /** Helper method for showing selected state in custom template */
isSelected(item: any): boolean { isSelected(item: any): boolean {
return this.selectedItems?.find((selected) => selected.id === item.id) != undefined; return this.selectedItems?.find((selected) => selected.id === item.id) != undefined;