Bugfix för dropdown select

Vastra-Gotalandsregionen · Dec 3, 2020 · d897265 · d897265
1 parent 1584223
commit d897265
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Change-log](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+# 7.8.2 (Beta, 2020-12-03)
+- Fixing a bug in `vgr-dropdown-select` where focus got stuck in filter fi deselectable was active.
 # 7.8.1 (Beta, 2020-11-10)
 - Various bugfixes for `vgr-dropdown-select`.
 

diff --git a/projects/komponentkartan/package.json b/projects/komponentkartan/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vgr-komponentkartan",
-  "version": "7.8.1-beta1",
+  "version": "7.8.2-beta1",
   "peerDependencies": {
     "@angular/common": "^9.1.7",
     "@angular/core": "^9.1.7",

diff --git a/projects/komponentkartan/src/lib/controls/dropdown-select/dropdown-select.component.ts b/projects/komponentkartan/src/lib/controls/dropdown-select/dropdown-select.component.ts
@@ -393,7 +393,7 @@ export class DropdownSelectComponent implements OnChanges, AfterContentInit, Aft
     } else if (event.key === 'ArrowDown' || event.key === 'Down') {
       if (this.multi) {
         this.selectAll.nativeElement.focus();
-      } else if (this.deselectable) {
+      } else if (this.deselectable && this.value) {
         this.deselectButton.focus();
       } else if (filteredItems.length) {
         filteredItems[0].focus();
@@ -535,7 +535,7 @@ export class DropdownSelectComponent implements OnChanges, AfterContentInit, Aft
       filteredItems[itemIndex - 1].focus();
     } else if (this.multi) {
       this.selectAll.nativeElement.focus();
-    } else if (this.deselectable) {
+    } else if (this.deselectable && this.value) {
       this.deselectButton.focus();
     } else if (this.filterVisible) {
       this.filter.focus();

diff --git a/src/app/dropdown-select-documentation/dropdown-select-documentation.component.html b/src/app/dropdown-select-documentation/dropdown-select-documentation.component.html
@@ -53,7 +53,7 @@
         </div>
         <div class="one-third">
           <p>Stor, 50 alternativ</p>
-          <vgr-dropdown-select>
+          <vgr-dropdown-select [deselectable]="true">
             <vgr-dropdown-item *ngFor="let item of items50">{{item}}</vgr-dropdown-item>
           </vgr-dropdown-select>
         </div>