bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-13 06:54:07 +00:00
Code Issues Releases Wiki Activity

[CL-459] Fix chip behavior when opening menu while item is selected (#11227)

Browse Source
This commit is contained in:
Victoria League
2024-09-26 11:52:10 -04:00
committed by GitHub
parent 1336b395b1
commit 15b7716620
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libs/components/src/chip-select/chip-select.component.ts
View File

@@ -108,8 +108,20 @@ export class ChipSelectComponent<T = unknown> implements ControlValueAccessor, A
return this.selectedOption?.icon || this.placeholderIcon;
}
/**
* Set the rendered options based on whether or not an option is already selected, so that the correct
* submenu displays.
*/
protected setOrResetRenderedOptions(): void {
this.renderedOptions = this.selectedOption
? this.selectedOption.children?.length > 0
? this.selectedOption
: this.getParent(this.selectedOption)
: this.rootTree;
}
protected handleMenuClosed(): void {
this.renderedOptions = this.selectedOption ?? this.rootTree;
this.setOrResetRenderedOptions();
}
protected selectOption(option: ChipSelectOption<T>, _event: MouseEvent) {
@@ -197,11 +209,7 @@ export class ChipSelectComponent<T = unknown> implements ControlValueAccessor, A
/** Implemented as part of NG_VALUE_ACCESSOR */
writeValue(obj: T): void {
this.selectedOption = this.findOption(this.rootTree, obj);
/** Update the rendered options for next time the menu is opened */
this.renderedOptions = this.selectedOption
? this.getParent(this.selectedOption)
: this.rootTree;
this.setOrResetRenderedOptions();
}
/** Implemented as part of NG_VALUE_ACCESSOR */