fix: don't show not found text while loading (#252)

fixes #243
ng-select · Feb 10, 2018 · 6be231a · 6be231a
1 parent fb7b94b
commit 6be231a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/ng-select/ng-select.component.spec.ts b/src/ng-select/ng-select.component.spec.ts
@@ -519,6 +519,7 @@ describe('NgSelectComponent', function () {
                 NgSelectBasicTestCmp,
                 `<ng-select [items]="cities"
                         bindLabel="name"
+                        [loading]="citiesLoading"
                         [multiple]="multiple"
                         [(ngModel)]="selectedCity">
                 </ng-select>`);
@@ -539,6 +540,17 @@ describe('NgSelectComponent', function () {
                 expect(text).toContain('No items found');
             }));
 
+            it('should open dropdown with loading message', fakeAsync(() => {
+                fixture.componentInstance.cities = [];
+                fixture.componentInstance.citiesLoading = true;
+                tickAndDetectChanges(fixture);
+                triggerKeyDownEvent(getNgSelectElement(fixture), KeyCode.Space);
+                tickAndDetectChanges(fixture);
+                const options = fixture.debugElement.queryAll(By.css('.ng-option'));
+                expect(options.length).toBe(1);
+                expect(options[0].nativeElement.innerHTML).toContain('Loading...');
+            }));
+
             it('should open dropdown and mark first item', () => {
                 const result = { value: fixture.componentInstance.cities[0] };
                 triggerKeyDownEvent(getNgSelectElement(fixture), KeyCode.Space);
@@ -1493,6 +1505,7 @@ class NgSelectBasicTestCmp {
     selectedCity: { id: number; name: string };
     multiple = false;
     dropdownPosition = 'bottom';
+    citiesLoading = false;
     cities = [
         { id: 1, name: 'Vilnius' },
         { id: 2, name: 'Kaunas' },

diff --git a/src/ng-select/ng-select.component.ts b/src/ng-select/ng-select.component.ts
@@ -359,7 +359,7 @@ export class NgSelectComponent implements OnInit, OnDestroy, OnChanges, AfterVie
 
     showNoItemsFound() {
         const empty = this.itemsList.filteredItems.length === 0;
-        return (empty && !this._isTypeahead) ||
+        return (empty && !this._isTypeahead && !this.loading) ||
             (empty && this._isTypeahead && this.filterValue && !this.isLoading);
     }