fix(navigation): close dropdown on tab click fixes #58 (#63)

ng-select · Oct 3, 2017 · e2fa1ed · e2fa1ed
1 parent 0fa10fd
commit e2fa1ed
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/lib/src/ng-select.component.spec.ts b/src/lib/src/ng-select.component.spec.ts
@@ -340,6 +340,14 @@ describe('NgSelectComponent', function () {
                 expect(fixture.componentInstance.select.isOpen).toBeFalsy()
             });
 
+            it('should close dropdown when there are no items', fakeAsync(() => {
+                fixture.componentInstance.select.onFilter({ target: { value: 'random stuff' } });
+                tick(200);
+                triggerKeyDownEvent(getNgSelectElement(fixture), KeyCode.Space);
+                triggerKeyDownEvent(getNgSelectElement(fixture), KeyCode.Tab);
+                expect(fixture.componentInstance.select.isOpen).toBeFalsy()
+            }));
+
             it('should close dropdown when marked item is already selected', () => {
                 fixture.componentInstance.selectedCity = fixture.componentInstance.cities[0];
                 triggerKeyDownEvent(getNgSelectElement(fixture), KeyCode.Space);

diff --git a/src/lib/src/ng-select.component.ts b/src/lib/src/ng-select.component.ts
@@ -395,8 +395,12 @@ export class NgSelectComponent implements OnInit, OnDestroy, ControlValueAccesso
 
     private handleTab($event: KeyboardEvent) {
         if (this.isOpen) {
-            this.select(this.itemsList.markedItem);
-            if (this.multiple) {
+            const marked = this.itemsList.markedItem;
+            if (marked) {
+                this.select(marked);
+            }
+
+            if (this.multiple || !marked) {
                 this.close();
             }
         }