fix: focus select after unselecting single item

fixes #661
ng-select · Jul 30, 2018 · 1bc3f02 · 1bc3f02
1 parent cb64f45
commit 1bc3f02
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/ng-select/ng-select.component.spec.ts b/src/ng-select/ng-select.component.spec.ts
@@ -2615,9 +2615,9 @@ describe('NgSelectComponent', function () {
                 expect(select.isOpen).toBe(false);
             }));
 
-            it('should focus dropdown', fakeAsync(() => {
+            it('should focus dropdown while unselecting', fakeAsync(() => {
                 const focus = spyOn(select, 'focus');
-                triggerMousedown();
+                select.unselect(fixture.componentInstance.cities[0]);
                 tickAndDetectChanges(fixture);
                 expect(focus).toHaveBeenCalled();
             }));

diff --git a/src/ng-select/ng-select.component.ts b/src/ng-select/ng-select.component.ts
@@ -261,14 +261,14 @@ export class NgSelectComponent implements OnDestroy, OnChanges, AfterViewInit, C
             return;
         }
 
-        if (!this._focused) {
-            this.focus();
-        }
-
         if (target.className.includes('ng-value-icon')) {
             return;
         }
 
+        if (!this._focused) {
+            this.focus();
+        }
+
         if (this.searchable) {
             this.open();
         } else {
@@ -395,6 +395,7 @@ export class NgSelectComponent implements OnDestroy, OnChanges, AfterViewInit, C
 
     unselect(item: NgOption) {
         this.itemsList.unselect(item);
+        this.focus();
         this._updateNgModel();
         this.removeEvent.emit(item);
     }
@@ -453,6 +454,10 @@ export class NgSelectComponent implements OnDestroy, OnChanges, AfterViewInit, C
     }
 
     onInputFocus($event) {
+        if (this._focused) {
+            return;
+        }
+
         (<HTMLElement>this.elementRef.nativeElement).classList.add('ng-select-focused');
         this.focusEvent.emit($event);
         this._focused = true;