GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-06-22 04:19:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): selector prevent edit selection on keydown

Browse Source
This commit is contained in:
Clem Fern 2023-09-10 17:52:38 +02:00
parent 3ce2bb68c6
commit 651861cd4a
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tabby-core/src/components/selectorModal.component.ts
View File

@ -18,17 +18,18 @@ export class SelectorModalComponent<T> {
@Input() selectedIndex = 0 @Input() selectedIndex = 0
hasGroups = false hasGroups = false
@ViewChildren('item') itemChildren: QueryList<ElementRef> @ViewChildren('item') itemChildren: QueryList<ElementRef>
private preventEdit: boolean
constructor ( constructor (public modalInstance: NgbActiveModal) {
public modalInstance: NgbActiveModal, this.preventEdit = false
) { } }
ngOnInit (): void { ngOnInit (): void {
this.onFilterChange() this.onFilterChange()
this.hasGroups = this.options.some(x => x.group) this.hasGroups = this.options.some(x => x.group)
} }
@HostListener('keydown', ['$event']) onKeyUp (event: KeyboardEvent): void { @HostListener('keydown', ['$event']) onKeyDown (event: KeyboardEvent): void {
if (event.key === 'Escape') { if (event.key === 'Escape') {
this.close() this.close()
} else if (this.filteredOptions.length > 0) { } else if (this.filteredOptions.length > 0) {
@ -46,10 +47,14 @@ export class SelectorModalComponent<T> {
event.preventDefault() event.preventDefault()
} else if (event.key === 'Enter') { } else if (event.key === 'Enter') {
this.selectOption(this.filteredOptions[this.selectedIndex]) this.selectOption(this.filteredOptions[this.selectedIndex])
} else if (event.key === 'Backspace' && this.canEditSelected()) { } else if (event.key === 'Backspace' && !this.preventEdit) {
if (this.canEditSelected()) {
event.preventDefault() event.preventDefault()
this.filter = this.filteredOptions[this.selectedIndex].freeInputEquivalent! this.filter = this.filteredOptions[this.selectedIndex].freeInputEquivalent!
this.onFilterChange() this.onFilterChange()
} else {
this.preventEdit = true
}
} }
this.selectedIndex = (this.selectedIndex + this.filteredOptions.length) % this.filteredOptions.length this.selectedIndex = (this.selectedIndex + this.filteredOptions.length) % this.filteredOptions.length
@ -61,6 +66,12 @@ export class SelectorModalComponent<T> {
} }
} }
@HostListener('keyup', ['$event']) onKeyUp (event: KeyboardEvent): void {
if (event.key === 'Backspace' && this.preventEdit) {
this.preventEdit = false
}
}
onFilterChange (): void { onFilterChange (): void {
const f = this.filter.trim().toLowerCase() const f = this.filter.trim().toLowerCase()
if (!f) { if (!f) {