From b1bb4bdf8474dd90c1bdd509ea112f7690f9125b Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 21 Nov 2026 10:39:47 -0800 Subject: [PATCH] Fix backspace bug --- .../common/input/tags/tags.component.html | 1 + .../common/input/tags/tags.component.spec.ts | 38 +++++++++++++++++++ .../common/input/tags/tags.component.ts | 11 ++++++ 3 files changed, 50 insertions(+) diff --git a/src-ui/src/app/components/common/input/tags/tags.component.html b/src-ui/src/app/components/common/input/tags/tags.component.html index 5bb833d0a9..b3debd0014 100644 --- a/src-ui/src/app/components/common/input/tags/tags.component.html +++ b/src-ui/src/app/components/common/input/tags/tags.component.html @@ -17,6 +17,7 @@ [searchFn]="searchFn" addTagText="Add tag" i18n-addTagText + [keyDownFn]="onKeyDown" (add)="onAdd($event)" (change)="onChange(value)"> diff --git a/src-ui/src/app/components/common/input/tags/tags.component.spec.ts b/src-ui/src/app/components/common/input/tags/tags.component.spec.ts index 184a6284a8..da8bf67fa9 100644 --- a/src-ui/src/app/components/common/input/tags/tags.component.spec.ts +++ b/src-ui/src/app/components/common/input/tags/tags.component.spec.ts @@ -278,4 +278,42 @@ describe('TagsComponent', () => { component.tags = [lone] expect(component.getParentChain(5)).toEqual([]) }) + + describe('hierarchy', () => { + const root: Tag = { id: 1, name: 'root' } + const mid: Tag = { id: 2, name: 'mid', parent: 1 } + const leaf: Tag = { id: 3, name: 'leaf', parent: 2 } + const other: Tag = { id: 4, name: 'other' } + + beforeEach(() => { + component.tags = [root, mid, leaf, other] + component.value = [3, 2, 1, 4] + }) + + it('should treat ancestors of another selected tag as implied', () => { + expect([1, 2, 3, 4].map((id) => component.isImplied(id))).toEqual([ + true, + true, + false, + false, + ]) + component.preserveHierarchy = false + expect(component.isImplied(1)).toBe(false) + }) + + it('should remove the last visible tag on backspace, not a hidden ancestor', () => { + const backspace = new KeyboardEvent('keydown', { key: 'Backspace' }) + expect(component.onKeyDown(backspace)).toBe(false) + expect(component.value).toEqual([3, 2, 1]) + expect(component.onKeyDown(backspace)).toBe(false) + expect(component.value).toEqual([2, 1]) + + // nothing hidden: leave it to ng-select + component.value = [4] + expect(component.onKeyDown(backspace)).toBe(true) + expect( + component.onKeyDown(new KeyboardEvent('keydown', { key: 'a' })) + ).toBe(true) + }) + }) }) diff --git a/src-ui/src/app/components/common/input/tags/tags.component.ts b/src-ui/src/app/components/common/input/tags/tags.component.ts index 97305d495a..6127a831fd 100644 --- a/src-ui/src/app/components/common/input/tags/tags.component.ts +++ b/src-ui/src/app/components/common/input/tags/tags.component.ts @@ -153,6 +153,17 @@ export class TagsComponent implements OnInit, ControlValueAccessor { return !collapseImpliedAncestors(this.value, this.tagsById).includes(id) } + /** + * Remove the last visible tag (in case its actually a hidden ancestor) + */ + readonly onKeyDown = (event: KeyboardEvent): boolean => { + if (event.key !== 'Backspace' || this.select?.searchTerm) return true + const visible = this.value?.filter((id) => !this.isImplied(id)) ?? [] + if (visible.length === (this.value?.length ?? 0)) return true + this.removeTag(visible.at(-1)) + return false + } + getTag(id: number) { if (this.tags) { return this.tags.find((tag) => tag.id == id)